diff options
| author | Ye Li <ye.li@nxp.com> | 2016-02-24 22:01:07 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:04:36 +0800 |
| commit | 1e71109ab3c0483b739b0c9be85643c2b8462523 (patch) | |
| tree | 516ccb90d380a656763b79166343ea6ec9ce5788 | |
| parent | b18995387375111011612aa1e47d203733d16d14 (diff) | |
| download | u-boot-imx-1e71109ab3c0483b739b0c9be85643c2b8462523.zip u-boot-imx-1e71109ab3c0483b739b0c9be85643c2b8462523.tar.gz u-boot-imx-1e71109ab3c0483b739b0c9be85643c2b8462523.tar.bz2 | |
MLK-12444-2 mx6: Modify kernel and fdt load address to align with mfgtool
Change the CONFIG_LOADADDR to 0x80800000 and environment variable "fdt_addr"
to 0x83000000 for i.MX6SX, i.MX6SL and i.MX6UL to align the address
used in mfgtool.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 41a6f612f6ae638ac6db61c60e19dcfebf052820)
| -rw-r--r-- | include/configs/mx6_common.h | 3 | ||||
| -rw-r--r-- | include/configs/mx6slevk.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sxsabresd.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index c23da27..0c3bc7d 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -1,4 +1,5 @@ /* + * Copyright (C) 2012-2016 Freescale Semiconductor, Inc. * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0 @@ -52,7 +53,7 @@ defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6SOLO) /* Boot options */ #if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || \ defined(CONFIG_MX6UL) || defined(CONFIG_MX6SLL)) -#define CONFIG_LOADADDR 0x82000000 +#define CONFIG_LOADADDR 0x80800000 #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0x87800000 #endif diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index f99ad44..d9ae9a4 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -70,7 +70,7 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=imx6sl-evk.dtb\0" \ - "fdt_addr=0x88000000\0" \ + "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ "mmcdev=1\0" \ diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 27569ab..7f8fb86 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -47,7 +47,7 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=imx6sx-sabreauto.dtb\0" \ - "fdt_addr=0x88000000\0" \ + "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ "panel=Hannstar-XGA\0" \ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index f1b4974..d0d6cbc 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -64,7 +64,7 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=imx6sx-sdb.dtb\0" \ - "fdt_addr=0x88000000\0" \ + "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ "panel=Hannstar-XGA\0" \ |