diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-22 18:15:16 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-22 19:20:28 (GMT) |
| commit | 711391131c84398d1b8256ab5a8cfa2969ad57c7 (patch) | |
| tree | 0abea0dbe3971e5420557828a145275bb07bd9f9 /include/configs | |
| parent | a4b0d83b66f1cef9a93b403e4c11424b5b43b09f (diff) | |
| parent | 80b51b5aa91b75d83323fd1fdd253d5f67621784 (diff) | |
| download | u-boot-fsl-qoriq-711391131c84398d1b8256ab5a8cfa2969ad57c7.tar.xz | |
Merge git://git.denx.de/u-boot-sunxi
trini: Make Kconfig SPL_xxx entires only show if SPL, so that we don't
get Kconfig errors on platforms without SPL, ie sandbox (without SPL).
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/sunxi-common.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 997a92c..f042f0d 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -32,6 +32,10 @@ # define CONFIG_MACH_TYPE_COMPAT_REV 1 #endif +#ifdef CONFIG_ARM64 +#define CONFIG_BUILD_TARGET "u-boot.itb" +#endif + /* Serial & console */ #define CONFIG_SYS_NS16550_SERIAL /* ns16550 reg in the low bits of cpu reg */ @@ -185,12 +189,17 @@ #endif #ifdef CONFIG_SUNXI_HIGH_SRAM -#define CONFIG_SPL_TEXT_BASE 0x10040 /* sram start+header */ -#define CONFIG_SPL_MAX_SIZE 0x7fc0 /* 32 KiB */ +#define CONFIG_SPL_TEXT_BASE 0x10060 /* sram start+header */ +#define CONFIG_SPL_MAX_SIZE 0x7fa0 /* 32 KiB */ +#ifdef CONFIG_ARM64 +/* end of SRAM A2 for now, as SRAM A1 is pretty tight for an ARM64 build */ +#define LOW_LEVEL_SRAM_STACK 0x00054000 +#else #define LOW_LEVEL_SRAM_STACK 0x00018000 +#endif /* !CONFIG_ARM64 */ #else -#define CONFIG_SPL_TEXT_BASE 0x40 /* sram start+header */ -#define CONFIG_SPL_MAX_SIZE 0x5fc0 /* 24KB on sun4i/sun7i */ +#define CONFIG_SPL_TEXT_BASE 0x60 /* sram start+header */ +#define CONFIG_SPL_MAX_SIZE 0x5fa0 /* 24KB on sun4i/sun7i */ #define LOW_LEVEL_SRAM_STACK 0x00008000 /* End of sram */ #endif |