Patchwork [U-Boot,V3,6/6] MPC8xxx DDR: align informational prints

login
register
mail settings
Submitter Becky Bruce
Date Dec. 17, 2010, 11:17 p.m.
Message ID <1292627879-9027-7-git-send-email-beckyb@kernel.crashing.org>
Download mbox | patch
Permalink /patch/76008/
State Accepted
Commit 7ea3871e06c421a44e7286792610dc00992070e6
Delegated to: Kumar Gala
Headers show

Comments

Becky Bruce - Dec. 17, 2010, 11:17 p.m.
Add spaces to cause the informational prints to line up with
the ones from init_func_ram() in board.c.  Output now looks like
this:

....
DRAM:  Detected 4096 MB of memory
       This U-Boot only supports < 4G of DDR
       You could rebuild it with CONFIG_PHYS_64BIT
       DDR: 2 GiB (DDR2, 64-bit, CL=5, ECC off)
....

The prints from lbc_sdram_init() have also been modified to line
line up and changed to start with "LBC SDRAM" instead of the
confusing "SDRAM".

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
---
 arch/powerpc/cpu/mpc8xxx/ddr/main.c     |    5 +++--
 board/freescale/mpc8540ads/mpc8540ads.c |    5 +++--
 board/freescale/mpc8541cds/mpc8541cds.c |    6 +++---
 board/freescale/mpc8548cds/mpc8548cds.c |    6 +++---
 board/freescale/mpc8555cds/mpc8555cds.c |    6 +++---
 board/freescale/mpc8560ads/mpc8560ads.c |    5 +++--
 board/freescale/mpc8568mds/mpc8568mds.c |    6 +++---
 7 files changed, 21 insertions(+), 18 deletions(-)
Kumar Gala - Jan. 5, 2011, 12:25 a.m.
On Dec 17, 2010, at 5:17 PM, Becky Bruce wrote:

> Add spaces to cause the informational prints to line up with
> the ones from init_func_ram() in board.c.  Output now looks like
> this:
> 
> ....
> DRAM:  Detected 4096 MB of memory
>       This U-Boot only supports < 4G of DDR
>       You could rebuild it with CONFIG_PHYS_64BIT
>       DDR: 2 GiB (DDR2, 64-bit, CL=5, ECC off)
> ....
> 
> The prints from lbc_sdram_init() have also been modified to line
> line up and changed to start with "LBC SDRAM" instead of the
> confusing "SDRAM".
> 
> Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
> ---
> arch/powerpc/cpu/mpc8xxx/ddr/main.c     |    5 +++--
> board/freescale/mpc8540ads/mpc8540ads.c |    5 +++--
> board/freescale/mpc8541cds/mpc8541cds.c |    6 +++---
> board/freescale/mpc8548cds/mpc8548cds.c |    6 +++---
> board/freescale/mpc8555cds/mpc8555cds.c |    6 +++---
> board/freescale/mpc8560ads/mpc8560ads.c |    5 +++--
> board/freescale/mpc8568mds/mpc8568mds.c |    6 +++---
> 7 files changed, 21 insertions(+), 18 deletions(-)

applied to 85xx

- k

Patch

diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/main.c b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
index 6d582e9..e3888ff 100644
--- a/arch/powerpc/cpu/mpc8xxx/ddr/main.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
@@ -469,8 +469,9 @@  phys_size_t fsl_ddr_sdram(void)
 	/* Check for 4G or more.  Bad. */
 	if (total_memory >= (1ull << 32)) {
 		printf("Detected %lld MB of memory\n", total_memory >> 20);
-		printf("This U-Boot only supports < 4G of DDR\n");
-		printf("You could rebuild it with CONFIG_PHYS_64BIT\n");
+		printf("       This U-Boot only supports < 4G of DDR\n");
+		printf("       You could rebuild it with CONFIG_PHYS_64BIT\n");
+		printf("       "); /* re-align to match init_func_ram print */
 		total_memory = CONFIG_MAX_MEM_MAPPED;
 	}
 #endif
diff --git a/board/freescale/mpc8540ads/mpc8540ads.c b/board/freescale/mpc8540ads/mpc8540ads.c
index 9eeb134..c75585e 100644
--- a/board/freescale/mpc8540ads/mpc8540ads.c
+++ b/board/freescale/mpc8540ads/mpc8540ads.c
@@ -127,8 +127,9 @@  void lbc_sdram_init(void)
 	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
 	uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;
 
-	puts("    SDRAM: ");
-	print_size (CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024, "\n");
+	puts("LBC SDRAM: ");
+	print_size(CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024,
+		   "\n       ");
 
 	/*
 	 * Setup SDRAM Base and Option Registers
diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c
index 3ee666f..0d3752d 100644
--- a/board/freescale/mpc8541cds/mpc8541cds.c
+++ b/board/freescale/mpc8541cds/mpc8541cds.c
@@ -301,9 +301,9 @@  void lbc_sdram_init(void)
 	uint cpu_board_rev;
 	uint lsdmr_common;
 
-	puts("    SDRAM: ");
-
-	print_size (CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024, "\n");
+	puts("LBC SDRAM: ");
+	print_size(CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024,
+		   "\n       ");
 
 	/*
 	 * Setup SDRAM Base and Option Registers
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 154435f..5ae7af1 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -121,9 +121,9 @@  void lbc_sdram_init(void)
 	uint cpu_board_rev;
 	uint lsdmr_common;
 
-	puts("    SDRAM: ");
-
-	print_size (CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024, "\n");
+	puts("LBC SDRAM: ");
+	print_size(CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024,
+		   "\n       ");
 
 	/*
 	 * Setup SDRAM Base and Option Registers
diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c
index 02df6ae..60d1758 100644
--- a/board/freescale/mpc8555cds/mpc8555cds.c
+++ b/board/freescale/mpc8555cds/mpc8555cds.c
@@ -299,9 +299,9 @@  void lbc_sdram_init(void)
 	uint cpu_board_rev;
 	uint lsdmr_common;
 
-	puts("    SDRAM: ");
-
-	print_size (CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024, "\n");
+	puts("LBC SDRAM: ");
+	print_size(CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024,
+		   "\n       ");
 
 	/*
 	 * Setup SDRAM Base and Option Registers
diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c
index 0a87d62..c4c31a2 100644
--- a/board/freescale/mpc8560ads/mpc8560ads.c
+++ b/board/freescale/mpc8560ads/mpc8560ads.c
@@ -332,8 +332,9 @@  void lbc_sdram_init(void)
 	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
 	uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;
 
-	puts("    SDRAM: ");
-	print_size (CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024, "\n");
+	puts("LBC SDRAM: ");
+	print_size(CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024,
+		   "\n       ");
 
 	/*
 	 * Setup SDRAM Base and Option Registers
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c
index 6a746ae..6425c79 100644
--- a/board/freescale/mpc8568mds/mpc8568mds.c
+++ b/board/freescale/mpc8568mds/mpc8568mds.c
@@ -180,9 +180,9 @@  void lbc_sdram_init(void)
 	uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;
 	uint lsdmr_common;
 
-	puts("    SDRAM: ");
-
-	print_size (CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024, "\n");
+	puts("LBC SDRAM: ");
+	print_size(CONFIG_SYS_LBC_SDRAM_SIZE * 1024 * 1024,
+		   "\n       ");
 
 	/*
 	 * Setup SDRAM Base and Option Registers