diff options
author | Tom Rini <trini@konsulko.com> | 2021-05-15 06:00:24 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-05-15 06:00:24 +0300 |
commit | 8054d80b04f368876e91d419e5399a57fb6aefa0 (patch) | |
tree | 5051463a274717936e386259cab4a347945b40cf | |
parent | 666afca0df559ee27a66fcc37685adc22162411a (diff) | |
parent | 8f76c9d73ab2ae58a84094990de3d0733ce23b13 (diff) | |
download | u-boot-8054d80b04f368876e91d419e5399a57fb6aefa0.tar.xz |
Merge https://source.denx.de/u-boot/custodians/u-boot-sh
-rw-r--r-- | arch/arm/mach-rmobile/Kconfig | 1 | ||||
-rw-r--r-- | board/beacon/beacon-rzg2m/Makefile | 2 | ||||
-rw-r--r-- | board/beacon/beacon-rzg2m/beacon-rzg2m.c | 15 | ||||
-rw-r--r-- | board/renesas/rcar-common/common.c | 80 |
4 files changed, 82 insertions, 16 deletions
diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig index 8cef3f5675..41322b2c4c 100644 --- a/arch/arm/mach-rmobile/Kconfig +++ b/arch/arm/mach-rmobile/Kconfig @@ -13,6 +13,7 @@ config RCAR_GEN3 select ARM64 select PHY select CMD_CACHE + select OF_BOARD_SETUP select PINCTRL select PINCONF select PINCTRL_PFC diff --git a/board/beacon/beacon-rzg2m/Makefile b/board/beacon/beacon-rzg2m/Makefile index 439f3199aa..9131a92efa 100644 --- a/board/beacon/beacon-rzg2m/Makefile +++ b/board/beacon/beacon-rzg2m/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := beacon-rzg2m.o +obj-y := beacon-rzg2m.o ../../renesas/rcar-common/common.o diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c index 0c7f8e54e9..c12ff77fb2 100644 --- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c +++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c @@ -28,21 +28,6 @@ int board_init(void) return 0; } -int dram_init(void) -{ - if (fdtdec_setup_mem_size_base() != 0) - return -EINVAL; - - return 0; -} - -int dram_init_banksize(void) -{ - fdtdec_setup_memory_banksize(); - - return 0; -} - #define RST_BASE 0xE6160000 #define RST_CA57RESCNT (RST_BASE + 0x40) #define RST_CODE 0xA5A5000F diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c index e77357968a..0352d341e7 100644 --- a/board/renesas/rcar-common/common.c +++ b/board/renesas/rcar-common/common.c @@ -43,4 +43,84 @@ int dram_init_banksize(void) return 0; } + +#if defined(CONFIG_OF_BOARD_SETUP) +static int is_mem_overlap(void *blob, int first_mem_node, int curr_mem_node) +{ + struct fdt_resource first_mem_res, curr_mem_res; + int curr_mem_reg, first_mem_reg = 0; + int ret; + + for (;;) { + ret = fdt_get_resource(blob, first_mem_node, "reg", + first_mem_reg++, &first_mem_res); + if (ret) /* No more entries, no overlap found */ + return 0; + + curr_mem_reg = 0; + for (;;) { + ret = fdt_get_resource(blob, curr_mem_node, "reg", + curr_mem_reg++, &curr_mem_res); + if (ret) /* No more entries, check next tuple */ + break; + + if (curr_mem_res.end < first_mem_res.start) + continue; + + if (curr_mem_res.start >= first_mem_res.end) + continue; + + printf("Overlap found: 0x%llx..0x%llx / 0x%llx..0x%llx\n", + first_mem_res.start, first_mem_res.end, + curr_mem_res.start, curr_mem_res.end); + + return 1; + } + } + + return 0; +} + +int ft_board_setup(void *blob, struct bd_info *bd) +{ + /* + * Scrub duplicate /memory@* node entries here. Some R-Car DTs might + * contain multiple /memory@* nodes, however fdt_fixup_memory_banks() + * either generates single /memory node or updates the first /memory + * node. Any remaining memory nodes are thus potential duplicates. + * + * However, it is not possible to delete all the memory nodes right + * away, since some of those might not be DRAM memory nodes, but some + * sort of other memory. Thus, delete only the memory nodes which are + * in the R-Car3 DBSC ranges. + */ + int mem = 0, first_mem_node = 0; + + for (;;) { + mem = fdt_node_offset_by_prop_value(blob, mem, + "device_type", "memory", 7); + if (mem < 0) + break; + if (!fdtdec_get_is_enabled(blob, mem)) + continue; + + /* First memory node, patched by U-Boot */ + if (!first_mem_node) { + first_mem_node = mem; + continue; + } + + /* Check the remaining nodes and delete duplicates */ + if (!is_mem_overlap(blob, first_mem_node, mem)) + continue; + + /* Delete duplicate node, start again */ + fdt_del_node(blob, mem); + first_mem_node = 0; + mem = 0; + } + + return 0; +} +#endif #endif |