diff options
| author | Tom Rini | 2019-05-09 07:11:52 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-05-09 07:11:52 -0400 |
| commit | 7d41f2dcbe5b25c0099d74a610cc586b940c50ab (patch) | |
| tree | 4284df3fa3784336f1bdd59f81daee26129dd89c /include | |
| parent | 7aaf2af0e07f9923976372ff7a3ce7a0f8004723 (diff) | |
| parent | 3cedc97479ff44cdc00485de7517a833e3dfb630 (diff) | |
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 'include')
| -rw-r--r-- | include/configs/ax25-ae350.h | 2 | ||||
| -rw-r--r-- | include/configs/qemu-riscv.h | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index 395f3a442da..a4037f33dd2 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -40,7 +40,7 @@ #define CONFIG_SYS_MALLOC_LEN (512 << 10) /* DT blob (fdt) address */ -#define CONFIG_SYS_FDT_BASE 0x000f0000 +#define CONFIG_SYS_FDT_BASE 0x800f0000 /* * Physical Memory Map diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index 2588c5a0b25..b7110edebcb 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -15,7 +15,7 @@ #define CONFIG_SYS_MALLOC_LEN SZ_8M -#define CONFIG_SYS_BOOTM_LEN SZ_16M +#define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 @@ -41,11 +41,15 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ - "kernel_addr_r=0x81000000\0" \ - "fdt_addr_r=0x82000000\0" \ - "scriptaddr=0x82100000\0" \ - "pxefile_addr_r=0x82200000\0" \ - "ramdisk_addr_r=0x82300000\0" \ + "kernel_addr_r=0x84000000\0" \ + "fdt_addr_r=0x88000000\0" \ + "scriptaddr=0x88100000\0" \ + "pxefile_addr_r=0x88200000\0" \ + "ramdisk_addr_r=0x88300000\0" \ BOOTENV +#define CONFIG_PREBOOT \ + "setenv fdt_addr ${fdtcontroladdr};" \ + "fdt addr ${fdtcontroladdr};" + #endif /* __CONFIG_H */ |