Revert "uboot-rockchip:doornet2 detaches from evb rk (coolsnowwolf#9812…

…)" This reverts commit cdad02d.
wangyubow · Jul 21, 2022 · 7af074f · 7af074f
1 parent cdad02d
commit 7af074f
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 987 deletions.
diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
@@ -90,6 +90,7 @@ define U-Boot/doornet2-rk3399
   DEPENDS:=+PACKAGE_u-boot-doornet2-rk3399:arm-trusted-firmware-rk3399
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3399_bl31_v1.35.elf
+  USE_RKBIN:=1
 endef
 
 define U-Boot/guangmiao-g4c-rk3399

diff --git a/.../boot/uboot-rockchip/patches/303-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch b/.../boot/uboot-rockchip/patches/303-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch
@@ -916,15 +916,14 @@
 +
 --- /dev/null
 +++ b/configs/doornet2-rk3399_defconfig
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,65 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_ROCKCHIP=y
 +CONFIG_SYS_TEXT_BASE=0x00200000
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_ENV_OFFSET=0x3F8000
 +CONFIG_ROCKCHIP_RK3399=y
 +CONFIG_TARGET_EVB_RK3399=y
-+CONFIG_TARGET_DOORNET2_RK3399=y
 +CONFIG_DEBUG_UART_BASE=0xFF1A0000
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_DEFAULT_DEVICE_TREE="rk3399-doornet2"