diff options
author | Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> | 2020-09-22 13:25:21 +0100 |
---|---|---|
committer | Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> | 2020-10-14 17:49:05 +0100 |
commit | 51be1fed841ce211384391fc0bf1967aa238ee9f (patch) | |
tree | 0a2eaf443c15190c3c65445b1deb70ef2e77cc2c /tools/generate_json | |
parent | 8c65f72e903377d42b78239eefc6e0d78166e8c1 (diff) | |
download | tf-a-tests-51be1fed841ce211384391fc0bf1967aa238ee9f.tar.gz |
cactus: re-structure platform dependent files
This patch makes below changes to cactus:
- Platform dependent files are moved to spm/cactus/plat/arm/fvp
- Removes relative path dependency for cactus dts by copying it to build
directory.
- Platform dependent macros are defined in cactus_platform_def.h like
- Device base
- Console UART
- RX Base
- Execution context count
Change-Id: I59e3c3f8640e01e46fc91bee4d8ce4255eaf9737
Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Diffstat (limited to 'tools/generate_json')
-rwxr-xr-x | tools/generate_json/generate_json.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/generate_json/generate_json.sh b/tools/generate_json/generate_json.sh index 449733ce8..f46cf158a 100755 --- a/tools/generate_json/generate_json.sh +++ b/tools/generate_json/generate_json.sh @@ -10,11 +10,10 @@ # Secure Partitions as part of FIP. # $1 = Secure Partition (cactus) -# $2 = Platform (fvp) -# $3 = Build Type -# Output = build/plat/<Build Type>/sp_layout.json +# $2 = Platform built path +# Output = $2/sp_layout.json -GENERATED_JSON=build/$2/$3/sp_layout.json +GENERATED_JSON=$2/sp_layout.json # To demonstrate communication between SP's, two cactus S-EL1 instances used. # To also test mapping of the RXTX region a third cactus S-EL1 instance is used. @@ -23,13 +22,13 @@ GENERATED_JSON=build/$2/$3/sp_layout.json if [ "$1" == "cactus" ]; then echo -e "{\n\t\"$1-primary\" : {\n \ \t\"image\": \"$1.bin\",\n \ - \t\"pm\": \"../../../spm/$1/$1.dts\",\n \ + \t\"pm\": \"$1.dts\",\n \ \t\"owner\": \"SiP\"\n\t},\n\n\t\"$1-secondary\" : {\n \ \t\"image\": \"$1.bin\",\n \ - \t\"pm\": \"../../../spm/$1/$1-secondary.dts\",\n \ + \t\"pm\": \"$1-secondary.dts\",\n \ \t\"owner\": \"Plat\"\n\t},\n\n\t\"$1-tertiary\" : {\n \ \t\"image\": \"$1.bin\",\n \ - \t\"pm\": \"../../../spm/$1/$1-tertiary.dts\" \n \ + \t\"pm\": \"$1-tertiary.dts\" \n \ }\n}" \ > "$GENERATED_JSON" else |