summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-17 12:08:14 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-17 12:08:14 +0000
commitd52270c9cfac981334dd8eff008becb267c127df (patch)
tree3b375ea1cd1d25a14831022bcefb97de0ce091a4 /meta
parent4a9392f5a3295b900eebc81fd6fd64a8029525df (diff)
downloadpoky-d52270c9cfac981334dd8eff008becb267c127df.tar.gz
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/defconfig5
-rw-r--r--meta/packages/linux/linux-nokia770_2.6.16-osso15.bb23
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 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-omap1 3# Linux kernel version: 2.6.16-omap1
4# Fri May 26 14:02:32 2006 4# Thu Nov 16 18:24:13 2006
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -200,8 +200,6 @@ CONFIG_ARM_THUMB=y
200CONFIG_PREEMPT=y 200CONFIG_PREEMPT=y
201CONFIG_NO_IDLE_HZ=y 201CONFIG_NO_IDLE_HZ=y
202# CONFIG_AEABI is not set 202# CONFIG_AEABI is not set
203CONFIG_OABI_COMPAT=y
204# CONFIG_ARTHUR is not set
205# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 203# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
206CONFIG_SELECT_MEMORY_MODEL=y 204CONFIG_SELECT_MEMORY_MODEL=y
207CONFIG_FLATMEM_MANUAL=y 205CONFIG_FLATMEM_MANUAL=y
@@ -245,6 +243,7 @@ CONFIG_FPE_NWFPE=y
245CONFIG_BINFMT_ELF=y 243CONFIG_BINFMT_ELF=y
246# CONFIG_BINFMT_AOUT is not set 244# CONFIG_BINFMT_AOUT is not set
247# CONFIG_BINFMT_MISC is not set 245# CONFIG_BINFMT_MISC is not set
246# CONFIG_ARTHUR is not set
248 247
249# 248#
250# Power management options 249# 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 @@
1SECTION = "kernel" 1SECTION = "kernel"
2DESCRIPTION = "Linux kernel for Nokia 770" 2DESCRIPTION = "Linux kernel for Nokia 770"
3LICENSE = "GPL" 3LICENSE = "GPL"
4PR = "r4" 4PR = "r0"
5 5
6SRC_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 \ 6SRC_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 \
7 file://defconfig" 7 file://defconfig"
@@ -12,17 +12,30 @@ KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
12 12
13inherit kernel 13inherit kernel
14 14
15COMPATIBLE_HOST = "arm.*-linux" 15COMPATIBLE_MACHINE = "nokia770"
16COMPATIBLE_MACHINE = "nokia770|cmx270"
17 16
18do_configure_prepend() { 17do_configure_prepend() {
19 install -m 0644 ${WORKDIR}/defconfig ${S}/.config 18 install -m 0644 ${WORKDIR}/defconfig ${S}/.config
20 oe_runmake oldconfig 19
20 if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
21 echo "CONFIG_AEABI=y" >> ${S}/.config
22 echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
23 else
24 echo "# CONFIG_AEABI is not set" >> ${S}/.config
25 echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
26 fi
27
28 sed -e '/CONFIG_AEABI/d' \
29 -e '/CONFIG_OABI_COMPAT=/d' \
30 '${WORKDIR}/defconfig' >>'${S}/.config'
31
32 yes '' | oe_runmake oldconfig
33
21} 34}
22 35
23do_deploy() { 36do_deploy() {
24 install -d ${DEPLOY_DIR}/images 37 install -d ${DEPLOY_DIR}/images
25 install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin 38 install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
26} 39}
27 40
28do_deploy[dirs] = "${S}" 41do_deploy[dirs] = "${S}"