diff options
-rw-r--r-- | README.md | 8 | ||||
-rwxr-xr-x | build-all.sh | 2 | ||||
-rwxr-xr-x | build-sgiboot.sh | 4 | ||||
-rw-r--r-- | configs/common/common.base (renamed from platforms/common/common.base) | 0 | ||||
-rw-r--r-- | configs/common/common.fvp (renamed from platforms/common/common.fvp) | 2 | ||||
-rw-r--r-- | configs/common/common.juno (renamed from platforms/common/common.juno) | 2 | ||||
-rw-r--r-- | configs/common/common.sgm (renamed from platforms/common/common.sgm) | 2 | ||||
-rw-r--r-- | configs/fvp/fvp (renamed from platforms/fvp/fvp) | 2 | ||||
-rw-r--r-- | configs/fvp32/fvp32 (renamed from platforms/fvp32/fvp32) | 2 | ||||
-rw-r--r-- | configs/juno/juno (renamed from platforms/juno/juno) | 2 | ||||
-rw-r--r-- | configs/juno32/juno32 (renamed from platforms/juno32/juno32) | 2 | ||||
-rw-r--r-- | configs/sgi575/grub_config/busybox-dhcp.cfg (renamed from platforms/sgi575/grub_config/busybox-dhcp.cfg) | 0 | ||||
-rw-r--r-- | configs/sgi575/grub_config/busybox.cfg (renamed from platforms/sgi575/grub_config/busybox.cfg) | 0 | ||||
-rw-r--r-- | configs/sgi575/grub_config/sgi575.cfg (renamed from platforms/sgi575/grub_config/sgi575.cfg) | 0 | ||||
-rw-r--r-- | configs/sgi575/sgi575 (renamed from platforms/sgi575/sgi575) | 4 | ||||
-rw-r--r-- | configs/sgm775/sgm775 (renamed from platforms/sgm775/sgm775) | 2 | ||||
-rw-r--r-- | configs/tc2/tc2 (renamed from platforms/tc2/tc2) | 2 | ||||
-rwxr-xr-x | framework.sh | 2 | ||||
-rw-r--r-- | parse_params.sh | 6 |
19 files changed, 22 insertions, 22 deletions
@@ -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 diff --git a/build-all.sh b/build-all.sh index f3f0309..a822ea9 100755 --- a/build-all.sh +++ b/build-all.sh @@ -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 diff --git a/build-sgiboot.sh b/build-sgiboot.sh index 5258bd2..4266d12 100755 --- a/build-sgiboot.sh +++ b/build-sgiboot.sh @@ -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 diff --git a/platforms/common/common.base b/configs/common/common.base index 7c7a58d..7c7a58d 100644 --- a/platforms/common/common.base +++ b/configs/common/common.base diff --git a/platforms/common/common.fvp b/configs/common/common.fvp index 16a4721..cc86298 100644 --- a/platforms/common/common.fvp +++ b/configs/common/common.fvp @@ -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" diff --git a/platforms/common/common.juno b/configs/common/common.juno index 29a9b44..724fb87 100644 --- a/platforms/common/common.juno +++ b/configs/common/common.juno @@ -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" diff --git a/platforms/common/common.sgm b/configs/common/common.sgm index 20b3cb2..63b8373 100644 --- a/platforms/common/common.sgm +++ b/configs/common/common.sgm @@ -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 " diff --git a/platforms/fvp/fvp b/configs/fvp/fvp index e450567..87eeaa5 100644 --- a/platforms/fvp/fvp +++ b/configs/fvp/fvp @@ -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 diff --git a/platforms/fvp32/fvp32 b/configs/fvp32/fvp32 index 4f59dad..63c8989 100644 --- a/platforms/fvp32/fvp32 +++ b/configs/fvp32/fvp32 @@ -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} diff --git a/platforms/juno/juno b/configs/juno/juno index dccbdf9..66d00c2 100644 --- a/platforms/juno/juno +++ b/configs/juno/juno @@ -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 diff --git a/platforms/juno32/juno32 b/configs/juno32/juno32 index ec80714..2d4cada 100644 --- a/platforms/juno32/juno32 +++ b/configs/juno32/juno32 @@ -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} diff --git a/platforms/sgi575/grub_config/busybox-dhcp.cfg b/configs/sgi575/grub_config/busybox-dhcp.cfg index 4201c23..4201c23 100644 --- a/platforms/sgi575/grub_config/busybox-dhcp.cfg +++ b/configs/sgi575/grub_config/busybox-dhcp.cfg diff --git a/platforms/sgi575/grub_config/busybox.cfg b/configs/sgi575/grub_config/busybox.cfg index 33065a8..33065a8 100644 --- a/platforms/sgi575/grub_config/busybox.cfg +++ b/configs/sgi575/grub_config/busybox.cfg diff --git a/platforms/sgi575/grub_config/sgi575.cfg b/configs/sgi575/grub_config/sgi575.cfg index cd2e9f5..cd2e9f5 100644 --- a/platforms/sgi575/grub_config/sgi575.cfg +++ b/configs/sgi575/grub_config/sgi575.cfg diff --git a/platforms/sgi575/sgi575 b/configs/sgi575/sgi575 index e707155..46cc8f9 100644 --- a/platforms/sgi575/sgi575 +++ b/configs/sgi575/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.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" diff --git a/platforms/sgm775/sgm775 b/configs/sgm775/sgm775 index f11f951..fb3fd93 100644 --- a/platforms/sgm775/sgm775 +++ b/configs/sgm775/sgm775 @@ -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" diff --git a/platforms/tc2/tc2 b/configs/tc2/tc2 index a8af6ed..bc293e9 100644 --- a/platforms/tc2/tc2 +++ b/configs/tc2/tc2 @@ -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 diff --git a/framework.sh b/framework.sh index b770190..b18e387 100755 --- a/framework.sh +++ b/framework.sh @@ -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 diff --git a/parse_params.sh b/parse_params.sh index 671b012..2c79321 100644 --- a/parse_params.sh +++ b/parse_params.sh @@ -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 |