diff --git a/README.md b/README.md
index 6d52b8b..d4fb5d2 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,9 @@ sudo apt install -y \
         debian-archive-keyring bdebstrap \
         build-essential autoconf automake \
         bison flex libssl-dev \
-        bc u-boot-tools swig python3-pyelftools
+        bc git wget u-boot-tools swig \
+        python3-pyelftools python3-pip python3-dev \
+        python3-yaml python3-jsonschema python3-cryptography
 sudo apt install --fix-broken
 sudo pip3 install toml-cli
 ```
diff --git a/configs/machines.toml b/configs/machines.toml
index c16fd95..787c06a 100644
--- a/configs/machines.toml
+++ b/configs/machines.toml
@@ -8,8 +8,6 @@
     atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
     optee_platform = "k3-am62x"
     optee_make_args = "CFG_WITH_SOFTWARE_PRNG=y"
-    sysfw_soc = "am62px"
-    dmfw_machine = "am62pxx"
     uboot_r5_defconfig = "am62px_evm_r5_defconfig"
     uboot_a53_defconfig = "am62px_evm_a53_defconfig"
 
@@ -21,8 +19,6 @@
     atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
     optee_platform = "k3-am62x"
     optee_make_args = "."
-    sysfw_soc = "am62x"
-    dmfw_machine = "am62xx"
     uboot_r5_defconfig = "am62x_evm_r5_defconfig"
     uboot_a53_defconfig = "am62x_evm_a53_defconfig"
 
@@ -34,8 +30,6 @@
     atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
     optee_platform = "k3-am62x"
     optee_make_args = "."
-    sysfw_soc = "am62x"
-    dmfw_machine = "am62xx"
     uboot_r5_defconfig = "am62x_lpsk_r5_defconfig"
     uboot_a53_defconfig = "am62x_lpsk_a53_defconfig"
 
@@ -47,8 +41,6 @@
     atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
     optee_platform = "k3-am62x"
     optee_make_args = "."
-    sysfw_soc = "am62x"
-    dmfw_machine = "am62xx"
     uboot_r5_defconfig = "am62x_evm_r5_defconfig,am62xsip_sk_r5.config"
     uboot_a53_defconfig = "am62x_evm_a53_defconfig"
 
@@ -60,7 +52,5 @@
     atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
     optee_platform = "k3-am64x"
     optee_make_args = "."
-    sysfw_soc = "am64x"
-    dmfw_machine = "am64xx"
     uboot_r5_defconfig = "am64x_evm_r5_defconfig"
     uboot_a53_defconfig = "am64x_evm_a53_defconfig"
diff --git a/scripts/build_bsp.sh b/scripts/build_bsp.sh
index acb74a2..20feac4 100755
--- a/scripts/build_bsp.sh
+++ b/scripts/build_bsp.sh
@@ -87,9 +87,7 @@ bsp_version=$3
     else
         log ">> ti-linux-firmware: available"
     fi
-    dmfw_machine=($(read_machine_config ${machine} dmfw_machine))
-    SYSFW_DIR=${topdir}/build/${build}/bsp_sources/ti-linux-firmware/ti-sysfw
-    DMFW_DIR=${topdir}/build/${build}/bsp_sources/ti-linux-firmware/ti-dm/${dmfw_machine}
+    FW_DIR=${topdir}/build/${build}/bsp_sources/ti-linux-firmware
 
     log "> BSP sources: cloned"
     log "> BSP sources: creating backup .."
@@ -132,12 +130,11 @@ machine=$1
     uboot_r5_defconfig=($(read_machine_config ${machine} uboot_r5_defconfig))
     uboot_r5_defconfig=`echo $uboot_r5_defconfig | tr ',' ' '`
     uboot_a53_defconfig=($(read_machine_config ${machine} uboot_a53_defconfig))
-    sysfw_soc=($(read_machine_config ${machine} sysfw_soc))
 
     cd ${UBOOT_DIR}
     log "> uboot-r5: building .."
     make -j`nproc` ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabihf- ${uboot_r5_defconfig} O=${UBOOT_DIR}/out/r5 &>>"${LOG_FILE}"
-    make -j`nproc` ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabihf- O=${UBOOT_DIR}/out/r5 BINMAN_INDIRS=${topdir}/build/${build}/bsp_sources/ti-linux-firmware &>>"${LOG_FILE}"
+    make -j`nproc` ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabihf- O=${UBOOT_DIR}/out/r5 BINMAN_INDIRS=${FW_DIR} &>>"${LOG_FILE}"
     cp ${UBOOT_DIR}/out/r5/tiboot3*.bin ${topdir}/build/${build}/tisdk-${distro}-${machine}-boot/ &>> ${LOG_FILE}
 
     cd ${UBOOT_DIR}