85 lines
3.7 KiB
Diff
85 lines
3.7 KiB
Diff
From 48f5c27ae2edfb36d7f6a628d3763b4c4b85c9c7 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
Date: Wed, 30 Dec 2020 21:01:20 +0100
|
|
Subject: [PATCH] sunxi: Add fdtoverlay_addr_r env variable
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
---
|
|
include/configs/sunxi-common.h | 40 +++++++++++++++++++---------------
|
|
1 file changed, 22 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
|
|
index a6a4879523a3..34917be3325f 100644
|
|
--- a/include/configs/sunxi-common.h
|
|
+++ b/include/configs/sunxi-common.h
|
|
@@ -287,12 +287,13 @@ extern int soft_i2c_gpio_scl;
|
|
* Scripts, PXE and DTBs should go afterwards, leaving the rest for the initrd.
|
|
* Align the initrd to a 2MB page.
|
|
*/
|
|
-#define BOOTM_SIZE __stringify(0xa000000)
|
|
-#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(0080000))
|
|
-#define FDT_ADDR_R __stringify(SDRAM_OFFSET(FA00000))
|
|
-#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(FC00000))
|
|
-#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(FD00000))
|
|
-#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(FE00000))
|
|
+#define BOOTM_SIZE __stringify(0xa000000)
|
|
+#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(0080000))
|
|
+#define FDT_ADDR_R __stringify(SDRAM_OFFSET(FA00000))
|
|
+#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(FB00000))
|
|
+#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(FC00000))
|
|
+#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(FD00000))
|
|
+#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(FE00000))
|
|
|
|
#else
|
|
/*
|
|
@@ -301,24 +302,26 @@ extern int soft_i2c_gpio_scl;
|
|
* 1M script, 1M pxe and the ramdisk at the end.
|
|
*/
|
|
#ifndef CONFIG_MACH_SUN8I_V3S
|
|
-#define BOOTM_SIZE __stringify(0xa000000)
|
|
-#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(2000000))
|
|
-#define FDT_ADDR_R __stringify(SDRAM_OFFSET(3000000))
|
|
-#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(3100000))
|
|
-#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000))
|
|
-#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3300000))
|
|
+#define BOOTM_SIZE __stringify(0xa000000)
|
|
+#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(2000000))
|
|
+#define FDT_ADDR_R __stringify(SDRAM_OFFSET(3000000))
|
|
+#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(3100000))
|
|
+#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(3200000))
|
|
+#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3300000))
|
|
+#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3400000))
|
|
#else
|
|
/*
|
|
* 64M RAM minus 2MB heap + 16MB for u-boot, stack, fb, etc.
|
|
* 16M uncompressed kernel, 8M compressed kernel, 1M fdt,
|
|
* 1M script, 1M pxe and the ramdisk at the end.
|
|
*/
|
|
-#define BOOTM_SIZE __stringify(0x2e00000)
|
|
-#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(1000000))
|
|
-#define FDT_ADDR_R __stringify(SDRAM_OFFSET(1800000))
|
|
-#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(1900000))
|
|
-#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(1A00000))
|
|
-#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(1B00000))
|
|
+#define BOOTM_SIZE __stringify(0x2e00000)
|
|
+#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(1000000))
|
|
+#define FDT_ADDR_R __stringify(SDRAM_OFFSET(1800000))
|
|
+#define FDTOVERLAY_ADDR_R __stringify(SDRAM_OFFSET(1900000))
|
|
+#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(1A00000))
|
|
+#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(1B00000))
|
|
+#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(1C00000))
|
|
#endif
|
|
#endif
|
|
|
|
@@ -326,6 +329,7 @@ extern int soft_i2c_gpio_scl;
|
|
"bootm_size=" BOOTM_SIZE "\0" \
|
|
"kernel_addr_r=" KERNEL_ADDR_R "\0" \
|
|
"fdt_addr_r=" FDT_ADDR_R "\0" \
|
|
+ "fdtoverlay_addr_r=" FDTOVERLAY_ADDR_R "\0" \
|
|
"scriptaddr=" SCRIPT_ADDR_R "\0" \
|
|
"pxefile_addr_r=" PXEFILE_ADDR_R "\0" \
|
|
"ramdisk_addr_r=" RAMDISK_ADDR_R "\0"
|
|
--
|
|
2.30.0
|
|
|