diff options
| author | Vincent Guittot <vincent.guittot@linaro.org> | 2023-11-28 15:50:39 +0100 |
|---|---|---|
| committer | Vincent Guittot <vincent.guittot@linaro.org> | 2024-02-09 09:58:51 +0100 |
| commit | a40581c2e11a96c31709980f0b920885376d7952 (patch) | |
| tree | 64fd95bd2e2f84109ade36c1659f5393e7ed5e02 | |
| parent | 5bee1c219d02cf15a71f81db87f4d821ff03bb98 (diff) | |
Replace tertiary partition by a SCMI server partition
When scmi is compiled, replace the tertiary cactucs partition by the SCMI
one.
TODO: add a dedicated scmi partition instead of replacing tertiary cactus
one.
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
| -rwxr-xr-x | tools/generate_dtb/generate_dtb.sh | 1 | ||||
| -rwxr-xr-x | tools/generate_json/generate_json.sh | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/tools/generate_dtb/generate_dtb.sh b/tools/generate_dtb/generate_dtb.sh index 1e0797b..d755805 100755 --- a/tools/generate_dtb/generate_dtb.sh +++ b/tools/generate_dtb/generate_dtb.sh @@ -43,6 +43,7 @@ BSS_END=$(grep __BSS_END__ $MAPFILE | awk {'print $1'}) cat "$ORIGINAL_DTS" > "$COMBINED_DTS" INCLUDES="-I spm/cactus + -I spm/scmi -I spm/ivy -I spm/include -I include/lib" diff --git a/tools/generate_json/generate_json.sh b/tools/generate_json/generate_json.sh index 5867700..ae30a7a 100755 --- a/tools/generate_json/generate_json.sh +++ b/tools/generate_json/generate_json.sh @@ -22,12 +22,14 @@ shift # Shift arguments 1 PARTITION_ALREADY_PRESENT=false CACTUS_PRESENT=false +SCMI_PRESENT=false IVY_PRESENT=false IVY_SHIM_PRESENT=false for target in "$@"; do case $target in cactus) CACTUS_PRESENT=true ;; + scmi) SCMI_PRESENT=true ;; ivy) IVY_PRESENT=true ;; ivy_shim) IVY_SHIM_PRESENT=true ;; *) echo "Invalid target $target"; exit 1 ;; @@ -60,6 +62,10 @@ if [ $CACTUS_PRESENT == "true" ]; then "pm": "cactus-secondary.dts", "physical-load-address": "0x7100000", "owner": "Plat" +EOF + +if [ $SCMI_PRESENT == "false" ]; then + cat >> "$GENERATED_JSON" << EOF }, "cactus-tertiary" : { @@ -68,9 +74,26 @@ if [ $CACTUS_PRESENT == "true" ]; then "physical-load-address": "0x7200000", "owner": "Plat" EOF +fi + PARTITION_ALREADY_PRESENT=true +fi + +if [ $SCMI_PRESENT == "true" ]; then + if [ $PARTITION_ALREADY_PRESENT == "true" ]; then + echo -ne "\t},\n\n" >> "$GENERATED_JSON" + fi + + cat >> "$GENERATED_JSON" << EOF +"scmi-primary" : { + "image": "scmi.bin", + "pm": "scmi.dts", + "physical-load-address": "0x7200000", + "owner": "Plat" +EOF PARTITION_ALREADY_PRESENT=true fi + if [ $IVY_PRESENT == "true" ]; then if [ $PARTITION_ALREADY_PRESENT == "true" ]; then echo -ne "\t},\n\n" >> "$GENERATED_JSON" |