JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

multiple boards: drop hooks adding 'python3-pyelftools' & libgnutls28-dev hostdeps, now included in standard core deps

Browse Source
This commit is contained in:
Ricardo Pardini
2024-04-28 12:56:19 +02:00
committed by Igor
parent 1d819c7b86
commit 1184c6d0e3
13 changed files with 5 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/boards/bananapir2pro.csc
View File

@@ -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"
}

6
config/boards/nanopi-r5c.csc
View File

@@ -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() {

6
config/boards/nanopi-r5s.csc
View File

@@ -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() {

4
config/boards/odroidm1.conf
View File

@@ -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

4
config/boards/orangepi3b.csc
View File

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

6
config/boards/orangepi5.conf
View File

@@ -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

4
config/boards/radxa-zero3.wip
View File

@@ -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"
}

7
config/boards/rock-4se.csc
View File

@@ -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"
}

5
config/boards/rock-5b.csc
View File

@@ -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
}

7
config/boards/rockpi-4cplus.csc
View File

@@ -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"
}

4
config/boards/rockpro64.conf
View File

@@ -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'

2
config/sources/families/k3.conf
View File

@@ -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() {

5
config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh vendored
View File

@@ -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