From: Andrew F. Davis Date: Fri, 10 Jan 2020 19:35:18 +0000 (-0500) Subject: configs: j721e_evm.h: Sync J721e environment configuration with AM65x X-Git-Tag: v2020.04-rc1~13^2~19 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fb03b77a469167d1287187a23bcb7f08dab2e624;p=oweals%2Fu-boot.git configs: j721e_evm.h: Sync J721e environment configuration with AM65x Some of the environment configuration in AM65x is not available in J721e due to additions on one but not the other. These two platforms are similar enough these common definitions should be factored out to a common area, prepare for this by synchronizing them. Signed-off-by: Andrew F. Davis Reviewed-by: Lokesh Vutla Signed-off-by: Lokesh Vutla --- diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 48d81dfd61..eaed520e6b 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -62,7 +62,9 @@ /* U-Boot general configuration */ #define EXTRA_ENV_J721E_BOARD_SETTINGS \ "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "findfdt=setenv fdtfile ${default_device_tree}\0" \ + "findfdt=" \ + "setenv name_fdt ${default_device_tree};" \ + "setenv fdtfile ${name_fdt}\0" \ "loadaddr=0x80080000\0" \ "fdtaddr=0x82000000\0" \ "overlayaddr=0x83000000\0" \ @@ -84,7 +86,7 @@ "bootdir=/boot\0" \ "rd_spec=-\0" \ "init_mmc=run args_all args_mmc\0" \ - "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \ "get_overlay_mmc=" \ "fdt address ${fdtaddr};" \ "fdt resize 0x100000;" \ @@ -95,7 +97,10 @@ "done;\0" \ "partitions=" PARTS_DEFAULT \ "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \ - "${bootdir}/${name_kern}\0" + "${bootdir}/${name_kern}\0" \ + "get_fit_mmc=load mmc ${bootpart} ${addr_fit} " \ + "${bootdir}/${name_fit}\0" \ + "partitions=" PARTS_DEFAULT #ifdef DEFAULT_RPROCS #undef DEFAULT_RPROCS @@ -118,6 +123,7 @@ /* Incorporate settings into the U-Boot environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_MMC_TI_ARGS \ + DEFAULT_FIT_TI_ARGS \ EXTRA_ENV_J721E_BOARD_SETTINGS \ EXTRA_ENV_J721E_BOARD_SETTINGS_MMC \ EXTRA_ENV_RPROC_SETTINGS \