From 81a8895ad3c8893b6c6293106b52e14df43f7f68 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 17 Feb 2009 07:40:12 +0100 Subject: linux-openmoko[devel]: use $CONFIG_NAME for upstream defconfig --- packages/linux/linux-openmoko-2.6.28_git.bb | 2 +- packages/linux/linux-openmoko-devel_git.bb | 15 ++++++--------- packages/linux/linux-openmoko.inc | 11 ++++++++--- 3 files changed, 15 insertions(+), 13 deletions(-) (limited to 'packages/linux') 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" -- cgit v1.2.3 From 953706ea56892007040db92df6e18dc650d326a8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 17 Feb 2009 14:29:09 +0100 Subject: linux-omap: set CONFIG_MODULE_FORCE_LOAD=y --- packages/linux/linux-omap-2.6.26/omap3evm/defconfig | 2 +- packages/linux/linux-omap-2.6.27/omap3evm/defconfig | 2 +- packages/linux/linux-omap-2.6.28/beagleboard/defconfig | 2 +- packages/linux/linux-omap-2.6.28/omap3-pandora/defconfig | 2 +- packages/linux/linux-omap-2.6.28/omap3evm/defconfig | 2 +- packages/linux/linux-omap-pm/beagleboard/defconfig | 2 +- packages/linux/linux-omap-pm/omap3-pandora/defconfig | 2 +- packages/linux/linux-omap-pm/omap3evm/defconfig | 2 +- packages/linux/linux-omap/beagleboard/defconfig | 2 +- packages/linux/linux-omap/omap3-pandora/defconfig | 2 +- packages/linux/linux-omap/omap3evm/defconfig | 2 +- packages/linux/linux-omap2-git/omap3evm/defconfig | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-omap-2.6.26/omap3evm/defconfig b/packages/linux/linux-omap-2.6.26/omap3evm/defconfig index e61fad48d9..a0ba3d1e0a 100644 --- a/packages/linux/linux-omap-2.6.26/omap3evm/defconfig +++ b/packages/linux/linux-omap-2.6.26/omap3evm/defconfig @@ -95,7 +95,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap-2.6.27/omap3evm/defconfig b/packages/linux/linux-omap-2.6.27/omap3evm/defconfig index 64597db3d2..f58ecded2d 100644 --- a/packages/linux/linux-omap-2.6.27/omap3evm/defconfig +++ b/packages/linux/linux-omap-2.6.27/omap3evm/defconfig @@ -115,7 +115,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap-2.6.28/beagleboard/defconfig b/packages/linux/linux-omap-2.6.28/beagleboard/defconfig index 2a0818ab0f..45958e0e07 100644 --- a/packages/linux/linux-omap-2.6.28/beagleboard/defconfig +++ b/packages/linux/linux-omap-2.6.28/beagleboard/defconfig @@ -98,7 +98,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap-2.6.28/omap3-pandora/defconfig b/packages/linux/linux-omap-2.6.28/omap3-pandora/defconfig index 6efe4ed660..5db83f08da 100644 --- a/packages/linux/linux-omap-2.6.28/omap3-pandora/defconfig +++ b/packages/linux/linux-omap-2.6.28/omap3-pandora/defconfig @@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap-2.6.28/omap3evm/defconfig b/packages/linux/linux-omap-2.6.28/omap3evm/defconfig index e5399f3141..da5a8c4b90 100644 --- a/packages/linux/linux-omap-2.6.28/omap3evm/defconfig +++ b/packages/linux/linux-omap-2.6.28/omap3evm/defconfig @@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap-pm/beagleboard/defconfig b/packages/linux/linux-omap-pm/beagleboard/defconfig index ef43e33b40..dcddd2425c 100644 --- a/packages/linux/linux-omap-pm/beagleboard/defconfig +++ b/packages/linux/linux-omap-pm/beagleboard/defconfig @@ -98,7 +98,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap-pm/omap3-pandora/defconfig b/packages/linux/linux-omap-pm/omap3-pandora/defconfig index 6efe4ed660..5db83f08da 100644 --- a/packages/linux/linux-omap-pm/omap3-pandora/defconfig +++ b/packages/linux/linux-omap-pm/omap3-pandora/defconfig @@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap-pm/omap3evm/defconfig b/packages/linux/linux-omap-pm/omap3evm/defconfig index e5399f3141..da5a8c4b90 100644 --- a/packages/linux/linux-omap-pm/omap3evm/defconfig +++ b/packages/linux/linux-omap-pm/omap3evm/defconfig @@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap/beagleboard/defconfig b/packages/linux/linux-omap/beagleboard/defconfig index d2f0af0c60..7fb93dfc78 100644 --- a/packages/linux/linux-omap/beagleboard/defconfig +++ b/packages/linux/linux-omap/beagleboard/defconfig @@ -98,7 +98,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap/omap3-pandora/defconfig b/packages/linux/linux-omap/omap3-pandora/defconfig index 6efe4ed660..5db83f08da 100644 --- a/packages/linux/linux-omap/omap3-pandora/defconfig +++ b/packages/linux/linux-omap/omap3-pandora/defconfig @@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap/omap3evm/defconfig b/packages/linux/linux-omap/omap3evm/defconfig index e5399f3141..da5a8c4b90 100644 --- a/packages/linux/linux-omap/omap3evm/defconfig +++ b/packages/linux/linux-omap/omap3evm/defconfig @@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/packages/linux/linux-omap2-git/omap3evm/defconfig b/packages/linux/linux-omap2-git/omap3evm/defconfig index e61fad48d9..a0ba3d1e0a 100644 --- a/packages/linux/linux-omap2-git/omap3evm/defconfig +++ b/packages/linux/linux-omap2-git/omap3evm/defconfig @@ -95,7 +95,7 @@ CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y -- cgit v1.2.3