diff options
13 files changed, 32 insertions, 14 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-akita b/meta/packages/linux/linux-rp-2.6.23/defconfig-akita index 7d9adaf0e3..0941936439 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-akita +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-akita @@ -244,6 +244,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 dyntick=enable quiet" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 index 833f72ac9e..22923a1e85 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 @@ -217,7 +217,8 @@ CONFIG_HZ_250=y # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=250 -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_PHYSICAL_START=0x100000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x100000 diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 index bd11500398..715b2bd134 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 @@ -246,6 +246,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 dyntick=enable quiet" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_CPU_FREQ_PXA25x=y # diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-collie b/meta/packages/linux/linux-rp-2.6.23/defconfig-collie index 49d9596b92..2672b796aa 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-collie +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-collie @@ -222,6 +222,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal b/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal index 2b02621499..81a38a9d43 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal @@ -241,6 +241,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 index ee05db4e5a..e0596c4c56 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 @@ -210,7 +210,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle index 387b5e9bff..a851f7d648 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle @@ -146,6 +146,7 @@ CONFIG_CPU_TLB_V4WBI=y CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_SHARP_LOCOMO=y CONFIG_SHARP_PARAM=y CONFIG_SHARPSL_PM=y diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm index 35cf3f5b17..355ecdf383 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm @@ -134,7 +134,8 @@ CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_DCACHE_WRITETHROUGH is not set # CONFIG_CPU_CACHE_ROUND_ROBIN is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_ARM_VIC=y CONFIG_ICST307=y diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 index e9eb83e2dd..e4a50304d2 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 @@ -177,7 +177,8 @@ CONFIG_SECCOMP=y CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set CONFIG_HZ=250 -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_PHYSICAL_START=0x100000 # CONFIG_HOTPLUG_CPU is not set diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz index 8e044e6a14..e3b5a3ee29 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.23-rc4 -# Tue Aug 28 22:32:38 2007 +# Linux kernel version: 2.6.23 +# Thu Dec 27 17:03:44 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -66,7 +66,6 @@ CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y @@ -149,6 +148,7 @@ CONFIG_PXA_SHARPSL=y # CONFIG_MACH_TRIZEPS4 is not set # CONFIG_MACH_EM_X270 is not set # CONFIG_MACH_HX2750 is not set +# CONFIG_MACH_HTCUNIVERSAL is not set # CONFIG_PXA_SHARPSL_25x is not set CONFIG_PXA_SHARPSL_27x=y CONFIG_MACH_AKITA=y @@ -244,6 +244,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw fbcon=rotate:1 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling @@ -275,6 +276,7 @@ CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_UP_POSSIBLE=y CONFIG_SUSPEND=y CONFIG_APM_EMULATION=y @@ -493,7 +495,6 @@ CONFIG_MTD=m # CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_AFS_PARTS is not set # @@ -502,6 +503,7 @@ CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CHAR=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m +# CONFIG_MTD_BLOCK_RO is not set # CONFIG_FTL is not set # CONFIG_NFTL is not set # CONFIG_INFTL is not set @@ -524,7 +526,7 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set # CONFIG_MTD_RAM is not set -CONFIG_MTD_ROM=y +CONFIG_MTD_ROM=m # CONFIG_MTD_ABSENT is not set # @@ -549,14 +551,14 @@ CONFIG_MTD_SHARP_SL=y # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set -CONFIG_MTD_NAND=y +CONFIG_MTD_NAND=m CONFIG_MTD_NAND_VERIFY_WRITE=y # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_H1900 is not set -CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_IDS=m # CONFIG_MTD_NAND_DISKONCHIP is not set -CONFIG_MTD_NAND_SHARPSL=y +CONFIG_MTD_NAND_SHARPSL=m # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_ONENAND is not set @@ -893,6 +895,7 @@ CONFIG_I2C_PXA=y # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set # CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set CONFIG_MISC_DEVICES=y # CONFIG_EEPROM_93CX6 is not set @@ -901,6 +904,8 @@ CONFIG_MISC_DEVICES=y # Multifunction device drivers # # CONFIG_MFD_SM501 is not set +# CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_ASIC3_DS1WM is not set # # Multi-Function Devices diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa index 74fc076608..55f32c9430 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa @@ -143,6 +143,7 @@ CONFIG_CPU_TLB_V4WBI=y CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_SHARP_PARAM=y CONFIG_SHARPSL_PM=y CONFIG_SHARP_SCOOP=y diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite b/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite index 0321704a1f..65b0aeff4b 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite @@ -232,7 +232,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,38400 root=/dev/mtdblock2 rootfstype=jffs2 mem=64M dyntick=enable debug" # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling diff --git a/meta/packages/linux/linux-rp_2.6.23.bb b/meta/packages/linux/linux-rp_2.6.23.bb index 96ad2676d7..3b0939417c 100644 --- a/meta/packages/linux/linux-rp_2.6.23.bb +++ b/meta/packages/linux/linux-rp_2.6.23.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r5" +PR = "r6" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" @@ -38,6 +38,8 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ ${RPSRC}/pxa27x_overlay-r6.patch;patch=1 \ ${RPSRC}/w100_extaccel-r1.patch;patch=1 \ ${RPSRC}/w100_extmem-r1.patch;patch=1 \ + ${RPSRC}/spitzkbd_fix-r0.patch;patch=1 \ + ${RPSRC}/export_atags-r0.patch;patch=1 \ file://w100fb-unused-var.patch;patch=1 \ file://hostap-monitor-mode.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ |