treewide: move CONFIG_PHYS_64BIT to Kconfig

We need to ensure that CONFIG_PHYS_64BIT is configured via Kconfig so
that it is always available to the build system.  Otherwise we can run
into cases where we have inconsistent sizes of certain attributes.

Ravi Babu reported offset mismatch of struct dwc3 across files since
commit 95ebc253e6d4 ("types.h: move and redefine resource_size_t").
Since the commit, resource_addr_t points to phys_addr_t, whose size
is dependent on CONFIG_PHYS_64BIT for ARM architecture.

I tried my best to use "select" where possible (for example, ARMv8
architecture) because I think this kind of option is generally user-
unconfigurable.  However, I see some of PowerPC boards have 36BIT
defconfigs as well as 32BIT ones.  I moved CONFIG_PHYS_64BIT to the
defconfigs for such boards.

CONFIG_36BIT is no longer referenced, so all of the defines were
removed from CONFIG_SYS_EXTRA_OPTIONS.

Fixes: 95ebc253e6d4 ("types.h: move and redefine resource_size_t")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reported-by: Ravi Babu <ravibabu@ti.com>
Acked-by: Stefan Roese <sr@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: York Sun <york.sun@nxp.com>

5 files changed, 21 insertions, 1 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a0a866ef48..29c54e58cd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -6,6 +6,7 @@ config SYS_ARCH
 
 config ARM64
 	bool
+	select PHYS_64BIT
 
 config DMA_ADDR_T_64BIT
 	bool
diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig
index 4fb5ef95cb..a8600b102e 100644
--- a/arch/arm/cpu/armv7/omap5/Kconfig
+++ b/arch/arm/cpu/armv7/omap5/Kconfig
@@ -13,6 +13,7 @@ config TARGET_OMAP5_UEVM
 config TARGET_DRA7XX_EVM
 	bool "TI DRA7XX"
 	select TI_I2C_BOARD_DETECT
+	select PHYS_64BIT
 
 config TARGET_AM57XX_EVM
 	bool "AM57XX"
diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h
index 435fc4521c..1ad221a987 100644
--- a/arch/arm/include/asm/config.h
+++ b/arch/arm/include/asm/config.h
@@ -11,7 +11,6 @@
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 
 #ifdef CONFIG_ARM64
-#define CONFIG_PHYS_64BIT
 #define CONFIG_STATIC_RELA
 #endif
 
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 0b89157fca..9bcbda006d 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -17,6 +17,7 @@ config TARGET_SOCRATES
 config TARGET_B4860QDS
 	bool "Support B4860QDS"
 	select SUPPORT_SPL
+	select PHYS_64BIT
 
 config TARGET_BSC9131RDB
 	bool "Support BSC9131RDB"
@@ -30,18 +31,23 @@ config TARGET_C29XPCIE
 	bool "Support C29XPCIE"
 	select SUPPORT_SPL
 	select SUPPORT_TPL
+	select PHYS_64BIT
 
 config TARGET_P3041DS
 	bool "Support P3041DS"
+	select PHYS_64BIT
 
 config TARGET_P4080DS
 	bool "Support P4080DS"
+	select PHYS_64BIT
 
 config TARGET_P5020DS
 	bool "Support P5020DS"
+	select PHYS_64BIT
 
 config TARGET_P5040DS
 	bool "Support P5040DS"
+	select PHYS_64BIT
 
 config TARGET_MPC8536DS
 	bool "Support MPC8536DS"
@@ -96,46 +102,57 @@ config TARGET_P1_TWR
 
 config TARGET_P2041RDB
 	bool "Support P2041RDB"
+	select PHYS_64BIT
 
 config TARGET_QEMU_PPCE500
 	bool "Support qemu-ppce500"
+	select PHYS_64BIT
 
 config TARGET_T102XQDS
 	bool "Support T102xQDS"
 	select SUPPORT_SPL
+	select PHYS_64BIT
 
 config TARGET_T102XRDB
 	bool "Support T102xRDB"
 	select SUPPORT_SPL
+	select PHYS_64BIT
 
 config TARGET_T1040QDS
 	bool "Support T1040QDS"
+	select PHYS_64BIT
 
 config TARGET_T104XRDB
 	bool "Support T104xRDB"
 	select SUPPORT_SPL
+	select PHYS_64BIT
 
 config TARGET_T208XQDS
 	bool "Support T208xQDS"
 	select SUPPORT_SPL
+	select PHYS_64BIT
 
 config TARGET_T208XRDB
 	bool "Support T208xRDB"
 	select SUPPORT_SPL
+	select PHYS_64BIT
 
 config TARGET_T4240QDS
 	bool "Support T4240QDS"
 	select SUPPORT_SPL
+	select PHYS_64BIT
 
 config TARGET_T4240RDB
 	bool "Support T4240RDB"
 	select SUPPORT_SPL
+	select PHYS_64BIT
 
 config TARGET_CONTROLCENTERD
 	bool "Support controlcenterd"
 
 config TARGET_KMP204X
 	bool "Support kmp204x"
+	select PHYS_64BIT
 
 config TARGET_XPEDITE520X
 	bool "Support xpedite520x"
@@ -151,6 +168,7 @@ config TARGET_UCP1020
 
 config TARGET_CYRUS
 	bool "Support Varisys Cyrus"
+	select PHYS_64BIT
 
 endchoice
 
diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig
index 36af1b9419..92a330dc63 100644
--- a/arch/powerpc/cpu/ppc4xx/Kconfig
+++ b/arch/powerpc/cpu/ppc4xx/Kconfig
@@ -30,6 +30,7 @@ config TARGET_CANYONLANDS
 
 config TARGET_KATMAI
 	bool "Support katmai"
+	select PHYS_64BIT
 
 config TARGET_KILAUEA
 	bool "Support kilauea"