Allow setting of base ubuntu and board config frag files

Use this in omap4 instead of the previous linaroconfigsboardflavour
Use this to use ubuntu-minimal.conf for vexpress kernels

Signed-off-by: John Rigby <john.rigby@linaro.org>

4 files changed, 10 insertions, 8 deletions

diff --git a/configs/llt-omap-3.4-config b/configs/llt-omap-3.4-config
index 37a5dc4..4cca7b3 100755
--- a/configs/llt-omap-3.4-config
+++ b/configs/llt-omap-3.4-config
@@ -1,10 +1,7 @@
 #!/bin/bash
-echo "export board_config_branch=config-boards-3.4"
-echo "export board_config_repo=git://git.linaro.org/kernel/configs.git"
 echo "export distribution=precise"
 echo "export kernel_branch=linux-linaro-tracking"
 echo "export kernel_repo=git://git.linaro.org/kernel/linux-linaro-tracking.git"
-echo "export linaroconfigsboardflavour=omap4"
 echo "export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.4"
 echo "export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-quantal.git"
 # this can be remote as well its just the first repo cloned to prime the pump
@@ -13,5 +10,8 @@ echo "export SAMPLEBOARDS=panda"
 echo "export SOCFAMILY=OMAP"
 echo "export SOCFLAVOUR=llt-omap"
 echo "export SOCVENDOR=TI"
-echo "export ubuntu_and_base_config_branch=config-core-3.4"
 echo "export ubuntu_and_base_config_repo=git://git.linaro.org/kernel/configs.git"
+echo "export ubuntu_and_base_config_branch=config-core-3.4"
+echo "export board_config_repo=git://git.linaro.org/kernel/configs.git"
+echo "export board_config_branch=config-boards-3.4"
+echo "export board_config_frag=linaro/configs/omap4.conf"
diff --git a/configs/lt-omap-3.4-config b/configs/lt-omap-3.4-config
index 79e96b0..24eab8b 100755
--- a/configs/lt-omap-3.4-config
+++ b/configs/lt-omap-3.4-config
@@ -1,10 +1,7 @@
 #!/bin/bash
-echo "export board_config_branch=config-boards-3.4"
-echo "export board_config_repo=git://git.linaro.org/kernel/configs.git"
 echo "export distribution=precise"
 echo "export kernel_branch=tilt-3.4"
 echo "export kernel_repo=git://git.linaro.org/landing-teams/working/ti/kernel.git"
-echo "export linaroconfigsboardflavour=omap4"
 echo "export linaro_ubuntu_packaging_branch=linaro-ubuntu-packaging-3.4"
 echo "export linaro_ubuntu_packaging_repo=git://git.linaro.org/ubuntu/linux-linaro-quantal.git"
 # this can be remote as well its just the first repo cloned to prime the pump
@@ -13,5 +10,8 @@ echo "export SAMPLEBOARDS=panda"
 echo "export SOCFAMILY=OMAP"
 echo "export SOCFLAVOUR=lt-omap"
 echo "export SOCVENDOR=TI"
-echo "export ubuntu_and_base_config_branch=config-core-3.4"
 echo "export ubuntu_and_base_config_repo=git://git.linaro.org/kernel/configs.git"
+echo "export ubuntu_and_base_config_branch=config-core-3.4"
+echo "export board_config_repo=git://git.linaro.org/kernel/configs.git"
+echo "export board_config_branch=config-boards-3.4"
+echo "export board_config_frag=linaro/configs/omap4.conf"
diff --git a/configs/lt-vexpress-3.5-config b/configs/lt-vexpress-3.5-config
index 0635662..88cde95 100755
--- a/configs/lt-vexpress-3.5-config
+++ b/configs/lt-vexpress-3.5-config
@@ -15,3 +15,4 @@ echo "export SOCFLAVOUR=lt-vexpress"
 echo "export SOCVENDOR=ARM"
 echo "export ubuntu_and_base_config_branch=config-core-tracking"
 echo "export ubuntu_and_base_config_repo=git://git.linaro.org/kernel/configs.git"
+echo "export ubuntu_config_frag=linaro/configs/ubuntu-minimal.conf"
diff --git a/configs/vexpress-3.5-config b/configs/vexpress-3.5-config
index a41628f..f45c517 100755
--- a/configs/vexpress-3.5-config
+++ b/configs/vexpress-3.5-config
@@ -15,3 +15,4 @@ echo "export SOCFLAVOUR=vexpress"
 echo "export SOCVENDOR=ARM"
 echo "export ubuntu_and_base_config_branch=config-core-tracking"
 echo "export ubuntu_and_base_config_repo=git://git.linaro.org/kernel/configs.git"
+echo "export ubuntu_config_frag=linaro/configs/ubuntu-minimal.conf"