Skip to content

Commit 8814cc9

Browse files
ginkageginkage
authored
Switch Retro Lite CM5 back to legacy U-Boot (#7004)
This allows us so successfully boot Armbian, ROCKNIX and Android.
1 parent 94ef30d commit 8814cc9

File tree

3 files changed

+357
-22
lines changed

3 files changed

+357
-22
lines changed

‎config/boards/retro-lite-cm5.csc

+1-22
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ BOARD_NAME="Retro Lite CM5"
33
BOARDFAMILY="rockchip-rk3588"
44
BOARD_MAINTAINER="ginkage"
55
BOOT_SOC="rk3588"
6+
BOOTCONFIG="retro-lite-cm5-rk3588s_defconfig"
67
KERNEL_TARGET="vendor"
78
FULL_DESKTOP="yes"
89
BOOT_LOGO="desktop"
@@ -23,25 +24,3 @@ function post_family_tweaks__retrolitecm5_naming_audios() {
2324
return 0
2425
}
2526

26-
# Mainline U-Boot
27-
function post_family_config__retro_lite_cm5_use_mainline_uboot() {
28-
display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
29-
30-
declare -g BOOTCONFIG="generic-rk3588_defconfig" # Use generic defconfig which should boot all RK3588 boards
31-
declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
32-
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
33-
declare -g BOOTBRANCH="tag:v2024.07-rc4"
34-
declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
35-
# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
36-
37-
declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
38-
39-
# Disable stuff from rockchip64_common; we're using binman here which does all the work already
40-
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
41-
42-
# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
43-
function write_uboot_platform() {
44-
dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
45-
}
46-
}
47-

‎patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/retro-lite-cm5-rk3588s_defconfig

+222
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,222 @@
1+
CONFIG_ARM=y
2+
CONFIG_ARM_CPU_SUSPEND=y
3+
CONFIG_ARCH_ROCKCHIP=y
4+
CONFIG_SPL_GPIO_SUPPORT=y
5+
CONFIG_SPL_LIBCOMMON_SUPPORT=y
6+
CONFIG_SPL_LIBGENERIC_SUPPORT=y
7+
CONFIG_SYS_MALLOC_F_LEN=0x80000
8+
CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
9+
CONFIG_ROCKCHIP_RK3588=y
10+
CONFIG_ROCKCHIP_USB_BOOT=y
11+
CONFIG_ROCKCHIP_FIT_IMAGE=y
12+
CONFIG_ROCKCHIP_HWID_DTB=y
13+
CONFIG_ROCKCHIP_VENDOR_PARTITION=y
14+
CONFIG_USING_KERNEL_DTB_V2=y
15+
CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y
16+
CONFIG_ROCKCHIP_NEW_IDB=y
17+
CONFIG_LOADER_INI="RK3588MINIALL.ini"
18+
CONFIG_TRUST_INI="RK3588TRUST.ini"
19+
CONFIG_SPL_SERIAL_SUPPORT=y
20+
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
21+
CONFIG_TARGET_EVB_RK3588=y
22+
CONFIG_SPL_LIBDISK_SUPPORT=y
23+
CONFIG_SPL_SPI_FLASH_SUPPORT=y
24+
CONFIG_SPL_SPI_SUPPORT=y
25+
CONFIG_DEFAULT_DEVICE_TREE="rk3588s-retro-lite-cm5"
26+
CONFIG_DEBUG_UART=y
27+
CONFIG_FIT=y
28+
CONFIG_FIT_IMAGE_POST_PROCESS=y
29+
CONFIG_FIT_HW_CRYPTO=y
30+
CONFIG_SPL_LOAD_FIT=y
31+
CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
32+
CONFIG_SPL_FIT_HW_CRYPTO=y
33+
# CONFIG_SPL_SYS_DCACHE_OFF is not set
34+
CONFIG_BOOTDELAY=0
35+
CONFIG_SYS_CONSOLE_INFO_QUIET=y
36+
# CONFIG_DISPLAY_CPUINFO is not set
37+
CONFIG_BOOTMETH_ANDROID=y
38+
CONFIG_ANDROID_BOOTLOADER=y
39+
CONFIG_ANDROID_AVB=y
40+
CONFIG_ANDROID_BOOT_IMAGE=y
41+
CONFIG_ANDROID_BOOT_IMAGE_HASH=y
42+
CONFIG_SPL_BOARD_INIT=y
43+
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
44+
# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
45+
CONFIG_SPL_SEPARATE_BSS=y
46+
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
47+
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
48+
CONFIG_SPL_MMC_WRITE=y
49+
CONFIG_SPL_MTD_SUPPORT=y
50+
CONFIG_SPL_ATF=y
51+
CONFIG_FASTBOOT_BUF_ADDR=0xc00800
52+
CONFIG_FASTBOOT_BUF_SIZE=0x07000000
53+
CONFIG_FASTBOOT_FLASH=y
54+
CONFIG_FASTBOOT_FLASH_MMC_DEV=0
55+
CONFIG_CMD_ABOOTIMG=y
56+
CONFIG_CMD_ADTIMG=y
57+
CONFIG_CMD_BOOTZ=y
58+
CONFIG_CMD_DTIMG=y
59+
# CONFIG_CMD_ELF is not set
60+
# CONFIG_CMD_IMI is not set
61+
# CONFIG_CMD_IMLS is not set
62+
# CONFIG_CMD_XIMG is not set
63+
# CONFIG_CMD_LZMADEC is not set
64+
# CONFIG_CMD_UNZIP is not set
65+
# CONFIG_CMD_FLASH is not set
66+
# CONFIG_CMD_FPGA is not set
67+
CONFIG_CMD_GPT=y
68+
# CONFIG_CMD_LOADB is not set
69+
# CONFIG_CMD_LOADS is not set
70+
CONFIG_CMD_BOOT_ANDROID=y
71+
CONFIG_CMD_MMC=y
72+
CONFIG_CMD_PCI=y
73+
CONFIG_CMD_SF=y
74+
CONFIG_CMD_SPI=y
75+
CONFIG_CMD_USB=y
76+
CONFIG_CMD_USB_MASS_STORAGE=y
77+
# CONFIG_CMD_ITEST is not set
78+
# CONFIG_CMD_SETEXPR is not set
79+
CONFIG_CMD_TFTPPUT=y
80+
CONFIG_CMD_TFTP_BOOTM=y
81+
CONFIG_CMD_TFTP_FLASH=y
82+
# CONFIG_CMD_MISC is not set
83+
CONFIG_CMD_MTD_BLK=y
84+
# CONFIG_SPL_DOS_PARTITION is not set
85+
# CONFIG_ISO_PARTITION is not set
86+
CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
87+
CONFIG_SPL_OF_CONTROL=y
88+
CONFIG_SPL_DTB_MINIMUM=y
89+
CONFIG_OF_LIVE=y
90+
CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
91+
# CONFIG_NET_TFTP_VARS is not set
92+
CONFIG_REGMAP=y
93+
CONFIG_SPL_REGMAP=y
94+
CONFIG_SYSCON=y
95+
CONFIG_SPL_SYSCON=y
96+
# CONFIG_SARADC_ROCKCHIP is not set
97+
CONFIG_SARADC_ROCKCHIP_V2=y
98+
CONFIG_CLK=y
99+
CONFIG_SPL_CLK=y
100+
CONFIG_CLK_SCMI=y
101+
CONFIG_SPL_CLK_SCMI=y
102+
CONFIG_DM_CRYPTO=y
103+
CONFIG_SPL_DM_CRYPTO=y
104+
CONFIG_ROCKCHIP_CRYPTO_V2=y
105+
CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y
106+
CONFIG_DM_RNG=y
107+
CONFIG_RNG_ROCKCHIP=y
108+
CONFIG_SCMI_FIRMWARE=y
109+
CONFIG_SPL_SCMI_FIRMWARE=y
110+
CONFIG_ROCKCHIP_GPIO=y
111+
CONFIG_ROCKCHIP_GPIO_V2=y
112+
CONFIG_SYS_I2C_ROCKCHIP=y
113+
CONFIG_DM_KEY=y
114+
CONFIG_ADC_KEY=y
115+
CONFIG_MISC=y
116+
CONFIG_SPL_MISC=y
117+
CONFIG_MISC_DECOMPRESS=y
118+
CONFIG_SPL_MISC_DECOMPRESS=y
119+
CONFIG_ROCKCHIP_OTP=y
120+
CONFIG_ROCKCHIP_HW_DECOMPRESS=y
121+
CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y
122+
CONFIG_SPL_ROCKCHIP_SECURE_OTP=y
123+
CONFIG_MMC_DW=y
124+
CONFIG_MMC_DW_ROCKCHIP=y
125+
CONFIG_MMC_SDHCI=y
126+
CONFIG_MMC_SDHCI_SDMA=y
127+
CONFIG_MMC_SDHCI_ROCKCHIP=y
128+
CONFIG_MTD=y
129+
CONFIG_MTD_BLK=y
130+
CONFIG_MTD_DEVICE=y
131+
CONFIG_NAND=y
132+
CONFIG_MTD_SPI_NAND=y
133+
CONFIG_SPI_FLASH=y
134+
CONFIG_SF_DEFAULT_SPEED=80000000
135+
CONFIG_SPI_FLASH_EON=y
136+
CONFIG_SPI_FLASH_GIGADEVICE=y
137+
CONFIG_SPI_FLASH_MACRONIX=y
138+
CONFIG_SPI_FLASH_SST=y
139+
CONFIG_SPI_FLASH_WINBOND=y
140+
CONFIG_SPI_FLASH_XMC=y
141+
CONFIG_SPI_FLASH_XTX=y
142+
CONFIG_SPI_FLASH_MTD=y
143+
CONFIG_DM_ETH=y
144+
CONFIG_DM_ETH_PHY=y
145+
CONFIG_DWC_ETH_QOS=y
146+
CONFIG_GMAC_ROCKCHIP=y
147+
CONFIG_NVME=y
148+
CONFIG_PCI=y
149+
CONFIG_DM_PCI=y
150+
CONFIG_DM_PCI_COMPAT=y
151+
CONFIG_PCIE_DW_ROCKCHIP=y
152+
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
153+
CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
154+
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
155+
CONFIG_PINCTRL=y
156+
CONFIG_SPL_PINCTRL=y
157+
CONFIG_DM_PMIC=y
158+
CONFIG_PMIC_SPI_RK8XX=y
159+
CONFIG_REGULATOR_PWM=y
160+
CONFIG_DM_REGULATOR_FIXED=y
161+
CONFIG_DM_REGULATOR_GPIO=y
162+
CONFIG_REGULATOR_RK860X=y
163+
CONFIG_REGULATOR_RK806=y
164+
CONFIG_PWM_ROCKCHIP=y
165+
CONFIG_RAM=y
166+
CONFIG_SPL_RAM=y
167+
CONFIG_TPL_RAM=y
168+
CONFIG_ROCKCHIP_SDRAM_COMMON=y
169+
CONFIG_ROCKCHIP_TPL_INIT_DRAM_TYPE=0
170+
CONFIG_DM_RESET=y
171+
CONFIG_SPL_DM_RESET=y
172+
CONFIG_SPL_RESET_ROCKCHIP=y
173+
CONFIG_BAUDRATE=1500000
174+
CONFIG_DEBUG_UART_BASE=0xFEB50000
175+
CONFIG_DEBUG_UART_CLOCK=24000000
176+
CONFIG_DEBUG_UART_SHIFT=2
177+
CONFIG_ROCKCHIP_SPI=y
178+
CONFIG_ROCKCHIP_SFC=y
179+
CONFIG_SYSRESET=y
180+
CONFIG_USB=y
181+
CONFIG_USB_XHCI_HCD=y
182+
CONFIG_USB_XHCI_DWC3=y
183+
CONFIG_USB_XHCI_PCI=y
184+
CONFIG_USB_EHCI_HCD=y
185+
CONFIG_USB_EHCI_GENERIC=y
186+
CONFIG_USB_OHCI_HCD=y
187+
CONFIG_USB_OHCI_GENERIC=y
188+
CONFIG_USB_DWC3=y
189+
CONFIG_USB_DWC3_GADGET=y
190+
CONFIG_USB_DWC3_GENERIC=y
191+
CONFIG_USB_STORAGE=y
192+
CONFIG_USB_GADGET=y
193+
CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
194+
CONFIG_USB_GADGET_VENDOR_NUM=0x2207
195+
CONFIG_USB_GADGET_PRODUCT_NUM=0x350a
196+
CONFIG_USB_GADGET_DOWNLOAD=y
197+
CONFIG_DM_VIDEO=y
198+
CONFIG_DISPLAY=y
199+
CONFIG_DRM_ROCKCHIP=y
200+
CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
201+
CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
202+
CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y
203+
CONFIG_USE_TINY_PRINTF=y
204+
CONFIG_LIB_RAND=y
205+
CONFIG_SPL_TINY_MEMSET=y
206+
CONFIG_RSA=y
207+
CONFIG_SPL_RSA=y
208+
CONFIG_RSA_N_SIZE=0x200
209+
CONFIG_RSA_E_SIZE=0x10
210+
CONFIG_RSA_C_SIZE=0x20
211+
CONFIG_XBC=y
212+
CONFIG_LZ4=y
213+
CONFIG_LZMA=y
214+
CONFIG_ERRNO_STR=y
215+
# CONFIG_EFI_LOADER is not set
216+
CONFIG_AVB_LIBAVB=y
217+
CONFIG_AVB_LIBAVB_AB=y
218+
CONFIG_AVB_LIBAVB_ATX=y
219+
CONFIG_AVB_LIBAVB_USER=y
220+
CONFIG_RK_AVB_LIBAVB_USER=y
221+
CONFIG_OPTEE_CLIENT=y
222+
CONFIG_OPTEE_V2=y

‎patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588s-retro-lite-cm5.dts

+134
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2024 StonedEdge and GinKage
4+
*
5+
*/
6+
7+
/dts-v1/;
8+
#include "rk3588s-radxa-cm5.dtsi"
9+
10+
/ {
11+
model = "Retro Lite CM5";
12+
compatible = "retro-lite,cm5", "radxa,cm5", "rockchip,rk3588";
13+
14+
vcc12v_dcin: vcc12v-dcin {
15+
u-boot,dm-pre-reloc;
16+
compatible = "regulator-fixed";
17+
regulator-name = "vcc12v_dcin";
18+
regulator-always-on;
19+
regulator-boot-on;
20+
regulator-min-microvolt = <12000000>;
21+
regulator-max-microvolt = <12000000>;
22+
};
23+
24+
vcc5v0_sys: vcc5v0-sys {
25+
u-boot,dm-pre-reloc;
26+
compatible = "regulator-fixed";
27+
regulator-name = "vcc5v0_sys";
28+
regulator-always-on;
29+
regulator-boot-on;
30+
regulator-min-microvolt = <5000000>;
31+
regulator-max-microvolt = <5000000>;
32+
vin-supply = <&vcc12v_dcin>;
33+
};
34+
35+
adc-keys {
36+
compatible = "adc-keys";
37+
io-channels = <&saradc 1>;
38+
io-channel-names = "buttons";
39+
keyup-threshold-microvolt = <1800000>;
40+
u-boot,dm-pre-reloc;
41+
status = "okay";
42+
43+
volumeup-key {
44+
u-boot,dm-pre-reloc;
45+
linux,code = <KEY_VOLUMEUP>;
46+
label = "volume up";
47+
press-threshold-microvolt = <1750>;
48+
};
49+
};
50+
};
51+
52+
&usb_host0_ehci {
53+
status = "okay";
54+
u-boot,dm-pre-reloc;
55+
};
56+
57+
&usb_host0_ohci {
58+
status = "okay";
59+
u-boot,dm-pre-reloc;
60+
};
61+
62+
&usb2phy2_grf {
63+
status = "okay";
64+
u-boot,dm-pre-reloc;
65+
};
66+
67+
&u2phy2 {
68+
status = "okay";
69+
u-boot,dm-pre-reloc;
70+
};
71+
72+
&u2phy2_host {
73+
status = "okay";
74+
u-boot,dm-pre-reloc;
75+
};
76+
77+
&usb_host1_ehci {
78+
status = "okay";
79+
u-boot,dm-pre-reloc;
80+
};
81+
82+
&usb_host1_ohci {
83+
status = "okay";
84+
u-boot,dm-pre-reloc;
85+
};
86+
87+
&usb2phy3_grf {
88+
status = "okay";
89+
u-boot,dm-pre-reloc;
90+
};
91+
92+
&u2phy3 {
93+
status = "okay";
94+
u-boot,dm-pre-reloc;
95+
};
96+
97+
&u2phy3_host {
98+
status = "okay";
99+
u-boot,dm-pre-reloc;
100+
};
101+
102+
&sfc {
103+
status = "disabled";
104+
pinctrl-names = "default";
105+
pinctrl-0 = <&fspim0_pins>;
106+
};
107+
108+
&spi_nor {
109+
status = "disabled";
110+
};
111+
112+
&pinctrl {
113+
114+
/delete-node/ fspi;
115+
fspi {
116+
u-boot,dm-spl;
117+
fspim0_pins: fspim0-pins {
118+
u-boot,dm-spl;
119+
rockchip,pins =
120+
/* fspi_clk_m0 */
121+
<2 RK_PA0 2 &pcfg_pull_none>,
122+
/* fspi_cs0n_m0 */
123+
<2 RK_PD6 2 &pcfg_pull_none>,
124+
/* fspi_d0_m0 */
125+
<2 RK_PD0 2 &pcfg_pull_none>,
126+
/* fspi_d1_m0 */
127+
<2 RK_PD1 2 &pcfg_pull_none>,
128+
/* fspi_d2_m0 */
129+
<2 RK_PD2 2 &pcfg_pull_none>,
130+
/* fspi_d3_m0 */
131+
<2 RK_PD3 2 &pcfg_pull_none>;
132+
};
133+
};
134+
};

0 commit comments

Comments
 (0)