On Aug 31, 2011, at 5:15 PM, Timur Tabi wrote:
Most 85xx boards can be built as a 32-bit or a 36-bit. Current code sometimes displays which of these is actually built, but it's inconsistent. This is especially problematic since the "default" build for a given 85xx board can be either one, so if you don't see a message, you can't always know which size is being used. Not only that, but each board includes code that displays the message, so there is duplication.
So if a given SOC can support 36-bit addresses, display one of these two messages during boot:
ADDR: 32-bit address map
or
ADDR: 36-bit address map
Also delete the board-specific code that does this.
Signed-off-by: Timur Tabi timur@freescale.com
arch/powerpc/cpu/mpc85xx/cpu_init.c | 12 ++++++++++++ board/freescale/corenet_ds/corenet_ds.c | 4 ---- board/freescale/mpc8536ds/mpc8536ds.c | 7 +------ board/freescale/mpc8572ds/mpc8572ds.c | 6 +----- board/freescale/p1010rdb/p1010rdb.c | 6 +----- board/freescale/p1022ds/p1022ds.c | 8 ++------ board/freescale/p1_p2_rdb/p1_p2_rdb.c | 4 +--- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 8 +------- board/freescale/p2020ds/p2020ds.c | 8 ++------ board/freescale/p2041rdb/p2041rdb.c | 4 ---- 10 files changed, 21 insertions(+), 46 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 27f836c..d691726 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -302,6 +302,18 @@ int cpu_init_r(void) sync(); #endif
- /*
* If we support 36-bit addressing, then display whether this is a* 32-bit build or a 36-bit build.*/+#ifdef CONFIG_ENABLE_36BIT_PHYS +#ifdef CONFIG_PHYS_64BIT
#if defined(A) && defined(B)
- puts("ADDR: 36-bit address map\n");
+#else
- puts("ADDR: 32-bit address map\n");
+#endif +#endif
- puts ("L2: ");
#if defined(CONFIG_L2_CACHE)
Wolfgang's being making comments about reducing the boot info we've been outputting so would like his 2 cents on this.
- k