diff options
author | Tom Rini <trini@konsulko.com> | 2022-04-22 15:12:20 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-04-22 15:12:20 +0300 |
commit | 6e2af641e4bfed24d3edd8519dd40ec397361b4e (patch) | |
tree | d387bc01229acd9db9d344f9c8240ce3b852f6fc /include/configs/apalis-imx8.h | |
parent | ea5583b90f9c162af6f2025718dc50ffbb6e4552 (diff) | |
parent | d173b107be94eb474e1ae75a8addbf5f2fecfd56 (diff) | |
download | u-boot-6e2af641e4bfed24d3edd8519dd40ec397361b4e.tar.xz |
Merge tag 'u-boot-imx-20220422' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20220422
-------------------
- Switch to DM_SERIAL
- Drop MMCROOT
- several cleanup
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/11815
Diffstat (limited to 'include/configs/apalis-imx8.h')
-rw-r--r-- | include/configs/apalis-imx8.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index e759f18fe4..c8422264b7 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -38,6 +38,7 @@ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "boot_file=Image\0" \ + "boot_script_dhcp=boot.scr\0" \ "console=ttyLP1 earlycon\0" \ "fdt_addr=0x83000000\0" \ "fdt_file=fsl-imx8qm-apalis-eval.dtb\0" \ @@ -49,11 +50,6 @@ "root=PARTUUID=${uuid} rootwait " \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ - "netargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \ - "\0" \ - "nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; tftp ${fdt_addr} " \ - "apalis-imx8/${fdt_file}; booti ${loadaddr} - ${fdt_addr}\0" \ "panel=NULL\0" \ "script=boot.scr\0" \ "update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \ |