diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-10 13:19:21 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-10 13:19:21 (GMT) |
| commit | 0b8404332ed08799ca0630e4cc868df039f206e3 (patch) | |
| tree | c5d4e2c1f963b5716ae9dd7024dce5341feb6856 /include | |
| parent | a705ebc81b7f91bbd0ef7c634284208342901149 (diff) | |
| parent | eb77f5c9f69ef6c8cb39643b7b7107ef7bff5305 (diff) | |
| download | u-boot-fsl-qoriq-0b8404332ed08799ca0630e4cc868df039f206e3.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 13 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 4 | ||||
| -rw-r--r-- | include/spl.h | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/include/common.h b/include/common.h index a8d833b..ee0436b 100644 --- a/include/common.h +++ b/include/common.h @@ -15,6 +15,9 @@ typedef volatile unsigned long vu_long; typedef volatile unsigned short vu_short; typedef volatile unsigned char vu_char; +/* Allow sharing constants with type modifiers between C and assembly. */ +#define _AC(X, Y) (X##Y) + #include <config.h> #include <errno.h> #include <asm-offsets.h> @@ -936,7 +939,12 @@ int cpu_disable(int nr); int cpu_release(int nr, int argc, char * const argv[]); #endif -#endif /* __ASSEMBLY__ */ +#else /* __ASSEMBLY__ */ + +/* Drop a C type modifier (like in 3UL) for constants used in assembly. */ +#define _AC(X, Y) X + +#endif /* __ASSEMBLY__ */ #ifdef CONFIG_PPC /* @@ -948,6 +956,9 @@ int cpu_release(int nr, int argc, char * const argv[]); /* Put only stuff here that the assembler can digest */ +/* Declare an unsigned long constant digestable both by C and an assembler. */ +#define UL(x) _AC(x, UL) + #ifdef CONFIG_POST #define CONFIG_HAS_POST #ifndef CONFIG_POST_ALT_LIST 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 */ diff --git a/include/spl.h b/include/spl.h index 6e746b2..bde4437 100644 --- a/include/spl.h +++ b/include/spl.h @@ -23,8 +23,8 @@ struct spl_image_info { const char *name; u8 os; - u32 load_addr; - u32 entry_point; + ulong load_addr; + ulong entry_point; u32 size; u32 flags; }; |