diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-03-22 16:40:04 (GMT) |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-03-23 16:45:41 (GMT) |
| commit | cbbc2d80fc58531c59cadc803717c9d53c9543f1 (patch) | |
| tree | 2559bedb3220e20e41fbadd30f615bc3fadcf57f | |
| parent | 95a2d438c905e78b061768f5339abc9193675df4 (diff) | |
| download | u-boot-cbbc2d80fc58531c59cadc803717c9d53c9543f1.tar.xz | |
ARM: uniphier: add NOR boot support
This allows to boot from NOR flash (or SRAM) with help of an external
loader (NOR-loader).
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c | 2 | ||||
| -rw-r--r-- | include/configs/uniphier.h | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c index 8334373..ef52d69 100644 --- a/arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c +++ b/arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c @@ -43,7 +43,7 @@ struct boot_device_info boot_device_table[] = { {BOOT_DEVICE_NONE, "Reserved"}, {BOOT_DEVICE_NONE, "Reserved"}, {BOOT_DEVICE_NONE, "Reserved"}, - {BOOT_DEVICE_NONE, "Reserved"}, + {BOOT_DEVICE_NOR, "NOR Boot"}, }; static int get_boot_mode_sel(void) diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c index b0f3f9a..0258fae 100644 --- a/arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c +++ b/arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c @@ -12,7 +12,7 @@ #include "boot-device.h" static struct boot_device_info boot_device_table[] = { - {BOOT_DEVICE_NONE, "Reserved"}, + {BOOT_DEVICE_NOR, "NOR boot"}, {BOOT_DEVICE_NONE, "External Master"}, {BOOT_DEVICE_NONE, "Reserved"}, {BOOT_DEVICE_NONE, "Reserved"}, diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 076c733..dd7b352 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -261,6 +261,7 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_NOR_SUPPORT #define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_MMC_SUPPORT @@ -270,6 +271,8 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x10000 + +#define CONFIG_SYS_UBOOT_BASE 0x60000 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x80 #define CONFIG_SPL_MAX_FOOTPRINT 0x10000 |