diff options
| author | Tom Rini <trini@konsulko.com> | 2017-07-26 11:29:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-26 11:29:25 -0400 |
| commit | f19955a01482d118eac0fdaf530ec6e5b08cf414 (patch) | |
| tree | fa7d35b9e36269270006ea75fe2b9b2c00384cd0 /include/configs | |
| parent | 0ddc9c172279f686077310fbcfa5baf10c719188 (diff) | |
| parent | a3f54bc74fb20c98aefebd9ca9a250e2f3f9e538 (diff) | |
| download | u-boot-f19955a01482d118eac0fdaf530ec6e5b08cf414.zip u-boot-f19955a01482d118eac0fdaf530ec6e5b08cf414.tar.gz u-boot-f19955a01482d118eac0fdaf530ec6e5b08cf414.tar.bz2 | |
Merge git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/uniphier.h | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index b8afa81..cc65f07 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -77,17 +77,7 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 1 -#ifdef CONFIG_ARMV8_MULTIENTRY -#define CPU_RELEASE_ADDR 0x80000000 -#define COUNTER_FREQUENCY 50000000 -#define CONFIG_GICV3 -#define GICD_BASE 0x5fe00000 -#if defined(CONFIG_ARCH_UNIPHIER_LD11) -#define GICR_BASE 0x5fe40000 -#elif defined(CONFIG_ARCH_UNIPHIER_LD20) -#define GICR_BASE 0x5fe80000 -#endif -#elif !defined(CONFIG_ARM64) +#if !defined(CONFIG_ARM64) /* Time clock 1MHz */ #define CONFIG_SYS_TIMER_RATE 1000000 #endif @@ -134,7 +124,7 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ -#if defined(CONFIG_ARM64) && !defined(CONFIG_ARMV8_MULTIENTRY) +#if defined(CONFIG_ARM64) /* ARM Trusted Firmware */ #define BOOT_IMAGES \ "second_image=unph_bl.bin\0" \ @@ -262,9 +252,7 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE) /* only for SPL */ -#if defined(CONFIG_ARM64) -#define CONFIG_SPL_TEXT_BASE 0x30000000 -#elif defined(CONFIG_ARCH_UNIPHIER_SLD3) || \ +#if defined(CONFIG_ARCH_UNIPHIER_SLD3) || \ defined(CONFIG_ARCH_UNIPHIER_LD4) || \ defined(CONFIG_ARCH_UNIPHIER_SLD8) #define CONFIG_SPL_TEXT_BASE 0x00040000 @@ -272,18 +260,9 @@ #define CONFIG_SPL_TEXT_BASE 0x00100000 #endif -#if defined(CONFIG_ARCH_UNIPHIER_LD11) -#define CONFIG_SPL_STACK (0x30014c00) -#elif defined(CONFIG_ARCH_UNIPHIER_LD20) -#define CONFIG_SPL_STACK (0x3001c000) -#else #define CONFIG_SPL_STACK (0x00100000) -#endif #define CONFIG_SPL_FRAMEWORK -#ifdef CONFIG_ARM64 -#define CONFIG_SPL_BOARD_LOAD_IMAGE -#endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 @@ -292,16 +271,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_MAX_FOOTPRINT 0x10000 -#if defined(CONFIG_ARCH_UNIPHIER_LD20) -#define CONFIG_SPL_MAX_SIZE 0x14000 -#else #define CONFIG_SPL_MAX_SIZE 0x10000 -#endif -#if defined(CONFIG_ARCH_UNIPHIER_LD11) -#define CONFIG_SPL_BSS_START_ADDR 0x30012000 -#elif defined(CONFIG_ARCH_UNIPHIER_LD20) -#define CONFIG_SPL_BSS_START_ADDR 0x30016000 -#endif #define CONFIG_SPL_BSS_MAX_SIZE 0x2000 #define CONFIG_SPL_PAD_TO 0x20000 |