diff options
| author | Ye Li <ye.li@nxp.com> | 2018-09-05 03:06:21 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-09-05 18:52:46 -0700 |
| commit | 7c10aa87f9cc3990577e2fb5ef36e1526761683f (patch) | |
| tree | a607a3f1245312de20ae3fb8c3038ad421ca16b4 /include | |
| parent | e701efe4f0c8730f964b6ff62673b3860c6a7a7d (diff) | |
MLK-19458 imx8/imx8m: Fix initrd_high env to disable relocation initramfs
When running on ARM64 platforms like imx8 and imx8m, the initrd_high should set to
0xffffffffffffffff not 0xffffffff. Otherwise the initramfs will be relocated to high
memory by u-boot before booting up kernel.
This may not cause issue, but to align with previous imx series and save boot time,
we'd better disable relocation for initramfs.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 33d88b0f2e31d965fd455bff9da7391d6a7b3594)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/imx8mm_evk.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8mm_val.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8mq_arm2.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8mq_evk.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8mq_phanbell.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8qm_arm2.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8qm_mek.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8qxp_arm2.h | 2 | ||||
| -rw-r--r-- | include/configs/imx8qxp_mek.h | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 1c3d3220212..38787551f03 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -113,7 +113,7 @@ #define CONFIG_MFG_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ "emmc_dev=1\0"\ "sd_dev=0\0" \ diff --git a/include/configs/imx8mm_val.h b/include/configs/imx8mm_val.h index c7276121115..5ec3f84ba01 100644 --- a/include/configs/imx8mm_val.h +++ b/include/configs/imx8mm_val.h @@ -104,7 +104,7 @@ "clk_ignore_unused "\ "\0" \ "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/imx8mq_arm2.h b/include/configs/imx8mq_arm2.h index 2b2f02c6015..2c224f679d9 100644 --- a/include/configs/imx8mq_arm2.h +++ b/include/configs/imx8mq_arm2.h @@ -132,7 +132,7 @@ "clk_ignore_unused "\ "\0" \ "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ /* Initial environment variables */ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 558480716c3..aa2669466d0 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -113,7 +113,7 @@ #define CONFIG_MFG_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ "emmc_dev=0\0"\ "sd_dev=1\0" \ diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index abd3ccbc3e1..521e018e3f6 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -102,7 +102,7 @@ #define CONFIG_MFG_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ "emmc_dev=0\0"\ "sd_dev=1\0" \ diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h index a62f3b79e63..9b0222f919c 100644 --- a/include/configs/imx8qm_arm2.h +++ b/include/configs/imx8qm_arm2.h @@ -171,7 +171,7 @@ "clk_ignore_unused "\ "\0" \ "initrd_addr=0x83800000\0" \ - "initrd_high=0xffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ #define XEN_BOOT_ENV \ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 05febe50e44..89201a58cfa 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -158,7 +158,7 @@ #define CONFIG_MFG_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x83100000\0" \ - "initrd_high=0xffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ "emmc_dev=0\0" \ "sd_dev=1\0" \ diff --git a/include/configs/imx8qxp_arm2.h b/include/configs/imx8qxp_arm2.h index 20ec29aef5a..5fda6e8baf6 100644 --- a/include/configs/imx8qxp_arm2.h +++ b/include/configs/imx8qxp_arm2.h @@ -117,7 +117,7 @@ "clk_ignore_unused "\ "\0" \ "initrd_addr=0x83100000\0" \ - "initrd_high=0xffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ "bootcmd_mfg=run mfgtool_args; if iminfo ${initrd_addr}; then "\ "booti ${loadaddr} ${initrd_addr} ${fdt_addr};"\ "else fastboot 1; fi\0" \ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 83a0a9b2952..181623198be 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -146,7 +146,7 @@ #define CONFIG_MFG_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x83100000\0" \ - "initrd_high=0xffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ "emmc_dev=0\0" \ "sd_dev=1\0" \ |