diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-12 07:26:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-12 07:26:57 -0400 |
| commit | 47e9c70421d75336336097c1425028b40e4f0b54 (patch) | |
| tree | b8ee7f6b2c0e6bfe39511f64dec25fad3b28de0b /include/configs/j721e_evm.h | |
| parent | 726561a9412abe50875b7791feab94f411d76199 (diff) | |
| parent | 555ee3949307648d6c40081b30e212af075ab8a8 (diff) | |
| download | u-boot-47e9c70421d75336336097c1425028b40e4f0b54.tar.gz | |
Merge tag 'ti-v2021.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- Minor cleanup on K3 env variables
- Fix OSPI compatible for J721e
- Drop unused property in omap-usb2-phy
- Update Maintainer for am335x-guardian board.
Diffstat (limited to 'include/configs/j721e_evm.h')
| -rw-r--r-- | include/configs/j721e_evm.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 1b47e18b2f..b707fc4e89 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -69,9 +69,6 @@ "findfdt=" \ "setenv name_fdt ${default_device_tree};" \ "setenv fdtfile ${name_fdt}\0" \ - "loadaddr=0x80080000\0" \ - "fdtaddr=0x82000000\0" \ - "overlayaddr=0x83000000\0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ "args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \ @@ -114,8 +111,8 @@ "fdt resize 0x100000;" \ "for overlay in $name_overlays;" \ "do;" \ - "load mmc ${bootpart} ${overlayaddr} ${bootdir}/${overlay} && " \ - "fdt apply ${overlayaddr};" \ + "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \ + "fdt apply ${dtboaddr};" \ "done;\0" \ "partitions=" PARTS_DEFAULT \ "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \ @@ -165,6 +162,7 @@ /* Incorporate settings into the U-Boot environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ EXTRA_ENV_J721E_BOARD_SETTINGS \ |