Commit 0409dd29 authored by Thomas Abraham's avatar Thomas Abraham

configs: rename 'platforms' directory as 'configs'

As build-scripts scales up to support platforms specfic tests, there is
a need to create a platform specific directory to hold the platform
specfic test build scripts. One of the ways to organize the platform
specfic test build scripts could be as below

	build-scripts
		|
		|-- build-<component1>.sh
		|-- build-<component2>.sh
		|-- .
		|-- .
		|-- build-<componentX>.sh
		|-- build-test-TEST1.sh
		|-- build-test-TEST2.sh
		|-- .
		|-- .
		|-- build-test-TESTX.sh
		|
		|-- configs
		|	|
		|	|-- <platform1>
		|	|-- <platform2>
		|	|-- .
		|	|-- .
		|	|-- <platformX>
		|
		|-- <platform1>
		|	|
		|	|-- <build-test-TEST1>.sh
		|	|-- <build-test-TEST2>.sh
		|	|-- .
		|	|-- .
		|	|-- <build-test-TESTX>.sh
		|
		|-- <platform2>
		|	|
		|	|-- <build-test-TEST1>.sh
		|	|-- <build-test-TEST2>.sh
		|	|-- .
		|	|-- .
		|	|-- <build-test-TESTX>.sh
		|
		|-- <platformX>
			|
			|-- <build-test-TEST1>.sh
			|-- <build-test-TEST2>.sh
			|-- .
			|-- .
			|-- <build-test-TESTX>.sh

The existing 'platforms' directory is in fact a bunch of build config
files. So the 'platforms' directory can be renamed as 'configs'
directory to allow adding platform specific directory under the root
of build-scripts directory. This would help to avoid any possible
incorrect interpretation of the purpose of the configs directory
and the platform specific test build scripts directory.

Change-Id: I3ca0576cfdbc7be88d2812fcda841c19c95ce8ca
Signed-off-by: Thomas Abraham's avatarThomas Abraham <thomas.abraham@arm.com>
parent 3240d313
......@@ -164,13 +164,13 @@ following example for a more reliable way of building and packaging in one go.
--------------------------------------------------------------------------------
## Platforms
## Configs
Platform files provide configuration for platforms and flavours of that
Config files provide configuration for platforms and flavours of that
platform. The structure on the filesystem is shown below.
```
platforms/
configs/
├── common
│   └── common.base
└── platform_name
......@@ -189,7 +189,7 @@ If this behaviour is not desired, and only one flavour of the platform is
required then the following structure might be desired instead:
```
platforms/
configs/
├── common
│   └── common.base
└── my_platform
......
......@@ -77,7 +77,7 @@ __do_build_all_loop() {
fi
initial=1
for flavour in $FLAVOURS ; do
source $DIR/platforms/$PLATFORM/$flavour
source $DIR/configs/$PLATFORM/$flavour
#Source all applicable
for fs in $DIR/filesystems/$FILESYSTEM_CONFIGURATION ; do
if [ ! -f $fs ] ; then
......
......@@ -108,8 +108,8 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
TOP_DIR=`pwd`
PLATDIR=${TOP_DIR}/output/$SGI_PLATFORM
OUTDIR=${PLATDIR}/components
GRUB_FS_CONFIG_FILE=${TOP_DIR}/build-scripts/platforms/$SGI_PLATFORM/grub_config/busybox.cfg
GRUB_FS_VALIDATION_CONFIG_FILE=${TOP_DIR}/build-scripts/platforms/$SGI_PLATFORM/grub_config/busybox-dhcp.cfg
GRUB_FS_CONFIG_FILE=${TOP_DIR}/build-scripts/configs/$SGI_PLATFORM/grub_config/busybox.cfg
GRUB_FS_VALIDATION_CONFIG_FILE=${TOP_DIR}/build-scripts/configs/$SGI_PLATFORM/grub_config/busybox-dhcp.cfg
BLOCK_SIZE=512
SEC_PER_MB=$((1024*2))
EXT3PART_UUID=535add81-5875-4b4a-b44a-464aee5f5cbd
......
......@@ -35,7 +35,7 @@ ANDROID_LUNCH_TARGET_SRC="fvp-userdebug"
ENABLE_BL_CONFIG=1
VARIANT_DESC="FVP kernel for BusyBox Software Stack"
source $DIR/platforms/common/common.base
source $DIR/configs/common/common.base
UBOOT_BUILD_ENABLED=1
UBOOT_BOARDS="vexpress_aemv8a_semi"
......
......@@ -35,7 +35,7 @@ ANDROID_LUNCH_TARGET_SRC="juno-userdebug"
ENABLE_BL_CONFIG=1
VARIANT_DESC="Juno kernel for BusyBox Software Stack"
source $DIR/platforms/common/common.base
source $DIR/configs/common/common.base
UBOOT_BUILD_ENABLED=1
UBOOT_BOARDS="vexpress_aemv8a_juno"
......
......@@ -32,7 +32,7 @@ FLAVOUR_NAME="sgm"
ANDROID_BINS_VARIANTS="mobile"
ANDROID_LUNCH_TARGET_PREBUILT="css_gpu-userdebug"
VARIANT_DESC="System Guidance for Mobile $FLAVOUR_NAME"
source $DIR/platforms/common/common.base
source $DIR/configs/common/common.base
BUILD_SCRIPTS=""
BUILD_SCRIPTS=$BUILD_SCRIPTS"build-uboot.sh build-arm-tf.sh build-optee-os.sh build-target-bins.sh build-linux.sh build-scp.sh "
......
......@@ -26,4 +26,4 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
source ${DIR}/platforms/common/common.fvp
source ${DIR}/configs/common/common.fvp
......@@ -31,7 +31,7 @@ LINUX_IMAGE_TYPE=zImage
UEFI_BUILD_ENABLED=0
# fvp32 is mostly fvp with some tweaks, so include it
source ${DIR}/platforms/common/common.fvp
source ${DIR}/configs/common/common.fvp
# over-ride some things from fvp that are specific to fvp32
export CROSS_COMPILE=${CROSS_COMPILE_32}
......
......@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
source ${DIR}/platforms/common/common.juno
source ${DIR}/configs/common/common.juno
declare -A TBBR_juno
TBBR_juno[tbbr]=1
......
......@@ -31,7 +31,7 @@ LINUX_IMAGE_TYPE=zImage
UEFI_BUILD_ENABLED=0
# fvp32 is mostly fvp with some tweaks, so include it
source ${DIR}/platforms/common/common.juno
source ${DIR}/configs/common/common.juno
# over-ride some things from fvp that are specific to fvp32
export CROSS_COMPILE=${CROSS_COMPILE_32}
......
......@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
source $DIR/platforms/common/common.base
source $DIR/configs/common/common.base
#Default linux configs per OS
LINUX_CONFIG_LIST=""
......@@ -36,7 +36,7 @@ BUSYBOX_LINUX_CONFIG_LIST="defconfig"
GRUB_BUILD_ENABLED=1
GRUB_PATH=grub
GRUB_BUILD_SCRIPT="build-grub.sh "
GRUB_PLAT_CONFIG_FILE=${TOP_DIR}/build-scripts/platforms/sgi575/grub_config/sgi575.cfg
GRUB_PLAT_CONFIG_FILE=${TOP_DIR}/build-scripts/configs/sgi575/grub_config/sgi575.cfg
# ARM_TF Flags
ARM_TF_PLATS="sgi575"
......
......@@ -26,7 +26,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
source $DIR/platforms/common/common.sgm
source $DIR/configs/common/common.sgm
#ARM TF
ARM_TF_PLATS="sgm775"
......
......@@ -32,7 +32,7 @@ ANDROID_SOURCE_VARIANT=$ANDROID_BINS_VARIANTS_PLAT
ANDROID_LUNCH_TARGET_PREBUILT="vexpress-userdebug"
ANDROID_LUNCH_TARGET_SRC="vexpress-userdebug"
VARIANT_DESC="TC2 kernel for BusyBox Software Stack"
source $DIR/platforms/common/common.base
source $DIR/configs/common/common.base
ENABLE_BL_CONFIG=1
......
......@@ -75,7 +75,7 @@ fi
OUTDIR=${PLATDIR}/components
LINUX_OUT_DIR=out/$PLATFORM/$COMPONENT_FLAVOUR
platform_folder="$DIR/platforms/$PLATFORM"
platform_folder="$DIR/configs/$PLATFORM"
if [ -z "$platform_folder" ] ; then
echo -e "${BOLD}${RED}Could not find platform $PLATFORM.${NORMAL}"
exit 2
......
......@@ -58,7 +58,7 @@ set_formatting() {
}
get_platform_dirs() {
find $DIR/platforms/ -mindepth 1 -maxdepth 1 -type d \
find $DIR/configs/ -mindepth 1 -maxdepth 1 -type d \
| grep -v -e "common\$" -e "\/\."
}
......@@ -71,8 +71,8 @@ get_flavour_files() {
if [ "$1" == "all" ] ; then
return
fi
find $DIR/platforms/$1 -mindepth 1 -maxdepth 1 -type f \
| grep -v -e "$DIR/platforms/$1/\." -e "\.base"
find $DIR/configs/$1 -mindepth 1 -maxdepth 1 -type f \
| grep -v -e "$DIR/configs/$1/\." -e "\.base"
}
#Requires PLATFORM as a parameter
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment