diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-22 14:55:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-22 21:17:39 -0400 |
| commit | 7b57e56739ed2c550d17a072a7f4c8326c0c83dc (patch) | |
| tree | 24770636838a7edd62dffe71039d217ebb6c19fb /board/atmel | |
| parent | 63823da4b9e25d2f6a81f1e9adb06391837055cb (diff) | |
| parent | d65b84a1d0dc116010a3842dc13661976ef92629 (diff) | |
Merge tag 'u-boot-at91-2022.01-a' of https://source.denx.de/u-boot/custodians/u-boot-at91 into next
First set of u-boot-at91 features for the 2022.01 cycle:
This feature set includes : the support for CPU driver for arm926
(sam9x60 device); changes required for OP-TEE boot for sama5d2_xplained
and sama5d27_som1_ek boards; QSPI boot configuration for sama5d2_icp;
starting to remove old Kconfig unused symbols from config_whitelist.txt
(work will take more time); also small fixes and updates in mach, DT,
configs, etc.
Diffstat (limited to 'board/atmel')
| -rw-r--r-- | board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 12 | ||||
| -rw-r--r-- | board/atmel/sama5d2_icp/MAINTAINERS | 1 | ||||
| -rw-r--r-- | board/atmel/sama5d2_xplained/sama5d2_xplained.c | 11 |
3 files changed, 16 insertions, 8 deletions
diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c index 1b7d946b50..8c0cf3da54 100644 --- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c +++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c @@ -6,6 +6,7 @@ #include <common.h> #include <debug_uart.h> +#include <fdtdec.h> #include <init.h> #include <asm/global_data.h> #include <asm/io.h> @@ -68,7 +69,7 @@ int board_early_init_f(void) int board_init(void) { /* address of boot parameters */ - gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100; #ifdef CONFIG_CMD_USB board_usb_hw_init(); @@ -77,11 +78,14 @@ int board_init(void) return 0; } +int dram_init_banksize(void) +{ + return fdtdec_setup_memory_banksize(); +} + int dram_init(void) { - gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, - CONFIG_SYS_SDRAM_SIZE); - return 0; + return fdtdec_setup_mem_size_base(); } #define MAC24AA_MAC_OFFSET 0xfa diff --git a/board/atmel/sama5d2_icp/MAINTAINERS b/board/atmel/sama5d2_icp/MAINTAINERS index db984b6ae4..4a65c65ec3 100644 --- a/board/atmel/sama5d2_icp/MAINTAINERS +++ b/board/atmel/sama5d2_icp/MAINTAINERS @@ -4,4 +4,5 @@ S: Maintained F: board/atmel/sama5d2_icp/ F: include/configs/sama5d2_icp.h F: configs/sama5d2_icp_mmc_defconfig +F: configs/sama5d2_icp_qspiflash_defconfig diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c index 5110ec8969..8b5cd533d0 100644 --- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c +++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c @@ -68,7 +68,7 @@ int board_early_init_f(void) int board_init(void) { /* address of boot parameters */ - gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + gd->bd->bi_boot_params = gd->bd->bi_dram[0].start + 0x100; #ifdef CONFIG_CMD_USB board_usb_hw_init(); @@ -77,11 +77,14 @@ int board_init(void) return 0; } +int dram_init_banksize(void) +{ + return fdtdec_setup_memory_banksize(); +} + int dram_init(void) { - gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, - CONFIG_SYS_SDRAM_SIZE); - return 0; + return fdtdec_setup_mem_size_base(); } #define AT24MAC_MAC_OFFSET 0x9a |