diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-09 07:11:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-09 07:11:52 -0400 |
| commit | 7d41f2dcbe5b25c0099d74a610cc586b940c50ab (patch) | |
| tree | 4284df3fa3784336f1bdd59f81daee26129dd89c /board | |
| parent | 7aaf2af0e07f9923976372ff7a3ce7a0f8004723 (diff) | |
| parent | 3cedc97479ff44cdc00485de7517a833e3dfb630 (diff) | |
| download | u-boot-7d41f2dcbe5b25c0099d74a610cc586b940c50ab.tar.gz | |
Merge git://git.denx.de/u-boot-riscv
- Correct SYS_TEXT_BASE for qemu.
- Support booti.
- Increase SYSBOOTM_LEN for Fedora/RISCV kernel.
- Support SMP booting from flash.
Diffstat (limited to 'board')
| -rw-r--r-- | board/AndesTech/ax25-ae350/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/AndesTech/ax25-ae350/ax25-ae350.c | 4 | ||||
| -rw-r--r-- | board/emulation/qemu-riscv/Kconfig | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/board/AndesTech/ax25-ae350/MAINTAINERS b/board/AndesTech/ax25-ae350/MAINTAINERS index b0a99e4ac4..feed5d1298 100644 --- a/board/AndesTech/ax25-ae350/MAINTAINERS +++ b/board/AndesTech/ax25-ae350/MAINTAINERS @@ -5,3 +5,5 @@ F: board/AndesTech/ax25-ae350/ F: include/configs/ax25-ae350.h F: configs/ae350_rv32_defconfig F: configs/ae350_rv64_defconfig +F: configs/ae350_rv32_xip_defconfig +F: configs/ae350_rv64_xip_defconfig diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c index d343453f22..3d65ce7b75 100644 --- a/board/AndesTech/ax25-ae350/ax25-ae350.c +++ b/board/AndesTech/ax25-ae350/ax25-ae350.c @@ -67,10 +67,6 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info) void *board_fdt_blob_setup(void) { - void **ptr = (void *)&prior_stage_fdt_address; - if (fdt_magic(*ptr) == FDT_MAGIC) - return (void *)*ptr; - return (void *)CONFIG_SYS_FDT_BASE; } diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig index cf057e7de6..20ea6dc59b 100644 --- a/board/emulation/qemu-riscv/Kconfig +++ b/board/emulation/qemu-riscv/Kconfig @@ -14,7 +14,8 @@ config SYS_CONFIG_NAME config SYS_TEXT_BASE default 0x80000000 if !RISCV_SMODE - default 0x80200000 if RISCV_SMODE + default 0x80200000 if RISCV_SMODE && ARCH_RV64I + default 0x80400000 if RISCV_SMODE && ARCH_RV32I config BOARD_SPECIFIC_OPTIONS # dummy def_bool y |