diff options
| author | Tom Rini <trini@konsulko.com> | 2022-08-11 22:20:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-08-11 22:20:01 -0400 |
| commit | f5003e0791dbe796bf7b41515d67ae5527679ec9 (patch) | |
| tree | 0a0a1401b0f1da9114460fe3fcbfc50142663920 /board | |
| parent | 157861e6afa5c26134639e8a8f34540141672a0a (diff) | |
| parent | aa0eda17cf98448c3ef826204f38c76bf48b3345 (diff) | |
| download | u-boot-WIP/11Aug2022.zip u-boot-WIP/11Aug2022.tar.gz u-boot-WIP/11Aug2022.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-riscvWIP/11Aug2022
Diffstat (limited to 'board')
| -rw-r--r-- | board/AndesTech/ax25-ae350/ax25-ae350.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c index d6a4291..36f0dd4 100644 --- a/board/AndesTech/ax25-ae350/ax25-ae350.c +++ b/board/AndesTech/ax25-ae350/ax25-ae350.c @@ -54,17 +54,22 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info) return 0; } +#define ANDES_HW_DTB_ADDRESS 0xF2000000 void *board_fdt_blob_setup(int *err) { *err = 0; -#if defined(CONFIG_OF_BOARD) - return (void *)(ulong)gd->arch.firmware_fdt_addr; -#elif defined(CONFIG_OF_SEPARATE) - return (void *)CONFIG_SYS_FDT_BASE; -#else + + if (IS_ENABLED(CONFIG_OF_SEPARATE) || IS_ENABLED(CONFIG_OF_BOARD)) { + if (gd->arch.firmware_fdt_addr) + return (void *)(ulong)gd->arch.firmware_fdt_addr; + } + + if (fdt_magic(CONFIG_SYS_FDT_BASE) == FDT_MAGIC) + return (void *)CONFIG_SYS_FDT_BASE; + return (void *)ANDES_HW_DTB_ADDRESS; + *err = -EINVAL; return NULL; -#endif } int smc_init(void) |