ARM: rockchip: add BPI-R2-Pro V00 board

frank-w · Mar 23, 2022 · deaf7a8 · deaf7a8
1 parent ba92974
commit deaf7a8
Show file tree

Hide file tree

Showing 4 changed files with 615 additions and 4 deletions.
diff --git a/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c b/arch/arm/boards/rockchip-rk3568-bpi-r2pro/lowlevel.c
@@ -10,8 +10,9 @@
 #include <mach/rockchip.h>
 
 extern char __dtb_rk3568_bpi_r2_pro_start[];
+extern char __dtb_rk3568_bpi_r2_pro_v00_start[];
 
-static noinline void rk3568_start(void)
+static noinline void rk3568_start(void *fdt_blob_fixed_offset)
 {
 	void *fdt;
 
@@ -21,7 +22,7 @@ static noinline void rk3568_start(void)
 	 */
 	writel(RK_SETBITS(0x50), 0xfdc20140);
 
-	fdt = __dtb_rk3568_bpi_r2_pro_start;
+	fdt = fdt_blob_fixed_offset;
 
 	if (current_el() == 3) {
 		rk3568_lowlevel_init();
@@ -32,7 +33,7 @@ static noinline void rk3568_start(void)
 	barebox_arm_entry(RK3568_DRAM_BOTTOM, 0x80000000 - RK3568_DRAM_BOTTOM, fdt);
 }
 
-ENTRY_FUNCTION(start_rk3568_bpi_r2pro, r0, r1, r2)
+static void start_rk3568_bpi_r2pro_common(void *fdt_blob_fixed_offset)
 {
 	/*
 	 * Image execution starts at 0x0, but this is used for ATF and
@@ -45,5 +46,15 @@ ENTRY_FUNCTION(start_rk3568_bpi_r2pro, r0, r1, r2)
 
 	setup_c();
 
-	rk3568_start();
+	rk3568_start(fdt_blob_fixed_offset);
+}
+
+ENTRY_FUNCTION(start_rk3568_bpi_r2pro, r0, r1, r2)
+{
+	start_rk3568_bpi_r2pro_common(__dtb_rk3568_bpi_r2_pro_start);
+}
+
+ENTRY_FUNCTION(start_rk3568_bpi_r2pro_v00, r0, r1, r2)
+{
+	start_rk3568_bpi_r2pro_common(__dtb_rk3568_bpi_r2_pro_v00_start);
 }
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
@@ -106,6 +106,7 @@ lwl-$(CONFIG_MACH_PHYTEC_SOM_RK3288) += rk3288-phycore-som.dtb.o
 lwl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-edmqmx6.dtb.o
 lwl-$(CONFIG_MACH_RK3568_EVB) += rk3568-evb1-v10.dtb.o
 lwl-$(CONFIG_MACH_RK3568_BPI_R2PRO) += rk3568-bpi-r2-pro.dtb.o
+lwl-$(CONFIG_MACH_RK3568_BPI_R2PRO) += rk3568-bpi-r2-pro-v00.dtb.o
 lwl-$(CONFIG_MACH_RPI) += bcm2835-rpi.dtb.o
 lwl-$(CONFIG_MACH_RPI2) += bcm2836-rpi-2.dtb.o
 lwl-$(CONFIG_MACH_RPI3) += bcm2837-rpi-3.dtb.o