[U-Boot] [PATCH] ppc/85xx: Set CONFIG_SYS_MONITOR_LEN correctly
A number of boards didn't have CONFIG_SYS_MONITOR_LEN set properly based on how TEXT_BASE was set. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- This patch is cleaning up things so we can use CONFIG_SYS_MONITOR_LEN in the linker script. I would appreciate ACKs via various board maintainers. - k include/configs/ATUM8548.h|2 +- include/configs/MPC8536DS.h |2 +- include/configs/MPC8540ADS.h |2 +- include/configs/MPC8540EVAL.h |2 +- include/configs/MPC8541CDS.h |2 +- include/configs/MPC8544DS.h |2 +- include/configs/MPC8548CDS.h |2 +- include/configs/MPC8555CDS.h |2 +- include/configs/MPC8560ADS.h |2 +- include/configs/MPC8568MDS.h |2 +- include/configs/MPC8569MDS.h |2 +- include/configs/MPC8572DS.h |2 +- include/configs/P1_P2_RDB.h |2 +- include/configs/P2020DS.h |2 +- include/configs/TQM85xx.h |6 +- include/configs/sbc8548.h |2 +- include/configs/socrates.h|2 +- include/configs/stxgp3.h |2 +- 18 files changed, 22 insertions(+), 18 deletions(-) diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h index 91369a7..9027d82 100644 --- a/include/configs/ATUM8548.h +++ b/include/configs/ATUM8548.h @@ -198,7 +198,7 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ +#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024)/* Reserved for malloc */ /* Serial Port */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 4746e2e..d454bfa 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -273,7 +273,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ +#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ #define CONFIG_SYS_NAND_BASE 0xffa0 diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 4af599b..e483eed 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -232,7 +232,7 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Reserve 256 kB for Mon */ +#define CONFIG_SYS_MONITOR_LEN (512 * 1024)/* Reserve 512 kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024)/* Reserved for malloc */ /* Serial Port */ diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h index 95ea275..808a34d 100644 --- a/include/configs/MPC8540EVAL.h +++ b/include/configs/MPC8540EVAL.h @@ -168,7 +168,7 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Reserve 256 kB for Mon */ +#define CONFIG_SYS_MONITOR_LEN (512 * 1024)/* Reserve 512 kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024)/* Reserved for malloc */ /* Serial Port */ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index a8f206f..319b74c 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -265,7 +265,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ +#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (128 * 1024)/* Reserved for malloc */ /* Serial Port */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 0caf456..f992458 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -218,7 +218,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ +#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024)
Re: [U-Boot] [PATCH] ppc/85xx: Set CONFIG_SYS_MONITOR_LEN correctly
Dear Kumar Gala, In message pine.lnx.4.64.0909090824300.3...@localhost.localdomain you wrote: A number of boards didn't have CONFIG_SYS_MONITOR_LEN set properly based on how TEXT_BASE was set. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- This patch is cleaning up things so we can use CONFIG_SYS_MONITOR_LEN in the linker script. I would appreciate ACKs via various board maintainers. Thsi makes no sense to me. The linker script should use the information that is intensded for the linker script, i. e. TEXT_BASE; using CONFIG_SYS_MONITOR_LEN seems to be wrong here. Actually I consider this a change to the worse. See for example The TQM85xx boards below. --- a/include/configs/ATUM8548.h +++ b/include/configs/ATUM8548.h @@ -198,7 +198,7 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSETCONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ +#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ Why is this changing here and in other places? diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index 1fbf4bf..1c50743 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -247,7 +247,11 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSETCONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (~TEXT_BASE + 1)/* Reserved for Monitor */ +#ifdef CONFIG_TQM8548_BE +#define CONFIG_SYS_MONITOR_LEN (512 * 1024)/* Reserve 512 kB for Mon */ +#else +#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Reserve 256 kB for Mon */ +#endif #define CONFIG_SYS_MALLOC_LEN(384 * 1024)/* Reserved for malloc */ Without your change, we just had one knob to twiddle (TEXT_BASE), now we suddenly have two, which must be kept in sync. And we have a lot of additional #ifdef's. diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 35feed0..e7c09fe 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -174,7 +174,7 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSETCONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024)/* Reserve 256kB for Mon */ +#define CONFIG_SYS_MONITOR_LEN (384 * 1024)/* Reserve 284kB for Mon */ Typo. s/284/384/ Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de You have the capacity to learn from mistakes. You'll learn a lot today. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc/85xx: Set CONFIG_SYS_MONITOR_LEN correctly
On Sep 9, 2009, at 8:42 AM, Wolfgang Denk wrote: --- a/include/configs/ATUM8548.h +++ b/include/configs/ATUM8548.h @@ -198,7 +198,7 @@ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSETCONFIG_SYS_GBL_DATA_OFFSET -#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ +#define CONFIG_SYS_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Mon */ Why is this changing here and in other places? Beyond the other issues this patch raises, there is technically a bug a number of config.h's in which CONFIG_SYS_MONITOR_LEN has been wrong. I agree that setting it like TQM85xx does for most of these would be a better option. - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
