diff options
| author | Tom Rini <trini@konsulko.com> | 2018-02-16 13:56:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-16 13:56:02 -0500 |
| commit | bd650cd404b6dc870b6cc220025f35da4b31d0f4 (patch) | |
| tree | 5082c02c7320fe0410624ccd1d9d6628905ca9df /include/configs | |
| parent | 7961b9f6db19d039b4e6e9c21a9715b6d5b92393 (diff) | |
| parent | 5b6ae550a8d88ca8c7b5c39642fe767729422edb (diff) | |
Merge git://git.denx.de/u-boot-sh
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/porter.h | 15 | ||||
| -rw-r--r-- | include/configs/rcar-gen2-common.h | 2 | ||||
| -rw-r--r-- | include/configs/rcar-gen3-common.h | 1 |
3 files changed, 11 insertions, 7 deletions
diff --git a/include/configs/porter.h b/include/configs/porter.h index b4a317f724..758ed21c15 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -16,12 +16,8 @@ #include "rcar-gen2-common.h" -#if defined(CONFIG_ARCH_RMOBILE_EXTRAM_BOOT) -#define CONFIG_SYS_INIT_SP_ADDR 0x7023FFFC -#else -#define CONFIG_SYS_INIT_SP_ADDR 0xE633fffC -#endif -#define STACK_AREA_SIZE 0xC000 +#define CONFIG_SYS_INIT_SP_ADDR 0x4f000000 +#define STACK_AREA_SIZE 0x00100000 #define LOW_LEVEL_MERAM_STACK \ (CONFIG_SYS_INIT_SP_ADDR + STACK_AREA_SIZE - 4) @@ -67,4 +63,11 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ +/* SPL support */ +#define CONFIG_SPL_TEXT_BASE 0xe6304000 +#define CONFIG_SPL_STACK 0xe6340000 +#define CONFIG_SPL_MAX_SIZE 0x40000 +#define CONFIG_SPL_SPI_LOAD +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x140000 + #endif /* __PORTER_H */ diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index ad436fd8b1..e47b02fcc9 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -26,7 +26,7 @@ #endif /* console */ - +#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_PBSIZE 256 #define CONFIG_SYS_BAUDRATE_TABLE { 38400, 115200 } diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index a16d26be99..226069d67c 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -16,6 +16,7 @@ /* boot option */ #define CONFIG_SUPPORT_RAW_INITRD +#define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS |