SMART AM40: Bump U-Boot to v2026.01

This commit is contained in:
retro98boy 2026-01-27 14:42:47 +08:00 committed by Igor
parent f4f91860b4
commit 4ca40d63f2
2 changed files with 7 additions and 9 deletions

View File

@ -11,8 +11,8 @@ MODULES_EDGE="extcon-usbc-virtual-pd"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3399-am40.dtb"
BOOTBRANCH_BOARD="tag:v2025.04"
BOOTPATCHDIR="v2025.04"
BOOTBRANCH_BOARD="tag:v2026.01"
BOOTPATCHDIR="v2026.01"
BOOT_SCENARIO="binman"
SRC_EXTLINUX="yes"
SRC_CMDLINE="console=ttyS2,1500000 console=tty0"

View File

@ -17,10 +17,10 @@ index 00000000..1f5fda1d
+};
diff --git a/configs/am40-rk3399_defconfig b/configs/am40-rk3399_defconfig
new file mode 100644
index 00000000..8ea5266f
index 00000000..739b8ae5
--- /dev/null
+++ b/configs/am40-rk3399_defconfig
@@ -0,0 +1,71 @@
@@ -0,0 +1,69 @@
+# Reference from firefly-rk3399_defconfig
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
@ -41,7 +41,6 @@ index 00000000..8ea5266f
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-am40.dtb"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_SPL_MAX_SIZE=0x40000
+CONFIG_SPL_PAD_TO=0x7f8000
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
+CONFIG_TPL=y
@ -55,10 +54,9 @@ index 00000000..8ea5266f
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_RELOC_GD_ENV_ADDR=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_ROCKCHIP_IODOMAIN=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
@ -94,7 +92,7 @@ index 00000000..8ea5266f
+CONFIG_ERRNO_STR=y
diff --git a/dts/upstream/src/arm64/rockchip/rk3399-am40.dts b/dts/upstream/src/arm64/rockchip/rk3399-am40.dts
new file mode 100644
index 00000000..195ad794
index 00000000..4a718e5a
--- /dev/null
+++ b/dts/upstream/src/arm64/rockchip/rk3399-am40.dts
@@ -0,0 +1,792 @@
@ -713,7 +711,7 @@ index 00000000..195ad794
+ };
+
+ usb {
+ vcc5v0_host_en: vcc5v0-hots-en {
+ vcc5v0_host_en: vcc5v0-host-en {
+ rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+