Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge patch series "Fix fdtfile for j722s and am62p"

Browse Source 
Manorit Chawdhry <m-chawdhry@ti.com> says:

fdtfile wasn't being populated in these boards in legacy boot using
bootcmd_ti_mmc, migrate these platforms to ti_set_fdt_env.
This commit is contained in:
Tom Rini
2024-07-16 13:01:52 -06:00
parent 61fac5dffa b1dfe6d328
commit 902d8ee94c
6 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
board/ti/am62px/evm.c
View File

@@ -13,6 +13,7 @@
#include <env.h>
#include <fdt_support.h>
#include <spl.h>
#include "../common/fdt_ops.h"
struct efi_fw_image fw_images[] = {
{
@@ -61,3 +62,11 @@ int dram_init_banksize(void)
{
return fdtdec_setup_memory_banksize();
}
#if IS_ENABLED(CONFIG_BOARD_LATE_INIT)
int board_late_init(void)
{
ti_set_fdt_env(NULL, NULL);
return 0;
}
#endif

9
board/ti/j722s/evm.c
View File

@@ -12,6 +12,7 @@
#include <env.h>
#include <fdt_support.h>
#include <spl.h>
#include "../common/fdt_ops.h"
int board_init(void)
{
@@ -27,3 +28,11 @@ int dram_init_banksize(void)
{
return fdtdec_setup_memory_banksize();
}
#if IS_ENABLED(CONFIG_BOARD_LATE_INIT)
int board_late_init(void)
{
ti_set_fdt_env(NULL, NULL);
return 0;
}
#endif

1
configs/am62px_evm_a53_defconfig
View File

@@ -33,6 +33,7 @@ CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
CONFIG_BOARD_LATE_INIT=y
CONFIG_SPL_MAX_SIZE=0x58000
CONFIG_SPL_PAD_TO=0x0
CONFIG_SPL_SYS_MALLOC_SIMPLE=y

1
configs/j722s_evm_a53_defconfig
View File

@@ -33,6 +33,7 @@ CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTSTD_FULL=y
CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
CONFIG_BOARD_LATE_INIT=y
CONFIG_SPL_MAX_SIZE=0x58000
CONFIG_SPL_PAD_TO=0x0
CONFIG_SPL_SYS_MALLOC_SIMPLE=y

2
include/env/ti/mmc.env vendored
View File

@@ -16,7 +16,7 @@ importbootenv=echo Importing environment from mmc${mmcdev} ...;
loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}
loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}
loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/dtb/${fdtfile}
get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/dtb/${name_fdt}
get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/dtb/${fdtfile}
envboot=if mmc dev ${mmcdev}; then
if mmc rescan; then
echo SD/MMC found on device ${mmcdev};

2
include/env/ti/ti_common.env vendored
View File

@@ -25,7 +25,7 @@ get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile}
run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring}
do_main_cpsw0_qsgmii_phyinit=0
bootcmd_ti_mmc=
run findfdt; run init_${boot};
run init_${boot};
#if CONFIG_CMD_REMOTEPROC
if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1;
then run main_cpsw0_qsgmii_phyinit;