* [U-Boot] [PATCH 1/2] powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT
@ 2011-09-06 14:36 Timur Tabi
2011-09-06 14:36 ` [U-Boot] [PATCH 2/2] powerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot Timur Tabi
2011-10-07 14:51 ` [U-Boot] [PATCH 1/2] powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT Kumar Gala
0 siblings, 2 replies; 5+ messages in thread
From: Timur Tabi @ 2011-09-06 14:36 UTC (permalink / raw)
To: u-boot
The macro CONFIG_ENABLE_36BIT_PHYS is used to indicate that the given SOC is
capable of 36-bit physical addresses, even if such large addresses are not
used. On two boards, this macro was enabled only when building a 36-bit
image.
Signed-off-by: Timur Tabi <timur@freescale.com>
---
include/configs/P1022DS.h | 3 ++-
include/configs/p1_p2_rdb_pc.h | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index a3cccf4..28848bd 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -43,8 +43,9 @@
#define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */
#define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */
-#ifdef CONFIG_PHYS_64BIT
#define CONFIG_ENABLE_36BIT_PHYS
+
+#ifdef CONFIG_PHYS_64BIT
#define CONFIG_ADDR_MAP
#define CONFIG_SYS_NUM_ADDR_MAP 16 /* number of TLB1 entries */
#endif
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index b9b89cf..df1925f 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -204,9 +204,8 @@
#define CONFIG_BTB
#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */
-#ifdef CONFIG_PHYS_64BIT
+
#define CONFIG_ENABLE_36BIT_PHYS
-#endif
#ifdef CONFIG_PHYS_64BIT
#define CONFIG_ADDR_MAP 1
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 2/2] powerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot
2011-09-06 14:36 [U-Boot] [PATCH 1/2] powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT Timur Tabi
@ 2011-09-06 14:36 ` Timur Tabi
2011-10-06 21:40 ` Wolfgang Denk
2011-10-07 14:51 ` [U-Boot] [PATCH 1/2] powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT Kumar Gala
1 sibling, 1 reply; 5+ messages in thread
From: Timur Tabi @ 2011-09-06 14:36 UTC (permalink / raw)
To: u-boot
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 instead of displaying this message at boot time, the address map size
information is moved into the 'bdinfo' command. The board-specific code is
deleted.
Signed-off-by: Timur Tabi <timur@freescale.com>
---
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 ----
common/cmd_bdinfo.c | 8 ++++++++
10 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index b1eecc4..a33c936 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -62,10 +62,6 @@ int checkboard (void)
else
printf("invalid setting of SW%u\n", PIXIS_LBMAP_SWITCH);
-#ifdef CONFIG_PHYS_64BIT
- puts("36-bit Addressing\n");
-#endif
-
/* Display the RCW, so that no one gets confused as to what RCW
* we're actually using for this boot.
*/
diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c
index b292e13..b407f1d 100644
--- a/board/freescale/mpc8536ds/mpc8536ds.c
+++ b/board/freescale/mpc8536ds/mpc8536ds.c
@@ -62,12 +62,7 @@ int checkboard (void)
u8 vboot;
u8 *pixis_base = (u8 *)PIXIS_BASE;
- puts("Board: MPC8536DS ");
-#ifdef CONFIG_PHYS_64BIT
- puts("(36-bit addrmap) ");
-#endif
-
- printf ("Sys ID: 0x%02x, "
+ printf ("Board: MPC8536DS Sys ID: 0x%02x, "
"Sys Ver: 0x%02x, FPGA Ver: 0x%02x, ",
in_8(pixis_base + PIXIS_ID), in_8(pixis_base + PIXIS_VER),
in_8(pixis_base + PIXIS_PVER));
diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c
index b20299e..38eafe0 100644
--- a/board/freescale/mpc8572ds/mpc8572ds.c
+++ b/board/freescale/mpc8572ds/mpc8572ds.c
@@ -45,11 +45,7 @@ int checkboard (void)
u8 vboot;
u8 *pixis_base = (u8 *)PIXIS_BASE;
- puts ("Board: MPC8572DS ");
-#ifdef CONFIG_PHYS_64BIT
- puts ("(36-bit addrmap) ");
-#endif
- printf ("Sys ID: 0x%02x, "
+ printf ("Board: MPC8572DS Sys ID: 0x%02x, "
"Sys Ver: 0x%02x, FPGA Ver: 0x%02x, ",
in_8(pixis_base + PIXIS_ID), in_8(pixis_base + PIXIS_VER),
in_8(pixis_base + PIXIS_PVER));
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index 03e9da1..7aa2117 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/freescale/p1010rdb/p1010rdb.c
@@ -165,11 +165,7 @@ int checkboard(void)
struct cpu_type *cpu;
cpu = gd->cpu;
- printf("Board: %sRDB ", cpu->name);
-#ifdef CONFIG_PHYS_64BIT
- puts("(36-bit addrmap)");
-#endif
- puts("\n");
+ printf("Board: %sRDB\n", cpu->name);
return 0;
}
diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c
index 456d9b0..aca30f3 100644
--- a/board/freescale/p1022ds/p1022ds.c
+++ b/board/freescale/p1022ds/p1022ds.c
@@ -56,12 +56,8 @@ int checkboard(void)
{
u8 sw;
- puts("Board: P1022DS ");
-#ifdef CONFIG_PHYS_64BIT
- puts("(36-bit addrmap) ");
-#endif
-
- printf("Sys ID: 0x%02x, Sys Ver: 0x%02x, FPGA Ver: 0x%02x, ",
+ printf("Board: P1022DS Sys ID: 0x%02x, "
+ "Sys Ver: 0x%02x, FPGA Ver: 0x%02x, ",
in_8(&pixis->id), in_8(&pixis->arch), in_8(&pixis->scver));
sw = in_8(&PIXIS_SW(PIXIS_LBMAP_SWITCH));
diff --git a/board/freescale/p1_p2_rdb/p1_p2_rdb.c b/board/freescale/p1_p2_rdb/p1_p2_rdb.c
index 864b3ce..6418710 100644
--- a/board/freescale/p1_p2_rdb/p1_p2_rdb.c
+++ b/board/freescale/p1_p2_rdb/p1_p2_rdb.c
@@ -110,9 +110,7 @@ int checkboard (void)
cpu = gd->cpu;
printf ("Board: %sRDB Rev%c\n", cpu->name, board_rev);
-#ifdef CONFIG_PHYS_64BIT
- puts ("(36-bit addrmap) \n");
-#endif
+
setbits_be32(&pgpio->gpdir, GPIO_DIR);
/*
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 4671128..abe087b 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -225,13 +225,7 @@ int checkboard(void)
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
u8 in, out, io_config, val;
- printf("Board: %s ", CONFIG_BOARDNAME);
-
-#ifdef CONFIG_PHYS_64BIT
- puts("(36-bit addrmap) ");
-#endif
-
- printf("CPLD: V%d.%d PCBA: V%d.0\n",
+ printf("Board: %s CPLD: V%d.%d PCBA: V%d.0\n", CONFIG_BOARDNAME,
in_8(&cpld_data->cpld_rev_major) & 0x0F,
in_8(&cpld_data->cpld_rev_minor) & 0x0F,
in_8(&cpld_data->pcba_rev) & 0x0F);
diff --git a/board/freescale/p2020ds/p2020ds.c b/board/freescale/p2020ds/p2020ds.c
index d3af6cf..e8d31a4 100644
--- a/board/freescale/p2020ds/p2020ds.c
+++ b/board/freescale/p2020ds/p2020ds.c
@@ -61,12 +61,8 @@ int checkboard(void)
{
u8 sw;
- puts("Board: P2020DS ");
-#ifdef CONFIG_PHYS_64BIT
- puts("(36-bit addrmap) ");
-#endif
-
- printf("Sys ID: 0x%02x, Sys Ver: 0x%02x, FPGA Ver: 0x%02x, ",
+ printf("Board: P2020DS Sys ID: 0x%02x, "
+ "Sys Ver: 0x%02x, FPGA Ver: 0x%02x, ",
in_8(&pixis->id), in_8(&pixis->arch), in_8(&pixis->scver));
sw = in_8(&PIXIS_SW(PIXIS_LBMAP_SWITCH));
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index 6ed404f..6e47204 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/freescale/p2041rdb/p2041rdb.c
@@ -54,10 +54,6 @@ int checkboard(void)
sw = CPLD_READ(fbank_sel);
printf("vBank: %d\n", sw & 0x1);
-#ifdef CONFIG_PHYS_64BIT
- puts("36-bit Addressing\n");
-#endif
-
/*
* Display the RCW, so that no one gets confused as to what RCW
* we're actually using for this boot.
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 6051120..12863f2 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -96,6 +96,14 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
print_str("pevfreq", strmhz(buf, bd->bi_pevfreq));
#endif
+#ifdef CONFIG_ENABLE_36BIT_PHYS
+#ifdef CONFIG_PHYS_64BIT
+ puts("addressing = 36-bit\n");
+#else
+ puts("addressing = 32-bit\n");
+#endif
+#endif
+
print_eth(0);
#if defined(CONFIG_HAS_ETH1)
print_eth(1);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 2/2] powerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot
2011-09-06 14:36 ` [U-Boot] [PATCH 2/2] powerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot Timur Tabi
@ 2011-10-06 21:40 ` Wolfgang Denk
0 siblings, 0 replies; 5+ messages in thread
From: Wolfgang Denk @ 2011-10-06 21:40 UTC (permalink / raw)
To: u-boot
Dear Timur Tabi,
In message <1315319767-26906-2-git-send-email-timur@freescale.com> you 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 instead of displaying this message at boot time, the address map size
> information is moved into the 'bdinfo' command. The board-specific code is
> deleted.
>
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
> 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 ----
> common/cmd_bdinfo.c | 8 ++++++++
> 10 files changed, 17 insertions(+), 46 deletions(-)
Checkpatch says:
total: 0 errors, 2 warnings, 123 lines checked
Please clean up and resubmit. Thanks.
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: wd at denx.de
"We don't have to protect the environment -- the Second Coming is at
hand." - James Watt
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 1/2] powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT
2011-09-06 14:36 [U-Boot] [PATCH 1/2] powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT Timur Tabi
2011-09-06 14:36 ` [U-Boot] [PATCH 2/2] powerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot Timur Tabi
@ 2011-10-07 14:51 ` Kumar Gala
1 sibling, 0 replies; 5+ messages in thread
From: Kumar Gala @ 2011-10-07 14:51 UTC (permalink / raw)
To: u-boot
On Sep 6, 2011, at 9:36 AM, Timur Tabi wrote:
> The macro CONFIG_ENABLE_36BIT_PHYS is used to indicate that the given SOC is
> capable of 36-bit physical addresses, even if such large addresses are not
> used. On two boards, this macro was enabled only when building a 36-bit
> image.
>
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
> include/configs/P1022DS.h | 3 ++-
> include/configs/p1_p2_rdb_pc.h | 3 +--
> 2 files changed, 3 insertions(+), 3 deletions(-)
applied to 85xx
- k
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 1/2] powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT
@ 2011-08-31 22:15 Timur Tabi
0 siblings, 0 replies; 5+ messages in thread
From: Timur Tabi @ 2011-08-31 22:15 UTC (permalink / raw)
To: u-boot
The macro CONFIG_ENABLE_36BIT_PHYS is used to indicate that the given SOC is
capable of 36-bit physical addresses, even if such large addresses are not
used. On two boards, this macro was enabled only when building a 36-bit
image.
Signed-off-by: Timur Tabi <timur@freescale.com>
---
include/configs/P1022DS.h | 3 ++-
include/configs/p1_p2_rdb_pc.h | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index a3cccf4..28848bd 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -43,8 +43,9 @@
#define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */
#define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */
-#ifdef CONFIG_PHYS_64BIT
#define CONFIG_ENABLE_36BIT_PHYS
+
+#ifdef CONFIG_PHYS_64BIT
#define CONFIG_ADDR_MAP
#define CONFIG_SYS_NUM_ADDR_MAP 16 /* number of TLB1 entries */
#endif
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index b9b89cf..df1925f 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -204,9 +204,8 @@
#define CONFIG_BTB
#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */
-#ifdef CONFIG_PHYS_64BIT
+
#define CONFIG_ENABLE_36BIT_PHYS
-#endif
#ifdef CONFIG_PHYS_64BIT
#define CONFIG_ADDR_MAP 1
--
1.7.3.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-10-07 14:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-06 14:36 [U-Boot] [PATCH 1/2] powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT Timur Tabi
2011-09-06 14:36 ` [U-Boot] [PATCH 2/2] powerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot Timur Tabi
2011-10-06 21:40 ` Wolfgang Denk
2011-10-07 14:51 ` [U-Boot] [PATCH 1/2] powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT Kumar Gala
-- strict thread matches above, loose matches on Subject: below --
2011-08-31 22:15 Timur Tabi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.