ARMLT: EAS test kernel support for all variants.armlt-20160926-001armlt-20160907-001armlt-20160906-002armlt-20160906-001armlt-16.0920160908-00120160907-00320160907-002

This patch is for the ARMLT tree only.

If the linux kernel config fragments for EAS are present, use them.
Also let the user provide BL_SUPPORT=EAS or BL_SUPPORT=big-LITTLE-MP
variable to the build scripts if desired.

Will warn and try to provide help if your chosen config does not exist
in the kernel source.

Change-Id: I9a850d03f00741219fb1b45e2e743b6098ec4669
Signed-off-by: Chris Redpath <chris.redpath@arm.com>
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

3 files changed, 113 insertions, 6 deletions

diff --git a/big-LITTLE-conf.sh b/big-LITTLE-conf.sh
new file mode 100755
index 0000000..717c4d4
--- /dev/null
+++ b/big-LITTLE-conf.sh
@@ -0,0 +1,106 @@
+# Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# Neither the name of ARM nor the names of its contributors may be used
+# to endorse or promote products derived from this software without specific
+# prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# select a kernel scheduling model from EAS or big-LITTLE-MP
+
+# uses BL_SUPPORT
+# uses LINUX_PATH
+
+# if the user provides BL_SUPPORT="", we will leave that alone
+# if the user provides incorrect case for EAS or big-LITTLE-MP, this will be corrected.
+# if the user either does not define BL_SUPPORT or provides anything which doesn't match
+#  one of EAS or big-LITTLE-MP, then we look to see what the kernel currently provides.
+# if the kernel has big-LITTLE-MP, use it. If kernel has EAS, use that. Check is in that
+#  order, so if both are present we will use big-LITTLE-MP.
+# if the kernel doesn't have whatever resulted from the above process, we set BL_SUPPORT=""
+
+# this script expects LINUX_PATH to already be set to point to the kernel
+# source.
+if [ -z "$LINUX_PATH" ] ; then
+  echo "\$LINUX_PATH has not been set"
+  exit
+fi
+
+modify_bl_config() {
+    # these are the names of the config fragments in linux/linaro/configs
+    BLMP_CONF="big-LITTLE-MP"
+    EAS_CONF="EAS"
+    ORIG_BL_SUPPORT="$BL_SUPPORT"
+    # find out what is present in the currently checked-out kernel
+    if [ -f "$LINUX_PATH/linaro/configs/EAS.conf" ] ; then
+        KERNEL_CONF="$EAS_CONF"
+    else
+        KERNEL_CONF="$BLMP_CONF"
+    fi
+
+    # if nothing is defined, use EAS.conf if present or use big-LITTLE-MP
+    if [ -z "$BL_SUPPORT" ] ; then
+        if [ -f "$LINUX_PATH/linaro/configs/EAS.conf" ] ; then
+            BL_SUPPORT="$EAS_CONF"
+        else
+            BL_SUPPORT="$BLMP_CONF"
+        fi
+    else
+        # if the user did define something, make sure the case is correct.
+        BLMP_CONF_UPPER=`echo $BLMP_CONF | tr '[a-z]' '[A-Z]'`
+        EAS_CONF_UPPER=`echo $EAS_CONF | tr '[a-z]' '[A-Z]'`
+        BL_SUPPORT_UPPER=`echo $BL_SUPPORT | tr '[a-z]' '[A-Z]'`
+        if [ ! "$BL_SUPPORT_UPPER" = "$BLMP_CONF_UPPER" ] ; then
+            if [ ! "$BL_SUPPORT_UPPER" = "$EAS_CONF_UPPER" ] ; then
+                echo "WARNING: BL_SUPPORT was set to \"$BL_SUPPORT\". The current kernel provides $KERNEL_CONF. Overriding to $KERNEL_CONF"
+                BL_SUPPORT="$KERNEL_CONF"
+            else
+                BL_SUPPORT="$EAS_CONF"
+            fi
+        else
+            BL_SUPPORT="$BLMP_CONF"
+        fi
+    fi
+
+    # now we definitely have either EAS_CONF or BLMP_CONF, ensure the files are there.
+    if [ ! -f "$LINUX_PATH/linaro/configs/$BL_SUPPORT.conf" ] ; then
+        echo "ERROR: Selected $BL_SUPPORT but your platform does not have this config."
+        echo "You provided \$BL_SUPPORT=$ORIG_BL_SUPPORT, which I understood as requesting"
+        echo "$BL_SUPPORT. However $LINUX_PATH/linaro/configs/ does not contain $BL_SUPPORT.conf"
+        echo "Turning off BL_SUPPORT."
+        BL_SUPPORT=""
+    fi
+}
+
+
+# do nothing if the user has already defined it to be empty
+# but do the replacement if it is not.
+if [ -z ${BL_SUPPORT+x} ] ; then
+    modify_bl_config
+else
+    if [ -n "${BL_SUPPORT}" ] ; then
+        modify_bl_config
+    else
+        echo "BL_SUPPORT was defined to be empty. Leaving it alone."
+    fi
+fi
diff --git a/platforms/common/common.base b/platforms/common/common.base
index 48a9416..ca105bf 100644
--- a/platforms/common/common.base
+++ b/platforms/common/common.base
@@ -74,15 +74,16 @@ LINUX_defconfig[defconfig]=defconfig
 declare -A LINUX_mobile_oe
 LINUX_mobile_oe[path]="linux"
 LINUX_mobile_oe[outpath]="linux"
-LINUX_mobile_oe[config]="linaro-base EAS distribution vexpress64"
+source $DIR/big-LITTLE-conf.sh
+LINUX_mobile_oe[config]="linaro-base $BL_SUPPORT distribution vexpress64"
 declare -A LINUX_mobile_bb
 LINUX_mobile_bb[path]="linux"
 LINUX_mobile_bb[outpath]="linux"
-LINUX_mobile_bb[config]="linaro-base vexpress64 EAS"
+LINUX_mobile_bb[config]="linaro-base vexpress64 $BL_SUPPORT"
 declare -A LINUX_android
 LINUX_android[path]="linux"
 LINUX_android[outpath]="linux"
-LINUX_android[config]="linaro-base EAS android vexpress64"
+LINUX_android[config]="linaro-base $BL_SUPPORT android vexpress64"
 #Default linux configs per OS - These can be overridden.
 BUSYBOX_LINUX_CONFIG_LIST=mobile_bb
 OE_LINUX_CONFIG_LIST=mobile_oe
diff --git a/platforms/tc2/tc2 b/platforms/tc2/tc2
index 2a332b5..7394524 100644
--- a/platforms/tc2/tc2
+++ b/platforms/tc2/tc2
@@ -39,9 +39,9 @@ export CROSS_COMPILE=${CROSS_COMPILE_32}
 LINUX_IMAGE_TYPE=zImage
 LINUX_ARCH=arm
 #Override the configs, no vexpress64
-LINUX_mobile_bb[config]="linaro-base EAS vexpress"
-LINUX_mobile_oe[config]="linaro-base EAS distribution vexpress"
-LINUX_android[config]="linaro-base EAS android vexpress"
+LINUX_mobile_bb[config]="linaro-base $BL_SUPPORT vexpress"
+LINUX_mobile_oe[config]="linaro-base $BL_SUPPORT distribution vexpress"
+LINUX_android[config]="linaro-base $BL_SUPPORT android vexpress"
 LINUX_CONFIG_LIST=""
 
 BOOTMON_BUILD_ENABLED=1