diff --git a/config/boards/bananapir2pro.csc b/config/boards/bananapir2pro.csc index 6ceabafacb..66bd050ec0 100644 --- a/config/boards/bananapir2pro.csc +++ b/config/boards/bananapir2pro.csc @@ -17,8 +17,3 @@ IMAGE_PARTITION_TABLE="gpt" function post_family_config___mainline_uboot() { declare -g UBOOT_TARGET_MAP="ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl u-boot.bin flash.bin;;idbloader.img u-boot.itb" } - -function add_host_dependencies__uboot_deps() { - display_alert "Adding python3-pyelftools for brute force mainline uboot" "${EXTENSION}" "info" - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" -} diff --git a/config/boards/nanopi-r5c.csc b/config/boards/nanopi-r5c.csc index 7294466767..7d1c3bf523 100644 --- a/config/boards/nanopi-r5c.csc +++ b/config/boards/nanopi-r5c.csc @@ -24,11 +24,7 @@ BL31_BLOB="rk35/rk3568_bl31_v1.43.elf" function post_family_config__uboot_config() { display_alert "$BOARD" "u-boot ${BOOTBRANCH_BOARD} overrides" "info" BOOTDELAY=2 # Wait for UART interrupt to enter UMS/RockUSB mode etc - UBOOT_TARGET_MAP="ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl u-boot.bin flash.bin;;idbloader.img u-boot.itb" -} - -function add_host_dependencies__new_uboot_wants_python3() { - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" # @TODO: convert to array later + UBOOT_TARGET_MAP="ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl u-boot.bin flash.bin;;idbloader.img u-boot.itb" } function post_family_tweaks__nanopir5c_udev_network_interfaces() { diff --git a/config/boards/nanopi-r5s.csc b/config/boards/nanopi-r5s.csc index 63aa5e284a..558f329f54 100644 --- a/config/boards/nanopi-r5s.csc +++ b/config/boards/nanopi-r5s.csc @@ -24,11 +24,7 @@ BL31_BLOB="rk35/rk3568_bl31_v1.43.elf" function post_family_config__uboot_config() { display_alert "$BOARD" "u-boot ${BOOTBRANCH_BOARD} overrides" "info" BOOTDELAY=2 # Wait for UART interrupt to enter UMS/RockUSB mode etc - UBOOT_TARGET_MAP="ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl u-boot.bin flash.bin;;idbloader.img u-boot.itb" -} - -function add_host_dependencies__new_uboot_wants_python3() { - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" # @TODO: convert to array later + UBOOT_TARGET_MAP="ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl u-boot.bin flash.bin;;idbloader.img u-boot.itb" } function post_family_tweaks__nanopir5s_udev_network_interfaces() { diff --git a/config/boards/odroidm1.conf b/config/boards/odroidm1.conf index dd18ecacdd..087f73bbd5 100644 --- a/config/boards/odroidm1.conf +++ b/config/boards/odroidm1.conf @@ -60,10 +60,6 @@ function post_family_config__uboot_config() { } } -function add_host_dependencies__new_uboot_wants_python3_odroidm1() { - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" # @TODO: convert to array later -} - # Include fw_setenv, configured to point to Petitboot's u-env mtd partition PACKAGE_LIST_BOARD="libubootenv-tool" # libubootenv-tool provides fw_printenv and fw_setenv, for talking to U-Boot environment diff --git a/config/boards/orangepi3b.csc b/config/boards/orangepi3b.csc index 14c4e5410c..dd69b632f2 100644 --- a/config/boards/orangepi3b.csc +++ b/config/boards/orangepi3b.csc @@ -53,10 +53,6 @@ function post_family_config__orangepi3b_use_mainline_uboot() { } -function add_host_dependencies__new_uboot_wants_python3_orangepi3b() { - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" # @TODO: convert to array later -} - function post_family_tweaks_bsp__orangepi3b() { display_alert "$BOARD" "Installing sprd-bluetooth.service" "info" diff --git a/config/boards/orangepi5.conf b/config/boards/orangepi5.conf index ce653ddfed..c27229ad34 100644 --- a/config/boards/orangepi5.conf +++ b/config/boards/orangepi5.conf @@ -115,12 +115,6 @@ function post_uboot_custom_postprocess__create_sata_spi_image() { dd if=u-boot.itb of=rkspi_loader_sata.img seek=16384 conv=notrunc } -function add_host_dependencies__mainline_uboot_wants_python3_orangepi5() { - if [[ $BRANCH == "edge" ]]; then - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" # @TODO: convert to array later - fi -} - # Override family config for this board; let's avoid conditionals in family config. function post_family_config__orangepi5_use_vendor_uboot() { if [[ $BRANCH == "edge" ]]; then diff --git a/config/boards/radxa-zero3.wip b/config/boards/radxa-zero3.wip index 9d82a5025c..4157d9d301 100644 --- a/config/boards/radxa-zero3.wip +++ b/config/boards/radxa-zero3.wip @@ -25,7 +25,3 @@ function post_family_config__radxa-zero3_use_vendor_uboot() { dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none } } - -function add_host_dependencies__mainline_uboot_wants_pyelftools_radxa_zero3() { - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" -} diff --git a/config/boards/rock-4se.csc b/config/boards/rock-4se.csc index 71b5e44b63..34542261af 100644 --- a/config/boards/rock-4se.csc +++ b/config/boards/rock-4se.csc @@ -17,10 +17,5 @@ BL31_BLOB="rk33/rk3399_bl31_v1.36.elf" DDR_BLOB="rk33/rk3399_ddr_933MHz_v1.30.bin" function post_family_config___mainline_uboot() { - declare -g UBOOT_TARGET_MAP="ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl u-boot.bin flash.bin;;idbloader.img u-boot.itb" -} - -function add_host_dependencies__uboot_deps() { - display_alert "Adding python3-pyelftools for brute force mainline uboot" "${EXTENSION}" "info" - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools libgnutls28-dev" + declare -g UBOOT_TARGET_MAP="ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl u-boot.bin flash.bin;;idbloader.img u-boot.itb" } diff --git a/config/boards/rock-5b.csc b/config/boards/rock-5b.csc index 57e1c1e4bf..0c64115284 100644 --- a/config/boards/rock-5b.csc +++ b/config/boards/rock-5b.csc @@ -76,8 +76,3 @@ function post_family_tweaks__config_rock5b_fwenv() { /dev/mtd0 0xc00000 0x20000 FW_ENV_CONFIG } - -# I'm FED UP with this, @TODO lets make it part of core deps soon and cleanup all those hooks all spread around - lol it's another week and this still in -function add_host_dependencies__new_uboot_wants_pyelftools() { - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" # @TODO: convert to array later -} diff --git a/config/boards/rockpi-4cplus.csc b/config/boards/rockpi-4cplus.csc index d2d402605f..1761e6159a 100644 --- a/config/boards/rockpi-4cplus.csc +++ b/config/boards/rockpi-4cplus.csc @@ -16,10 +16,5 @@ DDR_BLOB="rk33/rk3399_ddr_933MHz_v1.30.bin" BL31_BLOB="rk33/rk3399_bl31_v1.36.elf" function post_family_config___mainline_uboot() { - declare -g UBOOT_TARGET_MAP="ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl u-boot.bin flash.bin;;idbloader.img u-boot.itb" -} - -function add_host_dependencies__uboot_deps() { - display_alert "Adding python3-pyelftools for brute force mainline uboot" "${EXTENSION}" "info" - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools libgnutls28-dev" + declare -g UBOOT_TARGET_MAP="ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl u-boot.bin flash.bin;;idbloader.img u-boot.itb" } diff --git a/config/boards/rockpro64.conf b/config/boards/rockpro64.conf index 3e385b43c1..0069befa4c 100644 --- a/config/boards/rockpro64.conf +++ b/config/boards/rockpro64.conf @@ -17,10 +17,6 @@ BOOTPATCHDIR="v2024.04" # Include fw_setenv, configured to point to the correct spot on the SPI Flash PACKAGE_LIST_BOARD="libubootenv-tool" # libubootenv-tool provides fw_printenv and fw_setenv, for talking to U-Boot environment -function add_host_dependencies__new_uboot_wants_python3_rockpro64() { - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" # @TODO: convert to array later -} - function post_family_config__use_mainline_uboot_rockpro64() { # Use latest lts 2.8 ATF ATFBRANCH='tag:lts-v2.8.16' diff --git a/config/sources/families/k3.conf b/config/sources/families/k3.conf index 7aefc16107..3b707ae5cb 100644 --- a/config/sources/families/k3.conf +++ b/config/sources/families/k3.conf @@ -44,7 +44,7 @@ ROOT_FS_LABEL="root" function add_host_dependencies__k3_python3_dep() { display_alert "Preparing K3 U-Boot host-side dependencies" "${EXTENSION}" "info" - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-yaml python3-jsonschema python3-pyelftools" + declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-yaml python3-jsonschema" } function compile_k3_bootgen() { diff --git a/config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh b/config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh index d6e5736d1c..cb87e78b2d 100644 --- a/config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh +++ b/config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh @@ -44,9 +44,4 @@ if [[ "${MEKO_USE_MAINLINE_UBOOT:-"no"}" == "yes" ]]; then dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none } } - - # I'm FED UP with this, @TODO lets make it part of core deps soon and cleanup all those hooks all spread around - function add_host_dependencies__new_uboot_wants_pyelftools() { - declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} python3-pyelftools" # @TODO: convert to array later - } fi