fix common bootargs to set contiguous memory ranges for ISP

gtxaspec · Feb 5, 2024 · c7355df · c7355df
1 parent 90e5bbf
commit c7355df
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 25 deletions.
diff --git a/include/configs/isvp_common.h b/include/configs/isvp_common.h
@@ -249,18 +249,6 @@
 #define CONFIG_CMD_USB
 */
 
-#if defined(CONFIG_DDR2_128M) || defined(CONFIG_DDR3_128M)
-#define CONFIG_EXTRA_SETTINGS \
-"totalmem=128M\0" \
-"osmem=64M\0" \
-"rmem=64M@0x4000000\0"
-#else
-#define CONFIG_EXTRA_SETTINGS \
-"totalmem=64M\0" \
-"osmem=40M\0" \
-"rmem=24M@0x2800000\0"
-#endif
-
 #if defined(CONFIG_SPL_MMC_SUPPORT)
 #define CONFIG_BOOTCOMMAND \
 "setenv setargs setenv bootargs ${bootargs};run setargs;" \
@@ -284,7 +272,8 @@
 #endif
 
 #define CONFIG_BOOTARGS \
-"mem=\\${osmem} rmem=\\${rmem} console=\\${serialport},\\${baudrate}n8" \
+BOOTARGS_COMMON \
+" console=\\${serialport},\\${baudrate}n8" \
 " panic=\\${panic_timeout} root=/dev/mtdblock3 rootfstype=squashfs init=/init" \
 " mtdparts=jz_sfc:256k(boot),64k(env),\\${kern_size}(kernel),\\${rootfs_size}(rootfs),-(rootfs_data)\\${update}"
 

diff --git a/include/configs/isvp_t10.h b/include/configs/isvp_t10.h
@@ -110,7 +110,11 @@
 /**
  * Boot arguments definitions.
  */
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=39M@0x0 ispmem=5M@0x2700000 rmem=20M@0x2c00000"
+#define BOOTARGS_COMMON "mem=\\${osmem} rmem=\\${rmem}"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=39M@0x0\0" \
+"ispmem=5M@0x2700000\0" \
+"rmem=20M@0x2c00000\0"
 
 /*
 #if defined(CONFIG_SPL_MMC_SUPPORT)

diff --git a/include/configs/isvp_t20.h b/include/configs/isvp_t20.h
@@ -115,12 +115,18 @@
 /**
  * Boot arguments definitions.
  */
+#define BOOTARGS_COMMON "mem=\\${osmem} ispmem=\\${ispmem} rmem=\\${rmem}"
 #if defined(CONFIG_DDR2_128M)
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=96M@0x0 ispmem=8M@0x6000000 rmem=24M@0x6800000"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=99M@0x0\0" \
+"ispmem=8M@0x6000000\0" \
+"rmem=24M@0x6800000\0"
 #else
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=32M@0x0 ispmem=8M@0x2000000 rmem=24M@0x2800000"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=43M@0x0\0" \
+"ispmem=8M@0x2000000\0" \
+"rmem=24M@0x2800000\0"
 #endif
-
 /*
 #if defined(CONFIG_SPL_MMC_SUPPORT)
 #define CONFIG_BOOTARGS BOOTARGS_COMMON " init=/linuxrc root=/dev/mmcblk0p2 rw rootdelay=1"

diff --git a/include/configs/isvp_t21.h b/include/configs/isvp_t21.h
@@ -234,10 +234,15 @@
 /**
  * Boot arguments definitions.
  */
+#define BOOTARGS_COMMON "mem=\\${osmem} rmem=\\${rmem}"
 #if defined(CONFIG_DDR2_128M)
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=106M@0x0 rmem=22M@0x6a00000"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=106M@0x0\0" \
+"rmem=22M@0x6a00000\0"
 #else
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=43M@0x0 rmem=21M@0x2B00000"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=43M@0x0\0" \
+"rmem=21M@0x2B00000\0"
 #endif
 
 #if defined(CONFIG_SPL_SFC_NOR) || defined(CONFIG_SPL_SFC_NAND)

diff --git a/include/configs/isvp_t23.h b/include/configs/isvp_t23.h
@@ -228,10 +228,15 @@
 /**
  * Boot arguments definitions.
  */
+#define BOOTARGS_COMMON "mem=\\${osmem} rmem=\\${rmem}"
 #if defined(CONFIG_T23N)
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=41M@0x0 rmem=23M@0x2900000"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=41M@0x0\0" \
+"rmem=23M@0x2900000\0"
 #else
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=32M@0x0 rmem=32M@0x2000000"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=32M@0x0\0" \
+"rmem=32M@0x2000000\0"
 #endif
 
 #if defined(CONFIG_SPL_SFC_NOR) || defined(CONFIG_SPL_SFC_NAND)

diff --git a/include/configs/isvp_t30.h b/include/configs/isvp_t30.h
@@ -246,10 +246,15 @@
 /**
  * Boot arguments definitions.
  */
+#define BOOTARGS_COMMON "mem=\\${osmem} rmem=\\${rmem}"
 #if defined(CONFIG_DDR2_128M) || defined(CONFIG_DDR3_128M)
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=106M@0x0 rmem=22M@0x6a00000"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=106M@0x0\0" \
+"rmem=22M@0x6a00000\0"
 #else
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=42M@0x0 rmem=22M@0x2a00000"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=42M@0x0\0" \
+"rmem=22M@0x2a00000\0"
 #endif
 
 #if defined(CONFIG_SPL_SFC_NOR) || defined(CONFIG_SPL_SFC_NAND)

diff --git a/include/configs/isvp_t31.h b/include/configs/isvp_t31.h
@@ -363,10 +363,15 @@
 /**
  * Boot arguments definitions.
  */
+#define BOOTARGS_COMMON "mem=\\${osmem} rmem=\\${rmem}"
 #if defined(CONFIG_DDR2_128M) || defined(CONFIG_DDR3_128M)
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=64M@0x0 rmem=64M@0x4000000"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=99M@0x0\0" \
+"rmem=29M@0x6300000\0"
 #else
-#define BOOTARGS_COMMON "console=ttyS1,115200n8 mem=42M@0x0 rmem=22M@0x2a00000"
+#define CONFIG_EXTRA_SETTINGS \
+"osmem=42M@0x0\0" \
+"rmem=22M@0x2a00000\0"
 #endif
 
 #if defined(CONFIG_SPL_SFC_NOR) || defined(CONFIG_SPL_SFC_NAND)