From: Vignesh Raghavendra vigneshr@ti.com
All K3 SoCs use same set of args to load kernel for MMC. So move this to common place to avoid duplication.
Signed-off-by: Vignesh Raghavendra vigneshr@ti.com Signed-off-by: Manorit Chawdhry m-chawdhry@ti.com --- board/ti/am62x/am62x.env | 14 -------------- board/ti/am64x/am64x.env | 14 -------------- board/ti/am65x/am65x.env | 14 -------------- board/ti/j721e/j721e.env | 15 --------------- board/ti/j721s2/j721s2.env | 17 ----------------- include/environment/ti/mmc.env | 14 ++++++++++++++ 6 files changed, 14 insertions(+), 74 deletions(-)
diff --git a/board/ti/am62x/am62x.env b/board/ti/am62x/am62x.env index 0901a8536da5..bb37d21de61b 100644 --- a/board/ti/am62x/am62x.env +++ b/board/ti/am62x/am62x.env @@ -16,20 +16,6 @@ mmcdev=1 bootpart=1:2 bootdir=/boot rd_spec=- -init_mmc=run args_all args_mmc -get_overlay_mmc= - fdt address ${fdtaddr}; - fdt resize 0x100000; - for overlay in $name_overlays; - do; - load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && - fdt apply ${dtboaddr}; - done; -get_kern_mmc=load mmc ${bootpart} ${loadaddr} - ${bootdir}/${name_kern} -get_fit_mmc=load mmc ${bootpart} ${addr_fit} - ${bootdir}/${name_fit} -partitions=name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
splashfile=ti.gz splashimage=0x80200000 diff --git a/board/ti/am64x/am64x.env b/board/ti/am64x/am64x.env index 015f63a66c71..ecb07366fc8a 100644 --- a/board/ti/am64x/am64x.env +++ b/board/ti/am64x/am64x.env @@ -20,20 +20,6 @@ mmcdev=1 bootpart=1:2 bootdir=/boot rd_spec=- -init_mmc=run args_all args_mmc -get_overlay_mmc= - fdt address ${fdtaddr}; - fdt resize 0x100000; - for overlay in $name_overlays; - do; - load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && - fdt apply ${dtboaddr}; - done; -get_kern_mmc=load mmc ${bootpart} ${loadaddr} - ${bootdir}/${name_kern} -get_fit_mmc=load mmc ${bootpart} ${addr_fit} - ${bootdir}/${name_fit} -partitions=name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
args_usb=run finduuid;setenv bootargs console=${console} ${optargs} diff --git a/board/ti/am65x/am65x.env b/board/ti/am65x/am65x.env index d7130cc3f7df..036f4752835a 100644 --- a/board/ti/am65x/am65x.env +++ b/board/ti/am65x/am65x.env @@ -19,20 +19,6 @@ mmcdev=1 bootpart=1:2 bootdir=/boot rd_spec=- -init_mmc=run args_all args_mmc -get_overlay_mmc= - fdt address ${fdtaddr}; - fdt resize 0x100000; - for overlay in $name_overlays; - do; - load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && - fdt apply ${dtboaddr}; - done; -get_kern_mmc=load mmc ${bootpart} ${loadaddr} - ${bootdir}/${name_kern} -get_fit_mmc=load mmc ${bootpart} ${addr_fit} - ${bootdir}/${name_fit} -partitions=name=root,start=0,size=-,uuid=${uuid_gpt_rootfs}
init_ubi= run args_all args_ubi; diff --git a/board/ti/j721e/j721e.env b/board/ti/j721e/j721e.env index 23ce7e1af746..f7a4880bf835 100644 --- a/board/ti/j721e/j721e.env +++ b/board/ti/j721e/j721e.env @@ -36,21 +36,6 @@ mmcdev=1 bootpart=1:2 bootdir=/boot rd_spec=- -init_mmc=run args_all args_mmc -get_overlay_mmc= - fdt address ${fdtaddr}; - fdt resize 0x100000; - for overlay in $name_overlays; - do; - load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && - fdt apply ${dtboaddr}; - done; -partitions=uuid_disk=${uuid_gpt_disk}; - name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs} -get_kern_mmc=load mmc ${bootpart} ${loadaddr} - ${bootdir}/${name_kern} -get_fit_mmc=load mmc ${bootpart} ${addr_fit} - ${bootdir}/${name_fit}
#if CONFIG_TARGET_J7200_A72_EVM do_main_cpsw0_qsgmii_phyinit=1 diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env index 9464fe499037..2ec652dbdd3e 100644 --- a/board/ti/j721s2/j721s2.env +++ b/board/ti/j721s2/j721s2.env @@ -30,23 +30,6 @@ addr_mcur5f0_0load=0x89000000 name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw #endif rd_spec=- -init_mmc=run args_all args_mmc -get_overlay_mmc= - fdt address ${fdtaddr}; - fdt resize 0x100000; - for overlay in $name_overlays; - do; - load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && - fdt apply ${dtboaddr}; - done; -partitions=uuid_disk=${uuid_gpt_disk}; - name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs} -get_kern_mmc=load mmc ${bootpart} ${loadaddr} - ${bootdir}/${name_kern} -get_fit_mmc=load mmc ${bootpart} ${addr_fit} - ${bootdir}/${name_fit} -partitions=uuid_disk=${uuid_gpt_disk}; - name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
rproc_fw_binaries= 2 /lib/firmware/j721s2-main-r5f0_0-fw 3 /lib/firmware/j721s2-main-r5f0_1-fw 4 /lib/firmware/j721s2-main-r5f1_0-fw 5 /lib/firmware/j721s2-main-r5f1_1-fw 6 /lib/firmware/j721s2-c71_0-fw 7 /lib/firmware/j721s2-c71_1-fw
diff --git a/include/environment/ti/mmc.env b/include/environment/ti/mmc.env index a052d288535e..c0c8854bbd00 100644 --- a/include/environment/ti/mmc.env +++ b/include/environment/ti/mmc.env @@ -60,3 +60,17 @@ mmcboot=mmc dev ${mmcdev}; fi; fi;
+init_mmc=run args_all args_mmc +get_overlay_mmc= + fdt address ${fdtaddr}; + fdt resize 0x100000; + for overlay in $name_overlays; + do; + load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && + fdt apply ${dtboaddr}; + done; +get_kern_mmc=load mmc ${bootpart} ${loadaddr} + ${bootdir}/${name_kern} +get_fit_mmc=load mmc ${bootpart} ${addr_fit} + ${bootdir}/${name_fit} +partitions=name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}