summaryrefslogtreecommitdiff
path: root/board/ti
diff options
context:
space:
mode:
Diffstat (limited to 'board/ti')
-rw-r--r--board/ti/am62ax/evm.c8
-rw-r--r--board/ti/am62px/evm.c8
-rw-r--r--board/ti/am64x/evm.c2
-rw-r--r--board/ti/am65x/evm.c5
-rw-r--r--board/ti/common/k3-ddr-init.c5
-rw-r--r--board/ti/j721e/evm.c7
-rw-r--r--board/ti/j721s2/evm.c15
-rw-r--r--board/ti/j784s4/evm.c15
8 files changed, 34 insertions, 31 deletions
diff --git a/board/ti/am62ax/evm.c b/board/ti/am62ax/evm.c
index 6e6dc3dce5..0cfded02bd 100644
--- a/board/ti/am62ax/evm.c
+++ b/board/ti/am62ax/evm.c
@@ -33,8 +33,12 @@ int board_init(void)
#if defined(CONFIG_SPL_BUILD)
void spl_perform_fixups(struct spl_image_info *spl_image)
{
- if (IS_ENABLED(CONFIG_K3_INLINE_ECC))
- fixup_ddr_driver_for_ecc(spl_image);
+ if (IS_ENABLED(CONFIG_TARGET_AM62A7_R5_EVM)) {
+ if (IS_ENABLED(CONFIG_K3_INLINE_ECC))
+ fixup_ddr_driver_for_ecc(spl_image);
+ } else {
+ fixup_memory_node(spl_image);
+ }
}
#endif
diff --git a/board/ti/am62px/evm.c b/board/ti/am62px/evm.c
index 060c150b56..ddb6a6faf9 100644
--- a/board/ti/am62px/evm.c
+++ b/board/ti/am62px/evm.c
@@ -54,8 +54,12 @@ int board_init(void)
#if defined(CONFIG_SPL_BUILD)
void spl_perform_fixups(struct spl_image_info *spl_image)
{
- if (IS_ENABLED(CONFIG_K3_INLINE_ECC))
- fixup_ddr_driver_for_ecc(spl_image);
+ if (IS_ENABLED(CONFIG_TARGET_AM62P5_R5_EVM)) {
+ if (IS_ENABLED(CONFIG_K3_INLINE_ECC))
+ fixup_ddr_driver_for_ecc(spl_image);
+ } else {
+ fixup_memory_node(spl_image);
+ }
}
static int video_setup(void)
diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c
index 89b7c7524a..e990ba0d43 100644
--- a/board/ti/am64x/evm.c
+++ b/board/ti/am64x/evm.c
@@ -105,6 +105,8 @@ void spl_perform_fixups(struct spl_image_info *spl_image)
{
if (IS_ENABLED(CONFIG_K3_INLINE_ECC))
fixup_ddr_driver_for_ecc(spl_image);
+ else
+ fixup_memory_node(spl_image);
#if CONFIG_IS_ENABLED(USB_STORAGE)
fixup_usb_boot(spl_image->fdt_addr);
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 48dc1af9aa..8a536f5b97 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -80,10 +80,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
{
int ret;
- ret = fdt_fixup_msmc_ram(blob, "/bus@100000", "sram@70000000");
- if (ret < 0)
- ret = fdt_fixup_msmc_ram(blob, "/interconnect@100000",
- "sram@70000000");
+ ret = fdt_fixup_msmc_ram_k3(blob);
if (ret) {
printf("%s: fixing up msmc ram failed %d\n", __func__, ret);
return ret;
diff --git a/board/ti/common/k3-ddr-init.c b/board/ti/common/k3-ddr-init.c
index 2e0b7ed860..228b95774b 100644
--- a/board/ti/common/k3-ddr-init.c
+++ b/board/ti/common/k3-ddr-init.c
@@ -49,13 +49,16 @@ void fixup_ddr_driver_for_ecc(struct spl_image_info *spl_image)
if (ret)
printf("Error fixing up ddr node for ECC use! %d\n", ret);
+ dram_init_banksize();
+
ret = uclass_next_device_err(&dev);
- while (ret && ret != -ENODEV) {
+ while (!ret) {
ret = k3_ddrss_ddr_fdt_fixup(dev, spl_image->fdt_addr, gd->bd);
if (ret)
printf("Error fixing up ddr node %d for ECC use! %d\n", ctr, ret);
+ dram_init_banksize();
ret = uclass_next_device_err(&dev);
ctr++;
}
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 313c1cb034..1f5cb4f6ae 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -128,12 +128,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
{
int ret;
- ret = fdt_fixup_msmc_ram(blob, "/bus@100000", "sram@70000000");
- if (ret < 0)
- ret = fdt_fixup_msmc_ram(blob, "/interconnect@100000",
- "sram@70000000");
- if (ret)
- printf("%s: fixing up msmc ram failed %d\n", __func__, ret);
+ ret = fdt_fixup_msmc_ram_k3(blob);
detect_enable_hyperflash(blob);
diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c
index 1bde20a17d..79130443b7 100644
--- a/board/ti/j721s2/evm.c
+++ b/board/ti/j721s2/evm.c
@@ -81,8 +81,12 @@ static void __maybe_unused detect_enable_spinand(void *blob)
void spl_perform_fixups(struct spl_image_info *spl_image)
{
detect_enable_spinand(spl_image->fdt_addr);
- if (IS_ENABLED(CONFIG_K3_INLINE_ECC))
- fixup_ddr_driver_for_ecc(spl_image);
+ if (IS_ENABLED(CONFIG_TARGET_J721S2_R5_EVM)) {
+ if (IS_ENABLED(CONFIG_K3_INLINE_ECC))
+ fixup_ddr_driver_for_ecc(spl_image);
+ } else {
+ fixup_memory_node(spl_image);
+ }
}
#endif
@@ -91,12 +95,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
{
int ret;
- ret = fdt_fixup_msmc_ram(blob, "/bus@100000", "sram@70000000");
- if (ret < 0)
- ret = fdt_fixup_msmc_ram(blob, "/interconnect@100000",
- "sram@70000000");
- if (ret)
- printf("%s: fixing up msmc ram failed %d\n", __func__, ret);
+ ret = fdt_fixup_msmc_ram_k3(blob);
detect_enable_spinand(blob);
diff --git a/board/ti/j784s4/evm.c b/board/ti/j784s4/evm.c
index 7e7f4a5593..64bedf6ff4 100644
--- a/board/ti/j784s4/evm.c
+++ b/board/ti/j784s4/evm.c
@@ -80,8 +80,12 @@ static void __maybe_unused detect_enable_spinand(void *blob)
void spl_perform_fixups(struct spl_image_info *spl_image)
{
detect_enable_spinand(spl_image->fdt_addr);
- if (IS_ENABLED(CONFIG_K3_INLINE_ECC))
- fixup_ddr_driver_for_ecc(spl_image);
+ if (IS_ENABLED(CONFIG_TARGET_J784S4_R5_EVM)) {
+ if (IS_ENABLED(CONFIG_K3_INLINE_ECC))
+ fixup_ddr_driver_for_ecc(spl_image);
+ } else {
+ fixup_memory_node(spl_image);
+ }
}
#endif
@@ -90,12 +94,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
{
int ret;
- ret = fdt_fixup_msmc_ram(blob, "/bus@100000", "sram@70000000");
- if (ret < 0)
- ret = fdt_fixup_msmc_ram(blob, "/interconnect@100000",
- "sram@70000000");
- if (ret)
- printf("%s: fixing up msmc ram failed %d\n", __func__, ret);
+ ret = fdt_fixup_msmc_ram_k3(blob);
detect_enable_spinand(blob);
generated by cgit v1.2.3 (git 2.0.4) at 2024-06-20 11:10:24 +0000