diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-09-14 00:49:28 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-09-14 00:49:28 +0000 |
| commit | 3d406da3ff0b55d944afd9521c7e26ad614ff3ac (patch) | |
| tree | b170ce96a77d6bfe6b76f4fc8efd972c2c82a452 /packages/linux | |
| parent | 7a9354ad56e1b7e249c91f4a94e5a3b016900b54 (diff) | |
| parent | 79f77d92fc5ee018b591cbc2c86bae30f78a90ac (diff) | |
merge of '235d3c4d9fbc3aee4e352851f04eb4fa2da4a68f'
and '2d2fba06a82095954bfbae27ea7e7024c3604521'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-2.6.21/gumstix-verdex/defconfig | 15 | ||||
| -rw-r--r-- | packages/linux/linux-omap.inc | 4 | ||||
| -rw-r--r-- | packages/linux/linux_2.6.21.bb | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/packages/linux/linux-2.6.21/gumstix-verdex/defconfig b/packages/linux/linux-2.6.21/gumstix-verdex/defconfig index d49d7a1021..9107cd0d7c 100644 --- a/packages/linux/linux-2.6.21/gumstix-verdex/defconfig +++ b/packages/linux/linux-2.6.21/gumstix-verdex/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21 -# Thu Aug 23 09:30:49 2007 +# Thu Sep 13 14:49:02 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -63,11 +63,11 @@ CONFIG_BUG=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y # CONFIG_EPOLL is not set -# CONFIG_SHMEM is not set +CONFIG_SHMEM=y CONFIG_SLAB=y # CONFIG_VM_EVENT_COUNTERS is not set CONFIG_RT_MUTEXES=y -CONFIG_TINY_SHMEM=y +# CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set @@ -199,7 +199,7 @@ CONFIG_PCMCIA_PXA2XX=m CONFIG_NO_IDLE_HZ=y CONFIG_HZ=100 CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -235,6 +235,8 @@ CONFIG_KEXEC=y # # At least one emulation must be selected # +# CONFIG_FPE_NWFPE is not set +# CONFIG_FPE_FASTFPE is not set # # Userspace binary formats @@ -1161,10 +1163,7 @@ CONFIG_FONT_6x11=y # # Logo configuration # -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # # Sound diff --git a/packages/linux/linux-omap.inc b/packages/linux/linux-omap.inc index 6bc1363737..83f134b878 100644 --- a/packages/linux/linux-omap.inc +++ b/packages/linux/linux-omap.inc @@ -1,7 +1,9 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" LICENSE = "GPL" -DEPENDS = ${@['u-boot','u-boot-omap2430sdp'][bb.data.getVar('MACHINE',d,1) == 'omap2430sdp']} +#DEPENDS = ${@['u-boot','u-boot-omap2430sdp'][bb.data.getVar('MACHINE',d,1) == 'omap2430sdp']} + +DEPENDS = uboot-utils inherit kernel diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb index 2144dd28a1..0848bcd71a 100644 --- a/packages/linux/linux_2.6.21.bb +++ b/packages/linux/linux_2.6.21.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE_at91sam9263ek = "-1" DEFAULT_PREFERENCE_gumstix-connex = "1" DEFAULT_PREFERENCE_gumstix-verdex = "1" -PR = "r8" +PR = "r9" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig \ @@ -35,7 +35,6 @@ GUMSTIX_PATCHES = "\ file://arch-config.patch;patch=1 \ file://board-init.patch;patch=1 \ file://compact-flash.patch;patch=1 \ - file://defconfig.patch;patch=1 \ file://flash.patch;patch=1 \ file://pxa2xx_udc.patch;patch=1 \ file://bkpxa-pxa-cpu.patch;patch=1 \ @@ -63,7 +62,6 @@ GUMSTIX_PATCHES = "\ file://mmc-card-detect.patch;patch=1 \ file://misalignment-handling.patch;patch=1 \ file://compile-fix-pxa_cpufreq.patch;patch=1 \ - file://ramfs-mode-support.patch;patch=1 \ file://pxafb-definition.patch;patch=1 \ file://270-usb-gadget-udc.patch;patch=1 \ file://gumstix-pxa270-usb-host.patch;patch=1 \ |