diff --git a/config/boards/armsom-cm5-io.csc b/config/boards/armsom-cm5-io.csc index 69d626cd48f3..2c1dd8e922ee 100644 --- a/config/boards/armsom-cm5-io.csc +++ b/config/boards/armsom-cm5-io.csc @@ -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" diff --git a/config/boards/armsom-cm5-rpi-cm4-io.csc b/config/boards/armsom-cm5-rpi-cm4-io.csc index b7e30db03b59..ea33136b97ec 100644 --- a/config/boards/armsom-cm5-rpi-cm4-io.csc +++ b/config/boards/armsom-cm5-rpi-cm4-io.csc @@ -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" diff --git a/config/boards/armsom-sige5.csc b/config/boards/armsom-sige5.csc index c2ba55781dc8..9aea68a3c443 100644 --- a/config/boards/armsom-sige5.csc +++ b/config/boards/armsom-sige5.csc @@ -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" diff --git a/config/boards/bananapif3.csc b/config/boards/bananapif3.csc index 3159e9f4e256..e2d43b69b60c 100644 --- a/config/boards/bananapif3.csc +++ b/config/boards/bananapif3.csc @@ -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 diff --git a/config/boards/cherryba-m1.csc b/config/boards/cherryba-m1.csc index c38cc11dd768..b521ce160c9a 100644 --- a/config/boards/cherryba-m1.csc +++ b/config/boards/cherryba-m1.csc @@ -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" diff --git a/config/boards/oneplus-kebab.conf b/config/boards/oneplus-kebab.conf index 765868ed5a02..0841693d68fc 100644 --- a/config/boards/oneplus-kebab.conf +++ b/config/boards/oneplus-kebab.conf @@ -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 diff --git a/config/boards/orangepi3b.csc b/config/boards/orangepi3b.csc index 0d8d5b562d00..cea568fb69f5 100644 --- a/config/boards/orangepi3b.csc +++ b/config/boards/orangepi3b.csc @@ -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 } diff --git a/config/boards/orangepi5-plus.conf b/config/boards/orangepi5-plus.conf index 1bc59f6f929f..141e6153d49f 100644 --- a/config/boards/orangepi5-plus.conf +++ b/config/boards/orangepi5-plus.conf @@ -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 } diff --git a/config/boards/retro-lite-cm5.csc b/config/boards/retro-lite-cm5.csc index 6f2a1c66ba09..cdc1b116b313 100644 --- a/config/boards/retro-lite-cm5.csc +++ b/config/boards/retro-lite-cm5.csc @@ -23,4 +23,3 @@ function post_family_tweaks__retrolitecm5_naming_audios() { return 0 } - diff --git a/config/boards/rock-3a.conf b/config/boards/rock-3a.conf index a98072fb5f7b..7e35d4975b04 100644 --- a/config/boards/rock-3a.conf +++ b/config/boards/rock-3a.conf @@ -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" diff --git a/config/boards/rock-5b-plus.conf b/config/boards/rock-5b-plus.conf index 10618627228e..f204ee9c0e43 100644 --- a/config/boards/rock-5b-plus.conf +++ b/config/boards/rock-5b-plus.conf @@ -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 diff --git a/config/boards/turing-rk1.csc b/config/boards/turing-rk1.csc index 499f32697d3a..8339e9acbe6d 100644 --- a/config/boards/turing-rk1.csc +++ b/config/boards/turing-rk1.csc @@ -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="" @@ -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 @@ -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 } diff --git a/config/boards/xt-q8l-v10.tvb b/config/boards/xt-q8l-v10.tvb index 12d3c777eeeb..27709991c633 100644 --- a/config/boards/xt-q8l-v10.tvb +++ b/config/boards/xt-q8l-v10.tvb @@ -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" }