Skip to content

Commit 568536a

Browse files
chainsxColorfulRhino
chainsx
authored and
ColorfulRhino
committed
station-m2: use mainline u-boot
1 parent f6e3624 commit 568536a

File tree

2 files changed

+156
-9
lines changed

2 files changed

+156
-9
lines changed

‎config/boards/station-m2.csc‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,34 @@
22
BOARD_NAME="Station M2"
33
BOARDFAMILY="rk35xx"
44
BOARD_MAINTAINER=""
5-
BOOTCONFIG="firefly-m2-rk3568_defconfig"
5+
BOOTCONFIG="station-m2-rk3566_defconfig"
66
KERNEL_TARGET="legacy,vendor,current,edge"
77
FULL_DESKTOP="yes"
88
BOOT_LOGO="desktop"
99
BOOT_FDT_FILE="rockchip/rk3566-firefly-roc-pc.dtb"
10-
SRC_EXTLINUX="yes"
11-
SRC_CMDLINE="console=ttyS02,1500000 console=tty0"
10+
BOOT_SCENARIO="spl-blobs"
1211
ASOUND_STATE="asound.state.station-m2"
1312
IMAGE_PARTITION_TABLE="gpt"
1413

1514
function post_family_tweaks__station_m2() {
1615
display_alert "$BOARD" "Installing board tweaks" "info"
1716

18-
cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/
1917
cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/
2018
2119
return 0
2220
}
2321
2422
# Override family config for this board; let's avoid conditionals in family config.
25-
function post_family_config__stationm2_use_vendor_uboot() {
26-
BOOTSOURCE='https://github.com/150balbes/u-boot-rk'
27-
BOOTBRANCH='branch:rk356x'
28-
BOOTDIR="u-boot-${BOARD}"
29-
BOOTPATCHDIR="u-boot-station-p2"
23+
function post_family_config__stationm2_use_radxa_vendor_uboot() {
24+
BOOTSOURCE='https://github.com/radxa/u-boot.git'
25+
BOOTBRANCH='branch:rk35xx-2024.01'
26+
BOOTPATCHDIR="u-boot-radxa-latest"
27+
28+
UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
29+
30+
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
31+
32+
function write_uboot_platform() {
33+
dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none
34+
}
3035
}

‎patch/u-boot/u-boot-radxa-latest/board_station-m2-rk3566_defconfig.patch‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
diff -Nuar a/configs/station-m2-rk3566_defconfig b/configs/station-m2-rk3566_defconfig
2+
--- a/configs/station-m2-rk3566_defconfig
3+
+++ b/configs/station-m2-rk3566_defconfig
4+
@@ -0,0 +1,138 @@
5+
+CONFIG_ARM=y
6+
+CONFIG_SKIP_LOWLEVEL_INIT=y
7+
+CONFIG_COUNTER_FREQUENCY=24000000
8+
+CONFIG_ARCH_ROCKCHIP=y
9+
+CONFIG_TEXT_BASE=0x00a00000
10+
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
11+
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
12+
+CONFIG_NR_DRAM_BANKS=2
13+
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
14+
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000
15+
+CONFIG_SF_DEFAULT_SPEED=24000000
16+
+CONFIG_SF_DEFAULT_MODE=0x2000
17+
+CONFIG_DEFAULT_DEVICE_TREE="rk3566-radxa-zero3"
18+
+CONFIG_ROCKCHIP_RK3568=y
19+
+CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y
20+
+CONFIG_ROCKCHIP_SPI_IMAGE=y
21+
+CONFIG_SPL_SERIAL=y
22+
+CONFIG_SPL_STACK_R_ADDR=0x600000
23+
+CONFIG_SPL_STACK=0x400000
24+
+CONFIG_DEBUG_UART_BASE=0xFE660000
25+
+CONFIG_DEBUG_UART_CLOCK=24000000
26+
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
27+
+CONFIG_SPL_SPI=y
28+
+CONFIG_SYS_LOAD_ADDR=0xc00800
29+
+CONFIG_PCI=y
30+
+CONFIG_DEBUG_UART=y
31+
+CONFIG_FIT=y
32+
+CONFIG_FIT_VERBOSE=y
33+
+CONFIG_SPL_FIT_SIGNATURE=y
34+
+CONFIG_SPL_LOAD_FIT=y
35+
+CONFIG_LEGACY_IMAGE_FORMAT=y
36+
+CONFIG_SPI_BOOT=y
37+
+CONFIG_BOOTDELAY=0
38+
+CONFIG_AUTOBOOT_KEYED=y
39+
+CONFIG_AUTOBOOT_PROMPT="Hit CtrlC key in %d seconds to stop autoboot...\n"
40+
+CONFIG_AUTOBOOT_STOP_STR="\x03"
41+
+CONFIG_AUTOBOOT_KEYED_CTRLC=y
42+
+CONFIG_BOOTCOMMAND="bootflow scan; run distro_bootcmd; echo Boot failed. Reset in 3 seconds...; sleep 3; reset;"
43+
+CONFIG_USE_PREBOOT=y
44+
+CONFIG_PREBOOT="usb start; pci enum"
45+
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-radxa-zero3.dtb"
46+
+# CONFIG_SYS_DEVICE_NULLDEV is not set
47+
+# CONFIG_DISPLAY_CPUINFO is not set
48+
+CONFIG_DISPLAY_BOARDINFO_LATE=y
49+
+CONFIG_ID_EEPROM=y
50+
+CONFIG_SPL_MAX_SIZE=0x40000
51+
+CONFIG_SPL_PAD_TO=0x7f8000
52+
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
53+
+CONFIG_SPL_BSS_START_ADDR=0x4000000
54+
+CONFIG_SPL_BSS_MAX_SIZE=0x4000
55+
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
56+
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
57+
+CONFIG_SPL_STACK_R=y
58+
+CONFIG_SPL_SPI_LOAD=y
59+
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
60+
+CONFIG_SPL_ATF=y
61+
+CONFIG_CMD_GPIO=y
62+
+CONFIG_CMD_GPIO_READ=y
63+
+CONFIG_CMD_PWM=y
64+
+CONFIG_CMD_GPT=y
65+
+CONFIG_CMD_I2C=y
66+
+CONFIG_CMD_MBR=y
67+
+CONFIG_CMD_MMC=y
68+
+CONFIG_CMD_PCI=y
69+
+CONFIG_CMD_POWEROFF=y
70+
+CONFIG_CMD_USB=y
71+
+CONFIG_CMD_USB_MASS_STORAGE=y
72+
+# CONFIG_CMD_SETEXPR is not set
73+
+CONFIG_CMD_PMIC=y
74+
+CONFIG_CMD_REGULATOR=y
75+
+# CONFIG_SPL_DOS_PARTITION is not set
76+
+CONFIG_SPL_OF_CONTROL=y
77+
+CONFIG_OF_LIVE=y
78+
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
79+
+CONFIG_SPL_DM_SEQ_ALIAS=y
80+
+CONFIG_SPL_REGMAP=y
81+
+CONFIG_SPL_SYSCON=y
82+
+CONFIG_SATA=y
83+
+CONFIG_SCSI_AHCI=y
84+
+CONFIG_AHCI_PCI=y
85+
+CONFIG_SATA_SIL=y
86+
+CONFIG_SPL_CLK=y
87+
+CONFIG_FASTBOOT_BUF_ADDR=0x13000000
88+
+CONFIG_FASTBOOT_FLASH_MMC_DEV=2
89+
+CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y
90+
+CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
91+
+CONFIG_ROCKCHIP_GPIO=y
92+
+CONFIG_SYS_I2C_ROCKCHIP=y
93+
+CONFIG_LED=y
94+
+CONFIG_LED_GPIO=y
95+
+CONFIG_MISC=y
96+
+CONFIG_SUPPORT_EMMC_RPMB=y
97+
+CONFIG_MMC_HS200_SUPPORT=y
98+
+CONFIG_MMC_DW=y
99+
+CONFIG_MMC_DW_ROCKCHIP=y
100+
+CONFIG_MMC_SDHCI=y
101+
+CONFIG_MMC_SDHCI_SDMA=y
102+
+CONFIG_MMC_SDHCI_ROCKCHIP=y
103+
+CONFIG_SF_DEFAULT_BUS=4
104+
+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
105+
+CONFIG_SPI_FLASH_GIGADEVICE=y
106+
+CONFIG_SPI_FLASH_MACRONIX=y
107+
+CONFIG_SPI_FLASH_WINBOND=y
108+
+CONFIG_SPI_FLASH_XTX=y
109+
+CONFIG_ETH_DESIGNWARE=y
110+
+CONFIG_GMAC_ROCKCHIP=y
111+
+CONFIG_NVME_PCI=y
112+
+CONFIG_PCIE_DW_ROCKCHIP=y
113+
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
114+
+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
115+
+CONFIG_SPL_PINCTRL=y
116+
+CONFIG_DM_PMIC=y
117+
+CONFIG_DM_PMIC_FAN53555=y
118+
+CONFIG_PMIC_RK8XX=y
119+
+CONFIG_REGULATOR_RK8XX=y
120+
+CONFIG_PWM_ROCKCHIP=y
121+
+CONFIG_SPL_RAM=y
122+
+CONFIG_SCSI=y
123+
+CONFIG_DM_SCSI=y
124+
+CONFIG_BAUDRATE=1500000
125+
+CONFIG_DEBUG_UART_SHIFT=2
126+
+CONFIG_SYS_NS16550_MEM32=y
127+
+CONFIG_ROCKCHIP_SFC=y
128+
+CONFIG_ROCKCHIP_SPI=y
129+
+CONFIG_SYSRESET=y
130+
+CONFIG_USB=y
131+
+CONFIG_USB_XHCI_HCD=y
132+
+CONFIG_USB_XHCI_DWC3=y
133+
+CONFIG_USB_EHCI_HCD=y
134+
+CONFIG_USB_EHCI_GENERIC=y
135+
+CONFIG_USB_OHCI_HCD=y
136+
+CONFIG_USB_OHCI_GENERIC=y
137+
+CONFIG_USB_DWC3=y
138+
+CONFIG_USB_DWC3_GENERIC=y
139+
+CONFIG_USB_KEYBOARD=y
140+
+CONFIG_USB_GADGET=y
141+
+CONFIG_USB_GADGET_PRODUCT_NUM=0x2200
142+
+CONFIG_ERRNO_STR=y

0 commit comments

Comments
 (0)