diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-05 14:07:44 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-08 15:01:46 -0500 |
| commit | 699946ae61d52547113ccfc5bdca116d4ade3c6f (patch) | |
| tree | 1c26b7f192746fe8e5ac05b357fd50a8065ef0de | |
| parent | 22d90d560a2b01c47f180e196e6c6485eb8e65db (diff) | |
| download | talos-obmc-uboot-699946ae61d52547113ccfc5bdca116d4ade3c6f.tar.gz talos-obmc-uboot-699946ae61d52547113ccfc5bdca116d4ade3c6f.zip | |
sandbox: Fix building with LLVM
- The macro __BIGGEST_ALIGNMENT__ is gcc-specific. If it is not defined
we'll just assume 16. This is correct for at least the common cases
and LLVM does not provide an equivalent macro.
- When linking U-Boot we're passing -T to the linker, and while gcc will
just pass this along with LLVM we need to be specific.
Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/sandbox/config.mk | 2 | ||||
| -rw-r--r-- | arch/sandbox/include/asm/cache.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index b05a90fb18..16fd6d508a 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -16,7 +16,7 @@ PLATFORM_CPPFLAGS += $(shell sdl-config --cflags) endif endif -cmd_u-boot__ = $(CC) -o $@ -T u-boot.lds \ +cmd_u-boot__ = $(CC) -o $@ -Wl,-T u-boot.lds \ -Wl,--start-group $(u-boot-main) -Wl,--end-group \ $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map diff --git a/arch/sandbox/include/asm/cache.h b/arch/sandbox/include/asm/cache.h index d28c385eb5..ffbb9844eb 100644 --- a/arch/sandbox/include/asm/cache.h +++ b/arch/sandbox/include/asm/cache.h @@ -12,7 +12,13 @@ * the contents of stack buffers to something reasonable. The * GCC macro __BIGGEST_ALIGNMENT__ is defined to be the maximum * required alignment for any basic type. This seems reasonable. + * This is however GCC specific so if we don't have that available + * assume that 16 is large enough. */ +#ifdef __BIGGEST_ALIGNMENT__ #define ARCH_DMA_MINALIGN __BIGGEST_ALIGNMENT__ +#else +#define ARCH_DMA_MINALIGN 16 +#endif #endif /* __SANDBOX_CACHE_H__ */ |
