Skip to content

Commit

Permalink
board: ti: am62x: Set fdtfile from C code instead of findfdt script
Browse files Browse the repository at this point in the history
Stop using the findfdt script and switch to setting the fdtfile from
C code.

While at this, replace findfdt in environment with a warning as it is
no longer needed

Reviewed-by: Jonathan Humphreys <j-humphreys@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Signed-off-by: Nishanth Menon <nm@ti.com>
  • Loading branch information
nmenon authored and trini committed Feb 20, 2024
1 parent 39ae370 commit 0de0672
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 0 additions & 1 deletion board/ti/am62x/am62x.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include <env/ti/ti_common.env>
#include <env/ti/default_findfdt.env>
#include <env/ti/mmc.env>

name_kern=Image
Expand Down
10 changes: 10 additions & 0 deletions board/ti/am62x/evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#include <asm/arch/hardware.h>
#include <dm/uclass.h>

#include "../common/fdt_ops.h"

DECLARE_GLOBAL_DATA_PTR;

#if CONFIG_IS_ENABLED(SPLASH_SCREEN)
Expand Down Expand Up @@ -54,6 +56,14 @@ int dram_init(void)
return fdtdec_setup_mem_size_base();
}

#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
ti_set_fdt_env(NULL, NULL);
return 0;
}
#endif

int dram_init_banksize(void)
{
return fdtdec_setup_memory_banksize();
Expand Down
1 change: 1 addition & 0 deletions configs/am62x_evm_a53_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ CONFIG_BOOTSTD_FULL=y
CONFIG_BOOTSTD_DEFAULTS=y
CONFIG_SYS_BOOTM_LEN=0x800000
CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
CONFIG_BOARD_LATE_INIT=y
CONFIG_SPL_MAX_SIZE=0x58000
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
CONFIG_SPL_BSS_START_ADDR=0x80c80000
Expand Down

0 comments on commit 0de0672

Please sign in to comment.