diff options
author | Tom Rini <trini@konsulko.com> | 2020-08-26 06:12:43 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-08-26 06:12:43 +0300 |
commit | 7a1a01c6029039e4fa6aa185cdbbf9a357eecba7 (patch) | |
tree | f145f655379b2298dc58ef11aa03742c159e7f56 /include | |
parent | 9f9ecd3e4d7839e24c182fb7b24937e19b670f1b (diff) | |
parent | acbc1d86f16cc8372cccb7b862a0b9dc242f8fe5 (diff) | |
download | u-boot-7a1a01c6029039e4fa6aa185cdbbf9a357eecba7.tar.xz |
Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2020.10
-----------
- mx6: SOCs user selectable
Fix for imx6q_logic
Some DM conversion
- mx7: introduce secondary boot device
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/720918010
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/imx6_logic.h | 4 | ||||
-rw-r--r-- | include/configs/imx8mm_evk.h | 3 | ||||
-rw-r--r-- | include/configs/imx8mn_evk.h | 3 | ||||
-rw-r--r-- | include/configs/imx8mp_evk.h | 3 | ||||
-rw-r--r-- | include/configs/imx8mq_evk.h | 4 | ||||
-rw-r--r-- | include/configs/titanium.h | 2 |
6 files changed, 6 insertions, 13 deletions
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 63662dd18d..6b992f9ab8 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -34,8 +34,8 @@ "script=boot.scr\0" \ "image=zImage\0" \ "bootm_size=0x10000000\0" \ - "fdt_addr_r=0x13000000\0" \ - "ramdisk_addr_r=0x14000000\0" \ + "fdt_addr_r=0x14000000\0" \ + "ramdisk_addr_r=0x14080000\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "ramdisk_file=rootfs.cpio.uboot\0" \ "boot_fdt=try\0" \ diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 57971ca714..83521ad401 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -38,11 +38,10 @@ "image=Image\0" \ "console=ttymxc1,115200\0" \ "fdt_addr=0x43000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ "boot_fit=no\0" \ "fdt_file=imx8mm-evk.dtb\0" \ "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffffffffffff\0" \ + "bootm_size=0x10000000\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index d819266f99..a6333085fe 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -42,11 +42,10 @@ "image=Image.itb\0" \ "console=ttymxc1,115200\0" \ "fdt_addr=0x43000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ "boot_fit=try\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffffffffffff\0" \ + "bootm_size=0x10000000\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index ded0717ddb..8253c6aa2f 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -50,11 +50,10 @@ "image=Image\0" \ "console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \ "fdt_addr=0x43000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ "boot_fdt=try\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffffffffffff\0" \ + "bootm_size=0x10000000\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index d98f9263ca..3f9a3bc100 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -83,7 +83,6 @@ "clk_ignore_unused "\ "\0" \ "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffff\0" \ "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -92,11 +91,10 @@ "image=Image\0" \ "console=ttymxc0,115200\0" \ "fdt_addr=0x43000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ "boot_fdt=try\0" \ "fdt_file=imx8mq-evk.dtb\0" \ "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffffffffffff\0" \ + "bootm_size=0x10000000\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 7678f69ded..895c79f1a9 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -14,8 +14,6 @@ #include "mx6_common.h" -#define CONFIG_MX6Q - /* Provide the MACH_TYPE value that the vendor kernel requires. */ #define CONFIG_MACH_TYPE 3769 |