From 692b1363d65a6e29f0091d6c74e34b420910dfcd Mon Sep 17 00:00:00 2001 From: chainsx Date: Sat, 12 Apr 2025 12:24:39 +0800 Subject: [PATCH] sakurapi-rk3308b:bump u-boot to 2025.04 --- config/boards/sakurapi-rk3308b.csc | 6 +- .../add-board-sakurapi-rk3308b.patch | 108 +++++------------- 2 files changed, 32 insertions(+), 82 deletions(-) rename patch/u-boot/{u-boot-rockchip64-v2022.04 => v2025.04}/board_sakurapi-rk3308b/add-board-sakurapi-rk3308b.patch (70%) diff --git a/config/boards/sakurapi-rk3308b.csc b/config/boards/sakurapi-rk3308b.csc index 509786715..42f52aff7 100755 --- a/config/boards/sakurapi-rk3308b.csc +++ b/config/boards/sakurapi-rk3308b.csc @@ -11,11 +11,11 @@ KERNEL_TARGET="current" BOOT_FDT_FILE="rockchip/rk3308-sakurapi-rk3308b.dtb" MODULES_BLACKLIST="analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost" HAS_VIDEO_OUTPUT="no" -BOOTBRANCH_BOARD="tag:v2022.04" -BOOTPATCHDIR="u-boot-rockchip64-v2022.04" +BOOTBRANCH_BOARD="tag:v2025.04" +BOOTPATCHDIR="v2025.04" IMAGE_PARTITION_TABLE="gpt" -BOOT_SCENARIO="only-blobs" +BOOT_SCENARIO="binman" BL31_BLOB="rk33/rk3308_bl31_v2.26.elf" DDR_BLOB="rk33/rk3308_ddr_589MHz_uart2_m1_v1.30.bin" MINILOADER_BLOB="rk33/rk3308_miniloader_sd_nand_v1.13.bin" diff --git a/patch/u-boot/u-boot-rockchip64-v2022.04/board_sakurapi-rk3308b/add-board-sakurapi-rk3308b.patch b/patch/u-boot/v2025.04/board_sakurapi-rk3308b/add-board-sakurapi-rk3308b.patch similarity index 70% rename from patch/u-boot/u-boot-rockchip64-v2022.04/board_sakurapi-rk3308b/add-board-sakurapi-rk3308b.patch rename to patch/u-boot/v2025.04/board_sakurapi-rk3308b/add-board-sakurapi-rk3308b.patch index b70bd51ea..6dbca33a3 100644 --- a/patch/u-boot/u-boot-rockchip64-v2022.04/board_sakurapi-rk3308b/add-board-sakurapi-rk3308b.patch +++ b/patch/u-boot/v2025.04/board_sakurapi-rk3308b/add-board-sakurapi-rk3308b.patch @@ -5,28 +5,11 @@ Subject: Add Sakura Pi RK3308B support Signed-off-by: Chiyuki Akatsuki <17957399+TheSnowfield@users.noreply.github.com> --- - arch/arm/dts/Makefile | 1 - arch/arm/dts/rk3308-sakurapi-rk3308b-u-boot.dtsi | 18 ++ - arch/arm/dts/rk3308-sakurapi-rk3308b.dts | 167 ++++++++++++++++++++++ - configs/sakurapi_rk3308b_defconfig | 105 ++++++++++++++ - 4 files changed, 291 insertions(+) + arch/arm/dts/rk3308-sakurapi-rk3308b-u-boot.dtsi | 18 ++ + dts/upstream/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts | 167 ++++++++++++++++++++++ + configs/sakurapi_rk3308b_defconfig | 105 ++++++++++++++ + 3 files changed, 290 insertions(+) -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 11dcac8fea..9a72e1e366 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -114,10 +114,11 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \ - rk3288-veyron-minnie.dtb \ - rk3288-veyron-speedy.dtb \ - rk3288-vyasa.dtb - - dtb-$(CONFIG_ROCKCHIP_RK3308) += \ -+ rk3308-sakurapi-rk3308b.dtb \ - rk3308-evb.dtb \ - rk3308-roc-cc.dtb \ - rk3308-rock-pi-s.dtb - - dtb-$(CONFIG_ROCKCHIP_RK3328) += \ diff --git a/arch/arm/dts/rk3308-sakurapi-rk3308b-u-boot.dtsi b/arch/arm/dts/rk3308-sakurapi-rk3308b-u-boot.dtsi new file mode 100644 index 0000000000..7ff0ce903a @@ -51,11 +34,11 @@ index 0000000000..7ff0ce903a + clock-frequency = <24000000>; + status = "okay"; +}; -diff --git a/arch/arm/dts/rk3308-sakurapi-rk3308b.dts b/arch/arm/dts/rk3308-sakurapi-rk3308b.dts +diff --git a/dts/upstream/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts b/dts/upstream/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts new file mode 100644 index 0000000000..2697f0b885 --- /dev/null -+++ b/arch/arm/dts/rk3308-sakurapi-rk3308b.dts ++++ b/dts/upstream/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts @@ -0,0 +1,167 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* @@ -229,109 +212,76 @@ new file mode 100644 index 0000000000..1ab8320fa7 --- /dev/null +++ b/configs/sakurapi_rk3308b_defconfig -@@ -0,0 +1,105 @@ +@@ -0,0 +1,72 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y ++CONFIG_COUNTER_FREQUENCY=24000000 +CONFIG_ARCH_ROCKCHIP=y -+CONFIG_SYS_TEXT_BASE=0x00600000 -+CONFIG_SPL_GPIO_SUPPORT=y -+CONFIG_SPL_LIBCOMMON_SUPPORT=y -+CONFIG_SPL_LIBGENERIC_SUPPORT=y -+CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3308-sakurapi-rk3308b" ++CONFIG_DM_RESET=y +CONFIG_ROCKCHIP_RK3308=y -+CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 -+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_TARGET_EVB_RK3308=y -+CONFIG_SPL_STACK_R_ADDR=0xc00000 -+CONFIG_PRE_CON_BUF_ADDR=0x0f200000 +CONFIG_DEBUG_UART_BASE=0xFF0C0000 +CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_LIBDISK_SUPPORT=y -+CONFIG_DEFAULT_DEVICE_TREE="rk3308-sakurapi-rk3308b" -+CONFIG_DEBUG_UART=y ++# CONFIG_DEBUG_UART_BOARD_INIT is not set +CONFIG_SYS_LOAD_ADDR=0x800800 -+CONFIG_BAUDRATE=1500000 -+# CONFIG_LOCALVERSION_AUTO is not set ++CONFIG_DEBUG_UART=y +CONFIG_ANDROID_BOOT_IMAGE=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y -+CONFIG_PRE_CONSOLE_BUFFER=y -+CONFIG_CONSOLE_MUX=y -+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y -+# CONFIG_SYS_DEVICE_NULLDEV is not set +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3308-sakurapi-rk3308b.dtb" -+CONFIG_MISC_INIT_R=y -+CONFIG_VERSION_VARIABLE=y +# CONFIG_DISPLAY_CPUINFO is not set -+CONFIG_DISPLAY_BOARDINFO_LATE=y -+CONFIG_BOARD_TYPES=y -+CONFIG_SPL_STACK_R=y -+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y -+CONFIG_CMD_CONFIG=y -+# CONFIG_CMD_ELF is not set -+# CONFIG_CMD_IMI is not set -+# CONFIG_CMD_XIMG is not set ++CONFIG_SPL_MAX_SIZE=0x40000 ++CONFIG_SPL_PAD_TO=0x7f8000 ++# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set ++CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y -+# CONFIG_CMD_LOADB is not set -+# CONFIG_CMD_LOADS is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y ++CONFIG_CMD_ROCKUSB=y +CONFIG_CMD_USB_MASS_STORAGE=y -+# CONFIG_CMD_ITEST is not set -+# CONFIG_CMD_SETEXPR is not set -+# CONFIG_ISO_PARTITION is not set -+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 ++CONFIG_CMD_RNG=y ++CONFIG_CMD_KASLRSEED=y ++CONFIG_CMD_REGULATOR=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIVE=y -+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" ++CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_CLK=y +# CONFIG_USB_FUNCTION_FASTBOOT is not set -+CONFIG_SPL_FIRMWARE=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y ++CONFIG_ROCKCHIP_IODOMAIN=y ++CONFIG_SUPPORT_EMMC_RPMB=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_PHY_REALTEK=y -+CONFIG_DM_ETH=y -+CONFIG_PHY_GIGE=y ++CONFIG_DM_MDIO=y ++CONFIG_DM_ETH_PHY=y +CONFIG_ETH_DESIGNWARE=y -+CONFIG_RGMII=y -+CONFIG_MII=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PINCTRL=y -+CONFIG_DM_PMIC=y -+CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM=y -+CONFIG_ROCKCHIP_SDRAM_COMMON=y -+CONFIG_DM_RESET=y ++CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_ROCKCHIP_SPI=y ++CONFIG_SYS_NS16550_MEM32=y ++CONFIG_SYSINFO=y +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_DM_USB_GADGET=y -+CONFIG_SPL_DM_USB_GADGET=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_DWC2=y -+CONFIG_USB_DWC3=y -+CONFIG_ROCKCHIP_USB2_PHY=y -+CONFIG_USB_KEYBOARD=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y -+CONFIG_EXT4_WRITE=y -+CONFIG_SPL_TINY_MEMSET=y ++CONFIG_USB_FUNCTION_ROCKUSB=y +CONFIG_LZO=y +CONFIG_ERRNO_STR=y -+# CONFIG_EFI_LOADER is not set