[oe-commits] org.oe.dev merge of '5dc6982ea38f5357453c937c13cc8a341570c70e'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Dec 18 00:04:00 UTC 2007
merge of '5dc6982ea38f5357453c937c13cc8a341570c70e'
and 'b3b7b8bc7364554f922a7cbf7bab890c33ef0971'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: ee44e24ae7df2acd2c48896070c5b974ec2e952d
ViewMTN: http://monotone.openembedded.org/revision/info/ee44e24ae7df2acd2c48896070c5b974ec2e952d
Files:
1
packages/linux/linux-2.6.23+2.6.24-rc5
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch
packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig
packages/linux/linux_2.6.23+2.6.24-rc5.bb
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/machine/cm-x270.conf
contrib/angstrom/build-release.sh
packages/curl/curl_7.16.4.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig
packages/linux/linux-linkstationarm_2.6.12.bb
packages/linux/linux-linkstationppc_2.6.21-rc5.bb
packages/linux/linux-rp-2.6.22/defconfig-qemux86
packages/linux/linux-rp_2.6.22.bb
packages/linux/linux.inc
packages/linux/linux_2.6.23.bb
packages/tasks/task-base.bb
packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
packages/uboot/u-boot-utils-native_1.2.0.bb
packages/uboot/u-boot-utils_1.2.0.bb
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
Diffs:
#
# mt diff -r5dc6982ea38f5357453c937c13cc8a341570c70e -ree44e24ae7df2acd2c48896070c5b974ec2e952d
#
#
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc5"
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270"
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch"
# content [594f8119fb7412cc3a58789192ef4fe1225dfe1d]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch"
# content [3a0164b7721c3e46446104e684de419a61362a5c]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch"
# content [8d657a0c60045ee9ebb5121583f0b5d6a1dad97a]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch"
# content [7be809ca5d666e613ca1e1215552fda23819dd11]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch"
# content [178d843edcdae70a42a99ee4b3a55de4734a7c1d]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig"
# content [8483c6f77370ab189aeb3d4f9246d1b2563fc301]
#
# add_file "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
# content [ea7f634ff11fe3d829b90eacf2f7e442fda2de65]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [c9c69c3a8cfe32c296bc6533bfbe7d1245734ef7]
# to [7329acd7d0b92e08e302dab3b873ff71a3a5e0da]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [2ee34e9004f488e328231f5a1f139e5225d0e2cf]
# to [9bb6cf26f7a7451d99dda12e51b6584c26194aa5]
#
# patch "conf/machine/cm-x270.conf"
# from [01e554b1475f1f31f329a84fefd8199e5290fbcc]
# to [2a8d6b9ac864b5f94ce6689ef7814ec193676166]
#
# patch "contrib/angstrom/build-release.sh"
# from [8d77a44ca4304a0ee848142edd6f3c86b6abc9ea]
# to [fcbcc35a1bbbe58855952cff9065301b196efa1a]
#
# patch "packages/curl/curl_7.16.4.bb"
# from [9f422993011a8a54e5050ac333fe5e07a7112e3d]
# to [e059af19afea35121903c9bfbda21700cbf38c07]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
# from [cf4a868ba0d67c665cbdb50b00aad66a166e803a]
# to [cf9f8cb9fd5be055814a58a31b7eafe2772a8658]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [bc9b6320d36d6556339ca6526a84f192b7c3f86f]
# to [f9f0f5550a035d11532343bcf6adeddd9141aacb]
#
# patch "packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig"
# from [27678d7ecddb52724e52d1e6d8bdc0be12b8b32a]
# to [32e0eac7c402ef21b388fc096e69ea47f3ea5d3e]
#
# patch "packages/linux/linux-linkstationarm_2.6.12.bb"
# from [230d19e2e48f76e44f8caf816eef47910be90255]
# to [5c531f3ff8db593954394d2cd7b0bbf6d5f3c034]
#
# patch "packages/linux/linux-linkstationppc_2.6.21-rc5.bb"
# from [d038fcab32af632acacf324702cc25ae2f298bb7]
# to [679383825421e632b5d7cc7a4a1a719a3b8a403a]
#
# patch "packages/linux/linux-rp-2.6.22/defconfig-qemux86"
# from [13ba6932d390681dfa74465511435d21ed675514]
# to [16b8d2c9fa793b6983ce17c0ad73916e3c892e8b]
#
# patch "packages/linux/linux-rp_2.6.22.bb"
# from [acbe4f75ccc973360308a4eb4bfc4071a439ddb4]
# to [354129d3f7a203d9efebefa12179aacae093091c]
#
# patch "packages/linux/linux.inc"
# from [74d6d33befb5063d39401bc7a2c8b089ced7e97c]
# to [c2377d7cc726218e3c29b1d34e48ddc5e3e5c482]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [46f4e7136cce3c8d26a3f7dbc5a80a07611c6e03]
# to [2281487e8d175d81a3be60da3addf3d79106de70]
#
# patch "packages/tasks/task-base.bb"
# from [82df1fbd760d24db70fcb4cdf1ba37f5e15cb57d]
# to [f33c49fb3e3820bd151a0e0035b125643a46b85a]
#
# patch "packages/uboot/u-boot-mkimage-openmoko-native_oe.bb"
# from [c01c65b1498babb2fc3be4730cb705493ee6c823]
# to [8f9f753bc2c5c49521344050b8d6c56e4ec93404]
#
# patch "packages/uboot/u-boot-utils-native_1.2.0.bb"
# from [a79cb700407a2e90e0c039014ac9e7ebb0f22219]
# to [6a5c2e1750fa7ea68cbde9258d6e89c1aefb6528]
#
# patch "packages/uboot/u-boot-utils_1.2.0.bb"
# from [64396fa43c9fcef1ed1cd3ae82a49d140febbbd0]
# to [a665ab3de0681644fca851349a5fd6339733fb46]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [82f390a2257420604caa01ac186221938ae505ce]
# to [684d183b9b73eecbbdb15dc21ff863ae212a9e98]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# from [b4455938ec659767eadfbe50dd3227b157c2076d]
# to [6578acd7668e306b7372e0e3aebfb95d49fa7961]
#
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch 594f8119fb7412cc3a58789192ef4fe1225dfe1d
+++ packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0001-cm-x270-match-type.patch 594f8119fb7412cc3a58789192ef4fe1225dfe1d
@@ -0,0 +1,25 @@
+From 2a3b2dd055b235eb14f7654eeef217222cdb8e00 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 18:58:27 -0400
+Subject: [PATCH] cm-x270-match-type
+
+---
+ arch/arm/boot/compressed/head-xscale.S | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S
+index 67ea99e..2e63ba2 100644
+--- a/arch/arm/boot/compressed/head-xscale.S
++++ b/arch/arm/boot/compressed/head-xscale.S
+@@ -44,3 +44,8 @@ __XScale_start:
+ str r1, [r0, #0x18]
+ #endif
+
++#if defined(CONFIG_MACH_ARMCORE)
++ mov r7, #(MACH_TYPE_ARMCORE & 0xFF00)
++ add r7, r7, #(MACH_TYPE_ARMCORE & 0xFF)
++#endif
++
+--
+1.5.2.5
+
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch 3a0164b7721c3e46446104e684de419a61362a5c
+++ packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0002-ramdisk_load.patch 3a0164b7721c3e46446104e684de419a61362a5c
@@ -0,0 +1,81 @@
+From 7d874d6bb1c1210402938a21ab51a4b64e2d68e5 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 19:01:50 -0400
+Subject: [PATCH] ramdisk_load
+
+---
+ arch/arm/mach-pxa/cm-x270.c | 6 ++++++
+ include/asm-arm/arch-pxa/cm-x270.h | 4 ++++
+ init/initramfs.c | 16 ++++++++++++++++
+ 3 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
+index 177664c..fb607e9 100644
+--- a/arch/arm/mach-pxa/cm-x270.c
++++ b/arch/arm/mach-pxa/cm-x270.c
+@@ -239,6 +239,12 @@ static struct map_desc cmx270_io_desc[] __initdata = {
+ .length = SZ_64M,
+ .type = MT_DEVICE
+ },
++ [2] = { /* NOR flash */
++ .virtual = CMX270_FLASH_VIRT,
++ .pfn = __phys_to_pfn(PXA_CS0_PHYS),
++ .length = (8<<20), /* up to 8 MByte flash */
++ .type = MT_DEVICE
++ },
+ };
+
+ /*
+diff --git a/include/asm-arm/arch-pxa/cm-x270.h b/include/asm-arm/arch-pxa/cm-x270.h
+index f8fac9e..70e0dce 100644
+--- a/include/asm-arm/arch-pxa/cm-x270.h
++++ b/include/asm-arm/arch-pxa/cm-x270.h
+@@ -20,6 +20,10 @@
+ #define CMX270_VIRT_BASE (0xe8000000)
+ #define CMX270_IT8152_VIRT (CMX270_VIRT_BASE)
+ #define CMX270_IDE104_VIRT (CMX270_IT8152_VIRT + SZ_64M)
++#define CMX270_FLASH_VIRT (CMX270_IDE104_VIRT + SZ_64M)
++
++#define CMX270_FLASH_RAMDISK_VIRT (CMX270_FLASH_VIRT + 0x1c0000)
++
+
+ /* GPIO related definitions */
+ #define GPIO_IT8152_IRQ (22)
+diff --git a/init/initramfs.c b/init/initramfs.c
+index 1db02a0..d875fbc 100644
+--- a/init/initramfs.c
++++ b/init/initramfs.c
+@@ -7,6 +7,9 @@
+ #include <linux/string.h>
+ #include <linux/syscalls.h>
+
++// HACK for compulab cm-x270
++#include <asm/arch/cm-x270.h>
++
+ static __initdata char *message;
+ static void __init error(char *x)
+ {
+@@ -550,7 +553,20 @@ static int __init populate_rootfs(void)
+ #ifdef CONFIG_BLK_DEV_INITRD
+ if (initrd_start) {
+ #ifdef CONFIG_BLK_DEV_RAM
++
++ /* hack to make initramfs work because the
++ * compulab BL does not zero out the
++ * initrd memory. This only seems to affect loading
++ * initramfs (cpio.gz) archives. Does not seem to
++ * affect ramdisks.
++ */
++ int initrd_size = *(int *)(CMX270_FLASH_RAMDISK_VIRT);
+ int fd;
++
++ initrd_end = initrd_start + initrd_size;
++ //printk("CLIFF: initrd_start = 0x%x\n", initrd_start);
++ //printk("CLIFF: initrd_end = 0x%x\n", initrd_end);
++
+ printk(KERN_INFO "checking if image is initramfs...");
+ err = unpack_to_rootfs((char *)initrd_start,
+ initrd_end - initrd_start, 1);
+--
+1.5.2.5
+
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch 8d657a0c60045ee9ebb5121583f0b5d6a1dad97a
+++ packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0003-mmcsd_large_cards-r0.patch 8d657a0c60045ee9ebb5121583f0b5d6a1dad97a
@@ -0,0 +1,36 @@
+From caad105a5732f7ca8ea88d4448aa5d9f4d7eb2c4 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 19:02:55 -0400
+Subject: [PATCH] mmcsd_large_cards-r0
+
+---
+ drivers/mmc/card/block.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
+index aeb32a9..d854b0c 100644
+--- a/drivers/mmc/card/block.c
++++ b/drivers/mmc/card/block.c
+@@ -423,6 +423,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
+ {
+ struct mmc_blk_data *md;
+ int devidx, ret;
++ unsigned long cap;
+
+ devidx = find_first_zero_bit(dev_use, MMC_NUM_MINORS);
+ if (devidx >= MMC_NUM_MINORS)
+@@ -486,6 +487,11 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
+
+ sprintf(md->disk->disk_name, "mmcblk%d", devidx);
+
++ if (card->csd.read_blkbits > 9)
++ md->block_bits = 9;
++ else
++ md->block_bits = card->csd.read_blkbits;
++
+ blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits);
+
+ if (!mmc_card_sd(card) && mmc_card_blockaddr(card)) {
+--
+1.5.2.5
+
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch 7be809ca5d666e613ca1e1215552fda23819dd11
+++ packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0004-cm-x270-nand-simplify-name.patch 7be809ca5d666e613ca1e1215552fda23819dd11
@@ -0,0 +1,25 @@
+From deb5c78d6625c6fd5ce25ac3c8ac396e7e61ebf7 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.dev.bec-systems.com>
+Date: Fri, 20 Jul 2007 19:04:12 -0400
+Subject: [PATCH] cm-x270-nand-simplify-name
+
+---
+ drivers/mtd/nand/cmx270_nand.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
+index cb663ef..3654ce4 100644
+--- a/drivers/mtd/nand/cmx270_nand.c
++++ b/drivers/mtd/nand/cmx270_nand.c
+@@ -191,6 +191,8 @@ static int cmx270_init(void)
+ cmx270_nand_mtd->owner = THIS_MODULE;
+ cmx270_nand_mtd->priv = this;
+
++ cmx270_nand_mtd->name = "cm-x270-nand";
++
+ /* insert callbacks */
+ this->IO_ADDR_R = cmx270_nand_io;
+ this->IO_ADDR_W = cmx270_nand_io;
+--
+1.5.2.5
+
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch 178d843edcdae70a42a99ee4b3a55de4734a7c1d
+++ packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/0005-cmx270-pci.patch 178d843edcdae70a42a99ee4b3a55de4734a7c1d
@@ -0,0 +1,150 @@
+From 416e9cca1903f4a6f26c241c3393ad635015e7f6 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.(none)>
+Date: Sat, 15 Dec 2007 12:24:05 -0500
+Subject: [PATCH] cmx270-pci
+
+---
+ arch/arm/Kconfig | 8 +++++++-
+ arch/arm/common/it8152.c | 10 ++--------
+ arch/arm/mach-pxa/cm-x270-pci.c | 18 ++++++++----------
+ 3 files changed, 17 insertions(+), 19 deletions(-)
+
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index a7e9fea..c4de2d4 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -537,7 +537,7 @@ config ISA_DMA_API
+ bool
+
+ config PCI
+- bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695
++ bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE
+ help
+ Find out whether you have a PCI motherboard. PCI is the name of a
+ bus system, i.e. the way the CPU talks to the other stuff inside
+@@ -558,6 +558,12 @@ config PCI_HOST_VIA82C505
+ depends on PCI && ARCH_SHARK
+ default y
+
++config PCI_HOST_ITE8152
++ bool
++ depends on PCI && MACH_ARMCORE
++ default y
++ select DMABOUNCE
++
+ source "drivers/pci/Kconfig"
+
+ source "drivers/pcmcia/Kconfig"
+diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
+index c03de9b..97b7dc1 100644
+--- a/arch/arm/common/it8152.c
++++ b/arch/arm/common/it8152.c
+@@ -70,8 +70,6 @@ static inline void it8152_irq(int irq)
+ {
+ struct irq_desc *desc;
+
+- printk(KERN_DEBUG "===> %s: irq=%d\n", __FUNCTION__, irq);
+-
+ desc = irq_desc + irq;
+ desc_handle_irq(irq, desc);
+ }
+@@ -106,8 +104,6 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
+ int bits_pd, bits_lp, bits_ld;
+ int i;
+
+- printk(KERN_DEBUG "=> %s: irq = %d\n", __FUNCTION__, irq);
+-
+ while (1) {
+ /* Read all */
+ bits_pd = __raw_readl(IT8152_INTC_PDCNIRR);
+@@ -293,8 +289,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
+ */
+ int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
+ {
+- printk(KERN_DEBUG "%s: %s %llx\n",
+- __FUNCTION__, dev->dev.bus_id, mask);
++ dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask);
+ if (mask >= PHYS_OFFSET + SZ_64M - 1)
+ return 0;
+
+@@ -304,8 +299,7 @@ int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
+ int
+ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
+ {
+- printk(KERN_DEBUG "%s: %s %llx\n",
+- __FUNCTION__, dev->dev.bus_id, mask);
++ dev_dbg(&dev->dev, "%s: %llx\n", __FUNCTION__, mask);
+ if (mask >= PHYS_OFFSET + SZ_64M - 1)
+ return 0;
+
+diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c
+index 878d3b9..15c4e0d 100644
+--- a/arch/arm/mach-pxa/cm-x270-pci.c
++++ b/arch/arm/mach-pxa/cm-x270-pci.c
+@@ -40,7 +40,7 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size,
+ {
+ unsigned int sz = SZ_64M >> PAGE_SHIFT;
+
+- printk(KERN_INFO "Adjusting zones for CM-x270\n");
++ pr_info("Adjusting zones for CM-x270\n");
+
+ /*
+ * Only adjust if > 64M on current system
+@@ -104,8 +104,7 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+ {
+ int irq;
+
+- printk(KERN_DEBUG "===> %s: %s slot=%x, pin=%x\n", __FUNCTION__,
+- pci_name(dev), slot, pin);
++ dev_dbg(&dev->dev, "%s: slot=%x, pin=%x\n", __FUNCTION__, slot, pin);
+
+ irq = it8152_pci_map_irq(dev, slot, pin);
+ if (irq)
+@@ -141,14 +140,13 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+ return(0);
+ }
+
+-static struct pci_bus * __init
+-cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys)
++static void cmx270_pci_preinit(void)
+ {
+- printk(KERN_INFO "Initializing CM-X270 PCI subsystem\n");
++ pr_info("Initializing CM-X270 PCI subsystem\n");
+
+ __raw_writel(0x800, IT8152_PCI_CFG_ADDR);
+ if (__raw_readl(IT8152_PCI_CFG_DATA) == 0x81521283) {
+- printk(KERN_INFO "PCI Bridge found.\n");
++ pr_info("PCI Bridge found.\n");
+
+ /* set PCI I/O base at 0 */
+ writel(0x848, IT8152_PCI_CFG_ADDR);
+@@ -163,7 +161,7 @@ cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys)
+ /* CardBus Controller on ATXbase baseboard */
+ writel(0x4000, IT8152_PCI_CFG_ADDR);
+ if (readl(IT8152_PCI_CFG_DATA) == 0xAC51104C) {
+- printk(KERN_INFO "CardBus Bridge found.\n");
++ pr_info("CardBus Bridge found.\n");
+
+ /* Configure socket 0 */
+ writel(0x408C, IT8152_PCI_CFG_ADDR);
+@@ -196,7 +194,6 @@ cmx270_pci_scan_bus(int nr, struct pci_sys_data *sys)
+ writel(0xb0000000, IT8152_PCI_CFG_DATA);
+ }
+ }
+- return it8152_pci_scan_bus(nr, sys);
+ }
+
+ static struct hw_pci cmx270_pci __initdata = {
+@@ -204,7 +201,8 @@ static struct hw_pci cmx270_pci __initdata = {
+ .map_irq = cmx270_pci_map_irq,
+ .nr_controllers = 1,
+ .setup = it8152_pci_setup,
+- .scan = cmx270_pci_scan_bus,
++ .scan = it8152_pci_scan_bus,
++ .preinit = cmx270_pci_preinit,
+ };
+
+ static int __init cmx270_init_pci(void)
+--
+1.5.2.5
+
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig 8483c6f77370ab189aeb3d4f9246d1b2563fc301
+++ packages/linux/linux-2.6.23+2.6.24-r%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rb3b7b8bc7364554f922a7cbf7bab890c33ef0971 -ree44e24ae7df2acd2c48896070c5b974ec2e952d
#
#
#
# patch "packages/tasks/task-base.bb"
# from [3005c202e492ec2ec94e87ee07291c4f96060530]
# to [f33c49fb3e3820bd151a0e0035b125643a46b85a]
#
============================================================
--- packages/tasks/task-base.bb 3005c202e492ec2ec94e87ee07291c4f96060530
+++ packages/tasks/task-base.bb f33c49fb3e3820bd151a0e0035b125643a46b85a
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r50"
+PR = "r51"
inherit task
@@ -159,8 +159,14 @@ RRECOMMENDS_task-base-kernel24 = "\
kernel-module-input \
kernel-module-uinput"
+# utf8 - Standard FS encoding
+# iso8859-1, cp437 - These 2 are default encodings used by VFAT
+# If you don't need VFAT support - don't enable them in defconfig.
+# If you build them, you want VFAT support and they're included by default.
RRECOMMENDS_task-base-kernel26 = "\
kernel-module-nls-utf8 \
+ kernel-module-nls-iso8859-1 \
+ kernel-module-nls-cp437 \
kernel-module-input \
kernel-module-uinput \
kernel-module-rtc-dev \
More information about the Openembedded-commits
mailing list