[U-Boot] [PATCH v2 2/6] i.MX6: Change SYS_SOC from mx6 to imx6

Jagan Teki jagan at amarulasolutions.com
Sun Mar 25 18:22:41 UTC 2018 

Now, MX6 has proper CONFIG names so rename the SYS_SOC to
imx6 from mx6 and also change related files.

Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>
---
 .travis.yml                                                |  4 ++--
 arch/arm/Kconfig                                           |  2 +-
 arch/arm/Makefile                                          |  4 ++--
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/clock.h       |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/crm_regs.h    |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/gpio.h        |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-rdc.h     |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-regs.h    |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/iomux.h       |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/litesom.h     |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-ddr.h     |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-pins.h    |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6_plugin.S  |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl-ddr.h   |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl_pins.h  |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q-ddr.h    |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q_pins.h   |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl-ddr.h   |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl_pins.h  |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sll_pins.h |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx-ddr.h   |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_pins.h  |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_rdc.h   |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul-ddr.h   |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul_pins.h  |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ull_pins.h |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mxc_hdmi.h    |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/opos6ul.h     |  0
 arch/arm/include/asm/{arch-mx6 => arch-imx6}/sys_proto.h   |  0
 arch/arm/mach-imx/Makefile                                 | 10 +++++-----
 arch/arm/mach-imx/{mx6 => imx6}/Kconfig                    |  2 +-
 arch/arm/mach-imx/{mx6 => imx6}/Makefile                   |  0
 arch/arm/mach-imx/{mx6 => imx6}/clock.c                    |  0
 arch/arm/mach-imx/{mx6 => imx6}/ddr.c                      |  0
 arch/arm/mach-imx/{mx6 => imx6}/litesom.c                  |  0
 arch/arm/mach-imx/{mx6 => imx6}/mp.c                       |  0
 arch/arm/mach-imx/{mx6 => imx6}/opos6ul.c                  |  0
 arch/arm/mach-imx/{mx6 => imx6}/soc.c                      |  0
 board/advantech/dms-ba16/Kconfig                           |  2 +-
 board/ge/bx50v3/Kconfig                                    |  2 +-
 board/liebherr/display5/Kconfig                            |  2 +-
 board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg               |  6 +++---
 board/technexion/pico-imx6ul/Kconfig                       |  2 +-
 board/toradex/apalis_imx6/Kconfig                          |  2 +-
 board/toradex/colibri_imx6/Kconfig                         |  2 +-
 drivers/watchdog/Makefile                                  |  2 +-
 46 files changed, 21 insertions(+), 21 deletions(-)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/clock.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/crm_regs.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/gpio.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-rdc.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-regs.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/iomux.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/litesom.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-ddr.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-pins.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6_plugin.S (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl-ddr.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl_pins.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q-ddr.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q_pins.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl-ddr.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl_pins.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sll_pins.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx-ddr.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_pins.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_rdc.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul-ddr.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul_pins.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ull_pins.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mxc_hdmi.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/opos6ul.h (100%)
 rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/sys_proto.h (100%)
 rename arch/arm/mach-imx/{mx6 => imx6}/Kconfig (99%)
 rename arch/arm/mach-imx/{mx6 => imx6}/Makefile (100%)
 rename arch/arm/mach-imx/{mx6 => imx6}/clock.c (100%)
 rename arch/arm/mach-imx/{mx6 => imx6}/ddr.c (100%)
 rename arch/arm/mach-imx/{mx6 => imx6}/litesom.c (100%)
 rename arch/arm/mach-imx/{mx6 => imx6}/mp.c (100%)
 rename arch/arm/mach-imx/{mx6 => imx6}/opos6ul.c (100%)
 rename arch/arm/mach-imx/{mx6 => imx6}/soc.c (100%)

diff --git a/.travis.yml b/.travis.yml
index 6cad65fd37..ecc29f4c95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -177,10 +177,10 @@ matrix:
           BUILDMAN="freescale&aarch64"
     - env:
         - JOB="i.MX6 (non-Freescale)"
-          BUILDMAN="mx6 -x freescale,toradex,boundary,engicam"
+          BUILDMAN="imx6 -x freescale,toradex,boundary,engicam"
     - env:
         - JOB="i.MX (non-Freescale, non-i.MX6)"
-          BUILDMAN="mx -x freescale,mx6,toradex"
+          BUILDMAN="mx -x freescale,imx6,toradex"
     - env:
         - BUILDMAN="k2"
     - env:
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ad7f0c1f7d..7e385c2f91 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1249,7 +1249,7 @@ source "arch/arm/mach-imx/mx2/Kconfig"
 
 source "arch/arm/mach-imx/mx5/Kconfig"
 
-source "arch/arm/mach-imx/mx6/Kconfig"
+source "arch/arm/mach-imx/imx6/Kconfig"
 
 source "arch/arm/mach-imx/mx7/Kconfig"
 
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 4fa8b38397..2bd9440aea 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -96,11 +96,11 @@ libs-y += arch/arm/cpu/
 libs-y += arch/arm/lib/
 
 ifeq ($(CONFIG_SPL_BUILD),y)
-ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35 mx8m))
+ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 imx6 mx7 mx35 mx8m))
 libs-y += arch/arm/mach-imx/
 endif
 else
-ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs mx8m vf610))
+ifneq (,$(filter $(SOC), mx25 mx27 mx5 imx6 mx7 mx7ulp mx31 mx35 mxs mx8m vf610))
 libs-y += arch/arm/mach-imx/
 endif
 endif
diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-imx6/clock.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/clock.h
rename to arch/arm/include/asm/arch-imx6/clock.h
diff --git a/arch/arm/include/asm/arch-mx6/crm_regs.h b/arch/arm/include/asm/arch-imx6/crm_regs.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/crm_regs.h
rename to arch/arm/include/asm/arch-imx6/crm_regs.h
diff --git a/arch/arm/include/asm/arch-mx6/gpio.h b/arch/arm/include/asm/arch-imx6/gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/gpio.h
rename to arch/arm/include/asm/arch-imx6/gpio.h
diff --git a/arch/arm/include/asm/arch-mx6/imx-rdc.h b/arch/arm/include/asm/arch-imx6/imx-rdc.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/imx-rdc.h
rename to arch/arm/include/asm/arch-imx6/imx-rdc.h
diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-imx6/imx-regs.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/imx-regs.h
rename to arch/arm/include/asm/arch-imx6/imx-regs.h
diff --git a/arch/arm/include/asm/arch-mx6/iomux.h b/arch/arm/include/asm/arch-imx6/iomux.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/iomux.h
rename to arch/arm/include/asm/arch-imx6/iomux.h
diff --git a/arch/arm/include/asm/arch-mx6/litesom.h b/arch/arm/include/asm/arch-imx6/litesom.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/litesom.h
rename to arch/arm/include/asm/arch-imx6/litesom.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-imx6/mx6-ddr.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6-ddr.h
rename to arch/arm/include/asm/arch-imx6/mx6-ddr.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6-pins.h b/arch/arm/include/asm/arch-imx6/mx6-pins.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6-pins.h
rename to arch/arm/include/asm/arch-imx6/mx6-pins.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6_plugin.S b/arch/arm/include/asm/arch-imx6/mx6_plugin.S
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6_plugin.S
rename to arch/arm/include/asm/arch-imx6/mx6_plugin.S
diff --git a/arch/arm/include/asm/arch-mx6/mx6dl-ddr.h b/arch/arm/include/asm/arch-imx6/mx6dl-ddr.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6dl-ddr.h
rename to arch/arm/include/asm/arch-imx6/mx6dl-ddr.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6dl_pins.h b/arch/arm/include/asm/arch-imx6/mx6dl_pins.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6dl_pins.h
rename to arch/arm/include/asm/arch-imx6/mx6dl_pins.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6q-ddr.h b/arch/arm/include/asm/arch-imx6/mx6q-ddr.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6q-ddr.h
rename to arch/arm/include/asm/arch-imx6/mx6q-ddr.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6q_pins.h b/arch/arm/include/asm/arch-imx6/mx6q_pins.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6q_pins.h
rename to arch/arm/include/asm/arch-imx6/mx6q_pins.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6sl-ddr.h b/arch/arm/include/asm/arch-imx6/mx6sl-ddr.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6sl-ddr.h
rename to arch/arm/include/asm/arch-imx6/mx6sl-ddr.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6sl_pins.h b/arch/arm/include/asm/arch-imx6/mx6sl_pins.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6sl_pins.h
rename to arch/arm/include/asm/arch-imx6/mx6sl_pins.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6sll_pins.h b/arch/arm/include/asm/arch-imx6/mx6sll_pins.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6sll_pins.h
rename to arch/arm/include/asm/arch-imx6/mx6sll_pins.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6sx-ddr.h b/arch/arm/include/asm/arch-imx6/mx6sx-ddr.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6sx-ddr.h
rename to arch/arm/include/asm/arch-imx6/mx6sx-ddr.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6sx_pins.h b/arch/arm/include/asm/arch-imx6/mx6sx_pins.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6sx_pins.h
rename to arch/arm/include/asm/arch-imx6/mx6sx_pins.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6sx_rdc.h b/arch/arm/include/asm/arch-imx6/mx6sx_rdc.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6sx_rdc.h
rename to arch/arm/include/asm/arch-imx6/mx6sx_rdc.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6ul-ddr.h b/arch/arm/include/asm/arch-imx6/mx6ul-ddr.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6ul-ddr.h
rename to arch/arm/include/asm/arch-imx6/mx6ul-ddr.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6ul_pins.h b/arch/arm/include/asm/arch-imx6/mx6ul_pins.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6ul_pins.h
rename to arch/arm/include/asm/arch-imx6/mx6ul_pins.h
diff --git a/arch/arm/include/asm/arch-mx6/mx6ull_pins.h b/arch/arm/include/asm/arch-imx6/mx6ull_pins.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mx6ull_pins.h
rename to arch/arm/include/asm/arch-imx6/mx6ull_pins.h
diff --git a/arch/arm/include/asm/arch-mx6/mxc_hdmi.h b/arch/arm/include/asm/arch-imx6/mxc_hdmi.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/mxc_hdmi.h
rename to arch/arm/include/asm/arch-imx6/mxc_hdmi.h
diff --git a/arch/arm/include/asm/arch-mx6/opos6ul.h b/arch/arm/include/asm/arch-imx6/opos6ul.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/opos6ul.h
rename to arch/arm/include/asm/arch-imx6/opos6ul.h
diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-imx6/sys_proto.h
similarity index 100%
rename from arch/arm/include/asm/arch-mx6/sys_proto.h
rename to arch/arm/include/asm/arch-imx6/sys_proto.h
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 494534fa25..c037e5423b 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -7,7 +7,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6 mx7 mx8m vf610))
+ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 imx6 mx7 mx8m vf610))
 obj-y	= iomux-v3.o
 endif
 
@@ -19,12 +19,12 @@ obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
 obj-y += cpu.o
 endif
 
-ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
+ifeq ($(SOC),$(filter $(SOC),mx5 imx6))
 obj-y	+= cpu.o speed.o
 obj-$(CONFIG_GPT_TIMER) += timer.o
 obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
 endif
-ifeq ($(SOC),$(filter $(SOC),mx7 mx6 mxs mx8m))
+ifeq ($(SOC),$(filter $(SOC),mx7 imx6 mxs mx8m))
 obj-y	+= misc.o
 obj-$(CONFIG_SPL_BUILD)	+= spl.o
 endif
@@ -33,7 +33,7 @@ obj-y 	+= cpu.o
 obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += mmc_env.o
 endif
-ifeq ($(SOC),$(filter $(SOC),mx6 mx7))
+ifeq ($(SOC),$(filter $(SOC),imx6 mx7))
 obj-y 	+= cache.o init.o
 obj-$(CONFIG_FEC_MXC) += mac.o
 obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o
@@ -138,7 +138,7 @@ targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-sp
 obj-$(CONFIG_ARM64) += sip.o
 
 obj-$(CONFIG_MX5) += mx5/
-obj-$(CONFIG_SOC_IMX6) += mx6/
+obj-$(CONFIG_SOC_IMX6) += imx6/
 obj-$(CONFIG_MX7) += mx7/
 obj-$(CONFIG_ARCH_MX7ULP) += mx7ulp/
 obj-$(CONFIG_MX8M) += mx8m/
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/imx6/Kconfig
similarity index 99%
rename from arch/arm/mach-imx/mx6/Kconfig
rename to arch/arm/mach-imx/imx6/Kconfig
index f78ac2eaec..1b80d8c519 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/imx6/Kconfig
@@ -448,7 +448,7 @@ config TARGET_ZC5601
 endchoice
 
 config SYS_SOC
-	default "mx6"
+	default "imx6"
 
 source "board/ge/bx50v3/Kconfig"
 source "board/advantech/dms-ba16/Kconfig"
diff --git a/arch/arm/mach-imx/mx6/Makefile b/arch/arm/mach-imx/imx6/Makefile
similarity index 100%
rename from arch/arm/mach-imx/mx6/Makefile
rename to arch/arm/mach-imx/imx6/Makefile
diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/imx6/clock.c
similarity index 100%
rename from arch/arm/mach-imx/mx6/clock.c
rename to arch/arm/mach-imx/imx6/clock.c
diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/imx6/ddr.c
similarity index 100%
rename from arch/arm/mach-imx/mx6/ddr.c
rename to arch/arm/mach-imx/imx6/ddr.c
diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/imx6/litesom.c
similarity index 100%
rename from arch/arm/mach-imx/mx6/litesom.c
rename to arch/arm/mach-imx/imx6/litesom.c
diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/imx6/mp.c
similarity index 100%
rename from arch/arm/mach-imx/mx6/mp.c
rename to arch/arm/mach-imx/imx6/mp.c
diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/imx6/opos6ul.c
similarity index 100%
rename from arch/arm/mach-imx/mx6/opos6ul.c
rename to arch/arm/mach-imx/imx6/opos6ul.c
diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/imx6/soc.c
similarity index 100%
rename from arch/arm/mach-imx/mx6/soc.c
rename to arch/arm/mach-imx/imx6/soc.c
diff --git a/board/advantech/dms-ba16/Kconfig b/board/advantech/dms-ba16/Kconfig
index 040eb866b5..fac1ea5227 100644
--- a/board/advantech/dms-ba16/Kconfig
+++ b/board/advantech/dms-ba16/Kconfig
@@ -23,7 +23,7 @@ config SYS_VENDOR
 	default "advantech"
 
 config SYS_SOC
-	default "mx6"
+	default "imx6"
 
 config SYS_CONFIG_NAME
 	default "advantech_dms-ba16"
diff --git a/board/ge/bx50v3/Kconfig b/board/ge/bx50v3/Kconfig
index d50dece18e..fa77460e6f 100644
--- a/board/ge/bx50v3/Kconfig
+++ b/board/ge/bx50v3/Kconfig
@@ -10,7 +10,7 @@ config SYS_VENDOR
 	default "ge"
 
 config SYS_SOC
-	default "mx6"
+	default "imx6"
 
 config SYS_CONFIG_NAME
 	default "ge_bx50v3"
diff --git a/board/liebherr/display5/Kconfig b/board/liebherr/display5/Kconfig
index b096c8917a..21e7f87b2a 100644
--- a/board/liebherr/display5/Kconfig
+++ b/board/liebherr/display5/Kconfig
@@ -10,7 +10,7 @@ config SYS_VENDOR
 	default "liebherr"
 
 config SYS_SOC
-	default "mx6"
+	default "imx6"
 
 config SYS_CONFIG_NAME
 	default "display5"
diff --git a/board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg b/board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg
index a75746161e..bfa86492c8 100644
--- a/board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg
+++ b/board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg
@@ -31,9 +31,9 @@ BOOT_OFFSET FLASH_OFFSET_STANDARD
 
 #define __ASSEMBLY__
 #include <config.h>
-#include "asm/arch-mx6/mx6-ddr.h"
-#include "asm/arch-mx6/iomux.h"
-#include "asm/arch-mx6/crm_regs.h"
+#include "asm/arch-imx6/mx6-ddr.h"
+#include "asm/arch-imx6/iomux.h"
+#include "asm/arch-imx6/crm_regs.h"
 
 DATA 4, MX6_IOM_GRP_DDR_TYPE, 0x000C0000
 DATA 4, MX6_IOM_GRP_DDRPKE, 0x00000000
diff --git a/board/technexion/pico-imx6ul/Kconfig b/board/technexion/pico-imx6ul/Kconfig
index 81acd611f4..9c108c5c56 100644
--- a/board/technexion/pico-imx6ul/Kconfig
+++ b/board/technexion/pico-imx6ul/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
 	default "technexion"
 
 config SYS_SOC
-	default "mx6"
+	default "imx6"
 
 config SYS_CONFIG_NAME
 	default "pico-imx6ul"
diff --git a/board/toradex/apalis_imx6/Kconfig b/board/toradex/apalis_imx6/Kconfig
index 14f8c10c64..44df95ccd1 100644
--- a/board/toradex/apalis_imx6/Kconfig
+++ b/board/toradex/apalis_imx6/Kconfig
@@ -10,7 +10,7 @@ config SYS_CPU
 	default "armv7"
 
 config SYS_SOC
-	default "mx6"
+	default "imx6"
 
 config SYS_VENDOR
 	default "toradex"
diff --git a/board/toradex/colibri_imx6/Kconfig b/board/toradex/colibri_imx6/Kconfig
index d2ad1ce2a0..1a3cfa0a1c 100644
--- a/board/toradex/colibri_imx6/Kconfig
+++ b/board/toradex/colibri_imx6/Kconfig
@@ -10,7 +10,7 @@ config SYS_CPU
 	default "armv7"
 
 config SYS_SOC
-	default "mx6"
+	default "imx6"
 
 config SYS_VENDOR
 	default "toradex"
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index ab6a6b79e1..afec238fff 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -7,7 +7,7 @@
 
 obj-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o
 obj-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o
-ifneq (,$(filter $(SOC), mx31 mx35 mx5 mx6 mx7 vf610))
+ifneq (,$(filter $(SOC), mx31 mx35 mx5 imx6 mx7 vf610))
 obj-y += imx_watchdog.o
 endif
 obj-$(CONFIG_S5P)               += s5p_wdt.o
-- 
2.14.3

More information about the U-Boot mailing list