From 2f4941496c737543a12a0b6fc279081ef13b9a80 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 20 Dec 2022 14:30:18 +0100
Subject: use rockpi4 b plus dtb instead of c, fixes bootup. A lot of drivers
 where moved from mini.config to target/linux/config. WLAN works, ethernet
 works, i2c works, RTC works.

---
 package/u-boot/Makefile                            |   5 ++++-
 package/u-boot/files/boot.script.rockpi4           |   4 ++++
 .../patch-configs_rock-pi-4-rk3399_defconfig       |  21 +++++++++++++++++++++
 package/u-boot/src/bl31.elf                        | Bin 0 -> 365344 bytes
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 package/u-boot/files/boot.script.rockpi4
 create mode 100644 package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
 create mode 100644 package/u-boot/src/bl31.elf

(limited to 'package/u-boot')

diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index 0671a3fa3..45991de05 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -59,7 +59,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64),y)
 CONFIG:=		rpi_3_defconfig
 endif
 ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y)
-CONFIG:=		rock-pi-4c-rk3399_defconfig
+CONFIG:=		rock-pi-4-rk3399_defconfig
 UBOOT:=			u-boot.itb
 endif
 ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
@@ -141,6 +141,9 @@ endif
 ifeq ($(ADK_TARGET_SYSTEM_BANANA_P2_ZERO),y)
 	$(INSTALL_BIN) ./files/boot.script.bpizero $(FW_DIR)
 endif
+ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y)
+	$(INSTALL_BIN) ./files/boot.script.rockpi4 $(FW_DIR)
+endif
 ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y)
 	$(INSTALL_BIN) ./files/boot.script.opi $(FW_DIR)
 endif
diff --git a/package/u-boot/files/boot.script.rockpi4 b/package/u-boot/files/boot.script.rockpi4
new file mode 100644
index 000000000..1aca0bddb
--- /dev/null
+++ b/package/u-boot/files/boot.script.rockpi4
@@ -0,0 +1,4 @@
+setenv bootargs console=ttyS2,115200 root=/dev/mmcblk0p1 rootwait
+ext4load mmc 1:1 $kernel_addr_r boot/kernel
+ext4load mmc 1:1 $fdt_addr_r boot/rk3399-rock-pi-4b.dtb
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
new file mode 100644
index 000000000..575ddfbe6
--- /dev/null
+++ b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
@@ -0,0 +1,21 @@
+--- u-boot-2022.10.orig/configs/rock-pi-4-rk3399_defconfig	2022-10-03 21:25:32.000000000 +0200
++++ u-boot-2022.10/configs/rock-pi-4-rk3399_defconfig	2022-12-25 06:25:34.169217143 +0100
+@@ -4,7 +4,8 @@ CONFIG_COUNTER_FREQUENCY=24000000
+ CONFIG_ARCH_ROCKCHIP=y
+ CONFIG_SYS_TEXT_BASE=0x00200000
+ CONFIG_NR_DRAM_BANKS=1
+-CONFIG_ENV_OFFSET=0x3F8000
++CONFIG_ENV_OFFSET=-0x20000
++CONFIG_ENV_SIZE=0x20000
+ CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b"
+ CONFIG_ROCKCHIP_RK3399=y
+ CONFIG_TARGET_EVB_RK3399=y
+@@ -60,7 +61,7 @@ CONFIG_REGULATOR_RK8XX=y
+ CONFIG_PWM_ROCKCHIP=y
+ CONFIG_RAM_RK3399_LPDDR4=y
+ CONFIG_DM_RESET=y
+-CONFIG_BAUDRATE=1500000
++CONFIG_BAUDRATE=115200
+ CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYSRESET=y
+ CONFIG_USB=y
diff --git a/package/u-boot/src/bl31.elf b/package/u-boot/src/bl31.elf
new file mode 100644
index 000000000..24cb666c7
Binary files /dev/null and b/package/u-boot/src/bl31.elf differ
-- 
cgit v1.2.3