From f6fa9fe735c73a9d3030cd1d6f66163f8504fba1 Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Fri, 29 Mar 2013 09:37:51 -0500 Subject: linux: Use setup-defconfig in kernel recipes * Now that the setup-defconfig.inc file has been moved to the meta-ti layer the kernel recipes should include this file. * This makes way to clear this inclusion from the bbappend files in meta-arago Signed-off-by: Chase Maupin Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/linux-am335x_3.2.0-psp04.06.00.08.bb | 3 ++- recipes-kernel/linux/linux-omap-psp_2.6.37.bb | 3 ++- recipes-kernel/linux/linux-omapl138-psp_2.6.37.bb | 3 ++- recipes-kernel/linux/linux_3.3.7.bb | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-am335x_3.2.0-psp04.06.00.08.bb b/recipes-kernel/linux/linux-am335x_3.2.0-psp04.06.00.08.bb index 49d67342..74394a69 100644 --- a/recipes-kernel/linux/linux-am335x_3.2.0-psp04.06.00.08.bb +++ b/recipes-kernel/linux/linux-am335x_3.2.0-psp04.06.00.08.bb @@ -7,6 +7,7 @@ COMPATIBLE_MACHINE = "ti33x" DEFAULT_PREFERENCE = "-1" inherit kernel +require setup-defconfig.inc # Stage the power management firmware before building the kernel DEPENDS += "am33x-cm3" @@ -14,7 +15,7 @@ DEPENDS += "am33x-cm3" KERNEL_IMAGETYPE = "uImage" # The main PR is now using MACHINE_KERNEL_PR, for ti33x see conf/machine/include/ti33x.inc -MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}" BRANCH = "v3.2-staging" diff --git a/recipes-kernel/linux/linux-omap-psp_2.6.37.bb b/recipes-kernel/linux/linux-omap-psp_2.6.37.bb index 9eacfc9b..5d72af58 100644 --- a/recipes-kernel/linux/linux-omap-psp_2.6.37.bb +++ b/recipes-kernel/linux/linux-omap-psp_2.6.37.bb @@ -1,4 +1,5 @@ require linux.inc +require setup-defconfig.inc DESCRIPTION = "Linux kernel for OMAP3 EVM from PSP, based on linux-omap3 kernel" @@ -8,7 +9,7 @@ SRCREV= "20c003f2f024d9f50f59edf9f1b8f5f035fb15b8" # The main PR is now using MACHINE_KERNEL_PR, for omap3 devices # see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "a" +MACHINE_KERNEL_PR_append = "b" SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=git \ file://defconfig" diff --git a/recipes-kernel/linux/linux-omapl138-psp_2.6.37.bb b/recipes-kernel/linux/linux-omapl138-psp_2.6.37.bb index 0b6c50db..e4a54513 100644 --- a/recipes-kernel/linux/linux-omapl138-psp_2.6.37.bb +++ b/recipes-kernel/linux/linux-omapl138-psp_2.6.37.bb @@ -5,8 +5,9 @@ KERNEL_IMAGETYPE = "uImage" require multi-kernel.inc require tipspkernel.inc +require setup-defconfig.inc -MACHINE_KERNEL_PR_append = "b" +MACHINE_KERNEL_PR_append = "c" S = "${WORKDIR}/git" diff --git a/recipes-kernel/linux/linux_3.3.7.bb b/recipes-kernel/linux/linux_3.3.7.bb index 19280368..e38b6c2e 100644 --- a/recipes-kernel/linux/linux_3.3.7.bb +++ b/recipes-kernel/linux/linux_3.3.7.bb @@ -9,12 +9,13 @@ DEFAULT_PREFERENCE = "-1" COMPATIBLE_MACHINE = "beagleboard" inherit kernel +require setup-defconfig.inc KERNEL_IMAGETYPE = "uImage" # The main PR is now using MACHINE_KERNEL_PR, for beagleboard see # conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}" BRANCH = "linux-3.3.y" SRCREV = "v3.3.7" -- cgit v1.2.3-54-g00ecf