diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-02-17 07:40:12 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-02-17 07:40:12 +0100 |
| commit | 81a8895ad3c8893b6c6293106b52e14df43f7f68 (patch) | |
| tree | 7538d1c3fe309f62ccec590d58fbf841bd1a1f98 | |
| parent | 2ebf454e8133c02e6ca8ea169d86e4496573f739 (diff) | |
linux-openmoko[devel]: use $CONFIG_NAME for upstream defconfig
| -rw-r--r-- | packages/linux/linux-openmoko-2.6.28_git.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko-devel_git.bb | 15 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko.inc | 11 |
3 files changed, 15 insertions, 13 deletions
diff --git a/packages/linux/linux-openmoko-2.6.28_git.bb b/packages/linux/linux-openmoko-2.6.28_git.bb index 8774721308..de38b9d173 100644 --- a/packages/linux/linux-openmoko-2.6.28_git.bb +++ b/packages/linux/linux-openmoko-2.6.28_git.bb @@ -26,7 +26,7 @@ SRC_URI = "\ S = "${WORKDIR}/git" do_configure_prepend() { - install -m 644 ./arch/arm/configs/gta02-packaging-defconfig ${WORKDIR}/defconfig-oe + install -m 644 ${CONFIG_NAME} ${WORKDIR}/defconfig-oe cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR} } diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb index 56c57b395a..912d482413 100644 --- a/packages/linux/linux-openmoko-devel_git.bb +++ b/packages/linux/linux-openmoko-devel_git.bb @@ -1,26 +1,23 @@ require linux.inc require linux-openmoko.inc -DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones" - DEFAULT_PREFERENCE = "-1" -KERNEL_RELEASE = "2.6.28" +KERNEL_RELEASE = "2.6.29" KERNEL_VERSION = "${KERNEL_RELEASE}" -OEV = "oe1" +OEV = "oe0" PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" -PR = "r3" +PR = "r0" SRC_URI = "\ git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \ - file://openwrt-ledtrig-netdev.patch;patch=1 \ - file://defconfig-oe.patch \ +# file://openwrt-ledtrig-netdev.patch;patch=1 \ +# file://defconfig-oe.patch \ " S = "${WORKDIR}/git" do_configure_prepend() { - install -m 644 ./arch/arm/configs/gta02_packaging_defconfig ${WORKDIR}/defconfig-oe + install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR} } - diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc index 278a01d5ee..7bb6cd76c3 100644 --- a/packages/linux/linux-openmoko.inc +++ b/packages/linux/linux-openmoko.inc @@ -5,10 +5,13 @@ KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'om-gta01|om-gta02' +COMPATIBLE_MACHINE = "om-gta01|om-gta02|om-gta03" -CONFIG_NAME_om-gta01 = "gta01" -CONFIG_NAME_om-gta02 = "gta02" +CONFIG_NAME_om-gta01 = "gta01-moredrivers-defconfig" +CONFIG_NAME_om-gta02 = "gta02-packaging-defconfig" + +CONFIG_NAME_om-gta03 = "gta03_defconfig" +KERNEL_IMAGETYPE_om-gta03 = "zImage" CMDLINE = "unused -- bootloader passes ATAG list" @@ -24,6 +27,8 @@ module_autoload_g_ether = "g_ether" module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" # audio (GTA02) module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753" +# audio (GTA03) +module_autoload_snd-soc-neo1973-gta02-wm8753 = "" # sd/mmc module_autoload_s3cmci = "s3cmci" |