Skip to content

Commit

Permalink
Beautify shellfmt and add board configs to formatting list (armbian…
Browse files Browse the repository at this point in the history
…#6910)

* tools: shellfmt: Beautify and add board configs to formatting list
* Format the whole code using `lib/tools/shellfmt.sh`
---------
Co-authored-by: Igor <[email protected]>
  • Loading branch information
ColorfulRhino authored Jul 8, 2024
1 parent 9e5b859 commit 39fdf21
Show file tree
Hide file tree
Showing 47 changed files with 135 additions and 145 deletions.
12 changes: 6 additions & 6 deletions config/boards/avaota-a1.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ SERIALCON="ttyAS0"
declare -g SYTERKIT_BOARD_ID="avaota-a1" # This _only_ used for syterkit-allwinner extension

function post_family_tweaks__avaota-a1() {
display_alert "Applying boot blobs"
display_alert "Applying boot blobs"
cp -v "$SRC/packages/blobs/sunxi/sun50iw3/bl31.bin" "$SDCARD/boot/bl31.bin"
cp -v "$SRC/packages/blobs/sunxi/sun50iw3/scp.bin" "$SDCARD/boot/scp.bin"
cp -v "$SRC/packages/blobs/sunxi/sun50iw3/splash.bin" "$SDCARD/boot/splash.bin"
display_alert "Applying wifi firmware"
pushd "$SDCARD/lib/firmware"
ln -s "aic8800/SDIO/aic8800D80" "aic8800d80" # use armbian-firmware
popd

display_alert "Applying wifi firmware"
pushd "$SDCARD/lib/firmware"
ln -s "aic8800/SDIO/aic8800D80" "aic8800d80" # use armbian-firmware
popd
}
8 changes: 4 additions & 4 deletions config/boards/ayn-odin2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ declare -g BOARD_FIRMWARE_INSTALL="-full"

declare -g DESKTOP_AUTOLOGIN="yes"

function post_family_config_branch_sm8550__edk2_kernel() {
function post_family_config_branch_sm8550__edk2_kernel() {
declare -g KERNELSOURCE='https://github.com/edk2-porting/linux-next'
declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="branch:integration/ayn-odin2"
Expand All @@ -37,7 +37,7 @@ function post_family_tweaks__enable_services() {
return 0
fi

if [[ "${RELEASE}" == "noble" ]];then
if [[ "${RELEASE}" == "noble" ]]; then
display_alert "Adding Mesa PPA For Ubuntu " "${BOARD}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:oibaf/graphics-drivers --yes --no-update
fi
Expand All @@ -50,7 +50,7 @@ function post_family_tweaks__enable_services() {
echo 'MESA_LOADER_DRIVER_OVERRIDE=zink' | tee -a "${SDCARD}"/etc/environment
echo 'GALLIUM_DRIVER=zink' | tee -a "${SDCARD}"/etc/environment
# Add Gamepad udev rule
echo 'SUBSYSTEM=="input", ATTRS{name}=="Ayn Odin2 Gamepad", MODE="0666", ENV{ID_INPUT_MOUSE}="0", ENV{ID_INPUT_JOYSTICK}="1"'> "${SDCARD}"/etc/udev/rules.d/99-ignore-gamepad.rules
echo 'SUBSYSTEM=="input", ATTRS{name}=="Ayn Odin2 Gamepad", MODE="0666", ENV{ID_INPUT_MOUSE}="0", ENV{ID_INPUT_JOYSTICK}="1"' > "${SDCARD}"/etc/udev/rules.d/99-ignore-gamepad.rules
# No driver support for suspend
chroot_sdcard systemctl mask suspend.target
# Add Bt Mac Fixed service
Expand Down Expand Up @@ -137,7 +137,7 @@ function post_family_tweaks_bsp__firmware_in_initrd() {
# Extra one for bt
for f in /lib/firmware/qca/* ; do
add_firmware "${f#/lib/firmware/}"
done
done
FIRMWARE_HOOK
run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
}
Expand Down
2 changes: 1 addition & 1 deletion config/boards/bananapim2pro.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ BOOTBRANCH_BOARD="tag:v2023.07.02"
BOOTPATCHDIR="v2023.07.02"

function fetch_sources_tools__libreelec_amlogic_fip_pre_m2-pro_blob_update() {
fetch_from_repo "https://github.com/Dangku/amlogic-boot-fip" "amlogic-boot-fip" "branch:master"
fetch_from_repo "https://github.com/Dangku/amlogic-boot-fip" "amlogic-boot-fip" "branch:master"
}

function post_uboot_custom_postprocess__bpi-m2-pro() {
Expand Down
2 changes: 1 addition & 1 deletion config/boards/beaglev.csc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ KERNEL_TARGET="edge"
BOOT_FDT_FILE="starfive/jh7100-beaglev-starlight-a1.dtb"
SRC_EXTLINUX="yes"
SRC_CMDLINE="console=ttyS0,115200n8 console=tty0 earlycon=sbi rootflags=data=writeback stmmaceth=chain_mode:1 rw"
BOOTCONFIG=none
BOOTCONFIG=none

function post_family_tweaks__beaglev_uenv() {
# rpardini: uEnv.txt is needed to re-enable distroboot-like behaviour on the board's SPI u-boot
Expand Down
2 changes: 1 addition & 1 deletion config/boards/clockworkpi-a06.csc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ BOOTBRANCH_BOARD="tag:v2022.04"
BOOTPATCHDIR="u-boot-rockchip64-v2022.04"

function post_family_tweaks_bsp__clockworkpi-a06() {
display_alert "Installing BSP firmware and fixups"
display_alert "Installing BSP firmware and fixups"

# rotate screen & disable dpms
mkdir -p "$destination"/etc/X11/xorg.conf.d
Expand Down
5 changes: 2 additions & 3 deletions config/boards/coolpi-cm5.csc
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ function post_family_config_branch_edge__coolpi-cm5_use_mainline_uboot() {
declare -g BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # Kwiboo U-Boot
unset BOOTBRANCH
unset BOOTPATCHDIR
declare -g BOOTBRANCH_BOARD="tag:v2024.07" # commit: 52835266d3e as of v2024.07-rc2
declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
declare -g BOOTBRANCH_BOARD="tag:v2024.07"
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 All @@ -35,4 +35,3 @@ function post_family_config_branch_edge__coolpi-cm5_use_mainline_uboot() {
flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
}
}

2 changes: 0 additions & 2 deletions config/boards/firefly-itx-3588j.csc
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,3 @@ function post_family_tweaks__firefly_itx_3588j_enable_services() {
chroot_sdcard systemctl enable rk3588-bluetooth.service
return 0
}


1 change: 0 additions & 1 deletion config/boards/fxblox-rk1.csc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ IMAGE_PARTITION_TABLE="gpt"
DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin'
BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'


function post_family_tweaks__fxblox-rk1_naming_audios() {
display_alert "$BOARD" "Renaming fxblox rk1 audios" "info"

Expand Down
2 changes: 1 addition & 1 deletion config/boards/indiedroid-nova.csc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb"
declare -g BOOT_SCENARIO="spl-blobs"
declare -g BOOT_SUPPORT_SPI="no"
declare -g IMAGE_PARTITION_TABLE="gpt"
declare -g SRC_EXTLINUX="no" # going back to standard uboot for now
declare -g SRC_EXTLINUX="no" # going back to standard uboot for now
declare -g UEFI_EDK2_BOARD_ID="indiedroid-nova" # This _only_ used for uefi-edk2-rk3588 extension

# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
Expand Down
4 changes: 2 additions & 2 deletions config/boards/khadas-vim1s.conf
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ function post_family_tweaks_bsp__populate_etc_firmware() {
}

function vim1s_bsp_legacy_postinst_link_video_firmware() {
ln -sf video_ucode.bin.s4 /lib/firmware/video/video_ucode.bin
ln -sf video_ucode.bin.s4 /lib/firmware/video/video_ucode.bin
}

function post_family_tweaks_bsp__vim1s_link_video_firmware_on_install() {
postinst_functions+=(vim1s_bsp_legacy_postinst_link_video_firmware)
postinst_functions+=(vim1s_bsp_legacy_postinst_link_video_firmware)
}
2 changes: 1 addition & 1 deletion config/boards/lepotato.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ ASOUND_STATE="asound.state.lepotato"
BOOT_LOGO="desktop"

BOOTBRANCH_BOARD="tag:v2024.01"
BOOTPATCHDIR="v2024.01"
BOOTPATCHDIR="v2024.01"
14 changes: 7 additions & 7 deletions config/boards/licheepi-4a.csc
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ BOOTFS_TYPE="ext4"
BOOTSIZE="512"

function post_family_tweaks__licheepi4a() {
display_alert "Applying boot blobs"
display_alert "Applying boot blobs"
cp -v "$SRC/packages/blobs/riscv64/thead/light_aon_fpga.bin" "$SDCARD/boot/light_aon_fpga.bin"
cp -v "$SRC/packages/blobs/riscv64/thead/light_c906_audio.bin" "$SDCARD/boot/light_c906_audio.bin"
cp -v "$SRC/packages/blobs/riscv64/thead/fw_dynamic.bin" "$SDCARD/boot/fw_dynamic.bin"

display_alert "Applying bt blobs"
cp -v "$SRC/packages/blobs/riscv64/thead/rtlbt/rtk-hciattach.service" "$SDCARD/etc/systemd/system/rtk-hciattach.service"
cp -v "$SRC/packages/blobs/riscv64/thead/rtlbt/rtk_hciattach" "$SDCARD/usr/local/bin/rtk_hciattach"
cp -v "$SRC/packages/blobs/riscv64/thead/rtlbt/rtl8723d_config" "$SDCARD/lib/firmware/rtlbt/rtl8723d_config"
cp -v "$SRC/packages/blobs/riscv64/thead/rtlbt/rtl8723d_fw" "$SDCARD/lib/firmware/rtlbt/rtl8723d_fw"
display_alert "Applying bt blobs"
cp -v "$SRC/packages/blobs/riscv64/thead/rtlbt/rtk-hciattach.service" "$SDCARD/etc/systemd/system/rtk-hciattach.service"
cp -v "$SRC/packages/blobs/riscv64/thead/rtlbt/rtk_hciattach" "$SDCARD/usr/local/bin/rtk_hciattach"
cp -v "$SRC/packages/blobs/riscv64/thead/rtlbt/rtl8723d_config" "$SDCARD/lib/firmware/rtlbt/rtl8723d_config"
cp -v "$SRC/packages/blobs/riscv64/thead/rtlbt/rtl8723d_fw" "$SDCARD/lib/firmware/rtlbt/rtl8723d_fw"

display_alert "Temp add HDMI audio output on Volume control"
display_alert "Temp add HDMI audio output on Volume control"
mkdir -p $SDCARD/etc/pulse/
echo "load-module module-alsa-sink device=hw:0,2" >> "$SDCARD/etc/pulse/default.pa"
}
1 change: 0 additions & 1 deletion config/boards/lime-a33.csc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ HAS_VIDEO_OUTPUT="no"
BOOTCONFIG="A33-OLinuXino_defconfig"
OVERLAY_PREFIX="sun8i-a33"
KERNEL_TARGET="legacy,current,edge"

12 changes: 6 additions & 6 deletions config/boards/longanpi-4b.csc
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ SERIALCON="ttyAS0"
declare -g SYTERKIT_BOARD_ID="longanpi-4b" # This _only_ used for syterkit-allwinner extension

function post_family_tweaks__longanpi-4b() {
display_alert "Applying boot blobs"
display_alert "Applying boot blobs"
cp -v "$SRC/packages/blobs/sunxi/sun50iw3/bl31.bin" "$SDCARD/boot/bl31.bin"
cp -v "$SRC/packages/blobs/sunxi/sun50iw3/scp.bin" "$SDCARD/boot/scp.bin"
display_alert "Applying wifi firmware"
pushd "$SDCARD/lib/firmware"

display_alert "Applying wifi firmware"
pushd "$SDCARD/lib/firmware"
ln -s "aic8800/SDIO/aic8800/fmacfw_rf.bin" "$SDCARD/lib/firmware"
ln -s "aic8800/SDIO/aic8800/fw_adid.bin" "$SDCARD/lib/firmware"
ln -s "aic8800/SDIO/aic8800/fw_patch_table.bin" "$SDCARD/lib/firmware"
Expand All @@ -29,6 +29,6 @@ function post_family_tweaks__longanpi-4b() {
ln -s "aic8800/SDIO/aic8800/fmacfw_usb.bin" "$SDCARD/lib/firmware"
ln -s "aic8800/SDIO/aic8800/fw_patch.bin" "$SDCARD/lib/firmware"
ln -s "aic8800/SDIO/aic8800/fw_patch_u03.bin" "$SDCARD/lib/firmware"
ln -s "aic8800/SDIO/aic8800D80" "aic8800d80" # use armbian-firmware
popd
ln -s "aic8800/SDIO/aic8800D80" "aic8800d80" # use armbian-firmware
popd
}
4 changes: 2 additions & 2 deletions config/boards/nanopi-r2c.csc
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ HAS_VIDEO_OUTPUT="no"
BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev06.dtb"

function post_family_tweaks__nanopi-r2c_rename_USB_LAN() {
display_alert "$BOARD" "Installing board tweaks" "info"
display_alert "$BOARD" "Installing board tweaks" "info"

# rename USB based network to lan0
mkdir -p $SDCARD/etc/udev/rules.d/
echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="eth1", NAME="lan0"' > $SDCARD/etc/udev/rules.d/70-rename-lan.rules

return 0
}
}
4 changes: 2 additions & 2 deletions config/boards/nanopi-r2s.csc
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ HAS_VIDEO_OUTPUT="no"
BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev00.dtb"

function post_family_tweaks__nanopi-r2s_rename_USB_LAN() {
display_alert "$BOARD" "Installing board tweaks" "info"
display_alert "$BOARD" "Installing board tweaks" "info"

# rename USB based network to lan0
mkdir -p $SDCARD/etc/udev/rules.d/
echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="eth1", NAME="lan0"' > $SDCARD/etc/udev/rules.d/70-rename-lan.rules

return 0
}
}
1 change: 0 additions & 1 deletion config/boards/nanopineo4.csc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ BOOTCONFIG="nanopi-neo4-rk3399_defconfig"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"

8 changes: 4 additions & 4 deletions config/boards/odroidc1.csc
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ BOOTSIZE="200"
BOOTFS_TYPE="fat"

write_uboot_platform() {
dd if=$1/bl1.bin.hardkernel of=$2 bs=1 count=442 conv=fsync > /dev/null 2>&1
dd if=$1/bl1.bin.hardkernel of=$2 bs=512 skip=1 seek=1 conv=fsync > /dev/null 2>&1
dd if=$1/u-boot.bin of=$2 bs=512 seek=64 conv=fsync > /dev/null 2>&1
dd if=/dev/zero of=$2 seek=1024 count=32 bs=512 conv=fsync > /dev/null 2>&1
dd if=$1/bl1.bin.hardkernel of=$2 bs=1 count=442 conv=fsync > /dev/null 2>&1
dd if=$1/bl1.bin.hardkernel of=$2 bs=512 skip=1 seek=1 conv=fsync > /dev/null 2>&1
dd if=$1/u-boot.bin of=$2 bs=512 seek=64 conv=fsync > /dev/null 2>&1
dd if=/dev/zero of=$2 seek=1024 count=32 bs=512 conv=fsync > /dev/null 2>&1
}
2 changes: 1 addition & 1 deletion config/boards/onecloud.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ BOOTFS_TYPE="fat"
BOOT_LOGO=desktop

family_tweaks() {
cp $SRC/packages/blobs/splash/armbian-u-boot-24.bmp $SDCARD/boot/boot.bmp
cp $SRC/packages/blobs/splash/armbian-u-boot-24.bmp $SDCARD/boot/boot.bmp
}
83 changes: 41 additions & 42 deletions config/boards/orangepi-r1plus-lts.csc
Original file line number Diff line number Diff line change
Expand Up @@ -24,52 +24,51 @@ BOOT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus-lts.dtb"

# Content:
function post_family_tweaks_bsp__enable_leds_orangepi_r1_plus_lts() {
display_alert "Creating board support LEDs config for orangepi-r1-plus-lts"
cat <<- EOF > "${destination}"/etc/armbian-leds.conf
[/sys/class/leds/orangepi-r1-plus-lts:green:lan]
trigger=netdev
interval=52
brightness=1
link=1
tx=0
rx=1
device_name=eth0
display_alert "Creating board support LEDs config for orangepi-r1-plus-lts"
cat <<- EOF > "${destination}"/etc/armbian-leds.conf
[/sys/class/leds/orangepi-r1-plus-lts:green:lan]
trigger=netdev
interval=52
brightness=1
link=1
tx=0
rx=1
device_name=eth0

[/sys/class/leds/orangepi-r1-plus-lts:green:wan]
trigger=netdev
interval=52
brightness=1
link=1
tx=0
rx=1
device_name=lan0
[/sys/class/leds/orangepi-r1-plus-lts:green:wan]
trigger=netdev
interval=52
brightness=1
link=1
tx=0
rx=1
device_name=lan0

[/sys/class/leds/orangepi-r1-plus-lts:red:status]
trigger=heartbeat
brightness=0
invert=0
EOF
[/sys/class/leds/orangepi-r1-plus-lts:red:status]
trigger=heartbeat
brightness=0
invert=0
EOF

if [[ $BRANCH == legacy ]]; then
if [[ $BRANCH == legacy ]]; then

# Bluetooth for most of others (custom patchram is needed only in legacy)
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
# Bluetooth for most of others (custom patchram is needed only in legacy)
install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/

fi
fi

# add a network rule to work-around RTL8153B initialization issue.
display_alert "Creating board support network rename rule to work-around RTL8153B initialization issue for orangepi-r1-plus-lts"
mkdir -p "${destination}"/etc/udev/rules.d/
cat <<- EOF > "${destination}"/etc/udev/rules.d/70-rename-lan.rules
SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNEL=="end*", NAME="eth0"
SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="e*", NAME="lan0", \
RUN+="/usr/sbin/ip link set lan0 down", \
RUN+="/usr/sbin/ip link set eth0 down", \
RUN+="/usr/bin/sleep 5s ", \
RUN+="/usr/sbin/ip link set eth0 up", \
RUN+="/usr/bin/sleep 25s ", \
RUN+="/usr/sbin/ip link set lan0 up"
EOF
# add a network rule to work-around RTL8153B initialization issue.
display_alert "Creating board support network rename rule to work-around RTL8153B initialization issue for orangepi-r1-plus-lts"
mkdir -p "${destination}"/etc/udev/rules.d/
cat <<- EOF > "${destination}"/etc/udev/rules.d/70-rename-lan.rules
SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNEL=="end*", NAME="eth0"
SUBSYSTEM=="net", ACTION=="add", DRIVERS=="r8152", KERNEL=="e*", NAME="lan0", \
RUN+="/usr/sbin/ip link set lan0 down", \
RUN+="/usr/sbin/ip link set eth0 down", \
RUN+="/usr/bin/sleep 5s ", \
RUN+="/usr/sbin/ip link set eth0 up", \
RUN+="/usr/bin/sleep 25s ", \
RUN+="/usr/sbin/ip link set lan0 up"
EOF
}

6 changes: 3 additions & 3 deletions config/boards/orangepi-r1plus.csc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ HAS_VIDEO_OUTPUT="no"
BOOT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus.dtb"

function post_family_tweaks__opi-r1plus_rename_USB_LAN() {
display_alert "$BOARD" "Installing board tweaks" "info"
display_alert "$BOARD" "Installing board tweaks" "info"

# rename USB based network to lan0
mkdir -p $SDCARD/etc/udev/rules.d/
Expand All @@ -22,7 +22,7 @@ function post_family_tweaks__opi-r1plus_rename_USB_LAN() {
}

function post_family_tweaks_bsp__orangepi-r1plus_BSP() {
display_alert "Installing BSP firmware and fixups"
display_alert "Installing BSP firmware and fixups"

if [[ $BRANCH == legacy ]]; then

Expand All @@ -33,4 +33,4 @@ function post_family_tweaks_bsp__orangepi-r1plus_BSP() {
fi

return 0
}
}
8 changes: 4 additions & 4 deletions config/boards/orangepi5-plus.conf
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ function post_family_tweaks__orangepi5plus_naming_audios() {
function post_family_config_branch_edge__orangepi5plus_use_mainline_uboot() {
display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"

declare -g BOOTCONFIG="orangepi-5-plus-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 U-Boot
declare -g BOOTCONFIG="orangepi-5-plus-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 U-Boot
declare -g BOOTBRANCH="tag:v2024.07"
declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
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
1 change: 0 additions & 1 deletion config/boards/orangepi5.conf
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ function post_family_tweaks__orangepi5_naming_audios() {
return 0
}


function post_family_config__orangepi5_uboot_add_sata_target() {
if [[ $BRANCH == "edge" ]]; then
return
Expand Down
Loading

0 comments on commit 39fdf21

Please sign in to comment.