diff options
| author | Pierre Aubert <p.aubert@staubli.com> | 2013-06-04 09:00:15 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-06-26 17:34:11 +0200 |
| commit | c1747970612e36148e7f7a51872c652ed47697f4 (patch) | |
| tree | 3f3cb3cfa926fe6e6666b5b420dd9107012e9165 | |
| parent | 87d720e0c2c9ef0b14a77c38c57d26dcad9c9242 (diff) | |
| download | olio-uboot-2014.01-c1747970612e36148e7f7a51872c652ed47697f4.tar.xz olio-uboot-2014.01-c1747970612e36148e7f7a51872c652ed47697f4.zip | |
imx: Add support for the SabreSD shipped with i.MX6DL
The SabreSD platform is available with i.MX6Q or i.MX6DL. This patch adds the
support of the i.MX6DL. The config file and the board directory are renamed
to remove the reference to the MX6Q.
Signed-off-by: Pierre Aubert <p.aubert@staubli.com>
CC: Stefano Babic <sbabic@denx.de>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/freescale/mx6sabresd/Makefile (renamed from board/freescale/mx6qsabresd/Makefile) | 2 | ||||
| -rw-r--r-- | board/freescale/mx6sabresd/mx6sabresd.c (renamed from board/freescale/mx6qsabresd/mx6qsabresd.c) | 7 | ||||
| -rw-r--r-- | boards.cfg | 5 | ||||
| -rw-r--r-- | include/configs/mx6qsabreauto.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sabre_common.h (renamed from include/configs/mx6qsabre_common.h) | 1 | ||||
| -rw-r--r-- | include/configs/mx6sabresd.h (renamed from include/configs/mx6qsabresd.h) | 2 |
7 files changed, 9 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d3b7e1a54..e753e037e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -662,7 +662,7 @@ Fabio Estevam <fabio.estevam@freescale.com> mx31pdk i.MX31 mx53ard i.MX53 mx53smd i.MX53 - mx6qsabresd i.MX6Q + mx6sabresd i.MX6Q/DL mx6qsabreauto i.MX6Q wandboard i.MX6DL/S mx6slevk i.MX6SL diff --git a/board/freescale/mx6qsabresd/Makefile b/board/freescale/mx6sabresd/Makefile index 569377260..ff3c94b74 100644 --- a/board/freescale/mx6qsabresd/Makefile +++ b/board/freescale/mx6sabresd/Makefile @@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o -COBJS := mx6qsabresd.o +COBJS := mx6sabresd.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 252982614..222ee98c0 100644 --- a/board/freescale/mx6qsabresd/mx6qsabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -17,12 +17,10 @@ * GNU General Public License for more details. */ -#include <common.h> -#include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h> -#include <asm/arch/mx6q_pins.h> +#include <asm/arch/mx6-pins.h> #include <asm/errno.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> @@ -291,7 +289,6 @@ int board_late_init(void) int checkboard(void) { - puts("Board: MX6Q-SabreSD\n"); - + puts("Board: MX6-SabreSD\n"); return 0; } diff --git a/boards.cfg b/boards.cfg index 2635942e1..db56488dd 100644 --- a/boards.cfg +++ b/boards.cfg @@ -258,9 +258,10 @@ ima3-mx53 arm armv7 ima3-mx53 esg vision2 arm armv7 vision2 ttcontrol mx5 vision2:IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg cgtqmx6qeval arm armv7 cgtqmx6eval congatec mx6 cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q mx6qarm2 arm armv7 mx6qarm2 freescale mx6 mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg -mx6qsabreauto arm armv7 mx6qsabreauto freescale mx6 mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg +mx6qsabreauto arm armv7 mx6qsabreauto freescale mx6 mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q mx6qsabrelite arm armv7 mx6qsabrelite freescale mx6 mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg -mx6qsabresd arm armv7 mx6qsabresd freescale mx6 mx6qsabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg +mx6dlsabresd arm armv7 mx6sabresd freescale mx6 mx6sabresd:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL +mx6qsabresd arm armv7 mx6sabresd freescale mx6 mx6sabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q mx6slevk arm armv7 mx6slevk freescale mx6 mx6slevk:IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL titanium arm armv7 titanium freescale mx6 titanium:IMX_CONFIG=board/freescale/titanium/imximage.cfg vf610twr arm armv7 vf610twr freescale vf610 vf610twr:IMX_CONFIG=board/freescale/vf610twr/imximage.cfg diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 76f781206..a396acf2e 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -30,7 +30,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -#include "mx6qsabre_common.h" +#include "mx6sabre_common.h" #define CONFIG_SYS_FSL_USDHC_NUM 2 #if defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6sabre_common.h index bfaa420ed..53cc55929 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -18,7 +18,6 @@ #define __MX6QSABRE_COMMON_CONFIG_H #define CONFIG_MX6 -#define CONFIG_MX6Q #include "mx6_common.h" diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6sabresd.h index 44f07cbe4..76675f413 100644 --- a/include/configs/mx6qsabresd.h +++ b/include/configs/mx6sabresd.h @@ -24,7 +24,7 @@ #define CONFIG_DEFAULT_FDT_FILE "imx6q-sabresd.dtb" #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) -#include "mx6qsabre_common.h" +#include "mx6sabre_common.h" #define CONFIG_SYS_FSL_USDHC_NUM 3 #if defined(CONFIG_ENV_IS_IN_MMC) |