WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 813ea0b

Browse files
efectnefectn
committed
orangepi5: drop vendor uboot
1 parent 05303e8 commit 813ea0b

File tree

5 files changed

+144
-225
lines changed

5 files changed

+144
-225
lines changed

‎config/boards/orangepi5.conf‎

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,20 @@ declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS9 bcm43xx 1500000" # F
2020
enable_extension "bluetooth-hciattach" # Enable the bluetooth-hciattach extension
2121

2222
function post_family_config__orangepi5_use_mainline_uboot() {
23-
if [[ $BRANCH == "vendor" ]]; then
24-
return
25-
fi
26-
2723
display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
2824

2925
declare -g BOOTCONFIG="orangepi-5-rk3588s_defconfig"
3026
declare -g BOOTDELAY=1
3127
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
32-
declare -g BOOTBRANCH="tag:v2025.07"
33-
declare -g BOOTPATCHDIR="v2025.07"
28+
declare -g BOOTBRANCH="tag:v2025.10"
29+
declare -g BOOTPATCHDIR="v2025.10"
3430
declare -g BOOTDIR="u-boot-${BOARD}"
3531
declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} $BOOTCONFIG_SATA;;u-boot-rockchip-spi-sata.bin
3632
BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB} $BOOTCONFIG;;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
3733
unset uboot_custom_postprocess # disable stuff from rockchip64_common; we're using binman here which does all the work already
3834
}
3935

4036
function pre_config_uboot_target__orangepi5_patch_uboot_bootconfig_hack_for_sata() {
41-
if [[ $BRANCH == "vendor" ]]; then
42-
return
43-
fi
44-
4537
display_alert "u-boot for ${BOARD}" "u-boot: hack bootconfig for sata spi image" "info"
4638

4739
if [[ $target_make == *"orangepi-5-sata-rk3588s_defconfig"* ]]; then
@@ -53,12 +45,7 @@ function pre_config_uboot_target__orangepi5_patch_uboot_bootconfig_hack_for_sata
5345
fi
5446
}
5547

56-
5748
function post_config_uboot_target__orangepi5_keep_sata_bootconfig() {
58-
if [[ $BRANCH == "vendor" ]]; then
59-
return
60-
fi
61-
6249
display_alert "u-boot for ${BOARD}" "u-boot: hack bootconfig for sata spi image" "info"
6350

6451
if [[ $BOOTCONFIG == "orangepi-5-sata-rk3588s_defconfig" ]]; then
@@ -67,10 +54,6 @@ function post_config_uboot_target__orangepi5_keep_sata_bootconfig() {
6754
}
6855

6956
function pre_package_uboot_image__orangepi5_copy_sataconfig_to_package() {
70-
if [[ $BRANCH == "vendor" ]]; then
71-
return
72-
fi
73-
7457
if [[ -f "${uboottempdir}/.config.sata" ]]; then
7558
run_host_command_logged cp ${uboottempdir}/.config.sata "$uboottempdir/usr/lib/u-boot/orangepi-5-sata-rk3588s_defconfig"
7659
run_host_command_logged rm ${uboottempdir}/.config.sata
@@ -117,34 +100,3 @@ function post_family_tweaks__orangepi5_naming_audios() {
117100

118101
return 0
119102
}
120-
121-
function post_family_config__orangepi5_uboot_add_sata_target() {
122-
if [[ $BRANCH == "edge" || $BRANCH == "current" ]]; then
123-
return
124-
fi
125-
126-
display_alert "$BOARD" "Configuring ($BOARD) standard and sata uboot target map" "info"
127-
# Note: whitespace/newlines are significant; BOOT_SUPPORT_SPI & BOOT_SPI_RKSPI_LOADER influence the postprocess step that runs for _every_ target and produces rkspi_loader.img
128-
UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb rkspi_loader.img
129-
BL31=$RKBIN_DIR/$BL31_BLOB $BOOTCONFIG_SATA spl/u-boot-spl.bin u-boot.dtb u-boot.itb;; rkspi_loader_sata.img"
130-
}
131-
132-
function post_uboot_custom_postprocess__create_sata_spi_image() {
133-
if [[ $BRANCH == "edge" || $BRANCH == "current" ]]; then
134-
return
135-
fi
136-
137-
display_alert "$BOARD" "Create rkspi_loader_sata.img" "info"
138-
139-
dd if=/dev/zero of=rkspi_loader_sata.img bs=1M count=0 seek=16
140-
/sbin/parted -s rkspi_loader_sata.img mklabel gpt
141-
/sbin/parted -s rkspi_loader_sata.img unit s mkpart idbloader 64 7167
142-
/sbin/parted -s rkspi_loader_sata.img unit s mkpart vnvm 7168 7679
143-
/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved_space 7680 8063
144-
/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved1 8064 8127
145-
/sbin/parted -s rkspi_loader_sata.img unit s mkpart uboot_env 8128 8191
146-
/sbin/parted -s rkspi_loader_sata.img unit s mkpart reserved2 8192 16383
147-
/sbin/parted -s rkspi_loader_sata.img unit s mkpart uboot 16384 32734
148-
dd if=idbloader.img of=rkspi_loader_sata.img seek=64 conv=notrunc
149-
dd if=u-boot.itb of=rkspi_loader_sata.img seek=16384 conv=notrunc
150-
}

‎patch/u-boot/v2025.07/board_orangepi5/0001-add-sata-dts-and-defconfig-for-OPi5.patch‎

Lines changed: 0 additions & 175 deletions
This file was deleted.

‎patch/u-boot/v2025.10/defconfig/orangepi-5-sata-rk3588s_defconfig‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
CONFIG_ARM=y
2+
CONFIG_SKIP_LOWLEVEL_INIT=y
3+
CONFIG_COUNTER_FREQUENCY=24000000
4+
CONFIG_ARCH_ROCKCHIP=y
5+
CONFIG_SF_DEFAULT_SPEED=24000000
6+
CONFIG_SF_DEFAULT_MODE=0x2000
7+
CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-orangepi-5-sata"
8+
CONFIG_ROCKCHIP_RK3588=y
9+
CONFIG_ROCKCHIP_SPI_IMAGE=y
10+
CONFIG_SPL_SERIAL=y
11+
CONFIG_TARGET_EVB_RK3588=y
12+
CONFIG_SYS_LOAD_ADDR=0xc00800
13+
CONFIG_SF_DEFAULT_BUS=5
14+
CONFIG_DEBUG_UART_BASE=0xFEB50000
15+
CONFIG_DEBUG_UART_CLOCK=24000000
16+
CONFIG_SPL_SPI_FLASH_SUPPORT=y
17+
CONFIG_SPL_SPI=y
18+
CONFIG_PCI=y
19+
CONFIG_DEBUG_UART=y
20+
CONFIG_AHCI=y
21+
CONFIG_FIT=y
22+
CONFIG_FIT_VERBOSE=y
23+
CONFIG_SPL_FIT_SIGNATURE=y
24+
CONFIG_SPL_LOAD_FIT=y
25+
CONFIG_LEGACY_IMAGE_FORMAT=y
26+
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-orangepi-5-sata.dtb"
27+
# CONFIG_DISPLAY_CPUINFO is not set
28+
CONFIG_DISPLAY_BOARDINFO_LATE=y
29+
CONFIG_SPL_MAX_SIZE=0x40000
30+
CONFIG_SPL_PAD_TO=0x7f8000
31+
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
32+
CONFIG_SPL_SPI_LOAD=y
33+
CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
34+
CONFIG_SPL_ATF=y
35+
CONFIG_CMD_GPIO=y
36+
CONFIG_CMD_GPT=y
37+
CONFIG_CMD_I2C=y
38+
CONFIG_CMD_MMC=y
39+
CONFIG_CMD_PCI=y
40+
CONFIG_CMD_USB=y
41+
# CONFIG_CMD_SETEXPR is not set
42+
CONFIG_CMD_REGULATOR=y
43+
# CONFIG_SPL_DOS_PARTITION is not set
44+
CONFIG_SPL_OF_CONTROL=y
45+
CONFIG_OF_LIVE=y
46+
CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
47+
CONFIG_SPL_DM_SEQ_ALIAS=y
48+
CONFIG_SPL_REGMAP=y
49+
CONFIG_SPL_SYSCON=y
50+
CONFIG_AHCI_PCI=y
51+
CONFIG_DWC_AHCI=y
52+
CONFIG_SPL_CLK=y
53+
CONFIG_ROCKCHIP_GPIO=y
54+
CONFIG_SYS_I2C_ROCKCHIP=y
55+
CONFIG_MISC=y
56+
CONFIG_SUPPORT_EMMC_RPMB=y
57+
CONFIG_MMC_DW=y
58+
CONFIG_MMC_DW_ROCKCHIP=y
59+
CONFIG_SPI_FLASH_SFDP_SUPPORT=y
60+
CONFIG_SPI_FLASH_XMC=y
61+
CONFIG_PHY_MOTORCOMM=y
62+
CONFIG_DWC_ETH_QOS=y
63+
CONFIG_DWC_ETH_QOS_ROCKCHIP=y
64+
CONFIG_NVME_PCI=y
65+
CONFIG_PCIE_DW_ROCKCHIP=y
66+
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
67+
CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
68+
CONFIG_PHY_ROCKCHIP_USBDP=y
69+
CONFIG_SPL_PINCTRL=y
70+
CONFIG_PWM_ROCKCHIP=y
71+
CONFIG_SPL_RAM=y
72+
CONFIG_SCSI=y
73+
CONFIG_BAUDRATE=1500000
74+
CONFIG_DEBUG_UART_SHIFT=2
75+
CONFIG_SYS_NS16550_MEM32=y
76+
CONFIG_ROCKCHIP_SFC=y
77+
CONFIG_SYSRESET=y
78+
CONFIG_USB=y
79+
CONFIG_USB_XHCI_HCD=y
80+
CONFIG_USB_EHCI_HCD=y
81+
CONFIG_USB_EHCI_GENERIC=y
82+
CONFIG_USB_OHCI_HCD=y
83+
CONFIG_USB_OHCI_GENERIC=y
84+
CONFIG_USB_DWC3=y
85+
CONFIG_USB_DWC3_GENERIC=y
86+
CONFIG_ERRNO_STR=y
87+
CONFIG_AHCI=y
88+
CONFIG_CMD_SCSI=y
89+
CONFIG_DM_SCSI=y
90+
CONFIG_DWC_AHCI=y
91+
CONFIG_LIBATA=y
92+
CONFIG_SCSI_AHCI=y
93+
CONFIG_SCSI=y

‎patch/u-boot/v2025.10/dt_uboot/rk3588s-orangepi-5-sata-u-boot.dtsi‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
3+
#include "rk3588s-u-boot.dtsi"
4+
#include "rk3588s-orangepi-5-u-boot.dtsi"
5+
6+
/ {
7+
chosen {
8+
u-boot,spl-boot-order = "same-as-spl", &sdmmc;
9+
};
10+
};
11+
12+
&binman {
13+
simple-bin-spi {
14+
filename = "u-boot-rockchip-spi-sata.bin";
15+
};
16+
};

0 commit comments

Comments
 (0)