Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Couple cleanup patches on unused vars and missing dependencies #47

Merged
merged 2 commits into from
Mar 15, 2024
Merged

Couple cleanup patches on unused vars and missing dependencies #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c938366
Remove leftover sysfw_soc and dmfw_machine definitions
glneo Oct 13, 2023
d18b108
README: Update dependencies list with new requirements for U-Boot
glneo Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
10 changes: 0 additions & 10 deletions configs/machines.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"

Expand All @@ -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"

Expand All @@ -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"

Expand All @@ -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"
7 changes: 2 additions & 5 deletions scripts/build_bsp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .."
Expand Down Expand Up @@ -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}
Expand Down
Loading