diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-10 08:19:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-10 08:19:21 -0500 |
| commit | 0b8404332ed08799ca0630e4cc868df039f206e3 (patch) | |
| tree | c5d4e2c1f963b5716ae9dd7024dce5341feb6856 /include/configs | |
| parent | a705ebc81b7f91bbd0ef7c634284208342901149 (diff) | |
| parent | eb77f5c9f69ef6c8cb39643b7b7107ef7bff5305 (diff) | |
| download | u-boot-imx-0b8404332ed08799ca0630e4cc868df039f206e3.zip u-boot-imx-0b8404332ed08799ca0630e4cc868df039f206e3.tar.gz u-boot-imx-0b8404332ed08799ca0630e4cc868df039f206e3.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/sunxi-common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index b0bfc0d..ab2d33f 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -35,7 +35,7 @@ /* * High Level Configuration Options */ -#ifdef CONFIG_SPL_BUILD +#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_ARM64) #define CONFIG_SYS_THUMB_BUILD /* Thumbs mode to save space in SPL */ #endif @@ -183,7 +183,9 @@ #define CONFIG_SPL_FRAMEWORK +#ifndef CONFIG_ARM64 /* AArch64 FEL support is not ready yet */ #define CONFIG_SPL_BOARD_LOAD_IMAGE +#endif #if defined(CONFIG_MACH_SUN9I) #define CONFIG_SPL_TEXT_BASE 0x10040 /* sram start+header */ |