[oe-commits] org.oe.dev merge of 'f24ed430bf3ceb0d538a87543ba12756657e820e'
oe commit
oe at amethyst.openembedded.net
Tue May 6 13:25:24 UTC 2008
merge of 'f24ed430bf3ceb0d538a87543ba12756657e820e'
and 'f9a7308abb2bdd098705726bcaf19639473187de'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 32f83927f371bada65007ff9faed25fd263d6dfd
ViewMTN: http://monotone.openembedded.org/revision/info/32f83927f371bada65007ff9faed25fd263d6dfd
Files:
1
packages/linux/linux-2.6.25/cm-x270
packages/tmsnc
packages/linux/linux-2.6.25/cm-x270/0001-cm-x270-match-type.patch
packages/linux/linux-2.6.25/cm-x270/0002-ramdisk_load.patch
packages/linux/linux-2.6.25/cm-x270/0003-mmcsd_large_cards-r0.patch
packages/linux/linux-2.6.25/cm-x270/0004-cm-x270-nand-simplify-name.patch
packages/linux/linux-2.6.25/cm-x270/0005-add-display-set-default-16bpp.patch
packages/linux/linux-2.6.25/cm-x270/0006-updated-defconfig.patch
packages/linux/linux-2.6.25/cm-x270/defconfig
packages/tmsnc/tmsnc_0.3.2.bb
packages/uclibc/files/build_wcs_upper_buffer.patch
packages/fbreader/fbreader_0.8.2a.bb
packages/linux/linux_2.6.24.bb
packages/linux/linux_2.6.25.bb
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/uclibc/uclibc_0.9.29.bb
packages/uclibc/uclibc_svn.bb
conf/distro/angstrom-2008.1.conf
packages/tasks/task-base.bb
Diffs:
#
# mt diff -rf24ed430bf3ceb0d538a87543ba12756657e820e -r32f83927f371bada65007ff9faed25fd263d6dfd
#
#
#
# add_dir "packages/linux/linux-2.6.25/cm-x270"
#
# add_dir "packages/tmsnc"
#
# add_file "packages/linux/linux-2.6.25/cm-x270/0001-cm-x270-match-type.patch"
# content [1b7fa5ff537d7399263d59e28eca0aa6143e78cc]
#
# add_file "packages/linux/linux-2.6.25/cm-x270/0002-ramdisk_load.patch"
# content [809805779647739b90f53de46d16fdb474b6ee6f]
#
# add_file "packages/linux/linux-2.6.25/cm-x270/0003-mmcsd_large_cards-r0.patch"
# content [160c57e3eafd0e31e7f5bc4183b896aac91ada9d]
#
# add_file "packages/linux/linux-2.6.25/cm-x270/0004-cm-x270-nand-simplify-name.patch"
# content [f849e7d69d92a73408727642b609b978032849b8]
#
# add_file "packages/linux/linux-2.6.25/cm-x270/0005-add-display-set-default-16bpp.patch"
# content [6c6a0aa5bfbe9fe25268488cea1bdd19f5016719]
#
# add_file "packages/linux/linux-2.6.25/cm-x270/0006-updated-defconfig.patch"
# content [029bd46fcd30100445ccb1af1d351733b2c485fb]
#
# add_file "packages/linux/linux-2.6.25/cm-x270/defconfig"
# content [017f37e3e61f85f8a538808266aebed306ea4f54]
#
# add_file "packages/tmsnc/tmsnc_0.3.2.bb"
# content [9da21853019cf6582f479025a98d34e994938b3d]
#
# add_file "packages/uclibc/files/build_wcs_upper_buffer.patch"
# content [2ffb3951d168fb2168382fb97e9f19a7ab896fba]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [34b916ca0e224a0702b6e0ab82743b59573cee83]
# to [8db6f94263a3d565641816bc9b594a4cec9fa6a6]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [5819d62f743069d615e51ce38e88a46104232fd3]
# to [5140922314a6b7a562cfc145b5cd8bef1a115424]
#
# patch "packages/linux/linux_2.6.25.bb"
# from [cc090c604f64fcaff28a9afac75840fd99f449fa]
# to [dfb7619f1379579633ca1e76392a661f4a29aafc]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [28151fbdab1200d9c37c380e25f9bca4cbc1bbaf]
# to [ee54d8d89789d424beda2e0c58484df39062ea0b]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [dbbd24e34ec8e9ab218f1a914c0b9eb2e4e3468b]
# to [2768d9ecc595b84f45ce4e80e84cf53949a8b652]
#
# patch "packages/uclibc/uclibc_svn.bb"
# from [97cfa7f99c8af9580b5f508636f27ddb5d1aa49d]
# to [980440cf391f74fea1555789067bcd8cd4dc78e8]
#
============================================================
--- packages/linux/linux-2.6.25/cm-x270/0001-cm-x270-match-type.patch 1b7fa5ff537d7399263d59e28eca0aa6143e78cc
+++ packages/linux/linux-2.6.25/cm-x270/0001-cm-x270-match-type.patch 1b7fa5ff537d7399263d59e28eca0aa6143e78cc
@@ -0,0 +1,25 @@
+From b14fd99c45da2130e9a59917c8f9e9bc10941031 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.4.rc4
+
============================================================
--- packages/linux/linux-2.6.25/cm-x270/0002-ramdisk_load.patch 809805779647739b90f53de46d16fdb474b6ee6f
+++ packages/linux/linux-2.6.25/cm-x270/0002-ramdisk_load.patch 809805779647739b90f53de46d16fdb474b6ee6f
@@ -0,0 +1,81 @@
+From 66975ae3184aabc3080e23bf7f0195ed5862cb13 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 ecdbc96..0487aee 100644
+--- a/arch/arm/mach-pxa/cm-x270.c
++++ b/arch/arm/mach-pxa/cm-x270.c
+@@ -240,6 +240,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 d53fee8..bfcf0ea 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)
+ {
+@@ -546,7 +549,20 @@ static int __init populate_rootfs(void)
+ panic(err);
+ 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.4.rc4
+
============================================================
--- packages/linux/linux-2.6.25/cm-x270/0003-mmcsd_large_cards-r0.patch 160c57e3eafd0e31e7f5bc4183b896aac91ada9d
+++ packages/linux/linux-2.6.25/cm-x270/0003-mmcsd_large_cards-r0.patch 160c57e3eafd0e31e7f5bc4183b896aac91ada9d
@@ -0,0 +1,36 @@
+From b98b85eba9b31d79217b5c6e0aae42a038b033b7 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 91ded3e..5640c5b 100644
+--- a/drivers/mmc/card/block.c
++++ b/drivers/mmc/card/block.c
+@@ -409,6 +409,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)
+@@ -472,6 +473,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.4.rc4
+
============================================================
--- packages/linux/linux-2.6.25/cm-x270/0004-cm-x270-nand-simplify-name.patch f849e7d69d92a73408727642b609b978032849b8
+++ packages/linux/linux-2.6.25/cm-x270/0004-cm-x270-nand-simplify-name.patch f849e7d69d92a73408727642b609b978032849b8
@@ -0,0 +1,25 @@
+From 54d9a0dadfc920f5213f8c599c3ea91d82ceb2b4 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.4.rc4
+
============================================================
--- packages/linux/linux-2.6.25/cm-x270/0005-add-display-set-default-16bpp.patch 6c6a0aa5bfbe9fe25268488cea1bdd19f5016719
+++ packages/linux/linux-2.6.25/cm-x270/0005-add-display-set-default-16bpp.patch 6c6a0aa5bfbe9fe25268488cea1bdd19f5016719
@@ -0,0 +1,82 @@
+From a70bd453457fe59f87ec1c06fbf49ab56dc71008 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at bec-systems.com>
+Date: Wed, 27 Feb 2008 16:44:42 -0500
+Subject: [PATCH] add-display-set-default-16bpp
+
+---
+ arch/arm/mach-pxa/cm-x270.c | 31 +++++++++++++++++++++++++++++--
+ 1 files changed, 29 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
+index 0487aee..1aec199 100644
+--- a/arch/arm/mach-pxa/cm-x270.c
++++ b/arch/arm/mach-pxa/cm-x270.c
+@@ -259,6 +259,7 @@ static struct map_desc cmx270_io_desc[] __initdata = {
+ #define MTYPE_CRT800x600 3
+ #define MTYPE_TFT320x240 6
+ #define MTYPE_STN640x480 7
++#define MTYPE_TFT640x480_SHARP 8
+
+ static struct pxafb_mode_info generic_stn_320x240_mode = {
+ .pixclock = 76923,
+@@ -289,7 +290,7 @@ static struct pxafb_mach_info generic_stn_320x240 = {
+
+ static struct pxafb_mode_info generic_tft_640x480_mode = {
+ .pixclock = 38461,
+- .bpp = 8,
++ .bpp = 16,
+ .xres = 640,
+ .yres = 480,
+ .hsync_len = 60,
+@@ -315,7 +316,7 @@ static struct pxafb_mach_info generic_tft_640x480 = {
+
+ static struct pxafb_mode_info generic_crt_640x480_mode = {
+ .pixclock = 38461,
+- .bpp = 8,
++ .bpp = 16,
+ .xres = 640,
+ .yres = 480,
+ .hsync_len = 63,
+@@ -417,6 +418,29 @@ static struct pxafb_mach_info generic_stn_640x480 = {
+ .cmap_static = 0,
+ };
+
++
++static struct pxafb_mode_info sharp_vga_tft_mode = {
++ .pixclock = 38461,
++ .bpp = 16,
++ .xres = 640,
++ .yres = 480,
++ .hsync_len = 60,
++ .vsync_len = 2,
++ .left_margin = 72,
++ .upper_margin = 32,
++ .right_margin = 72,
++ .lower_margin = 10,
++ .sync = 0,
++};
++
++static struct pxafb_mach_info sharp_vga_tft = {
++ .modes = &sharp_vga_tft_mode,
++ .num_modes = 1,
++ .lccr0 = (LCCR0_PAS),
++ .lccr3 = (LCCR3_PixClkDiv(0x01) |
++ LCCR3_Acb(0xff)),
++};
++
+ static struct pxafb_mach_info *cmx270_display = &generic_crt_640x480;
+
+ static int __init cmx270_set_display(char *str)
+@@ -438,6 +462,9 @@ static int __init cmx270_set_display(char *str)
+ case MTYPE_TFT320x240:
+ cmx270_display = &generic_tft_320x240;
+ break;
++ case MTYPE_TFT640x480_SHARP:
++ cmx270_display = &sharp_vga_tft;
++ break;
+ case MTYPE_STN640x480:
+ cmx270_display = &generic_stn_640x480;
+ break;
+--
+1.5.4.rc4
+
============================================================
--- packages/linux/linux-2.6.25/cm-x270/0006-updated-defconfig.patch 029bd46fcd30100445ccb1af1d351733b2c485fb
+++ packages/linux/linux-2.6.25/cm-x270/0006-updated-defconfig.patch 029bd46fcd30100445ccb1af1d351733b2c485fb
@@ -0,0 +1,1457 @@
+From 283d562e0e9d4999488b147ecdf81cca733e5d95 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at bec-systems.com>
+Date: Wed, 27 Feb 2008 15:57:02 -0500
+Subject: [PATCH] updated defconfig
+
+---
+ arch/arm/configs/cm_x270_defconfig | 834 +++++++++++++++---------------------
+ 1 files changed, 353 insertions(+), 481 deletions(-)
+
+diff --git a/arch/arm/configs/cm_x270_defconfig b/arch/arm/configs/cm_x270_defconfig
+index 5cab083..eb20958 100644
+--- a/arch/arm/configs/cm_x270_defconfig
++++ b/arch/arm/configs/cm_x270_defconfig
+@@ -1,13 +1,13 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.22
+-# Wed Jul 18 14:11:48 2007
++# Linux kernel version: 2.6.25
++# Wed Apr 30 15:08:40 2008
+ #
+ CONFIG_ARM=y
+ CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+ CONFIG_GENERIC_GPIO=y
+ CONFIG_GENERIC_TIME=y
+-# CONFIG_GENERIC_CLOCKEVENTS is not set
++CONFIG_GENERIC_CLOCKEVENTS=y
+ CONFIG_MMU=y
+ # CONFIG_NO_IOPORT is not set
+ CONFIG_GENERIC_HARDIRQS=y
+@@ -21,22 +21,20 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
+ # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+ CONFIG_GENERIC_HWEIGHT=y
+ CONFIG_GENERIC_CALIBRATE_DELAY=y
++CONFIG_ARCH_SUPPORTS_AOUT=y
+ CONFIG_ZONE_DMA=y
+ CONFIG_ARCH_MTD_XIP=y
+ CONFIG_VECTORS_BASE=0xffff0000
+ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+ #
+-# Code maturity level options
++# General setup
+ #
+ CONFIG_EXPERIMENTAL=y
+ CONFIG_BROKEN_ON_SMP=y
++CONFIG_LOCK_KERNEL=y
+ CONFIG_INIT_ENV_ARG_LIMIT=32
+-
+-#
+-# General setup
+-#
+-CONFIG_LOCALVERSION=""
++CONFIG_LOCALVERSION="-cm-x270"
+ # CONFIG_LOCALVERSION_AUTO is not set
+ CONFIG_SWAP=y
+ CONFIG_SYSVIPC=y
+@@ -44,13 +42,18 @@ CONFIG_SYSVIPC_SYSCTL=y
+ # CONFIG_POSIX_MQUEUE is not set
+ # CONFIG_BSD_PROCESS_ACCT is not set
+ # CONFIG_TASKSTATS is not set
+-# CONFIG_USER_NS is not set
+ # CONFIG_AUDIT is not set
+ CONFIG_IKCONFIG=y
+ CONFIG_IKCONFIG_PROC=y
+-CONFIG_LOG_BUF_SHIFT=17
++CONFIG_LOG_BUF_SHIFT=14
++# CONFIG_CGROUPS is not set
++# CONFIG_GROUP_SCHED is not set
++# CONFIG_USER_SCHED is not set
++# CONFIG_CGROUP_SCHED is not set
+ CONFIG_SYSFS_DEPRECATED=y
++CONFIG_SYSFS_DEPRECATED_V2=y
+ # CONFIG_RELAY is not set
++# CONFIG_NAMESPACES is not set
+ CONFIG_BLK_DEV_INITRD=y
+ CONFIG_INITRAMFS_SOURCE=""
+ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+@@ -59,30 +62,38 @@ CONFIG_EMBEDDED=y
+ CONFIG_UID16=y
+ CONFIG_SYSCTL_SYSCALL=y
+ CONFIG_KALLSYMS=y
+-# CONFIG_KALLSYMS_ALL is not set
+ # CONFIG_KALLSYMS_EXTRA_PASS is not set
+ CONFIG_HOTPLUG=y
+ CONFIG_PRINTK=y
+ CONFIG_BUG=y
+ CONFIG_ELF_CORE=y
++CONFIG_COMPAT_BRK=y
+ CONFIG_BASE_FULL=y
+ CONFIG_FUTEX=y
+ CONFIG_ANON_INODES=y
+-# CONFIG_EPOLL is not set
+-# CONFIG_SIGNALFD is not set
+-# CONFIG_TIMERFD is not set
+-# CONFIG_EVENTFD is not set
++CONFIG_EPOLL=y
++CONFIG_SIGNALFD=y
++CONFIG_TIMERFD=y
++CONFIG_EVENTFD=y
+ CONFIG_SHMEM=y
+ CONFIG_VM_EVENT_COUNTERS=y
+ CONFIG_SLAB=y
+ # CONFIG_SLUB is not set
+ # CONFIG_SLOB is not set
++# CONFIG_PROFILING is not set
++# CONFIG_MARKERS is not set
++CONFIG_HAVE_OPROFILE=y
++# CONFIG_KPROBES is not set
++CONFIG_HAVE_KPROBES=y
++CONFIG_HAVE_KRETPROBES=y
++CONFIG_PROC_PAGE_MONITOR=y
++CONFIG_SLABINFO=y
+ CONFIG_RT_MUTEXES=y
+ # CONFIG_TINY_SHMEM is not set
+ CONFIG_BASE_SMALL=0
+ CONFIG_MODULES=y
+ CONFIG_MODULE_UNLOAD=y
+-CONFIG_MODULE_FORCE_UNLOAD=y
++# CONFIG_MODULE_FORCE_UNLOAD is not set
+ # CONFIG_MODVERSIONS is not set
+ # CONFIG_MODULE_SRCVERSION_ALL is not set
+ CONFIG_KMOD=y
+@@ -99,11 +110,12 @@ CONFIG_IOSCHED_NOOP=y
+ CONFIG_IOSCHED_AS=y
+ CONFIG_IOSCHED_DEADLINE=y
+ CONFIG_IOSCHED_CFQ=y
+-CONFIG_DEFAULT_AS=y
++# CONFIG_DEFAULT_AS is not set
+ # CONFIG_DEFAULT_DEADLINE is not set
+-# CONFIG_DEFAULT_CFQ is not set
++CONFIG_DEFAULT_CFQ=y
+ # CONFIG_DEFAULT_NOOP is not set
+-CONFIG_DEFAULT_IOSCHED="anticipatory"
++CONFIG_DEFAULT_IOSCHED="cfq"
++CONFIG_CLASSIC_RCU=y
+
+ #
+ # System Type
+@@ -131,6 +143,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
+ # CONFIG_ARCH_L7200 is not set
+ # CONFIG_ARCH_KS8695 is not set
+ # CONFIG_ARCH_NS9XXX is not set
++# CONFIG_ARCH_MXC is not set
++# CONFIG_ARCH_ORION is not set
+ # CONFIG_ARCH_PNX4008 is not set
+ CONFIG_ARCH_PXA=y
+ # CONFIG_ARCH_RPC is not set
+@@ -140,21 +154,36 @@ CONFIG_ARCH_PXA=y
+ # CONFIG_ARCH_LH7A40X is not set
+ # CONFIG_ARCH_DAVINCI is not set
+ # CONFIG_ARCH_OMAP is not set
+-CONFIG_DMABOUNCE=y
++# CONFIG_ARCH_MSM7X00A is not set
+
+ #
+-# Intel PXA2xx Implementations
++# Intel PXA2xx/PXA3xx Implementations
+ #
+ # CONFIG_ARCH_LUBBOCK is not set
+ # CONFIG_MACH_LOGICPD_PXA270 is not set
+ # CONFIG_MACH_MAINSTONE is not set
+ # CONFIG_ARCH_PXA_IDP is not set
+ # CONFIG_PXA_SHARPSL is not set
++# CONFIG_ARCH_PXA_ESERIES is not set
+ # CONFIG_MACH_TRIZEPS4 is not set
++# CONFIG_MACH_EM_X270 is not set
++# CONFIG_MACH_COLIBRI is not s%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf9a7308abb2bdd098705726bcaf19639473187de -r32f83927f371bada65007ff9faed25fd263d6dfd
#
#
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [580a8e8bdd2e455c1aa7545e2c8d9d1f7c19f983]
# to [1426e85436d24f9292dd3115736fef8e6fae4887]
#
# patch "packages/tasks/task-base.bb"
# from [4f3fba7e4b5f01a54b98411187bcbae655008613]
# to [c013fadaf0387eb1ffe99d00b051d75fbff69b82]
#
============================================================
--- conf/distro/angstrom-2008.1.conf 580a8e8bdd2e455c1aa7545e2c8d9d1f7c19f983
+++ conf/distro/angstrom-2008.1.conf 1426e85436d24f9292dd3115736fef8e6fae4887
@@ -193,7 +193,7 @@ DISTRO_EXTRA_RDEPENDS += "\
update-modules \
${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
angstrom-version \
- opkg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \
+ opkg-nogpg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \
util-linux-mount util-linux-umount \
${DEBUG_APPS} \
"
============================================================
--- packages/tasks/task-base.bb 4f3fba7e4b5f01a54b98411187bcbae655008613
+++ packages/tasks/task-base.bb c013fadaf0387eb1ffe99d00b051d75fbff69b82
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r68"
+PR = "r69"
inherit task
More information about the Openembedded-commits
mailing list