diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2016-01-21 13:05:22 +0000 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2016-01-21 13:05:22 +0000 |
| commit | 5606c79f5750a2eca1a47a3653cfd9fcd09b1b78 (patch) | |
| tree | ecf111af3aff4ad7e120a2876cd93386afc06b7b | |
| parent | 14dc5f67fa5d05baf08770947e91dc23a864276c (diff) | |
Move BL_SUPPORT config to end of listarmlt-2016012216.01
The BL_SUPPORT variable is set to the config fragment the build uses for
the kernel.
Move this variable to the end of the list so it over-rides all other
fragments.
Currently, Android or OE choices could revert configs we request in
EAS.conf of big-LITTLE-MP.conf and that should not happen.
We also specifically want it to sit after the platform config.
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rw-r--r-- | variants/fvp-android | 2 | ||||
| -rw-r--r-- | variants/fvp-busybox | 2 | ||||
| -rw-r--r-- | variants/fvp-oe | 2 | ||||
| -rw-r--r-- | variants/juno-android | 2 | ||||
| -rw-r--r-- | variants/juno-busybox | 2 | ||||
| -rw-r--r-- | variants/juno-oe | 2 | ||||
| -rw-r--r-- | variants/tc2-android | 2 | ||||
| -rw-r--r-- | variants/tc2-busybox | 2 | ||||
| -rw-r--r-- | variants/tc2-oe | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/variants/fvp-android b/variants/fvp-android index 2c019ae..b42c6bf 100644 --- a/variants/fvp-android +++ b/variants/fvp-android @@ -29,7 +29,7 @@ source $DIR/variants/fvp-busybox VARIANT_DESC="FVP kernel for Android Software Stack" -LINUX_CONFIGS="linaro-base $BL_SUPPORT android vexpress64" +LINUX_CONFIGS="linaro-base android vexpress64 $BL_SUPPORT" BUSYBOX_BUILD_ENABLED= RAMDISK_BUILD_ENABLED= TARGET_BINS_HAS_BUSYBOX= diff --git a/variants/fvp-busybox b/variants/fvp-busybox index 6343f79..a8cef83 100644 --- a/variants/fvp-busybox +++ b/variants/fvp-busybox @@ -38,7 +38,7 @@ LINUX_BUILD_ENABLED=1 BUILD_SCRIPTS=$BUILD_SCRIPTS"build-linux.sh " LINUX_PATH=linux source $DIR/big-LITTLE-conf.sh -LINUX_CONFIGS="linaro-base $BL_SUPPORT vexpress64" +LINUX_CONFIGS="linaro-base vexpress64 $BL_SUPPORT" LINUX_DEFCONFIG=defconfig LINUX_ARCH=arm64 DEVTREE_TREES=(fvp-base-gicv2-psci fvp-foundation-gicv2-psci) diff --git a/variants/fvp-oe b/variants/fvp-oe index 0bd5cfd..fc75504 100644 --- a/variants/fvp-oe +++ b/variants/fvp-oe @@ -29,7 +29,7 @@ source $DIR/variants/fvp-busybox VARIANT_DESC="FVP LSK kernel for OpenEmbedded Software Stack" -LINUX_CONFIGS="linaro-base $BL_SUPPORT distribution vexpress64" +LINUX_CONFIGS="linaro-base distribution vexpress64 $BL_SUPPORT" TARGET_BINS_HAS_BUSYBOX= BUSYBOX_BUILD_ENABLED= RAMDISK_BUILD_ENABLED= diff --git a/variants/juno-android b/variants/juno-android index c1afd5f..9750fdb 100644 --- a/variants/juno-android +++ b/variants/juno-android @@ -30,7 +30,7 @@ source $DIR/variants/juno-busybox VARIANT_DESC="Juno kernel for Android Software Stack" -LINUX_CONFIGS="linaro-base $BL_SUPPORT android vexpress64" +LINUX_CONFIGS="linaro-base android vexpress64 $BL_SUPPORT" TARGET_BINS_HAS_BUSYBOX= TARGET_BINS_HAS_ANDROID=1 diff --git a/variants/juno-busybox b/variants/juno-busybox index df1a0b7..c509ebd 100644 --- a/variants/juno-busybox +++ b/variants/juno-busybox @@ -38,7 +38,7 @@ LINUX_BUILD_ENABLED=1 BUILD_SCRIPTS=$BUILD_SCRIPTS"build-linux.sh " LINUX_PATH=linux source $DIR/big-LITTLE-conf.sh -LINUX_CONFIGS="linaro-base $BL_SUPPORT vexpress64" +LINUX_CONFIGS="linaro-base vexpress64 $BL_SUPPORT" LINUX_DEFCONFIG=defconfig LINUX_ARCH=arm64 DEVTREE_TREES=(juno juno-r1 juno-r2) diff --git a/variants/juno-oe b/variants/juno-oe index bfc2ad7..0e40baa 100644 --- a/variants/juno-oe +++ b/variants/juno-oe @@ -29,6 +29,6 @@ source $DIR/variants/juno-busybox VARIANT_DESC="Juno LSK kernel for OpenEmbedded Software Stack" -LINUX_CONFIGS="linaro-base $BL_SUPPORT distribution vexpress64" +LINUX_CONFIGS="linaro-base distribution vexpress64 $BL_SUPPORT" TARGET_BINS_HAS_BUSYBOX= TARGET_BINS_HAS_OE=1 diff --git a/variants/tc2-android b/variants/tc2-android index b51e0f5..1ea3a0d 100644 --- a/variants/tc2-android +++ b/variants/tc2-android @@ -30,7 +30,7 @@ source $DIR/variants/tc2-busybox VARIANT_DESC="TC2 kernel for Android Software Stack" -LINUX_CONFIGS="linaro-base $BL_SUPPORT android vexpress" +LINUX_CONFIGS="linaro-base android vexpress $BL_SUPPORT" TARGET_BINS_HAS_BUSYBOX= TARGET_BINS_HAS_ANDROID=1 diff --git a/variants/tc2-busybox b/variants/tc2-busybox index db7d397..6e11935 100644 --- a/variants/tc2-busybox +++ b/variants/tc2-busybox @@ -38,7 +38,7 @@ LINUX_BUILD_ENABLED=1 BUILD_SCRIPTS=$BUILD_SCRIPTS"build-linux.sh " LINUX_PATH=linux source $DIR/big-LITTLE-conf.sh -LINUX_CONFIGS="linaro-base $BL_SUPPORT vexpress" +LINUX_CONFIGS="linaro-base vexpress $BL_SUPPORT" LINUX_DEFCONFIG=defconfig LINUX_ARCH=arm LINUX_IMAGE_TYPE=zImage diff --git a/variants/tc2-oe b/variants/tc2-oe index 883a907..977fdfe 100644 --- a/variants/tc2-oe +++ b/variants/tc2-oe @@ -29,6 +29,6 @@ source $DIR/variants/tc2-busybox VARIANT_DESC="TC2 LSK kernel for OpenEmbedded Software Stack" -LINUX_CONFIGS="linaro-base $BL_SUPPORT distribution vexpress" +LINUX_CONFIGS="linaro-base distribution vexpress $BL_SUPPORT" TARGET_BINS_HAS_BUSYBOX= TARGET_BINS_HAS_OE=1 |