tests: Build correct sandbox configuration on 32bit

Currently sandbox configuration defautls to 64bit and there is no
automation for building 32bit sandbox on 32bit hosts.

Use _LP64 macro as heuristic for detecting 64bit targets.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index 852a7c8bf2c2814f8120157d4b409438fbf04e7c..35508c6b2928bc0cf80ae540f4458c84b698de88 100644 (file)
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -13,7 +13,7 @@ config SYS_CPU
 config SANDBOX64
        bool "Use 64-bit addresses"
        select PHYS_64BIT
-       select HOST_64BIT
+       depends on HOST_64BIT
 
 config SANDBOX_RAM_SIZE_MB
        int "RAM size in MiB"
@@ -41,23 +41,11 @@ config SYS_CONFIG_NAME
        default "sandbox_spl" if SANDBOX_SPL
        default "sandbox" if !SANDBOX_SPL
 
-choice
-       prompt "Run sandbox on 32/64-bit host"
-       default HOST_64BIT
-       help
-         Sandbox can be built on 32-bit and 64-bit hosts.
-         The default is to build on a 64-bit host and run
-         on a 64-bit host. If you want to run sandbox on
-         a 32-bit host, change it here.
-
 config HOST_32BIT
-       bool "32-bit host"
-       depends on !PHYS_64BIT
+       def_bool ! $(cc-define,_LP64)
 
 config HOST_64BIT
-       bool "64-bit host"
-
-endchoice
+       def_bool $(cc-define,_LP64)
 
 config SANDBOX_CRASH_RESET
        bool "Reset on crash"

diff --git a/scripts/Kconfig.include b/scripts/Kconfig.include
index dad5583451afba96b2de211309fa898c9e69eb3e..b7598ca5d9f8754ad10b755c94d8842dc1ffd46b 100644 (file)
--- a/scripts/Kconfig.include
+++ b/scripts/Kconfig.include
@@ -22,6 +22,10 @@ success = $(if-success,$(1),y,n)
 # Return y if the compiler supports <flag>, n otherwise
 cc-option = $(success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null)
 
+# $(cc-define,<macro>)
+# Return y if the compiler defines <macro>, n otherwise
+cc-define = $(success,$(CC) -dM -E -x c /dev/null | grep -q '^#define \<$(1)\>')
+
 # $(ld-option,<flag>)
 # Return y if the linker supports <flag>, n otherwise
 ld-option = $(success,$(LD) -v $(1))