diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-11-17 12:08:14 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-11-17 12:08:14 +0000 |
| commit | d52270c9cfac981334dd8eff008becb267c127df (patch) | |
| tree | 3b375ea1cd1d25a14831022bcefb97de0ce091a4 /meta | |
| parent | 4a9392f5a3295b900eebc81fd6fd64a8029525df (diff) | |
| download | openembedded-core-d52270c9cfac981334dd8eff008becb267c127df.tar.gz openembedded-core-d52270c9cfac981334dd8eff008becb267c127df.tar.bz2 openembedded-core-d52270c9cfac981334dd8eff008becb267c127df.zip | |
linux-nokia770: Sync with updates in OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@868 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig | 5 | ||||
| -rw-r--r-- | meta/packages/linux/linux-nokia770_2.6.16-osso15.bb | 23 |
2 files changed, 20 insertions, 8 deletions
diff --git a/meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig b/meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig index 315ac831e9..813d07d055 100644 --- a/meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig +++ b/meta/packages/linux/linux-nokia770-2.6.16-osso15/nokia770/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-omap1 -# Fri May 26 14:02:32 2006 +# Thu Nov 16 18:24:13 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -200,8 +200,6 @@ CONFIG_ARM_THUMB=y CONFIG_PREEMPT=y CONFIG_NO_IDLE_HZ=y # CONFIG_AEABI is not set -CONFIG_OABI_COMPAT=y -# CONFIG_ARTHUR is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -245,6 +243,7 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set # # Power management options diff --git a/meta/packages/linux/linux-nokia770_2.6.16-osso15.bb b/meta/packages/linux/linux-nokia770_2.6.16-osso15.bb index 85312b4b8c..e0c823a80c 100644 --- a/meta/packages/linux/linux-nokia770_2.6.16-osso15.bb +++ b/meta/packages/linux/linux-nokia770_2.6.16-osso15.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Nokia 770" LICENSE = "GPL" -PR = "r4" +PR = "r0" SRC_URI = "http://repository.maemo.org/pool/mistral/non-free/source/k/kernel-source-2.6.16/kernel-source-2.6.16_2.6.16.rel-osso15.tar.gz \ file://defconfig" @@ -12,17 +12,30 @@ KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" inherit kernel -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = "nokia770|cmx270" +COMPATIBLE_MACHINE = "nokia770" do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config - oe_runmake oldconfig + + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' + + yes '' | oe_runmake oldconfig + } do_deploy() { install -d ${DEPLOY_DIR}/images - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} } do_deploy[dirs] = "${S}" |