diff options
-rw-r--r-- | recipes-kernel/linux/linux-omap-psp_2.6.32.bb | 4 | ||||
-rw-r--r-- | recipes-kernel/linux/multi-kernel.inc | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-omap-psp_2.6.32.bb b/recipes-kernel/linux/linux-omap-psp_2.6.32.bb index 212a6e31..61fc24f0 100644 --- a/recipes-kernel/linux/linux-omap-psp_2.6.32.bb +++ b/recipes-kernel/linux/linux-omap-psp_2.6.32.bb | |||
@@ -1,5 +1,7 @@ | |||
1 | require multi-kernel.inc | 1 | require multi-kernel.inc |
2 | 2 | ||
3 | MULTI_CONFIG_BASE_SUFFIX = "" | ||
4 | |||
3 | DESCRIPTION = "Linux kernel for OMAP processors" | 5 | DESCRIPTION = "Linux kernel for OMAP processors" |
4 | KERNEL_IMAGETYPE = "uImage" | 6 | KERNEL_IMAGETYPE = "uImage" |
5 | 7 | ||
@@ -9,7 +11,7 @@ COMPATIBLE_MACHINE = "am3517-crane|beagleboard|omap3evm|am3517-evm|dm37x-evm|am3 | |||
9 | SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155" | 11 | SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155" |
10 | 12 | ||
11 | # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc | 13 | # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc |
12 | MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}" | 14 | MACHINE_KERNEL_PR_append = "c+gitr${SRCREV}" |
13 | 15 | ||
14 | SRC_URI += "git://arago-project.org/git/projects/linux-omap3.git;protocol=git;branch=master \ | 16 | SRC_URI += "git://arago-project.org/git/projects/linux-omap3.git;protocol=git;branch=master \ |
15 | file://0001-Revert-omap3-beagle-Fix-compile-time-errors.patch \ | 17 | file://0001-Revert-omap3-beagle-Fix-compile-time-errors.patch \ |
diff --git a/recipes-kernel/linux/multi-kernel.inc b/recipes-kernel/linux/multi-kernel.inc index 53144541..056adb97 100644 --- a/recipes-kernel/linux/multi-kernel.inc +++ b/recipes-kernel/linux/multi-kernel.inc | |||
@@ -16,6 +16,14 @@ SRC_URI += " \ | |||
16 | file://configs " | 16 | file://configs " |
17 | 17 | ||
18 | MULTI_CONFIG_BASE_SUFFIX = "multi-config-" | 18 | MULTI_CONFIG_BASE_SUFFIX = "multi-config-" |
19 | MODULES_IMAGE_BASE_NAME = "modules-${PV}-${PR}-${MACHINE}" | ||
20 | |||
21 | do_preparekernel () { | ||
22 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE | ||
23 | oe_runmake prepare CC="${KERNEL_CC}" LD="${KERNEL_LD}" | ||
24 | } | ||
25 | |||
26 | addtask preparekernel after do_configure before do_compile | ||
19 | 27 | ||
20 | do_compileconfigs () { | 28 | do_compileconfigs () { |
21 | 29 | ||
@@ -100,5 +108,4 @@ do_deploy_append () { | |||
100 | } | 108 | } |
101 | 109 | ||
102 | do_compileconfigs[depends] += "u-boot-mkimage-native:do_populate_sysroot virtual/${TARGET_PREFIX}gcc:do_populate_sysroot virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}:do_populate_sysroot" | 110 | do_compileconfigs[depends] += "u-boot-mkimage-native:do_populate_sysroot virtual/${TARGET_PREFIX}gcc:do_populate_sysroot virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}:do_populate_sysroot" |
103 | addtask compileconfigs after do_patch before do_configure | 111 | addtask compileconfigs after do_preparekernel before do_compile |
104 | |||