Merge pull request #65 from TexasInstruments/am62p-fix-lpm

Fix LPM: Return and use array instead of just 1st string
TexasInstruments · Nov 25, 2024 · 8841c89 · 8841c89
2 parents c80d680 + ea1a444
commit 8841c89
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/configs/machines/09.02.00.010.toml b/configs/machines/09.02.00.010.toml
@@ -4,7 +4,7 @@
     # u-boot config
     atf_target_board = "lite"
     atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
-    optee_platform = "k3-am62x"
+    optee_platform = "k3-am62px"
     optee_make_args = "CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1"
     uboot_r5_defconfig = "am62px_evm_r5_defconfig"
     uboot_a53_defconfig = "am62px_evm_a53_defconfig"

diff --git a/configs/machines/10.01.08.02.toml b/configs/machines/10.01.08.02.toml
@@ -4,7 +4,7 @@
     # u-boot config
     atf_target_board = "lite"
     atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
-    optee_platform = "k3-am62x"
+    optee_platform = "k3-am62px"
     optee_make_args = "CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1"
     uboot_r5_defconfig = "am62px_evm_r5_defconfig"
     uboot_a53_defconfig = "am62px_evm_a53_defconfig"

diff --git a/scripts/build_bsp.sh b/scripts/build_bsp.sh
@@ -122,7 +122,7 @@ bsp_version=$2
     fi
 
     log "> optee: building .."
-    make -j`nproc` CROSS_COMPILE64=${cross_compile} CROSS_COMPILE=arm-none-linux-gnueabihf- PLATFORM=${platform} CFG_ARM64_core=y ${make_args} &>>"${LOG_FILE}"
+    make -j`nproc` CROSS_COMPILE64=${cross_compile} CROSS_COMPILE=arm-none-linux-gnueabihf- PLATFORM=${platform} CFG_ARM64_core=y ${make_args[*]} &>>"${LOG_FILE}"
 }
 
 function build_uboot() {

diff --git a/scripts/common.sh b/scripts/common.sh
@@ -12,7 +12,7 @@ function read_config() {
         value=($(toml get common.${param} --toml-path ${config_file}))
     fi
 
-    echo "${value}"
+    echo "${value[*]}"
 }
 
 function read_machine_config() {