summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2011-09-06 09:36:06 -0500
committerKumar Gala <galak@kernel.crashing.org>2011-10-09 17:57:53 -0500
commitbabb348cd0b507950e010bbc7fa360eff61db889 (patch)
tree78b4fc232c2d03f68cb9791309823014c28a58b1
parent6f5e1dc531d6b4a975e39054fdf7c737cbb4d8e9 (diff)
downloadu-boot-babb348cd0b507950e010bbc7fa360eff61db889.tar.gz
u-boot-babb348cd0b507950e010bbc7fa360eff61db889.tar.xz
u-boot-babb348cd0b507950e010bbc7fa360eff61db889.zip
powerpc/85xx: CONFIG_ENABLE_36BIT_PHYS does not depend on CONFIG_PHYS_64BIT
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> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--include/configs/P1022DS.h3
-rw-r--r--include/configs/p1_p2_rdb_pc.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index d892b6701b..9620370874 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 f1ef1df183..b3d981f3e4 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