aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorOlivier Deprez <olivier.deprez@arm.com>2020-03-13 18:04:17 +0100
committerOlivier Deprez <olivier.deprez@arm.com>2020-03-23 15:39:41 +0100
commit48e6d26e60ec5151a9771625bc4e9a1bed36bf31 (patch)
tree3bcc4e85299f181e6780e7ca346e98078ec62957 /tools
parent1d2b88d430aa98961865f8be296a1b61b9ce0813 (diff)
downloadtf-a-tests-48e6d26e60ec5151a9771625bc4e9a1bed36bf31.tar.gz
cactus: update sample manifest to SPCI Beta1 format
Notice, the dtb generation wrapper script had a provision to automatically generate an "extra" memory description section. This will be revisited later when SP boot time memory region is implemented in SPM. Signed-off-by: Olivier Deprez <olivier.deprez@arm.com> Change-Id: I4fb9e23004871d74eee4a1d1f4be0826695e3e9f
Diffstat (limited to 'tools')
-rwxr-xr-xtools/generate_dtb/generate_dtb.sh34
1 files changed, 3 insertions, 31 deletions
diff --git a/tools/generate_dtb/generate_dtb.sh b/tools/generate_dtb/generate_dtb.sh
index 84ba8809..564c2a05 100755
--- a/tools/generate_dtb/generate_dtb.sh
+++ b/tools/generate_dtb/generate_dtb.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
-# Copyright (c) 2018, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2020, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -37,37 +37,9 @@ BSS_END=$(grep __BSS_END__ $MAPFILE | awk {'print $1'})
# Inject new sections to the base DTS
-echo "\
-/ {
- memory_regions {
- text {
- str = \"Text\";
- base = <0x0 ${TEXT_START}ULL>;
- size = <0x0 (${TEXT_END}ULL - ${TEXT_START}ULL)>;
- attr = <RD_MEM_NORMAL_CODE>;
- };
- rodata {
- str = \"RO Data\";
- base = <0x0 (${RODATA_START}ULL)>;
- size = <0x0 (${RODATA_END}ULL - ${RODATA_START}ULL)>;
- attr = <RD_MEM_NORMAL_RODATA>;
- };
- rwdata {
- str = \"Data\";
- base = <0x0 ${DATA_START}ULL>;
- size = <0x0 (${DATA_END}ULL - ${DATA_START}ULL)>;
- attr = <RD_MEM_NORMAL_DATA>;
- };
- bss {
- str = \"BSS\";
- base = <0x0 ${BSS_START}ULL>;
- size = <0x0 (${BSS_END}ULL - ${BSS_START}ULL)>;
- attr = <RD_MEM_NORMAL_BSS>;
- };
- };
-};" > "$EXTRA_DTS"
+# Memory region generation discarded
-cat "$ORIGINAL_DTS" "$EXTRA_DTS" > "$COMBINED_DTS"
+cat "$ORIGINAL_DTS" > "$COMBINED_DTS"
INCLUDES="-I spm/cactus
-I spm/ivy