diff options
author | Ye Li <ye.li@nxp.com> | 2016-02-24 22:01:07 +0800 |
---|---|---|
committer | Ye Li <ye.li@nxp.com> | 2016-03-25 14:22:58 +0800 |
commit | 41a6f612f6ae638ac6db61c60e19dcfebf052820 (patch) | |
tree | 2d0feed6366d879c24b5d0d591458f83007c0d73 /include | |
parent | a352ed3c5184b95c4c9f7468f5fbb5f43de5e412 (diff) | |
download | u-boot-imx-41a6f612f6ae638ac6db61c60e19dcfebf052820.zip u-boot-imx-41a6f612f6ae638ac6db61c60e19dcfebf052820.tar.gz u-boot-imx-41a6f612f6ae638ac6db61c60e19dcfebf052820.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>
Diffstat (limited to 'include')
-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 179b4f9..e4c4574 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 @@ -47,7 +48,7 @@ /* Boot options */ #if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || defined(CONFIG_MX6UL)) -#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 719ec87..82fe36b 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -83,7 +83,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 43e43e7..f0d7197 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -52,7 +52,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 04247aa..cf99687 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -74,7 +74,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" \ |