diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-04-23 12:15:27 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-04-23 12:15:27 +0200 |
| commit | 4c312174e1b1419e47f3b2d644926a7c985e4312 (patch) | |
| tree | 3e57af3502ec0b6703dd85c2a54b9a3692ed1957 | |
| parent | 2747c78c7c545a1188cfb255603f20e8ebf67475 (diff) | |
| parent | 4a9cec9c1a5e585dbc56f5aa0000488313e25338 (diff) | |
| download | openembedded-4c312174e1b1419e47f3b2d644926a7c985e4312.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/machine/include/tune-ppce500.inc | 1 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.24/hipox/defconfig | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/machine/include/tune-ppce500.inc b/conf/machine/include/tune-ppce500.inc index 9c8c68c342..44f8742f9f 100644 --- a/conf/machine/include/tune-ppce500.inc +++ b/conf/machine/include/tune-ppce500.inc @@ -1,3 +1,4 @@ TARGET_CC_ARCH = "-mcpu=8540" BASE_PACKAGE_ARCH = "ppce500" FEED_ARCH = "ppce500" +PACKAGE_EXTRA_ARCHS += "ppce500" diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig index 7f4dbdde5e..76d2b689ca 100644 --- a/recipes/linux/linux-2.6.24/hipox/defconfig +++ b/recipes/linux/linux-2.6.24/hipox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24.4 -# Mon Apr 20 12:29:34 2009 +# Tue Apr 21 08:57:22 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -287,7 +287,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y # # Floating point emulation |