diff options
| author | Ye.Li <B37916@freescale.com> | 2015-05-22 14:16:35 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2015-05-25 17:20:55 +0800 |
| commit | 96cf32fb7b5903058125e4443dd87be9283110db (patch) | |
| tree | 6e26549a791aa62c7d8977a54ac3d6b6eca30c24 /include | |
| parent | f3f49d71c825067c803e5f7fd9e50e52ee89c428 (diff) | |
| download | u-boot-imx-96cf32fb7b5903058125e4443dd87be9283110db.zip u-boot-imx-96cf32fb7b5903058125e4443dd87be9283110db.tar.gz u-boot-imx-96cf32fb7b5903058125e4443dd87be9283110db.tar.bz2 | |
MLK-10956 imx: mx6ul: Change BSP name and dtb name for 14x14 package
Since there is another 9x9 package for mx6ul, modify the BSP names
of ddr3 arm2 board and evk board to add 14x14 package info.
Also modify the loaded dtb file to align with kernel.
After the change, the build target for mx6ul ddr3 arm2 board is:
mx6ul_14x14_ddr3_arm2_config
and the build target for mx6ul evk board is:
mx6ul_14x14_evk_config
Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6ul_14x14_ddr3_arm2.h (renamed from include/configs/mx6ul_ddr3_arm2.h) | 8 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h (renamed from include/configs/mx6ulevk.h) | 10 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk_android.h (renamed from include/configs/mx6ulevkandroid.h) | 0 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/configs/mx6ul_ddr3_arm2.h b/include/configs/mx6ul_14x14_ddr3_arm2.h index 318c3c8..0148f6c 100644 --- a/include/configs/mx6ul_ddr3_arm2.h +++ b/include/configs/mx6ul_14x14_ddr3_arm2.h @@ -1,12 +1,12 @@ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * - * Configuration settings for the Freescale i.MX7. + * Configuration settings for the Freescale i.MX6UL 14x14 DDR3 ARM2. * * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __MX6UL_DDR3_ARM2_CONFIG_H -#define __MX6UL_DDR3_ARM2_CONFIG_H +#ifndef __MX6UL_14X14_DDR3_ARM2_CONFIG_H +#define __MX6UL_14X14_DDR3_ARM2_CONFIG_H #include <asm/arch/imx-regs.h> @@ -165,7 +165,7 @@ "console=ttymxc0\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=imx6ul-ddr3-arm2.dtb\0" \ + "fdt_file=imx6ul-14x14-ddr3-arm2.dtb\0" \ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ diff --git a/include/configs/mx6ulevk.h b/include/configs/mx6ul_14x14_evk.h index 4dce52c..dde1463 100644 --- a/include/configs/mx6ulevk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -1,12 +1,12 @@ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * - * Configuration settings for the Freescale i.MX6UL EVK board. + * Configuration settings for the Freescale i.MX6UL 14x14 EVK board. * * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __MX6UL_EVK_CONFIG_H -#define __MX6UL_EVK_CONFIG_H +#ifndef __MX6UL_14X14_EVK_CONFIG_H +#define __MX6UL_14X14_EVK_CONFIG_H #include <asm/arch/imx-regs.h> @@ -182,7 +182,7 @@ "console=ttymxc0\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=imx6ul-evk.dtb\0" \ + "fdt_file=imx6ul-14x14-evk.dtb\0" \ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ @@ -393,7 +393,7 @@ #endif #if defined(CONFIG_ANDROID_SUPPORT) -#include "mx6ulevkandroid.h" +#include "mx6ul_14x14_evk_android.h" #endif #endif diff --git a/include/configs/mx6ulevkandroid.h b/include/configs/mx6ul_14x14_evk_android.h index f44145a..f44145a 100644 --- a/include/configs/mx6ulevkandroid.h +++ b/include/configs/mx6ul_14x14_evk_android.h |