Skip to content

Commit 692b136

Browse files
chainsxigorpecovnik
chainsx
authored and
igorpecovnik
committed
sakurapi-rk3308b:bump u-boot to 2025.04
1 parent 56d867f commit 692b136

File tree

2 files changed

+32
-82
lines changed

2 files changed

+32
-82
lines changed

‎config/boards/sakurapi-rk3308b.csc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ KERNEL_TARGET="current"
1111
BOOT_FDT_FILE="rockchip/rk3308-sakurapi-rk3308b.dtb"
1212
MODULES_BLACKLIST="analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
1313
HAS_VIDEO_OUTPUT="no"
14-
BOOTBRANCH_BOARD="tag:v2022.04"
15-
BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
14+
BOOTBRANCH_BOARD="tag:v2025.04"
15+
BOOTPATCHDIR="v2025.04"
1616
IMAGE_PARTITION_TABLE="gpt"
1717

18-
BOOT_SCENARIO="only-blobs"
18+
BOOT_SCENARIO="binman"
1919
BL31_BLOB="rk33/rk3308_bl31_v2.26.elf"
2020
DDR_BLOB="rk33/rk3308_ddr_589MHz_uart2_m1_v1.30.bin"
2121
MINILOADER_BLOB="rk33/rk3308_miniloader_sd_nand_v1.13.bin"

‎patch/u-boot/u-boot-rockchip64-v2022.04/board_sakurapi-rk3308b/add-board-sakurapi-rk3308b.patch‎ renamed to ‎patch/u-boot/v2025.04/board_sakurapi-rk3308b/add-board-sakurapi-rk3308b.patch‎

Lines changed: 29 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,11 @@ Subject: Add Sakura Pi RK3308B support
55

66
Signed-off-by: Chiyuki Akatsuki <17957399+TheSnowfield@users.noreply.github.com>
77
---
8-
arch/arm/dts/Makefile | 1
9-
arch/arm/dts/rk3308-sakurapi-rk3308b-u-boot.dtsi | 18 ++
10-
arch/arm/dts/rk3308-sakurapi-rk3308b.dts | 167 ++++++++++++++++++++++
11-
configs/sakurapi_rk3308b_defconfig | 105 ++++++++++++++
12-
4 files changed, 291 insertions(+)
8+
arch/arm/dts/rk3308-sakurapi-rk3308b-u-boot.dtsi | 18 ++
9+
dts/upstream/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts | 167 ++++++++++++++++++++++
10+
configs/sakurapi_rk3308b_defconfig | 105 ++++++++++++++
11+
3 files changed, 290 insertions(+)
1312

14-
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
15-
index 11dcac8fea..9a72e1e366 100644
16-
--- a/arch/arm/dts/Makefile
17-
+++ b/arch/arm/dts/Makefile
18-
@@ -114,10 +114,11 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \
19-
rk3288-veyron-minnie.dtb \
20-
rk3288-veyron-speedy.dtb \
21-
rk3288-vyasa.dtb
22-
23-
dtb-$(CONFIG_ROCKCHIP_RK3308) += \
24-
+ rk3308-sakurapi-rk3308b.dtb \
25-
rk3308-evb.dtb \
26-
rk3308-roc-cc.dtb \
27-
rk3308-rock-pi-s.dtb
28-
29-
dtb-$(CONFIG_ROCKCHIP_RK3328) += \
3013
diff --git a/arch/arm/dts/rk3308-sakurapi-rk3308b-u-boot.dtsi b/arch/arm/dts/rk3308-sakurapi-rk3308b-u-boot.dtsi
3114
new file mode 100644
3215
index 0000000000..7ff0ce903a
@@ -51,11 +34,11 @@ index 0000000000..7ff0ce903a
5134
+ clock-frequency = <24000000>;
5235
+ status = "okay";
5336
+};
54-
diff --git a/arch/arm/dts/rk3308-sakurapi-rk3308b.dts b/arch/arm/dts/rk3308-sakurapi-rk3308b.dts
37+
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts b/dts/upstream/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts
5538
new file mode 100644
5639
index 0000000000..2697f0b885
5740
--- /dev/null
58-
+++ b/arch/arm/dts/rk3308-sakurapi-rk3308b.dts
41+
+++ b/dts/upstream/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts
5942
@@ -0,0 +1,167 @@
6043
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
6144
+/*
@@ -229,109 +212,76 @@ new file mode 100644
229212
index 0000000000..1ab8320fa7
230213
--- /dev/null
231214
+++ b/configs/sakurapi_rk3308b_defconfig
232-
@@ -0,0 +1,105 @@
215+
@@ -0,0 +1,72 @@
233216
+CONFIG_ARM=y
234217
+CONFIG_SKIP_LOWLEVEL_INIT=y
218+
+CONFIG_COUNTER_FREQUENCY=24000000
235219
+CONFIG_ARCH_ROCKCHIP=y
236-
+CONFIG_SYS_TEXT_BASE=0x00600000
237-
+CONFIG_SPL_GPIO_SUPPORT=y
238-
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
239-
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
240-
+CONFIG_SYS_MALLOC_F_LEN=0x2000
220+
+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-sakurapi-rk3308b"
221+
+CONFIG_DM_RESET=y
241222
+CONFIG_ROCKCHIP_RK3308=y
242-
+CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0
243-
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
244223
+CONFIG_TARGET_EVB_RK3308=y
245-
+CONFIG_SPL_STACK_R_ADDR=0xc00000
246-
+CONFIG_PRE_CON_BUF_ADDR=0x0f200000
247224
+CONFIG_DEBUG_UART_BASE=0xFF0C0000
248225
+CONFIG_DEBUG_UART_CLOCK=24000000
249-
+CONFIG_SPL_LIBDISK_SUPPORT=y
250-
+CONFIG_DEFAULT_DEVICE_TREE="rk3308-sakurapi-rk3308b"
251-
+CONFIG_DEBUG_UART=y
226+
+# CONFIG_DEBUG_UART_BOARD_INIT is not set
252227
+CONFIG_SYS_LOAD_ADDR=0x800800
253-
+CONFIG_BAUDRATE=1500000
254-
+# CONFIG_LOCALVERSION_AUTO is not set
228+
+CONFIG_DEBUG_UART=y
255229
+CONFIG_ANDROID_BOOT_IMAGE=y
256230
+CONFIG_FIT=y
257231
+CONFIG_FIT_VERBOSE=y
258-
+CONFIG_PRE_CONSOLE_BUFFER=y
259-
+CONFIG_CONSOLE_MUX=y
260-
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
261-
+# CONFIG_SYS_DEVICE_NULLDEV is not set
262232
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-sakurapi-rk3308b.dtb"
263-
+CONFIG_MISC_INIT_R=y
264-
+CONFIG_VERSION_VARIABLE=y
265233
+# CONFIG_DISPLAY_CPUINFO is not set
266-
+CONFIG_DISPLAY_BOARDINFO_LATE=y
267-
+CONFIG_BOARD_TYPES=y
268-
+CONFIG_SPL_STACK_R=y
269-
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
270-
+CONFIG_CMD_CONFIG=y
271-
+# CONFIG_CMD_ELF is not set
272-
+# CONFIG_CMD_IMI is not set
273-
+# CONFIG_CMD_XIMG is not set
234+
+CONFIG_SPL_MAX_SIZE=0x40000
235+
+CONFIG_SPL_PAD_TO=0x7f8000
236+
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
237+
+CONFIG_CMD_GPIO=y
274238
+CONFIG_CMD_GPT=y
275-
+# CONFIG_CMD_LOADB is not set
276-
+# CONFIG_CMD_LOADS is not set
277239
+CONFIG_CMD_MMC=y
278240
+CONFIG_CMD_USB=y
241+
+CONFIG_CMD_ROCKUSB=y
279242
+CONFIG_CMD_USB_MASS_STORAGE=y
280-
+# CONFIG_CMD_ITEST is not set
281-
+# CONFIG_CMD_SETEXPR is not set
282-
+# CONFIG_ISO_PARTITION is not set
283-
+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
243+
+CONFIG_CMD_RNG=y
244+
+CONFIG_CMD_KASLRSEED=y
245+
+CONFIG_CMD_REGULATOR=y
284246
+CONFIG_SPL_OF_CONTROL=y
285247
+CONFIG_OF_LIVE=y
286-
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
248+
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
287249
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
288250
+CONFIG_REGMAP=y
289251
+CONFIG_SYSCON=y
290252
+CONFIG_CLK=y
291253
+# CONFIG_USB_FUNCTION_FASTBOOT is not set
292-
+CONFIG_SPL_FIRMWARE=y
293254
+CONFIG_ROCKCHIP_GPIO=y
294255
+CONFIG_SYS_I2C_ROCKCHIP=y
295256
+CONFIG_LED=y
296257
+CONFIG_LED_GPIO=y
258+
+CONFIG_ROCKCHIP_IODOMAIN=y
259+
+CONFIG_SUPPORT_EMMC_RPMB=y
297260
+CONFIG_MMC_DW=y
298261
+CONFIG_MMC_DW_ROCKCHIP=y
299-
+CONFIG_MMC_SDHCI=y
300-
+CONFIG_MMC_SDHCI_ROCKCHIP=y
301262
+CONFIG_PHY_REALTEK=y
302-
+CONFIG_DM_ETH=y
303-
+CONFIG_PHY_GIGE=y
263+
+CONFIG_DM_MDIO=y
264+
+CONFIG_DM_ETH_PHY=y
304265
+CONFIG_ETH_DESIGNWARE=y
305-
+CONFIG_RGMII=y
306-
+CONFIG_MII=y
307266
+CONFIG_GMAC_ROCKCHIP=y
308267
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
309268
+CONFIG_PINCTRL=y
310-
+CONFIG_DM_PMIC=y
311-
+CONFIG_PMIC_RK8XX=y
312269
+CONFIG_REGULATOR_PWM=y
313270
+CONFIG_DM_REGULATOR_FIXED=y
314271
+CONFIG_PWM_ROCKCHIP=y
315272
+CONFIG_RAM=y
316-
+CONFIG_ROCKCHIP_SDRAM_COMMON=y
317-
+CONFIG_DM_RESET=y
273+
+CONFIG_BAUDRATE=1500000
318274
+CONFIG_DEBUG_UART_SHIFT=2
319-
+CONFIG_ROCKCHIP_SPI=y
275+
+CONFIG_SYS_NS16550_MEM32=y
276+
+CONFIG_SYSINFO=y
320277
+CONFIG_SYSRESET=y
321278
+CONFIG_USB=y
322279
+CONFIG_DM_USB_GADGET=y
323-
+CONFIG_SPL_DM_USB_GADGET=y
324280
+CONFIG_USB_EHCI_HCD=y
325281
+CONFIG_USB_EHCI_GENERIC=y
326-
+CONFIG_USB_DWC2=y
327-
+CONFIG_USB_DWC3=y
328-
+CONFIG_ROCKCHIP_USB2_PHY=y
329-
+CONFIG_USB_KEYBOARD=y
330282
+CONFIG_USB_GADGET=y
331283
+CONFIG_USB_GADGET_DWC2_OTG=y
332284
+CONFIG_USB_GADGET_DOWNLOAD=y
333-
+CONFIG_EXT4_WRITE=y
334-
+CONFIG_SPL_TINY_MEMSET=y
285+
+CONFIG_USB_FUNCTION_ROCKUSB=y
335286
+CONFIG_LZO=y
336287
+CONFIG_ERRNO_STR=y
337-
+# CONFIG_EFI_LOADER is not set

0 commit comments

Comments
 (0)