sandbox: Change CONFIG_SANDBOX_BITS_PER_LONG to hard-coded

Instead of having CONFIG_SANDBOX_BITS_PER_LONG in sandbox.h set to 64
with a comment to change to 32 on a 32bit host, simply set this to 64 in
asm/types.h and have the comment be there.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/sandbox/include/asm/types.h b/arch/sandbox/include/asm/types.h
index 42c09e2fff25c9bd0b68f274548f67a73bf416ee..623cdafefaa5d919c9b21d8e737d8cd13cb55c7e 100644 (file)
--- a/arch/sandbox/include/asm/types.h
+++ b/arch/sandbox/include/asm/types.h
@@ -50,7 +50,11 @@ typedef __INT64_TYPE__ s64;
 typedef __UINT64_TYPE__ u64;
 #endif
 
-#define BITS_PER_LONG  CONFIG_SANDBOX_BITS_PER_LONG
+/*
+ * Number of bits in a C 'long' on this architecture. Set this to 32 when
+ * building on a 32-bit machine.
+ */
+#define BITS_PER_LONG  32
 
 typedef unsigned long dma_addr_t;
 typedef u32 phys_addr_t;

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 7de8765dc803eed4ecb01e1b937a2b417ed2ca56..4c112cc1a99d916e2cfb5d7e5aaaafe5c10695f8 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -25,12 +25,6 @@
 #define CONFIG_SYS_TIMER_RATE          1000000
 #endif
 
-/*
- * Number of bits in a C 'long' on this architecture. Set this to 32 when
- * building on a 32-bit machine.
- */
-#define CONFIG_SANDBOX_BITS_PER_LONG   64
-
 #define CONFIG_LMB
 #define CONFIG_ANDROID_BOOT_IMAGE