Skip to content

Commit

Permalink
shellfmt: config/boards; no changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rpardini authored and igorpecovnik committed Nov 25, 2024
1 parent 2f63a9c commit 29caae8
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 25 deletions.
2 changes: 1 addition & 1 deletion config/boards/armsom-cm5-io.csc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ IMAGE_PARTITION_TABLE="gpt"
BOARD_MAINTAINER=""

function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() {
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"

declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/armsom-cm5-rpi-cm4-io.csc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ IMAGE_PARTITION_TABLE="gpt"
BOARD_MAINTAINER=""

function post_family_config_branch_vendor__armsom-cm5-rpi-cm4-io_use_vendor_uboot() {
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"

declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/armsom-sige5.csc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ IMAGE_PARTITION_TABLE="gpt"
BOARD_MAINTAINER=""

function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"

declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/bananapif3.csc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"

function post_config_uboot_target__extra_configs_for_bananapi_f3() {
display_alert "u-boot for ${BOARD}" "u-boot: enabling extra configs" "info"

run_host_command_logged scripts/config --enable CONFIG_SD_BOOT
run_host_command_logged scripts/config --enable CONFIG_EXT4_WRITE
run_host_command_logged scripts/config --enable CONFIG_FS_BTRFS
Expand Down
2 changes: 1 addition & 1 deletion config/boards/cherryba-m1.csc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Allwinner H618 quad core 1GB 2GB 4GB RAM SoC WiFi USB-C emmc
# Allwinner H618 quad core 1GB 2GB 4GB RAM SoC WiFi USB-C emmc
BOARD_NAME="CherryBa M1"
BOARDFAMILY="sun50iw9"
BOOTCONFIG="cherryba-m1_defconfig"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/oneplus-kebab.conf
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function post_family_tweaks__oneplus-kebab_enable_services() {
return 0
fi

if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]];then
if [[ "${RELEASE}" == "jammy" ]] || [[ "${RELEASE}" == "noble" ]]; then
display_alert "Adding qcom-mainline PPA" "${BOARD}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/qcom-mainline --yes --no-update
fi
Expand Down
2 changes: 1 addition & 1 deletion config/boards/orangepi3b.csc
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function post_family_tweaks__orangepi3b_naming_audios() {
mkdir -p $SDCARD/etc/udev/rules.d/
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi-sound", ENV{SOUND_DESCRIPTION}="HDMI Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-rk809-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules # vendor dts
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules # mainline dts
echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-sound", ENV{SOUND_DESCRIPTION}="RK809 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules # mainline dts

return 0
}
6 changes: 3 additions & 3 deletions config/boards/orangepi5-plus.conf
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ function post_family_config_branch_current__orangepi5plus_use_mainline_uboot() {
function post_config_uboot_target__extra_configs_for_rock5b_mainline_environment_in_spi() {
[[ "${BRANCH}" != "edge" && "${BRANCH}" != "current" ]] && return 0

display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
run_host_command_logged scripts/config --set-val CONFIG_BOARD_RNG_SEED "y"
run_host_command_logged scripts/config --set-val ARMV8_CRYPTO "n" #broken as per 2024.10-rc3
run_host_command_logged scripts/config --set-val ARMV8_CE_SHA1 "n" #broken as per 2024.10-rc3
run_host_command_logged scripts/config --set-val ARMV8_CRYPTO "n" #broken as per 2024.10-rc3
run_host_command_logged scripts/config --set-val ARMV8_CE_SHA1 "n" #broken as per 2024.10-rc3
run_host_command_logged scripts/config --set-val ARMV8_CE_SHA256 "n" #broken as per 2024.10-rc3
}
1 change: 0 additions & 1 deletion config/boards/retro-lite-cm5.csc
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,3 @@ function post_family_tweaks__retrolitecm5_naming_audios() {

return 0
}

2 changes: 1 addition & 1 deletion config/boards/rock-3a.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function post_family_config_branch_edge__rock-3a_use_mainline_uboot() {
display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
unset BOOTFS_TYPE # fixes armbian-install and unneeded for modern uboot anyway
declare -g BOOTCONFIG="rock-3a-rk3568_defconfig"
declare -g BOOTDELAY=1
declare -g BOOTDELAY=1
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot"
declare -g BOOTBRANCH="tag:v2024.10"
declare -g BOOTPATCHDIR="v2024.10"
Expand Down
12 changes: 6 additions & 6 deletions config/boards/rock-5b-plus.conf
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ function post_family_config_branch_edge__rock-5b_use_mainline_uboot() {
# temporary override until DT in armbian/rockchip-linux is renamed
declare -g BOOT_FDT_FILE="rockchip/rk3588-rock-5b-plus.dtb"

declare -g BOOTCONFIG="rock5b-rk3588_defconfig" # override the default for the board/family
declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline tree
declare -g BOOTBRANCH="tag:v2024.10" #
declare -g BOOTPATCHDIR="v2024.10" # empty; defconfig changes are done in hook below
declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
declare -g BOOTCONFIG="rock5b-rk3588_defconfig" # override the default for the board/family
declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline tree
declare -g BOOTBRANCH="tag:v2024.10" #
declare -g BOOTPATCHDIR="v2024.10" # empty; defconfig changes are done in hook below
declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already

Expand Down
12 changes: 6 additions & 6 deletions config/boards/turing-rk1.csc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Rockchip RK3588 octa core 8/16/32GB RAM SoM GBE NVMe eMMC USB3
# Rockchip RK3588 octa core 8/16/32GB RAM SoM GBE NVMe eMMC USB3
BOARD_NAME="Turing RK1"
BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER=""
Expand All @@ -18,10 +18,10 @@ function post_family_config__turing-rk1_default_serial_console_by_branch() {

case $BRANCH in
vendor)
declare -g SERIALCON="ttyS9"
declare -g SERIALCON="ttyS9"
;;
*)
declare -g SERIALCON="ttyS0"
declare -g SERIALCON="ttyS0"
;;
esac

Expand Down Expand Up @@ -51,15 +51,15 @@ function post_family_config__turing-rk1_use_mainline_uboot() {
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
declare -g BOOTBRANCH='tag:v2024.04'
declare -g BOOTPATCHDIR="v2024.04"
declare -g BOOTDELAY=1
declare -g BOOTDELAY=1
# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency

declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"

# Disable stuff from rockchip64_common; we're using binman here which does all the work already
# Disable stuff from rockchip64_common; we're using binman here which does all the work already
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd

# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
function write_uboot_platform() {
dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
}
Expand Down
2 changes: 1 addition & 1 deletion config/boards/xt-q8l-v10.tvb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PACKAGE_LIST_BOARD="bluez"
function post_family_config__uboot_config() {
# Overwrite UBOOT_TARGET_MAP to use the proprietary rockchip
# ddrbin in place of u-boot TPL. The reason is that the board
# uses DDR2 memories and u-boot TPL is not capable of
# uses DDR2 memories and u-boot TPL is not capable of
# initializing DDR2.
UBOOT_TARGET_MAP="ROCKCHIP_TPL=$SRC/cache/sources/rkbin-tools/rk32/rk3288_ddr_400MHz_v1.08.bin;;u-boot-rockchip-with-spl.bin"
}

0 comments on commit 29caae8

Please sign in to comment.