Patchwork [U-Boot,v2] powerpc/mpc8xxx: Move HWCONFIG_BUFFER_SIZE into config.h

login
register
mail settings
Submitter York Sun
Date Sept. 7, 2012, 3:03 p.m.
Message ID <1347030219-7717-1-git-send-email-yorksun@freescale.com>
Download mbox | patch
Permalink /patch/182404/
State Superseded
Delegated to: Andy Fleming
Headers show

Comments

York Sun - Sept. 7, 2012, 3:03 p.m.
Before proper environment is setup, we extract hwconfig and put it into a
buffer with size HWCONFIG_BUFFER_SIZE. We need to enlarge the buffer to
accommodate longer string. Since this macro is used in multiple files, we
move it into arch/powerpc/include/asm/config.h.

Signed-off-by: York Sun <yorksun@freescale.com>
---
Change since v1:
 Move HWCONFIG_BUFFER_SIZE under #ifdef

 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c |    2 --
 arch/powerpc/cpu/mpc8xxx/ddr/options.c        |    1 -
 arch/powerpc/include/asm/config.h             |    8 ++++++++
 3 files changed, 8 insertions(+), 3 deletions(-)

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index 4b52dad..ef4ce09 100644
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -46,8 +46,6 @@ 
 
 static u32 serdes_prtcl_map;
 
-#define HWCONFIG_BUFFER_SIZE	128
-
 #ifdef DEBUG
 static const char *serdes_prtcl_str[] = {
 	[NONE] = "NA",
diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/options.c b/arch/powerpc/cpu/mpc8xxx/ddr/options.c
index 00ec57b..24c8a51 100644
--- a/arch/powerpc/cpu/mpc8xxx/ddr/options.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/options.c
@@ -19,7 +19,6 @@ 
  * This is pretty fragile on both the use of stack and if the buffer is big
  * enough. However we will get a warning from getenv_f for the later.
  */
-#define HWCONFIG_BUFFER_SIZE	128
 
 /* Board-specific functions defined in each board's ddr.c */
 extern void fsl_ddr_board_options(memctl_options_t *popts,
diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h
index d138636..5038195 100644
--- a/arch/powerpc/include/asm/config.h
+++ b/arch/powerpc/include/asm/config.h
@@ -29,6 +29,14 @@ 
 #include <asm/config_mpc86xx.h>
 #endif
 
+#if	defined(CONFIG_MPC85xx) || \
+	defined(CONFIG_MPC86xx) || \
+	defined(CONFIG_MPC83xx)
+#ifndef HWCONFIG_BUFFER_SIZE
+  #define HWCONFIG_BUFFER_SIZE 256
+#endif
+#endif
+
 /* CONFIG_HARD_SPI triggers SPI bus initialization in PowerPC */
 #if defined(CONFIG_MPC8XXX_SPI) || defined(CONFIG_FSL_ESPI)
 # ifndef CONFIG_HARD_SPI