Patchwork [U-Boot,1/2] powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT

login
register
mail settings
Submitter Timur Tabi
Date Aug. 31, 2011, 10:15 p.m.
Message ID <1314828916-17931-1-git-send-email-timur@freescale.com>
Download mbox | patch
Permalink /patch/112695/
State Accepted
Commit babb348cd0b507950e010bbc7fa360eff61db889
Headers show

Comments

Timur Tabi - Aug. 31, 2011, 10:15 p.m.
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(-)

Patch

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