powerpc: Replace CONFIG_SYS_INIT_RAM_END with CONFIG_SYS_INIT_RAM_SIZE

PATCH New York Sun 3 participants 5 messages Apr 6, 2016 – Apr 8, 2016

Share & tools

York Sun

author

2016-04-06 20:51 UTC #0 lore raw

PATCH 1/1 powerpc: Replace CONFIG_SYS_INIT_RAM_END with CONFIG_SYS_INIT_RAM_SIZE

CONFIG_SYS_INIT_RAM_SIZE may be used out of the board header file. Some boards use CONFIG_SYS_INIT_RAM_END for the same purpose. To unify the macros, use CONFIG_SYS_INIT_RAM_SIZE for all.

Signed-off-by York Sun <[email protected]>

CC Mario Six <[email protected]>

---

 include/configs/BSC9131RDB.h   |    4 ++--
 include/configs/BSC9132QDS.h   |    4 ++--
 include/configs/C29XPCIE.h     |    4 ++--
 include/configs/P1010RDB.h     |    4 ++--
 include/configs/a3m071.h       |    4 ++--
 include/configs/ac14xx.h       |    4 ++--
 include/configs/dlvision-10g.h |    4 ++--
 include/configs/io.h           |    4 ++--
 include/configs/iocon.h        |    4 ++--
 include/configs/o2dnt-common.h |    6 +++---
 10 files changed, 21 insertions(+), 21 deletions(-)

include/configs/BSC9131RDB.h +2 -2

index 9c32a01..e870ffe 100644
@@ -215,9 +215,9 @@ extern unsigned long get_sdram_size(void);
 
 #define CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR	0xffd00000	/* stack in RAM */
-#define CONFIG_SYS_INIT_RAM_END		0x00004000/* End of used area in RAM */
+#define CONFIG_SYS_INIT_RAM_SIZE	0x00004000/* End of used area in RAM */
 
-#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END \
+#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE \
 						- GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET

include/configs/BSC9132QDS.h +2 -2

index 9f7ceb8..108e924 100644
@@ -396,9 +396,9 @@ combinations. this should be removed later
 
 #define CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR	0xffd00000	/* stack in RAM */
-#define CONFIG_SYS_INIT_RAM_END		0x00004000 /* End of used area in RAM */
+#define CONFIG_SYS_INIT_RAM_SIZE	0x00004000 /* End of used area in RAM */
 
-#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END \
+#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE \
 						- GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET

include/configs/C29XPCIE.h +2 -2

index 4cbc9ad..a7a5e8e 100644
@@ -329,9 +329,9 @@
 
 #define CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR	0xffd00000
-#define CONFIG_SYS_INIT_RAM_END		0x00004000
+#define CONFIG_SYS_INIT_RAM_SIZE	0x00004000
 
-#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END \
+#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE \
 						- GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET

include/configs/P1010RDB.h +2 -2

index 81af871..249e11b 100644
@@ -555,9 +555,9 @@ extern unsigned long get_sdram_size(void);
 
 #define CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR	0xffd00000 /* stack in RAM */
-#define CONFIG_SYS_INIT_RAM_END		0x00004000 /* End of used area in RAM */
+#define CONFIG_SYS_INIT_RAM_SIZE	0x00004000 /* End of used area in RAM */
 
-#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END \
+#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE \
 						- GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET

include/configs/a3m071.h +2 -2

index cf931a6..31348da 100644
@@ -141,9 +141,9 @@
 
 /* Use SRAM until RAM will be available */
 #define CONFIG_SYS_INIT_RAM_ADDR	MPC5XXX_SRAM
-#define CONFIG_SYS_INIT_RAM_END		MPC5XXX_SRAM_SIZE
+#define CONFIG_SYS_INIT_RAM_SIZE	MPC5XXX_SRAM_SIZE
 
-#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END - \
+#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - \
 					 GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET

include/configs/ac14xx.h +2 -2

index 750d8ff..57421c6 100644
@@ -289,9 +289,9 @@
 
 /* Use SRAM for initial stack */
 #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_SRAM_BASE
-#define CONFIG_SYS_INIT_RAM_END		CONFIG_SYS_SRAM_SIZE
+#define CONFIG_SYS_INIT_RAM_SIZE	CONFIG_SYS_SRAM_SIZE
 
-#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END - \
+#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - \
 					 GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET

include/configs/dlvision-10g.h +2 -2

index 9f9bcb8..bbeed76 100644
@@ -238,10 +238,10 @@
 #define CONFIG_SYS_OCM_DATA_ADDR	0xF8000000
 #define CONFIG_SYS_OCM_DATA_SIZE	0x1000
 #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_OCM_DATA_ADDR /* in SDRAM */
-#define CONFIG_SYS_INIT_RAM_END	CONFIG_SYS_OCM_DATA_SIZE /* End of used area */
+#define CONFIG_SYS_INIT_RAM_SIZE	CONFIG_SYS_OCM_DATA_SIZE
 
 #define CONFIG_SYS_GBL_DATA_OFFSET \
-	(CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)
+	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET
 
 /*

include/configs/io.h +2 -2

index 1213fe2..f05eb0a 100644
@@ -196,10 +196,10 @@
 #define CONFIG_SYS_OCM_DATA_ADDR	0xF8000000
 #define CONFIG_SYS_OCM_DATA_SIZE	0x1000
 #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_OCM_DATA_ADDR /* in SDRAM */
-#define CONFIG_SYS_INIT_RAM_END	CONFIG_SYS_OCM_DATA_SIZE /* End of used area */
+#define CONFIG_SYS_INIT_RAM_SIZE	CONFIG_SYS_OCM_DATA_SIZE
 
 #define CONFIG_SYS_GBL_DATA_OFFSET \
-	(CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)
+	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET
 
 /*

include/configs/iocon.h +2 -2

index 8bc89a0..f75ca76 100644
@@ -249,10 +249,10 @@ int fpga_gpio_get(unsigned int bus, int pin);
 #define CONFIG_SYS_OCM_DATA_ADDR	0xF8000000
 #define CONFIG_SYS_OCM_DATA_SIZE	0x1000
 #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_OCM_DATA_ADDR /* in SDRAM */
-#define CONFIG_SYS_INIT_RAM_END	CONFIG_SYS_OCM_DATA_SIZE /* End of used area */
+#define CONFIG_SYS_INIT_RAM_SIZE	CONFIG_SYS_OCM_DATA_SIZE
 
 #define CONFIG_SYS_GBL_DATA_OFFSET \
-	(CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)
+	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET
 
 /*

include/configs/o2dnt-common.h +3 -3

index 73a44a7..4ffab8a 100644
@@ -253,13 +253,13 @@
 #define CONFIG_SYS_INIT_RAM_ADDR	MPC5XXX_SRAM
 #ifdef CONFIG_POST
 /* preserve space for the post_word at end of on-chip SRAM */
-#define CONFIG_SYS_INIT_RAM_END		MPC5XXX_SRAM_POST_SIZE
+#define CONFIG_SYS_INIT_RAM_SIZE	MPC5XXX_SRAM_POST_SIZE
 #else
 /* End of used area in DPRAM */
-#define CONFIG_SYS_INIT_RAM_END		MPC5XXX_SRAM_SIZE
+#define CONFIG_SYS_INIT_RAM_SIZE	MPC5XXX_SRAM_SIZE
 #endif
 
-#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END - \
+#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_SIZE - \
 					 GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET

Signature · 1 line

1.7.9.5

York Sun

author

2016-04-08 16:08 UTC #1 lore raw

PATCH 1/1 powerpc: Replace CONFIG_SYS_INIT_RAM_END with CONFIG_SYS_INIT_RAM_SIZE

Quoted 9 lines · York Sun

CONFIG_SYS_INIT_RAM_SIZE may be used out of the board header file. Some boards use CONFIG_SYS_INIT_RAM_END for the same purpose. To unify the macros, use CONFIG_SYS_INIT_RAM_SIZE for all.
Signed-off-by York Sun <[email protected]>
CC Mario Six <[email protected]>
---

Quoted 12 lines

 include/configs/BSC9131RDB.h   |    4 ++--
 include/configs/BSC9132QDS.h   |    4 ++--
 include/configs/C29XPCIE.h     |    4 ++--
 include/configs/P1010RDB.h     |    4 ++--
 include/configs/a3m071.h       |    4 ++--
 include/configs/ac14xx.h       |    4 ++--
 include/configs/dlvision-10g.h |    4 ++--
 include/configs/io.h           |    4 ++--
 include/configs/iocon.h        |    4 ++--
 include/configs/o2dnt-common.h |    6 +++---
 10 files changed, 21 insertions(+), 21 deletions(-)

Stefan, Anatolij, Dirk,

Do you have any objection/comment on the proposed changes? I plan to merge it soon.

York

Stefan Roese

2016-04-08 16:11 UTC #2 lore raw

PATCH 1/1 powerpc: Replace CONFIG_SYS_INIT_RAM_END with CONFIG_SYS_INIT_RAM_SIZE

Quoted 24 lines · York Sun

Quoted 9 lines · York Sun
CONFIG_SYS_INIT_RAM_SIZE may be used out of the board header file. Some boards use CONFIG_SYS_INIT_RAM_END for the same purpose. To unify the macros, use CONFIG_SYS_INIT_RAM_SIZE for all.
Signed-off-by York Sun <[email protected]>
CC Mario Six <[email protected]>
---
Quoted 12 lines
  include/configs/BSC9131RDB.h   |    4 ++--
  include/configs/BSC9132QDS.h   |    4 ++--
  include/configs/C29XPCIE.h     |    4 ++--
  include/configs/P1010RDB.h     |    4 ++--
  include/configs/a3m071.h       |    4 ++--
  include/configs/ac14xx.h       |    4 ++--
  include/configs/dlvision-10g.h |    4 ++--
  include/configs/io.h           |    4 ++--
  include/configs/iocon.h        |    4 ++--
  include/configs/o2dnt-common.h |    6 +++---
  10 files changed, 21 insertions(+), 21 deletions(-)

Quoted 4 lines

Stefan, Anatolij, Dirk,
Do you have any objection/comment on the proposed changes? I plan to merge it soon.

Looks good to me (not tested on real hardware), so:

Acked-by Stefan Roese <[email protected]>

Thanks,
Stefan

Anatolij Gustschin

2016-04-08 16:23 UTC #3 lore raw

PATCH 1/1 powerpc: Replace CONFIG_SYS_INIT_RAM_END with CONFIG_SYS_INIT_RAM_SIZE

In reply to York Sun

Hi York,

Quoted 9 lines · On Wed, 6 Apr 2016 13:51:57 -0700 York Sun york.sun at nxp.com wrote:

CONFIG_SYS_INIT_RAM_SIZE may be used out of the board header file. Some boards use CONFIG_SYS_INIT_RAM_END for the same purpose. To unify the macros, use CONFIG_SYS_INIT_RAM_SIZE for all.
Signed-off-by York Sun <[email protected]>
CC Mario Six <[email protected]>
---

Quoted 11 lines

 include/configs/BSC9131RDB.h   |    4 ++--
 include/configs/BSC9132QDS.h   |    4 ++--
 include/configs/C29XPCIE.h     |    4 ++--
 include/configs/P1010RDB.h     |    4 ++--
 include/configs/a3m071.h       |    4 ++--
 include/configs/ac14xx.h       |    4 ++--
 include/configs/dlvision-10g.h |    4 ++--
 include/configs/io.h           |    4 ++--
 include/configs/iocon.h        |    4 ++--
 include/configs/o2dnt-common.h |    6 +++---
 10 files changed, 21 insertions(+), 21 deletions(-)

Acked-by Anatolij Gustschin <[email protected]>

--
Anatolij

York Sun

author

2016-04-08 22:46 UTC #4 lore raw

PATCH 1/1 powerpc: Replace CONFIG_SYS_INIT_RAM_END with CONFIG_SYS_INIT_RAM_SIZE

In reply to York Sun

Quoted 9 lines · York Sun

CONFIG_SYS_INIT_RAM_SIZE may be used out of the board header file. Some boards use CONFIG_SYS_INIT_RAM_END for the same purpose. To unify the macros, use CONFIG_SYS_INIT_RAM_SIZE for all.
Signed-off-by York Sun <[email protected]>
CC Mario Six <[email protected]>
---

Quoted 11 lines

 include/configs/BSC9131RDB.h   |    4 ++--
 include/configs/BSC9132QDS.h   |    4 ++--
 include/configs/C29XPCIE.h     |    4 ++--
 include/configs/P1010RDB.h     |    4 ++--
 include/configs/a3m071.h       |    4 ++--
 include/configs/ac14xx.h       |    4 ++--
 include/configs/dlvision-10g.h |    4 ++--
 include/configs/io.h           |    4 ++--
 include/configs/iocon.h        |    4 ++--
 include/configs/o2dnt-common.h |    6 +++---
 10 files changed, 21 insertions(+), 21 deletions(-)

Applied to u-boot-mpc85xx master. Awaiting upstream.

York