| Message ID | 1492030539-31367-1-git-send-email-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 6823e6fe66ad9e9043ca8a0da2d79f1d11af1f34 |
| Headers | show |
On Wed, Apr 12, 2017 at 04:55:39PM -0400, Tom Rini wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/arch/sandbox/include/asm/types.h b/arch/sandbox/include/asm/types.h index 42c09e2fff25..623cdafefaa5 100644 --- 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 7de8765dc803..4c112cc1a99d 100644 --- 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
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> --- arch/sandbox/include/asm/types.h | 6 +++++- include/configs/sandbox.h | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-)