diff options
| author | Phil Blundell <philb@gnu.org> | 2008-10-20 08:23:05 +0100 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2008-10-20 08:23:05 +0100 |
| commit | 2cab657e1a2a13ee607cd81ff6682fe54e27010f (patch) | |
| tree | 9ddffde1ad3241a91492f42539a19ef5ce1505f4 /packages | |
| parent | a62e78edb46f5070e668c7349da51b4a6b38165e (diff) | |
| parent | 5b9a8183ccb79d02ca593e746c5f5d02133ed6cf (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig | 12 | ||||
| -rw-r--r-- | packages/kexecboot/linux-kexecboot_2.6.26.bb | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig b/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig index 4434962a64..2e7c8130f6 100644 --- a/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig +++ b/packages/kexecboot/linux-kexecboot-2.6.26/collie/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26 -# Thu Jul 24 23:13:04 2008 +# Sat Oct 18 23:52:11 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -34,7 +34,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -49,6 +49,8 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz" +CONFIG_INITRAMFS_ROOT_UID=0 +CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_EMBEDDED=y @@ -251,7 +253,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 rootdelay=3 mem=64M fbcon=rotate:1 dyntick=enable" +CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -342,14 +344,12 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_RAM is not set # CONFIG_MTD_ROM is not set # CONFIG_MTD_ABSENT is not set -CONFING_MTD_SHARP=y +CONFIG_MTD_SHARP=y # # Mapping drivers for chip access # # CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_PHYSMAP is not set -# CONFIG_MTD_ARM_INTEGRATOR is not set CONFIG_MTD_SA1100=y # CONFIG_MTD_PLATRAM is not set diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb index 7d000ff2e1..26af506132 100644 --- a/packages/kexecboot/linux-kexecboot_2.6.26.bb +++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -FILE_PR = "r5" +FILE_PR = "r6" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" |