imx: reorganize IMX code as other SOCs

author Stefano Babic <sbabic@denx.de>

Thu, 29 Jun 2017 08:16:06 +0000 (10:16 +0200)

committer Stefano Babic <sbabic@denx.de>

Wed, 12 Jul 2017 08:17:44 +0000 (10:17 +0200)
author Stefano Babic <sbabic@denx.de>
Thu, 29 Jun 2017 08:16:06 +0000 (10:16 +0200)
committer Stefano Babic <sbabic@denx.de>
Wed, 12 Jul 2017 08:17:44 +0000 (10:17 +0200)
diff --git a/MAINTAINERS b/MAINTAINERS

index 1e8d7d9..ffdb98a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -96,11 +96,11 @@ F:  arch/arm/cpu/arm1136/mx*/
  F:     arch/arm/cpu/arm926ejs/mx*/
  F:     arch/arm/cpu/armv7/mx*/
  F:     arch/arm/cpu/armv7/vf610/
-F:     arch/arm/imx-common/
+F:     arch/arm/mach-imx/
  F:     arch/arm/include/asm/arch-imx/
  F:     arch/arm/include/asm/arch-mx*/
  F:     arch/arm/include/asm/arch-vf610/
-F:     arch/arm/include/asm/imx-common/
+F:     arch/arm/include/asm/mach-imx/
  F:     board/freescale/*mx*/
  
  ARM HISILICON
diff --git a/Makefile b/Makefile

index 4c4c8d8..4525964 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -899,7 +899,7 @@ u-boot.bin: u-boot-nodtb.bin FORCE
  endif
  
  %.imx: %.bin
-       $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
+       $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
  
  %.vyb: %.imx
         $(Q)$(MAKE) $(build)=arch/arm/cpu/armv7/vf610 $@
@@ -1064,10 +1064,10 @@ tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin FORCE
         $(call if_changed,pad_cat)
  
  SPL: spl/u-boot-spl.bin FORCE
-       $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
+       $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
  
  u-boot-with-spl.imx u-boot-with-nand-spl.imx: SPL u-boot.bin FORCE
-       $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
+       $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
  
  MKIMAGEFLAGS_u-boot.ubl = -n $(UBL_CONFIG) -T ublimage -e $(CONFIG_SYS_TEXT_BASE)
  
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig

index d43aaac..f7b4439 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1098,13 +1098,13 @@ source "arch/arm/mach-mvebu/Kconfig"
  
  source "arch/arm/cpu/armv7/ls102xa/Kconfig"
  
-source "arch/arm/cpu/armv7/mx7ulp/Kconfig"
+source "arch/arm/mach-imx/mx7ulp/Kconfig"
  
-source "arch/arm/cpu/armv7/mx7/Kconfig"
+source "arch/arm/mach-imx/mx7/Kconfig"
  
-source "arch/arm/cpu/armv7/mx6/Kconfig"
+source "arch/arm/mach-imx/mx6/Kconfig"
  
-source "arch/arm/cpu/armv7/mx5/Kconfig"
+source "arch/arm/mach-imx/mx5/Kconfig"
  
  source "arch/arm/mach-omap2/Kconfig"
  
@@ -1144,7 +1144,7 @@ source "arch/arm/cpu/armv8/zynqmp/Kconfig"
  
  source "arch/arm/cpu/armv8/Kconfig"
  
-source "arch/arm/imx-common/Kconfig"
+source "arch/arm/mach-imx/Kconfig"
  
  source "board/aries/m28evk/Kconfig"
  source "board/bosch/shc/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile

index 3e93fd6..0e0ae77 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -96,11 +96,11 @@ libs-y += arch/arm/lib/
  
  ifeq ($(CONFIG_SPL_BUILD),y)
  ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35))
-libs-y += arch/arm/imx-common/
+libs-y += arch/arm/mach-imx/
  endif
  else
  ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs vf610))
-libs-y += arch/arm/imx-common/
+libs-y += arch/arm/mach-imx/
  endif
  endif
  
diff --git a/arch/arm/cpu/arm926ejs/mx27/generic.c b/arch/arm/cpu/arm926ejs/mx27/generic.c

index 3b4326a..86798e3 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx27/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx27/generic.c
@@ -12,7 +12,7 @@
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/gpio.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
  #ifdef CONFIG_MMC_MXC
  #include <asm/arch/mxcmmc.h>
  #endif
diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c

index 840dd9e..7a68a8f 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -14,7 +14,7 @@
  #include <linux/errno.h>
  #include <asm/io.h>
  #include <asm/arch/clock.h>
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
  #include <asm/arch/gpio.h>
  #include <asm/arch/iomux.h>
  #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile

index 45dd3ca..b14ee54 100644 (file)
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -33,10 +33,6 @@ obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
  obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
  obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
  obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/
-obj-$(if $(filter mx5,$(SOC)),y) += mx5/
-obj-$(CONFIG_MX6) += mx6/
-obj-$(CONFIG_MX7) += mx7/
-obj-$(CONFIG_ARCH_MX7ULP) += mx7ulp/
  obj-$(CONFIG_RMOBILE) += rmobile/
  obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/
  obj-$(CONFIG_ARCH_SUNXI) += sunxi/
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c

index 0328096..ac2d8d1 100644 (file)
--- a/arch/arm/cpu/armv7/vf610/generic.c
+++ b/arch/arm/cpu/armv7/vf610/generic.c
@@ -9,7 +9,7 @@
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/crm_regs.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
  #include <netdev.h>
  #ifdef CONFIG_FSL_ESDHC
  #include <fsl_esdhc.h>
diff --git a/arch/arm/include/asm/arch-mx25/gpio.h b/arch/arm/include/asm/arch-mx25/gpio.h

index 81d95ea..ef88d83 100644 (file)
--- a/arch/arm/include/asm/arch-mx25/gpio.h
+++ b/arch/arm/include/asm/arch-mx25/gpio.h
@@ -9,6 +9,6 @@
  #ifndef __ASM_ARCH_MX25_GPIO_H
  #define __ASM_ARCH_MX25_GPIO_H
  
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #endif
diff --git a/arch/arm/include/asm/arch-mx25/iomux-mx25.h b/arch/arm/include/asm/arch-mx25/iomux-mx25.h

index 220cf4e..5b2863e 100644 (file)
--- a/arch/arm/include/asm/arch-mx25/iomux-mx25.h
+++ b/arch/arm/include/asm/arch-mx25/iomux-mx25.h
@@ -16,7 +16,7 @@
  #ifndef __IOMUX_MX25_H__
  #define __IOMUX_MX25_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  /* Pad control groupings */
  #define MX25_KPP_ROW_PAD_CTRL  PAD_CTL_PUS_100K_UP
diff --git a/arch/arm/include/asm/arch-mx31/gpio.h b/arch/arm/include/asm/arch-mx31/gpio.h

index 14e9b85..8e4b9a8 100644 (file)
--- a/arch/arm/include/asm/arch-mx31/gpio.h
+++ b/arch/arm/include/asm/arch-mx31/gpio.h
@@ -9,6 +9,6 @@
  #ifndef __ASM_ARCH_MX31_GPIO_H
  #define __ASM_ARCH_MX31_GPIO_H
  
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #endif
diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h

index 674b25c..5b9fa9c 100644 (file)
--- a/arch/arm/include/asm/arch-mx31/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx31/sys_proto.h
@@ -8,7 +8,7 @@
  #ifndef _MX31_SYS_PROTO_H_
  #define _MX31_SYS_PROTO_H_
  
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
  
  struct mxc_weimcs {
         u32 upper;
diff --git a/arch/arm/include/asm/arch-mx35/gpio.h b/arch/arm/include/asm/arch-mx35/gpio.h

index f3572a4..5570ec7 100644 (file)
--- a/arch/arm/include/asm/arch-mx35/gpio.h
+++ b/arch/arm/include/asm/arch-mx35/gpio.h
@@ -9,6 +9,6 @@
  #ifndef __ASM_ARCH_MX35_GPIO_H
  #define __ASM_ARCH_MX35_GPIO_H
  
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #endif
diff --git a/arch/arm/include/asm/arch-mx35/iomux-mx35.h b/arch/arm/include/asm/arch-mx35/iomux-mx35.h

index 5898b46..4ec9da2 100644 (file)
--- a/arch/arm/include/asm/arch-mx35/iomux-mx35.h
+++ b/arch/arm/include/asm/arch-mx35/iomux-mx35.h
@@ -11,7 +11,7 @@
  #ifndef __IOMUX_MX35_H__
  #define __IOMUX_MX35_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  /*
   * The naming convention for the pad modes is MX35_PAD_<padname>__<padmode>
diff --git a/arch/arm/include/asm/arch-mx35/sys_proto.h b/arch/arm/include/asm/arch-mx35/sys_proto.h

index 0979fda..735e135 100644 (file)
--- a/arch/arm/include/asm/arch-mx35/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx35/sys_proto.h
@@ -8,7 +8,7 @@
  #ifndef _MX35_SYS_PROTO_H_
  #define _MX35_SYS_PROTO_H_
  
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
  
  void mx3_setup_sdram_bank(u32 start_address, u32 ddr2_config, u32 row,
                           u32 col, u32 dsize, u32 refresh);
diff --git a/arch/arm/include/asm/arch-mx5/gpio.h b/arch/arm/include/asm/arch-mx5/gpio.h

index e2a5bc9..06658ff 100644 (file)
--- a/arch/arm/include/asm/arch-mx5/gpio.h
+++ b/arch/arm/include/asm/arch-mx5/gpio.h
@@ -9,6 +9,6 @@
  #ifndef __ASM_ARCH_MX5_GPIO_H
  #define __ASM_ARCH_MX5_GPIO_H
  
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #endif
diff --git a/arch/arm/include/asm/arch-mx5/iomux-mx51.h b/arch/arm/include/asm/arch-mx5/iomux-mx51.h

index b7b1695..5c636ac 100644 (file)
--- a/arch/arm/include/asm/arch-mx5/iomux-mx51.h
+++ b/arch/arm/include/asm/arch-mx5/iomux-mx51.h
@@ -19,7 +19,7 @@
  #ifndef __IOMUX_MX51_H__
  #define __IOMUX_MX51_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  /* Pad control groupings */
  #define MX51_UART_PAD_CTRL     (PAD_CTL_PUS_100K_DOWN | PAD_CTL_DSE_HIGH | \
diff --git a/arch/arm/include/asm/arch-mx5/iomux-mx53.h b/arch/arm/include/asm/arch-mx5/iomux-mx53.h

index 1b75fd1..1572af7 100644 (file)
--- a/arch/arm/include/asm/arch-mx5/iomux-mx53.h
+++ b/arch/arm/include/asm/arch-mx5/iomux-mx53.h
@@ -11,7 +11,7 @@
  #ifndef __IOMUX_MX53_H__
  #define __IOMUX_MX53_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  /* Pad control groupings */
  #define MX53_UART_PAD_CTRL     (PAD_CTL_PUS_100K_DOWN | PAD_CTL_DSE_HIGH | \
diff --git a/arch/arm/include/asm/arch-mx5/sys_proto.h b/arch/arm/include/asm/arch-mx5/sys_proto.h

index 16c9b76..14f5d94 100644 (file)
--- a/arch/arm/include/asm/arch-mx5/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx5/sys_proto.h
@@ -5,4 +5,4 @@
   * SPDX-License-Identifier:    GPL-2.0+
   */
  
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
diff --git a/arch/arm/include/asm/arch-mx6/gpio.h b/arch/arm/include/asm/arch-mx6/gpio.h

index e6640f3..baecbb4 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/gpio.h
+++ b/arch/arm/include/asm/arch-mx6/gpio.h
@@ -9,6 +9,6 @@
  #ifndef __ASM_ARCH_MX6_GPIO_H
  #define __ASM_ARCH_MX6_GPIO_H
  
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #endif /* __ASM_ARCH_MX6_GPIO_H */
diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h

index 646013d..86e2670 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx6/imx-regs.h
@@ -359,7 +359,7 @@
  #endif
  #define FEC_QUIRK_ENET_MAC
  
-#include <asm/imx-common/regs-lcdif.h>
+#include <asm/mach-imx/regs-lcdif.h>
  #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
  #include <asm/types.h>
  
diff --git a/arch/arm/include/asm/arch-mx6/mx6-pins.h b/arch/arm/include/asm/arch-mx6/mx6-pins.h

index 2934b12..c2ce953 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/mx6-pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6-pins.h
@@ -6,7 +6,7 @@
  #ifndef __ASM_ARCH_MX6_PINS_H__
  #define __ASM_ARCH_MX6_PINS_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  #define MX6_PAD_DECLARE(prefix, name, pco, mc, mm, sio, si, pc) \
         prefix##name = IOMUX_PAD(pco, mc, mm, sio, si, pc)
diff --git a/arch/arm/include/asm/arch-mx6/mx6sl_pins.h b/arch/arm/include/asm/arch-mx6/mx6sl_pins.h

index 919d83d..158e47c 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/mx6sl_pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6sl_pins.h
@@ -7,7 +7,7 @@
  #ifndef __ASM_ARCH_MX6_MX6SL_PINS_H__
  #define __ASM_ARCH_MX6_MX6SL_PINS_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  enum {
         MX6_PAD_ECSPI1_MISO__ECSPI_MISO                         = IOMUX_PAD(0x0358, 0x0068, 0, 0x0684, 0, 0),
diff --git a/arch/arm/include/asm/arch-mx6/mx6sll_pins.h b/arch/arm/include/asm/arch-mx6/mx6sll_pins.h

index 1ecb7ce..37ed45a 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/mx6sll_pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6sll_pins.h
@@ -7,7 +7,7 @@
  #ifndef __ASM_ARCH_IMX6SLL_PINS_H__
  #define __ASM_ARCH_IMX6SLL_PINS_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  enum {
         MX6_PAD_WDOG_B__WDOG1_B                               = IOMUX_PAD(0x02DC, 0x0014, 0, 0x0000, 0, 0),
diff --git a/arch/arm/include/asm/arch-mx6/mx6sx_pins.h b/arch/arm/include/asm/arch-mx6/mx6sx_pins.h

index 5dd9a50..86e69fd 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/mx6sx_pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6sx_pins.h
@@ -7,7 +7,7 @@
  #ifndef __ASM_ARCH_MX6_MX6_PINS_H__
  #define __ASM_ARCH_MX6_MX6_PINS_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  enum {
          MX6_PAD_GPIO1_IO00__I2C1_SCL                           = IOMUX_PAD(0x035C, 0x0014, IOMUX_CONFIG_SION | 0, 0x07A8, 1, 0),
diff --git a/arch/arm/include/asm/arch-mx6/mx6ul_pins.h b/arch/arm/include/asm/arch-mx6/mx6ul_pins.h

index c92b4f0..900e062 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/mx6ul_pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6ul_pins.h
@@ -7,7 +7,7 @@
  #ifndef __ASM_ARCH_IMX6UL_PINS_H__
  #define __ASM_ARCH_IMX6UL_PINS_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  enum {
  
diff --git a/arch/arm/include/asm/arch-mx6/mx6ull_pins.h b/arch/arm/include/asm/arch-mx6/mx6ull_pins.h

index 682430e..9c0390a 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/mx6ull_pins.h
+++ b/arch/arm/include/asm/arch-mx6/mx6ull_pins.h
@@ -7,7 +7,7 @@
  #ifndef __ASM_ARCH_IMX6ULL_PINS_H__
  #define __ASM_ARCH_IMX6ULL_PINS_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  enum {
         MX6_PAD_BOOT_MODE0__GPIO5_IO10                         = IOMUX_PAD(0x0044, 0x0000, IOMUX_CONFIG_LPSR | 5, 0x0000, 0, 0),
diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h

index 16c9b76..14f5d94 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx6/sys_proto.h
@@ -5,4 +5,4 @@
   * SPDX-License-Identifier:    GPL-2.0+
   */
  
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
diff --git a/arch/arm/include/asm/arch-mx7/gpio.h b/arch/arm/include/asm/arch-mx7/gpio.h

index b7890c2..af57bb9 100644 (file)
--- a/arch/arm/include/asm/arch-mx7/gpio.h
+++ b/arch/arm/include/asm/arch-mx7/gpio.h
@@ -7,6 +7,6 @@
  #ifndef __ASM_ARCH_MX7_GPIO_H
  #define __ASM_ARCH_MX7_GPIO_H
  
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #endif /* __ASM_ARCH_MX7_GPIO_H */
diff --git a/arch/arm/include/asm/arch-mx7/imx-regs.h b/arch/arm/include/asm/arch-mx7/imx-regs.h

index d33be31..aab3a9a 100644 (file)
--- a/arch/arm/include/asm/arch-mx7/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx7/imx-regs.h
@@ -224,7 +224,7 @@
                                          CONFIG_SYS_FSL_JR0_OFFSET)
  #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC   1
  #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
-#include <asm/imx-common/regs-lcdif.h>
+#include <asm/mach-imx/regs-lcdif.h>
  #include <asm/types.h>
  
  extern void imx_get_mac_from_fuse(int dev_id, unsigned char *mac);
diff --git a/arch/arm/include/asm/arch-mx7/mx7-pins.h b/arch/arm/include/asm/arch-mx7/mx7-pins.h

index 164c2be..9df81f7 100644 (file)
--- a/arch/arm/include/asm/arch-mx7/mx7-pins.h
+++ b/arch/arm/include/asm/arch-mx7/mx7-pins.h
@@ -6,7 +6,7 @@
  #ifndef __ASM_ARCH_MX7_PINS_H__
  #define __ASM_ARCH_MX7_PINS_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  #if defined(CONFIG_MX7D)
  #include "mx7d_pins.h"
diff --git a/arch/arm/include/asm/arch-mx7/mx7d_pins.h b/arch/arm/include/asm/arch-mx7/mx7d_pins.h

index 0ab1246..7e926d1 100644 (file)
--- a/arch/arm/include/asm/arch-mx7/mx7d_pins.h
+++ b/arch/arm/include/asm/arch-mx7/mx7d_pins.h
@@ -7,7 +7,7 @@
  #ifndef __ASM_ARCH_IMX7D_PINS_H__
  #define __ASM_ARCH_IMX7D_PINS_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  enum {
         MX7D_PAD_GPIO1_IO00__GPIO1_IO0                           = IOMUX_PAD(0x0030, 0x0000, IOMUX_CONFIG_LPSR | 0, 0x0000, 0, 0),
diff --git a/arch/arm/include/asm/arch-mx7/sys_proto.h b/arch/arm/include/asm/arch-mx7/sys_proto.h

index ca7608b..15e24d4 100644 (file)
--- a/arch/arm/include/asm/arch-mx7/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx7/sys_proto.h
@@ -4,6 +4,6 @@
   * SPDX-License-Identifier:    GPL-2.0+
   */
  
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
  
  void set_wdog_reset(struct wdog_regs *wdog);
diff --git a/arch/arm/include/asm/arch-mx7ulp/sys_proto.h b/arch/arm/include/asm/arch-mx7ulp/sys_proto.h

index d01748f..d53bfcc 100644 (file)
--- a/arch/arm/include/asm/arch-mx7ulp/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx7ulp/sys_proto.h
@@ -7,7 +7,7 @@
  #ifndef _SYS_PROTO_MX7ULP_H_
  #define _SYS_PROTO_MX7ULP_H_
  
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
  
  #define BT0CFG_LPBOOT_MASK 0x1
  #define BT0CFG_DUALBOOT_MASK 0x2
diff --git a/arch/arm/include/asm/arch-mxs/imx-regs.h b/arch/arm/include/asm/arch-mxs/imx-regs.h

index 8872438..6e35f2d 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/imx-regs.h
+++ b/arch/arm/include/asm/arch-mxs/imx-regs.h
@@ -10,12 +10,12 @@
  #ifndef __IMX_REGS_H__
  #define __IMX_REGS_H__
  
-#include <asm/imx-common/regs-apbh.h>
+#include <asm/mach-imx/regs-apbh.h>
  #include <asm/arch/regs-base.h>
-#include <asm/imx-common/regs-bch.h>
+#include <asm/mach-imx/regs-bch.h>
  #include <asm/arch/regs-digctl.h>
-#include <asm/imx-common/regs-gpmi.h>
-#include <asm/imx-common/regs-lcdif.h>
+#include <asm/mach-imx/regs-gpmi.h>
+#include <asm/mach-imx/regs-lcdif.h>
  #include <asm/arch/regs-i2c.h>
  #include <asm/arch/regs-lradc.h>
  #include <asm/arch/regs-ocotp.h>
diff --git a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h

index d155e3a..6a86055 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
+++ b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h
@@ -13,7 +13,7 @@
  #ifndef __MX23_REGS_CLKCTRL_H__
  #define __MX23_REGS_CLKCTRL_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_clkctrl_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h

index 1490ffd..16447ae 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
+++ b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
@@ -13,7 +13,7 @@
  #ifndef __MX28_REGS_CLKCTRL_H__
  #define __MX28_REGS_CLKCTRL_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_clkctrl_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-digctl.h b/arch/arm/include/asm/arch-mxs/regs-digctl.h

index 860be9e..e8ba1dd 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-digctl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-digctl.h
@@ -9,7 +9,7 @@
  #ifndef __MX28_REGS_DIGCTL_H__
  #define __MX28_REGS_DIGCTL_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_digctl_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-i2c.h b/arch/arm/include/asm/arch-mxs/regs-i2c.h

index a58303e..6d10e4b 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-i2c.h
+++ b/arch/arm/include/asm/arch-mxs/regs-i2c.h
@@ -10,7 +10,7 @@
  #ifndef __MX28_REGS_I2C_H__
  #define __MX28_REGS_I2C_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_i2c_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-lradc.h b/arch/arm/include/asm/arch-mxs/regs-lradc.h

index 74f9f76..a00d6a4 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-lradc.h
+++ b/arch/arm/include/asm/arch-mxs/regs-lradc.h
@@ -13,7 +13,7 @@
  #ifndef __MX28_REGS_LRADC_H__
  #define __MX28_REGS_LRADC_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_lradc_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-ocotp.h b/arch/arm/include/asm/arch-mxs/regs-ocotp.h

index bd80ac7..7c51031 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-ocotp.h
+++ b/arch/arm/include/asm/arch-mxs/regs-ocotp.h
@@ -13,7 +13,7 @@
  #ifndef __MX28_REGS_OCOTP_H__
  #define __MX28_REGS_OCOTP_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_ocotp_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h

index 251fe66..b107dec 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
+++ b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h
@@ -13,7 +13,7 @@
  #ifndef __MX28_REGS_PINCTRL_H__
  #define __MX28_REGS_PINCTRL_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_pinctrl_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-power-mx23.h b/arch/arm/include/asm/arch-mxs/regs-power-mx23.h

index ce2f425..d05fccf 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-power-mx23.h
+++ b/arch/arm/include/asm/arch-mxs/regs-power-mx23.h
@@ -9,7 +9,7 @@
  #ifndef __MX23_REGS_POWER_H__
  #define __MX23_REGS_POWER_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_power_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-power-mx28.h b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h

index 9528e3c..f6bb301 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-power-mx28.h
+++ b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h
@@ -9,7 +9,7 @@
  #ifndef __MX28_REGS_POWER_H__
  #define __MX28_REGS_POWER_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_power_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-rtc.h b/arch/arm/include/asm/arch-mxs/regs-rtc.h

index 03e2e5d..dfa4dd0 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-rtc.h
+++ b/arch/arm/include/asm/arch-mxs/regs-rtc.h
@@ -10,7 +10,7 @@
  #ifndef __MX28_REGS_RTC_H__
  #define __MX28_REGS_RTC_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_rtc_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-ssp.h b/arch/arm/include/asm/arch-mxs/regs-ssp.h

index e991216..12a5dab 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-ssp.h
+++ b/arch/arm/include/asm/arch-mxs/regs-ssp.h
@@ -12,7 +12,7 @@
  #ifndef __MX28_REGS_SSP_H__
  #define __MX28_REGS_SSP_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  #if defined(CONFIG_MX23)
diff --git a/arch/arm/include/asm/arch-mxs/regs-timrot.h b/arch/arm/include/asm/arch-mxs/regs-timrot.h

index 713c630..260d7d7 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-timrot.h
+++ b/arch/arm/include/asm/arch-mxs/regs-timrot.h
@@ -12,7 +12,7 @@
  #ifndef __MX28_REGS_TIMROT_H__
  #define __MX28_REGS_TIMROT_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_timrot_regs {
diff --git a/arch/arm/include/asm/arch-mxs/regs-uartapp.h b/arch/arm/include/asm/arch-mxs/regs-uartapp.h

index 7ceb810..608182a 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/regs-uartapp.h
+++ b/arch/arm/include/asm/arch-mxs/regs-uartapp.h
@@ -12,7 +12,7 @@
  #ifndef __ARCH_ARM___MXS_UARTAPP_H
  #define __ARCH_ARM___MXS_UARTAPP_H
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef __ASSEMBLY__
  struct mxs_uartapp_regs {
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h

index f2b075e..6096763 100644 (file)
--- a/arch/arm/include/asm/arch-mxs/sys_proto.h
+++ b/arch/arm/include/asm/arch-mxs/sys_proto.h
@@ -10,7 +10,7 @@
  #ifndef __MXS_SYS_PROTO_H__
  #define __MXS_SYS_PROTO_H__
  
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
  
  int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int), int (*cd)(int));
  
diff --git a/arch/arm/include/asm/arch-vf610/iomux-vf610.h b/arch/arm/include/asm/arch-vf610/iomux-vf610.h

index 5af071a..506e584 100644 (file)
--- a/arch/arm/include/asm/arch-vf610/iomux-vf610.h
+++ b/arch/arm/include/asm/arch-vf610/iomux-vf610.h
@@ -7,7 +7,7 @@
  #ifndef __IOMUX_VF610_H__
  #define __IOMUX_VF610_H__
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  /* Pad control groupings */
  #define VF610_UART_PAD_CTRL    (PAD_CTL_PUS_100K_UP | PAD_CTL_DSE_25ohm | \
diff --git a/arch/arm/include/asm/imx-common/boot_mode.h b/arch/arm/include/asm/mach-imx/boot_mode.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/boot_mode.h

rename to arch/arm/include/asm/mach-imx/boot_mode.h
diff --git a/arch/arm/include/asm/imx-common/dma.h b/arch/arm/include/asm/mach-imx/dma.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/dma.h

rename to arch/arm/include/asm/mach-imx/dma.h
diff --git a/arch/arm/include/asm/imx-common/gpio.h b/arch/arm/include/asm/mach-imx/gpio.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/gpio.h

rename to arch/arm/include/asm/mach-imx/gpio.h
diff --git a/arch/arm/include/asm/imx-common/hab.h b/arch/arm/include/asm/mach-imx/hab.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/hab.h

rename to arch/arm/include/asm/mach-imx/hab.h
diff --git a/arch/arm/include/asm/imx-common/imximage.cfg b/arch/arm/include/asm/mach-imx/imximage.cfg

similarity index 100%

rename from arch/arm/include/asm/imx-common/imximage.cfg

rename to arch/arm/include/asm/mach-imx/imximage.cfg
diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/iomux-v3.h

rename to arch/arm/include/asm/mach-imx/iomux-v3.h
diff --git a/arch/arm/include/asm/imx-common/mx5_video.h b/arch/arm/include/asm/mach-imx/mx5_video.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/mx5_video.h

rename to arch/arm/include/asm/mach-imx/mx5_video.h
diff --git a/arch/arm/include/asm/imx-common/mxc_i2c.h b/arch/arm/include/asm/mach-imx/mxc_i2c.h

similarity index 98%

rename from arch/arm/include/asm/imx-common/mxc_i2c.h

rename to arch/arm/include/asm/mach-imx/mxc_i2c.h

index b0b6d61..292bf0c 100644 (file)
--- a/arch/arm/include/asm/imx-common/mxc_i2c.h
+++ b/arch/arm/include/asm/mach-imx/mxc_i2c.h
@@ -6,7 +6,7 @@
  #ifndef __ASM_ARCH_MXC_MXC_I2C_H__
  #define __ASM_ARCH_MXC_MXC_I2C_H__
  #include <asm-generic/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  struct i2c_pin_ctrl {
         iomux_v3_cfg_t i2c_mode;
diff --git a/arch/arm/include/asm/imx-common/rdc-sema.h b/arch/arm/include/asm/mach-imx/rdc-sema.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/rdc-sema.h

rename to arch/arm/include/asm/mach-imx/rdc-sema.h
diff --git a/arch/arm/include/asm/imx-common/regs-apbh.h b/arch/arm/include/asm/mach-imx/regs-apbh.h

similarity index 99%

rename from arch/arm/include/asm/imx-common/regs-apbh.h

rename to arch/arm/include/asm/mach-imx/regs-apbh.h

index 391452c..4cc4aba 100644 (file)
--- a/arch/arm/include/asm/imx-common/regs-apbh.h
+++ b/arch/arm/include/asm/mach-imx/regs-apbh.h
@@ -13,7 +13,7 @@
  #ifndef __REGS_APBH_H__
  #define __REGS_APBH_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  
diff --git a/arch/arm/include/asm/imx-common/regs-bch.h b/arch/arm/include/asm/mach-imx/regs-bch.h

similarity index 99%

rename from arch/arm/include/asm/imx-common/regs-bch.h

rename to arch/arm/include/asm/mach-imx/regs-bch.h

index adfbace..c0f673c 100644 (file)
--- a/arch/arm/include/asm/imx-common/regs-bch.h
+++ b/arch/arm/include/asm/mach-imx/regs-bch.h
@@ -13,7 +13,7 @@
  #ifndef __MX28_REGS_BCH_H__
  #define __MX28_REGS_BCH_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_bch_regs {
diff --git a/arch/arm/include/asm/imx-common/regs-common.h b/arch/arm/include/asm/mach-imx/regs-common.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/regs-common.h

rename to arch/arm/include/asm/mach-imx/regs-common.h
diff --git a/arch/arm/include/asm/imx-common/regs-gpmi.h b/arch/arm/include/asm/mach-imx/regs-gpmi.h

similarity index 99%

rename from arch/arm/include/asm/imx-common/regs-gpmi.h

rename to arch/arm/include/asm/mach-imx/regs-gpmi.h

index b93bfe5..9ff646b 100644 (file)
--- a/arch/arm/include/asm/imx-common/regs-gpmi.h
+++ b/arch/arm/include/asm/mach-imx/regs-gpmi.h
@@ -13,7 +13,7 @@
  #ifndef __MX28_REGS_GPMI_H__
  #define __MX28_REGS_GPMI_H__
  
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  #ifndef        __ASSEMBLY__
  struct mxs_gpmi_regs {
diff --git a/arch/arm/include/asm/imx-common/regs-lcdif.h b/arch/arm/include/asm/mach-imx/regs-lcdif.h

similarity index 99%

rename from arch/arm/include/asm/imx-common/regs-lcdif.h

rename to arch/arm/include/asm/mach-imx/regs-lcdif.h

index ab147b5..4de401b 100644 (file)
--- a/arch/arm/include/asm/imx-common/regs-lcdif.h
+++ b/arch/arm/include/asm/mach-imx/regs-lcdif.h
@@ -14,7 +14,7 @@
  #define __IMX_REGS_LCDIF_H__
  
  #ifndef        __ASSEMBLY__
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  struct mxs_lcdif_regs {
         mxs_reg_32(hw_lcdif_ctrl)               /* 0x00 */
diff --git a/arch/arm/include/asm/imx-common/regs-usbphy.h b/arch/arm/include/asm/mach-imx/regs-usbphy.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/regs-usbphy.h

rename to arch/arm/include/asm/mach-imx/regs-usbphy.h
diff --git a/arch/arm/include/asm/imx-common/sata.h b/arch/arm/include/asm/mach-imx/sata.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/sata.h

rename to arch/arm/include/asm/mach-imx/sata.h
diff --git a/arch/arm/include/asm/imx-common/spi.h b/arch/arm/include/asm/mach-imx/spi.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/spi.h

rename to arch/arm/include/asm/mach-imx/spi.h
diff --git a/arch/arm/include/asm/imx-common/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h

similarity index 98%

rename from arch/arm/include/asm/imx-common/sys_proto.h

rename to arch/arm/include/asm/mach-imx/sys_proto.h

index a07061b..046df62 100644 (file)
--- a/arch/arm/include/asm/imx-common/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -9,7 +9,7 @@
  #define _SYS_PROTO_H_
  
  #include <asm/io.h>
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  #include <common.h>
  #include "../arch-imx/cpu.h"
  
diff --git a/arch/arm/include/asm/imx-common/syscounter.h b/arch/arm/include/asm/mach-imx/syscounter.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/syscounter.h

rename to arch/arm/include/asm/mach-imx/syscounter.h
diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/mach-imx/video.h

similarity index 100%

rename from arch/arm/include/asm/imx-common/video.h

rename to arch/arm/include/asm/mach-imx/video.h
diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/mach-imx/Kconfig

similarity index 100%

rename from arch/arm/imx-common/Kconfig

rename to arch/arm/mach-imx/Kconfig
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/mach-imx/Makefile

similarity index 96%

rename from arch/arm/imx-common/Makefile

rename to arch/arm/mach-imx/Makefile

index fc69172..d77c10e 100644 (file)
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -120,3 +120,9 @@ spl/u-boot-nand-spl.imx: SPL FORCE
         $(call if_changed,u-boot-nand-spl_imx)
  
  targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx)
+
+obj-$(CONFIG_MX5) += mx5/
+obj-$(CONFIG_MX6) += mx6/
+obj-$(CONFIG_MX7) += mx7/
+obj-$(CONFIG_ARCH_MX7ULP) += mx7ulp/
+
diff --git a/arch/arm/imx-common/cache.c b/arch/arm/mach-imx/cache.c

similarity index 98%

rename from arch/arm/imx-common/cache.c

rename to arch/arm/mach-imx/cache.c

index 1c4a9a2..c5279a7 100644 (file)
--- a/arch/arm/imx-common/cache.c
+++ b/arch/arm/mach-imx/cache.c
@@ -8,7 +8,7 @@
  #include <asm/armv7.h>
  #include <asm/pl310.h>
  #include <asm/io.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
  
  #ifndef CONFIG_SYS_DCACHE_OFF
  void enable_caches(void)
diff --git a/arch/arm/imx-common/cmd_bmode.c b/arch/arm/mach-imx/cmd_bmode.c

similarity index 97%

rename from arch/arm/imx-common/cmd_bmode.c

rename to arch/arm/mach-imx/cmd_bmode.c

index b0868aa..4ee514f 100644 (file)
--- a/arch/arm/imx-common/cmd_bmode.c
+++ b/arch/arm/mach-imx/cmd_bmode.c
@@ -6,7 +6,7 @@
  #include <common.h>
  #include <linux/errno.h>
  #include <asm/io.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <malloc.h>
  #include <command.h>
  
diff --git a/arch/arm/imx-common/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c

similarity index 100%

rename from arch/arm/imx-common/cmd_dek.c

rename to arch/arm/mach-imx/cmd_dek.c
diff --git a/arch/arm/imx-common/cmd_hdmidet.c b/arch/arm/mach-imx/cmd_hdmidet.c

similarity index 100%

rename from arch/arm/imx-common/cmd_hdmidet.c

rename to arch/arm/mach-imx/cmd_hdmidet.c
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/mach-imx/cpu.c

similarity index 100%

rename from arch/arm/imx-common/cpu.c

rename to arch/arm/mach-imx/cpu.c
diff --git a/arch/arm/imx-common/ddrmc-vf610.c b/arch/arm/mach-imx/ddrmc-vf610.c

similarity index 100%

rename from arch/arm/imx-common/ddrmc-vf610.c

rename to arch/arm/mach-imx/ddrmc-vf610.c
diff --git a/arch/arm/imx-common/hab.c b/arch/arm/mach-imx/hab.c

similarity index 99%

rename from arch/arm/imx-common/hab.c

rename to arch/arm/mach-imx/hab.c

index 523d0e3..02c7ae4 100644 (file)
--- a/arch/arm/imx-common/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -11,7 +11,7 @@
  #include <asm/system.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/hab.h>
+#include <asm/mach-imx/hab.h>
  
  /* -------- start of HAB API updates ------------*/
  
diff --git a/arch/arm/imx-common/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c

similarity index 98%

rename from arch/arm/imx-common/i2c-mxv7.c

rename to arch/arm/mach-imx/i2c-mxv7.c

index ae8809c..dfb5c1e 100644 (file)
--- a/arch/arm/imx-common/i2c-mxv7.c
+++ b/arch/arm/mach-imx/i2c-mxv7.c
@@ -9,7 +9,7 @@
  #include <asm/arch/imx-regs.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <watchdog.h>
  
  int force_idle_bus(void *priv)
diff --git a/arch/arm/imx-common/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c

similarity index 100%

rename from arch/arm/imx-common/imx_bootaux.c

rename to arch/arm/mach-imx/imx_bootaux.c
diff --git a/arch/arm/imx-common/init.c b/arch/arm/mach-imx/init.c

similarity index 98%

rename from arch/arm/imx-common/init.c

rename to arch/arm/mach-imx/init.c

index 5b4f828..720ad67 100644 (file)
--- a/arch/arm/imx-common/init.c
+++ b/arch/arm/mach-imx/init.c
@@ -8,7 +8,7 @@
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <asm/arch/crm_regs.h>
  
  void init_aips(void)
diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c

similarity index 97%

rename from arch/arm/imx-common/iomux-v3.c

rename to arch/arm/mach-imx/iomux-v3.c

index c9a3bf2..94d6600 100644 (file)
--- a/arch/arm/imx-common/iomux-v3.c
+++ b/arch/arm/mach-imx/iomux-v3.c
@@ -11,8 +11,8 @@
  #include <common.h>
  #include <asm/io.h>
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sys_proto.h>
  
  static void *base = (void *)IOMUXC_BASE_ADDR;
  
diff --git a/arch/arm/imx-common/misc.c b/arch/arm/mach-imx/misc.c

similarity index 97%

rename from arch/arm/imx-common/misc.c

rename to arch/arm/mach-imx/misc.c

index 1b0f18d..c644183 100644 (file)
--- a/arch/arm/imx-common/misc.c
+++ b/arch/arm/mach-imx/misc.c
@@ -8,7 +8,7 @@
  #include <asm/arch/sys_proto.h>
  #include <linux/errno.h>
  #include <asm/io.h>
-#include <asm/imx-common/regs-common.h>
+#include <asm/mach-imx/regs-common.h>
  
  /* 1 second delay should be plenty of time for block reset. */
  #define        RESET_MAX_TIMEOUT       1000000
diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/mach-imx/mx5/Kconfig

similarity index 100%

rename from arch/arm/cpu/armv7/mx5/Kconfig

rename to arch/arm/mach-imx/mx5/Kconfig
diff --git a/arch/arm/cpu/armv7/mx5/Makefile b/arch/arm/mach-imx/mx5/Makefile

similarity index 100%

rename from arch/arm/cpu/armv7/mx5/Makefile

rename to arch/arm/mach-imx/mx5/Makefile
diff --git a/arch/arm/cpu/armv7/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx5/clock.c

rename to arch/arm/mach-imx/mx5/clock.c
diff --git a/arch/arm/cpu/armv7/mx5/lowlevel_init.S b/arch/arm/mach-imx/mx5/lowlevel_init.S

similarity index 100%

rename from arch/arm/cpu/armv7/mx5/lowlevel_init.S

rename to arch/arm/mach-imx/mx5/lowlevel_init.S
diff --git a/arch/arm/cpu/armv7/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c

similarity index 98%

rename from arch/arm/cpu/armv7/mx5/soc.c

rename to arch/arm/mach-imx/mx5/soc.c

index e6cc7cb..2b63871 100644 (file)
--- a/arch/arm/cpu/armv7/mx5/soc.c
+++ b/arch/arm/mach-imx/mx5/soc.c
@@ -14,7 +14,7 @@
  
  #include <linux/errno.h>
  #include <asm/io.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/boot_mode.h>
  
  #if !(defined(CONFIG_MX51) || defined(CONFIG_MX53))
  #error "CPU_TYPE not defined"
diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig

similarity index 100%

rename from arch/arm/cpu/armv7/mx6/Kconfig

rename to arch/arm/mach-imx/mx6/Kconfig
diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/mach-imx/mx6/Makefile

similarity index 100%

rename from arch/arm/cpu/armv7/mx6/Makefile

rename to arch/arm/mach-imx/mx6/Makefile
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx6/clock.c

rename to arch/arm/mach-imx/mx6/clock.c
diff --git a/arch/arm/cpu/armv7/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx6/ddr.c

rename to arch/arm/mach-imx/mx6/ddr.c
diff --git a/arch/arm/cpu/armv7/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c

similarity index 98%

rename from arch/arm/cpu/armv7/mx6/litesom.c

rename to arch/arm/mach-imx/mx6/litesom.c

index ac2eccf..590e92f 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/litesom.c
+++ b/arch/arm/mach-imx/mx6/litesom.c
@@ -13,8 +13,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <asm/io.h>
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/arch/arm/cpu/armv7/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx6/mp.c

rename to arch/arm/mach-imx/mx6/mp.c
diff --git a/arch/arm/cpu/armv7/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c

similarity index 99%

rename from arch/arm/cpu/armv7/mx6/opos6ul.c

rename to arch/arm/mach-imx/mx6/opos6ul.c

index ea2f0ec..22b2440 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -12,7 +12,7 @@
  #include <asm/arch/mx6ul_pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <asm/io.h>
  #include <common.h>
  #include <environment.h>
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c

similarity index 99%

rename from arch/arm/cpu/armv7/mx6/soc.c

rename to arch/arm/mach-imx/mx6/soc.c

index 832ef25..af31673 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/mach-imx/mx6/soc.c
@@ -13,9 +13,9 @@
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/dma.h>
-#include <asm/imx-common/hab.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/dma.h>
+#include <asm/mach-imx/hab.h>
  #include <stdbool.h>
  #include <asm/arch/mxc_hdmi.h>
  #include <asm/arch/crm_regs.h>
diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig

similarity index 100%

rename from arch/arm/cpu/armv7/mx7/Kconfig

rename to arch/arm/mach-imx/mx7/Kconfig
diff --git a/arch/arm/cpu/armv7/mx7/Makefile b/arch/arm/mach-imx/mx7/Makefile

similarity index 100%

rename from arch/arm/cpu/armv7/mx7/Makefile

rename to arch/arm/mach-imx/mx7/Makefile
diff --git a/arch/arm/cpu/armv7/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx7/clock.c

rename to arch/arm/mach-imx/mx7/clock.c
diff --git a/arch/arm/cpu/armv7/mx7/clock_slice.c b/arch/arm/mach-imx/mx7/clock_slice.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx7/clock_slice.c

rename to arch/arm/mach-imx/mx7/clock_slice.c
diff --git a/arch/arm/cpu/armv7/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx7/psci-mx7.c

rename to arch/arm/mach-imx/mx7/psci-mx7.c
diff --git a/arch/arm/cpu/armv7/mx7/psci.S b/arch/arm/mach-imx/mx7/psci.S

similarity index 100%

rename from arch/arm/cpu/armv7/mx7/psci.S

rename to arch/arm/mach-imx/mx7/psci.S
diff --git a/arch/arm/cpu/armv7/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c

similarity index 98%

rename from arch/arm/cpu/armv7/mx7/soc.c

rename to arch/arm/mach-imx/mx7/soc.c

index 8422f24..4cf977e 100644 (file)
--- a/arch/arm/cpu/armv7/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -9,10 +9,10 @@
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/dma.h>
-#include <asm/imx-common/hab.h>
-#include <asm/imx-common/rdc-sema.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/dma.h>
+#include <asm/mach-imx/hab.h>
+#include <asm/mach-imx/rdc-sema.h>
  #include <asm/arch/imx-rdc.h>
  #include <asm/arch/crm_regs.h>
  #include <dm.h>
diff --git a/arch/arm/cpu/armv7/mx7ulp/Kconfig b/arch/arm/mach-imx/mx7ulp/Kconfig

similarity index 100%

rename from arch/arm/cpu/armv7/mx7ulp/Kconfig

rename to arch/arm/mach-imx/mx7ulp/Kconfig
diff --git a/arch/arm/cpu/armv7/mx7ulp/Makefile b/arch/arm/mach-imx/mx7ulp/Makefile

similarity index 100%

rename from arch/arm/cpu/armv7/mx7ulp/Makefile

rename to arch/arm/mach-imx/mx7ulp/Makefile
diff --git a/arch/arm/cpu/armv7/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx7ulp/clock.c

rename to arch/arm/mach-imx/mx7ulp/clock.c
diff --git a/arch/arm/cpu/armv7/mx7ulp/iomux.c b/arch/arm/mach-imx/mx7ulp/iomux.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx7ulp/iomux.c

rename to arch/arm/mach-imx/mx7ulp/iomux.c
diff --git a/arch/arm/cpu/armv7/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx7ulp/pcc.c

rename to arch/arm/mach-imx/mx7ulp/pcc.c
diff --git a/arch/arm/cpu/armv7/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c

similarity index 100%

rename from arch/arm/cpu/armv7/mx7ulp/scg.c

rename to arch/arm/mach-imx/mx7ulp/scg.c
diff --git a/arch/arm/cpu/armv7/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c

similarity index 99%

rename from arch/arm/cpu/armv7/mx7ulp/soc.c

rename to arch/arm/mach-imx/mx7ulp/soc.c

index 4fd4c3a..454665a 100644 (file)
--- a/arch/arm/cpu/armv7/mx7ulp/soc.c
+++ b/arch/arm/mach-imx/mx7ulp/soc.c
@@ -7,7 +7,7 @@
  #include <asm/arch/clock.h>
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/hab.h>
+#include <asm/mach-imx/hab.h>
  
  static char *get_reset_cause(char *);
  
diff --git a/arch/arm/imx-common/rdc-sema.c b/arch/arm/mach-imx/rdc-sema.c

similarity index 99%

rename from arch/arm/imx-common/rdc-sema.c

rename to arch/arm/mach-imx/rdc-sema.c

index 1d97ac8..cffd4e8 100644 (file)
--- a/arch/arm/imx-common/rdc-sema.c
+++ b/arch/arm/mach-imx/rdc-sema.c
@@ -6,7 +6,7 @@
  #include <common.h>
  #include <asm/io.h>
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/rdc-sema.h>
+#include <asm/mach-imx/rdc-sema.h>
  #include <asm/arch/imx-rdc.h>
  #include <linux/errno.h>
  
diff --git a/arch/arm/imx-common/sata.c b/arch/arm/mach-imx/sata.c

similarity index 95%

rename from arch/arm/imx-common/sata.c

rename to arch/arm/mach-imx/sata.c

index acf9831..142a7f4 100644 (file)
--- a/arch/arm/imx-common/sata.c
+++ b/arch/arm/mach-imx/sata.c
@@ -4,7 +4,7 @@
   * SPDX-License-Identifier:    GPL-2.0+
   */
  
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <asm/arch/iomux.h>
  #include <asm/io.h>
  #include <asm/arch/clock.h>
diff --git a/arch/arm/imx-common/speed.c b/arch/arm/mach-imx/speed.c

similarity index 100%

rename from arch/arm/imx-common/speed.c

rename to arch/arm/mach-imx/speed.c
diff --git a/arch/arm/imx-common/spl.c b/arch/arm/mach-imx/spl.c

similarity index 99%

rename from arch/arm/imx-common/spl.c

rename to arch/arm/mach-imx/spl.c

index f392941..75698c4 100644 (file)
--- a/arch/arm/imx-common/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -13,7 +13,7 @@
  #include <asm/arch/sys_proto.h>
  #include <asm/spl.h>
  #include <spl.h>
-#include <asm/imx-common/hab.h>
+#include <asm/mach-imx/hab.h>
  
  #if defined(CONFIG_MX6)
  /* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */
diff --git a/arch/arm/imx-common/spl_sd.cfg b/arch/arm/mach-imx/spl_sd.cfg

similarity index 100%

rename from arch/arm/imx-common/spl_sd.cfg

rename to arch/arm/mach-imx/spl_sd.cfg
diff --git a/arch/arm/imx-common/syscounter.c b/arch/arm/mach-imx/syscounter.c

similarity index 98%

rename from arch/arm/imx-common/syscounter.c

rename to arch/arm/mach-imx/syscounter.c

index e00fef2..9290918 100644 (file)
--- a/arch/arm/imx-common/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -11,7 +11,7 @@
  #include <div64.h>
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/syscounter.h>
+#include <asm/mach-imx/syscounter.h>
  
  DECLARE_GLOBAL_DATA_PTR;
  
diff --git a/arch/arm/imx-common/timer.c b/arch/arm/mach-imx/timer.c

similarity index 100%

rename from arch/arm/imx-common/timer.c

rename to arch/arm/mach-imx/timer.c
diff --git a/arch/arm/imx-common/video.c b/arch/arm/mach-imx/video.c

similarity index 97%

rename from arch/arm/imx-common/video.c

rename to arch/arm/mach-imx/video.c

index 549bf9d..55242f0 100644 (file)
--- a/arch/arm/imx-common/video.c
+++ b/arch/arm/mach-imx/video.c
@@ -4,7 +4,7 @@
  
  #include <common.h>
  #include <linux/errno.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/video.h>
  
  int board_video_skip(void)
  {
diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c

index 2dab906..c728943 100644 (file)
--- a/board/advantech/dms-ba16/dms-ba16.c
+++ b/board/advantech/dms-ba16/dms-ba16.c
@@ -12,10 +12,10 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
diff --git a/board/aries/m53evk/imximage.cfg b/board/aries/m53evk/imximage.cfg

index ec855c8..e4f3ce5 100644 (file)
--- a/board/aries/m53evk/imximage.cfg
+++ b/board/aries/m53evk/imximage.cfg
@@ -9,7 +9,7 @@
   *
   * The syntax is taken as close as possible with the kwbimage
   */
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
  
  /* image version */
  IMAGE_VERSION  2
diff --git a/board/aries/m53evk/m53evk.c b/board/aries/m53evk/m53evk.c

index 14c60fc..ece8957 100644 (file)
--- a/board/aries/m53evk/m53evk.c
+++ b/board/aries/m53evk/m53evk.c
@@ -13,7 +13,7 @@
  #include <asm/arch/crm_regs.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/iomux-mx53.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
  #include <asm/spl.h>
  #include <linux/errno.h>
  #include <netdev.h>
diff --git a/board/aristainetos/aristainetos-v1.c b/board/aristainetos/aristainetos-v1.c

index 94e2b8a..b3f5c99 100644 (file)
--- a/board/aristainetos/aristainetos-v1.c
+++ b/board/aristainetos/aristainetos-v1.c
@@ -16,10 +16,10 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
diff --git a/board/aristainetos/aristainetos-v2.c b/board/aristainetos/aristainetos-v2.c

index 4cd184e..6abc215 100644 (file)
--- a/board/aristainetos/aristainetos-v2.c
+++ b/board/aristainetos/aristainetos-v2.c
@@ -16,10 +16,10 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c

index b7c65ca..872fedd 100644 (file)
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -16,10 +16,10 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
diff --git a/board/armadeus/opos6uldev/Kconfig b/board/armadeus/opos6uldev/Kconfig

index beca37d..e66f060 100644 (file)
--- a/board/armadeus/opos6uldev/Kconfig
+++ b/board/armadeus/opos6uldev/Kconfig
@@ -10,6 +10,6 @@ config SYS_CONFIG_NAME
         default "opos6uldev"
  
  config IMX_CONFIG
-       default "arch/arm/imx-common/spl_sd.cfg"
+       default "arch/arm/mach-imx/spl_sd.cfg"
  
  endif
diff --git a/board/armadeus/opos6uldev/board.c b/board/armadeus/opos6uldev/board.c

index 500d0bd..646094a 100644 (file)
--- a/board/armadeus/opos6uldev/board.c
+++ b/board/armadeus/opos6uldev/board.c
@@ -9,7 +9,7 @@
  #include <asm/arch/opos6ul.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <asm/io.h>
  #include <common.h>
  
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c

index 74f652e..1ad4ef9 100644 (file)
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -12,10 +12,10 @@
  #include <asm/arch/iomux.h>
  #include <malloc.h>
  #include <asm/arch/mx6-pins.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <asm/arch/crm_regs.h>
  #include <asm/arch/sys_proto.h>
  #include <mmc.h>
diff --git a/board/barco/platinum/platinum.c b/board/barco/platinum/platinum.c

index 1485a48..f74fa13 100644 (file)
--- a/board/barco/platinum/platinum.c
+++ b/board/barco/platinum/platinum.c
@@ -18,8 +18,8 @@
  #include <asm/arch/crm_regs.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
  
  #include "platinum.h"
  
diff --git a/board/barco/platinum/platinum_picon.c b/board/barco/platinum/platinum_picon.c

index 0384a26..716aec2 100644 (file)
--- a/board/barco/platinum/platinum_picon.c
+++ b/board/barco/platinum/platinum_picon.c
@@ -11,8 +11,8 @@
  #include <asm/arch/clock.h>
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <i2c.h>
  #include <miiphy.h>
  
diff --git a/board/barco/platinum/platinum_titanium.c b/board/barco/platinum/platinum_titanium.c

index 73a955f..bbcd1c5 100644 (file)
--- a/board/barco/platinum/platinum_titanium.c
+++ b/board/barco/platinum/platinum_titanium.c
@@ -9,8 +9,8 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <miiphy.h>
  #include <micrel.h>
  
diff --git a/board/barco/platinum/spl_picon.c b/board/barco/platinum/spl_picon.c

index ec57cf1..f49adf0 100644 (file)
--- a/board/barco/platinum/spl_picon.c
+++ b/board/barco/platinum/spl_picon.c
@@ -14,9 +14,9 @@
  #include <asm/arch/mx6-ddr.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <spl.h>
  
  #include "platinum.h"
diff --git a/board/barco/platinum/spl_titanium.c b/board/barco/platinum/spl_titanium.c

index d1ba85a..c27fb48 100644 (file)
--- a/board/barco/platinum/spl_titanium.c
+++ b/board/barco/platinum/spl_titanium.c
@@ -14,9 +14,9 @@
  #include <asm/arch/mx6-ddr.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <spl.h>
  
  #include "platinum.h"
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c

index 84a7b84..caa598d 100644 (file)
--- a/board/barco/titanium/titanium.c
+++ b/board/barco/titanium/titanium.c
@@ -13,9 +13,9 @@
  #include <asm/arch/crm_regs.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <micrel.h>
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c

index e903bc1..a18a4e8 100644 (file)
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/board/beckhoff/mx53cx9020/mx53cx9020.c
@@ -17,7 +17,7 @@
  #include <asm/arch/clock.h>
  #include <asm/arch/iomux-mx53.h>
  #include <asm/arch/clock.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
  #include <ACEX1K.h>
  #include <netdev.h>
  #include <i2c.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c

index 1145af5..17fd6f5 100644 (file)
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -15,12 +15,12 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/spi.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/spi.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <micrel.h>
diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c

index 3193abf..542e534 100644 (file)
--- a/board/ccv/xpress/xpress.c
+++ b/board/ccv/xpress/xpress.c
@@ -12,9 +12,9 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/io.h>
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c

index 80b5dc9..c59884a 100644 (file)
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -23,9 +23,9 @@
  #include <asm/arch/sys_proto.h>
  #include <asm/arch/iomux.h>
  #include <asm/arch/mxc_hdmi.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/video.h>
  #include <asm/io.h>
  #include <asm/gpio.h>
  #include <dm/platform_data/serial_mxc.h>
diff --git a/board/compulab/cm_fx6/common.c b/board/compulab/cm_fx6/common.c

index 59c9d1a..19fa5d3 100644 (file)
--- a/board/compulab/cm_fx6/common.c
+++ b/board/compulab/cm_fx6/common.c
@@ -11,7 +11,7 @@
  #include <common.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/spi.h>
  #include <fsl_esdhc.h>
  #include "common.h"
  
diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c

index 9442d09..bba977f 100644 (file)
--- a/board/compulab/cm_fx6/spl.c
+++ b/board/compulab/cm_fx6/spl.c
@@ -16,7 +16,7 @@
  #include <asm/arch/clock.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/arch/crm_regs.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <fsl_esdhc.h>
  #include "common.h"
  
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c

index fe7db91..5cb97b4 100644 (file)
--- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c
+++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c
@@ -14,10 +14,10 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/arch/mxc_hdmi.h>
  #include <asm/arch/crm_regs.h>
diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c

index 5b60654..cbe355a 100644 (file)
--- a/board/el/el6x/el6x.c
+++ b/board/el/el6x/el6x.c
@@ -12,10 +12,10 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c

index 95cdaeb..8674599 100644 (file)
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -20,11 +20,11 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/spi.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/spi.h>
+#include <asm/mach-imx/video.h>
  #include <i2c.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c

index ab0ab98..a8a7cf3 100644 (file)
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -20,8 +20,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/video.h>
  
  DECLARE_GLOBAL_DATA_PTR;
  
diff --git a/board/engicam/geam6ul/geam6ul.c b/board/engicam/geam6ul/geam6ul.c

index 841ade9..bc36fc7 100644 (file)
--- a/board/engicam/geam6ul/geam6ul.c
+++ b/board/engicam/geam6ul/geam6ul.c
@@ -18,7 +18,7 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  #include "../common/board.h"
  
diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c

index 74cbbc5..5b2ed06 100644 (file)
--- a/board/engicam/icorem6/icorem6.c
+++ b/board/engicam/icorem6/icorem6.c
@@ -18,8 +18,8 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/video.h>
  
  #include "../common/board.h"
  
diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c

index c3c3173..10a9471 100644 (file)
--- a/board/engicam/icorem6_rqs/icorem6_rqs.c
+++ b/board/engicam/icorem6_rqs/icorem6_rqs.c
@@ -18,7 +18,7 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  #include "../common/board.h"
  
diff --git a/board/engicam/isiotmx6ul/isiotmx6ul.c b/board/engicam/isiotmx6ul/isiotmx6ul.c

index 105db73..4dcc9ea 100644 (file)
--- a/board/engicam/isiotmx6ul/isiotmx6ul.c
+++ b/board/engicam/isiotmx6ul/isiotmx6ul.c
@@ -18,7 +18,7 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  #include "../common/board.h"
  
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c

index df25be8..a88ff8f 100644 (file)
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -13,7 +13,7 @@
  #include <asm/arch/sys_proto.h>
  #include <asm/arch/crm_regs.h>
  #include <asm/arch/clock.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
  #include <i2c.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c

index db28942..c608de4 100644 (file)
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -12,7 +12,7 @@
  #include <asm/arch/clock.h>
  #include <asm/arch/iomux-mx53.h>
  #include <linux/errno.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <netdev.h>
  #include <i2c.h>
  #include <mmc.h>
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c

index 3741fa1..27d606f 100644 (file)
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -14,7 +14,7 @@
  #include <asm/arch/iomux-mx53.h>
  #include <asm/arch/clock.h>
  #include <linux/errno.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
  #include <netdev.h>
  #include <i2c.h>
  #include <mmc.h>
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c

index 7f8eca3..8cb5ac5 100644 (file)
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -11,7 +11,7 @@
  #include <asm/arch/clock.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c

index 927ebe4..13af9ca 100644 (file)
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c
@@ -14,10 +14,10 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/spi.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
@@ -25,7 +25,7 @@
  #include <asm/arch/sys_proto.h>
  #include <i2c.h>
  #include <asm/arch/mxc_hdmi.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/video.h>
  #include <asm/arch/crm_regs.h>
  #include <pca953x.h>
  #include <power/pmic.h>
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c

index f4a5d9c..e416042 100644 (file)
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -12,10 +12,10 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c

index 228514b..8afd5da 100644 (file)
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -14,9 +14,9 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/spi.h>
  #include <asm/io.h>
  #include <linux/sizes.h>
  #include <common.h>
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c

index 74a27a3..33aada1 100644 (file)
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/freescale/mx6sllevk/mx6sllevk.c
@@ -11,8 +11,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <asm/io.h>
  #include <common.h>
  #include <linux/sizes.h>
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c

index e7ab810..83473d8 100644 (file)
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -13,8 +13,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <asm/io.h>
  #include <linux/sizes.h>
  #include <common.h>
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c

index 0460cd9..2aeef61 100644 (file)
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -13,9 +13,9 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <asm/io.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <linux/sizes.h>
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c

index a5746fe..a30c379 100644 (file)
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -12,9 +12,9 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/io.h>
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c

index 489bf21..66b08f8 100644 (file)
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -11,8 +11,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <asm/io.h>
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c

index 7d22501..a681ece 100644 (file)
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -9,7 +9,7 @@
  #include <asm/arch/mx7-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <asm/io.h>
  #include <linux/sizes.h>
  #include <common.h>
@@ -21,7 +21,7 @@
  #include <power/pfuze3000_pmic.h>
  #include "../common/pfuze.h"
  #include <i2c.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/arch/crm_regs.h>
  
  DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/s32v234evb/s32v234evb.cfg b/board/freescale/s32v234evb/s32v234evb.cfg

index 6449ef2..6626a12 100644 (file)
--- a/board/freescale/s32v234evb/s32v234evb.cfg
+++ b/board/freescale/s32v234evb/s32v234evb.cfg
@@ -10,7 +10,7 @@
   *
   * The syntax is taken as close as possible with the kwbimage
   */
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
  
  /* image version */
  IMAGE_VERSION  2
diff --git a/board/freescale/vf610twr/imximage.cfg b/board/freescale/vf610twr/imximage.cfg

index 09125cf..70157ed 100644 (file)
--- a/board/freescale/vf610twr/imximage.cfg
+++ b/board/freescale/vf610twr/imximage.cfg
@@ -8,7 +8,7 @@
   *
   * The syntax is taken as close as possible with the kwbimage
   */
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
  
  /* image version */
  IMAGE_VERSION  2
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c

index 186eb18..46404b4 100644 (file)
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -10,7 +10,7 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <fsl_esdhc.h>
  #include <hwconfig.h>
  #include <power/pmic.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c

index 40ee1b6..89848c8 100644 (file)
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -14,10 +14,10 @@
  #include <asm/arch/mxc_hdmi.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/spi.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/spi.h>
+#include <asm/mach-imx/video.h>
  #include <asm/io.h>
  #include <asm/setup.h>
  #include <dm.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c

index 6060b44..69a638d 100644 (file)
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -11,9 +11,9 @@
  #include <asm/arch/mx6-ddr.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <environment.h>
  #include <i2c.h>
  #include <spl.h>
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c

index 0acf655..b25c634 100644 (file)
--- a/board/ge/bx50v3/bx50v3.c
+++ b/board/ge/bx50v3/bx50v3.c
@@ -12,10 +12,10 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c

index 2d184c8..817e22f 100644 (file)
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -14,8 +14,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <asm/io.h>
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c

index 17c2b13..980cd62 100644 (file)
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -16,11 +16,11 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mxc_hdmi.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/video.h>
  #include <fsl_esdhc.h>
  #include <i2c.h>
  #include <input.h>
diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c

index b934d36..3645b75 100644 (file)
--- a/board/kosagi/novena/novena_spl.c
+++ b/board/kosagi/novena/novena_spl.c
@@ -14,9 +14,9 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/arch/crm_regs.h>
  #include <i2c.h>
  #include <mmc.h>
diff --git a/board/kosagi/novena/video.c b/board/kosagi/novena/video.c

index a4c1222..bd84569 100644 (file)
--- a/board/kosagi/novena/video.c
+++ b/board/kosagi/novena/video.c
@@ -20,9 +20,9 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mxc_hdmi.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/video.h>
  #include <i2c.h>
  #include <input.h>
  #include <ipu_pixfmt.h>
diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c

index eb5eae4..e265e2a 100644 (file)
--- a/board/liebherr/mccmon6/mccmon6.c
+++ b/board/liebherr/mccmon6/mccmon6.c
@@ -12,10 +12,10 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/spi.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/spi.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <asm/io.h>
  #include <fsl_esdhc.h>
  #include <mmc.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c

index 73beeaa..15844ef 100644 (file)
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -11,8 +11,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <asm/arch/crm_regs.h>
diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c

index 5576799..0a7d412 100644 (file)
--- a/board/logicpd/imx6/imx6logic.c
+++ b/board/logicpd/imx6/imx6logic.c
@@ -22,8 +22,8 @@
  #include <asm/arch/mxc_hdmi.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  DECLARE_GLOBAL_DATA_PTR;
  
diff --git a/board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg b/board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg

index b206548..a757461 100644 (file)
--- a/board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg
+++ b/board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg
@@ -10,7 +10,7 @@
   * The syntax is taken as close as possible with the kwbimage
   */
  
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
  
  /* image version */
  IMAGE_VERSION 2
diff --git a/board/phytec/pcm052/imximage.cfg b/board/phytec/pcm052/imximage.cfg

index 2fbb5c1..2a302d7 100644 (file)
--- a/board/phytec/pcm052/imximage.cfg
+++ b/board/phytec/pcm052/imximage.cfg
@@ -8,7 +8,7 @@
   *
   * The syntax is taken as close as possible with the kwbimage
   */
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
  
  /* image version */
  IMAGE_VERSION  2
diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c

index 3dc8cbd..4257fbc 100644 (file)
--- a/board/phytec/pcm058/pcm058.c
+++ b/board/phytec/pcm058/pcm058.c
@@ -18,10 +18,10 @@
  #include <asm/arch/mx6-ddr.h>
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/spi.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
  #include <mmc.h>
diff --git a/board/samtec/vining_2000/vining_2000.c b/board/samtec/vining_2000/vining_2000.c

index c92f37c..5c8b436 100644 (file)
--- a/board/samtec/vining_2000/vining_2000.c
+++ b/board/samtec/vining_2000/vining_2000.c
@@ -13,9 +13,9 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <asm/io.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <linux/sizes.h>
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/board/seco/common/mx6.c b/board/seco/common/mx6.c

index c4abc1d..ad4bb5b 100644 (file)
--- a/board/seco/common/mx6.c
+++ b/board/seco/common/mx6.c
@@ -14,8 +14,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
@@ -27,7 +27,7 @@
  #include <asm/io.h>
  #include <asm/arch/sys_proto.h>
  #include <micrel.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <i2c.h>
  
  #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                  \
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c

index 341e727..be8fef4 100644 (file)
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -14,8 +14,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
  #include <malloc.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
@@ -28,7 +28,7 @@
  #include <asm/io.h>
  #include <asm/arch/sys_proto.h>
  #include <micrel.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <i2c.h>
  
  #include "../common/mx6.h"
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c

index 5c62216..1ccdfa8 100644 (file)
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -21,9 +21,9 @@
  #include <asm/arch/mxc_hdmi.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <malloc.h>
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c

index db0c58f..7a6657f 100644 (file)
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -10,11 +10,11 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <miiphy.h>
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c

index 49aeb80..39f7e01 100644 (file)
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -13,8 +13,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/io.h>
  #include <common.h>
  #include <miiphy.h>
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c

index 799751d..b4c9be7 100644 (file)
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -10,8 +10,8 @@
  #include <asm/arch/mx7-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/io.h>
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c

index eef6922..94251c6 100644 (file)
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -16,7 +16,7 @@
  #include <asm/arch/sys_proto.h>
  #include <asm/arch/crm_regs.h>
  #include <asm/arch/clock.h>
-#include <asm/imx-common/mx5_video.h>
+#include <asm/mach-imx/mx5_video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <mc13892.h>
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c

index 166b93f..8e5613c 100644 (file)
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -20,11 +20,11 @@
  #include <asm/bootm.h>
  #include <asm/gpio.h>
  #include <asm/io.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
  #include <dm/platform_data/serial_mxc.h>
  #include <dm/platdata.h>
  #include <fsl_esdhc.h>
diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c

index 0b42438..5eaf9c0 100644 (file)
--- a/board/toradex/apalis_imx6/pf0100.c
+++ b/board/toradex/apalis_imx6/pf0100.c
@@ -14,7 +14,7 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  #include "pf0100_otp.inc"
  #include "pf0100.h"
diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c

index 87e2447..cbf7aa9 100644 (file)
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -19,11 +19,11 @@
  #include <asm/arch/sys_proto.h>
  #include <asm/bootm.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/sata.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/sata.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
  #include <asm/io.h>
  #include <dm/platform_data/serial_mxc.h>
  #include <dm/platdata.h>
diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c

index 618c571..6889287 100644 (file)
--- a/board/toradex/colibri_imx6/pf0100.c
+++ b/board/toradex/colibri_imx6/pf0100.c
@@ -14,7 +14,7 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  
  #include "pf0100_otp.inc"
  #include "pf0100.h"
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c

index e54afa1..5cb14b4 100644 (file)
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -10,8 +10,8 @@
  #include <asm/arch/mx7-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <asm/io.h>
  #include <common.h>
  #include <dm.h>
diff --git a/board/toradex/colibri_vf/imximage.cfg b/board/toradex/colibri_vf/imximage.cfg

index baab812..6d032ed 100644 (file)
--- a/board/toradex/colibri_vf/imximage.cfg
+++ b/board/toradex/colibri_vf/imximage.cfg
@@ -8,7 +8,7 @@
   *
   * The syntax is taken as close as possible with the kwbimage
   */
-#include <asm/imx-common/imximage.cfg>
+#include <asm/mach-imx/imximage.cfg>
  
  /* image version */
  IMAGE_VERSION  2
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c

index fdb0fa1..fcdea34 100644 (file)
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -16,8 +16,8 @@
  #include <linux/errno.h>
  #include <asm/gpio.h>
  #include <asm/io.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/spi.h>
  #include <common.h>
  #include <fsl_esdhc.h>
  #include <libfdt.h>
diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c

index 43349ad..1188215 100644 (file)
--- a/board/tqc/tqma6/tqma6_mba6.c
+++ b/board/tqc/tqma6/tqma6_mba6.c
@@ -16,7 +16,7 @@
  #include <asm/arch/sys_proto.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
  
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/board/tqc/tqma6/tqma6_wru4.c b/board/tqc/tqma6/tqma6_wru4.c

index 2bbb614..2360cff 100644 (file)
--- a/board/tqc/tqma6/tqma6_wru4.c
+++ b/board/tqc/tqma6/tqma6_wru4.c
@@ -18,8 +18,8 @@
  #include <asm/arch/sys_proto.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/mxc_i2c.h>
  
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c

index 530c45f..276c625 100644 (file)
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -15,12 +15,12 @@
  #include <asm/arch/iomux.h>
  #include <asm/arch/mx6-pins.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <asm/arch/crm_regs.h>
  #include <asm/io.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/arch/sys_proto.h>
  #include <spl.h>
  #include <linux/sizes.h>
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c

index d2cbbaa..7534935 100644 (file)
--- a/board/udoo/udoo.c
+++ b/board/udoo/udoo.c
@@ -13,8 +13,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sata.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sata.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <asm/arch/crm_regs.h>
diff --git a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c

index f24d21e..e83e7c3 100644 (file)
--- a/board/udoo/udoo_spl.c
+++ b/board/udoo/udoo_spl.c
@@ -12,8 +12,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <asm/arch/crm_regs.h>
diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c

index 24c1767..47082a8 100644 (file)
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -11,8 +11,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <linux/errno.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/video.h>
  #include <mmc.h>
  #include <fsl_esdhc.h>
  #include <asm/arch/crm_regs.h>
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c

index 438bc0e..1dbc966 100644 (file)
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -15,11 +15,11 @@
  #include <asm/arch/mxc_hdmi.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
-#include <asm/imx-common/sata.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
+#include <asm/mach-imx/sata.h>
  #include <asm/io.h>
  #include <linux/sizes.h>
  #include <common.h>
diff --git a/board/warp/warp.c b/board/warp/warp.c

index b1b528a..52319b3 100644 (file)
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -14,8 +14,8 @@
  #include <asm/arch/mx6-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/io.h>
  #include <linux/sizes.h>
  #include <common.h>
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c

index df8e9da..d422d63 100644 (file)
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -10,8 +10,8 @@
  #include <asm/arch/mx7-pins.h>
  #include <asm/arch/sys_proto.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/io.h>
  #include <common.h>
  #include <fsl_esdhc.h>
diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig

index d171cf0..d6adf04 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -8,7 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_VIDEO=y
  CONFIG_CMD_HDMIDETECT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
  CONFIG_BOOTDELAY=1
  # CONFIG_CONSOLE_MUX is not set
  # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig

index 4acede4..85ac7ac 100644 (file)
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -11,7 +11,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
  CONFIG_BOOTDELAY=3
  # CONFIG_CONSOLE_MUX is not set
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig

index fa5d9e3..26b4f8a 100644 (file)
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -12,7 +12,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_VIDEO=y
  # CONFIG_CMD_BMODE is not set
  CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
  CONFIG_BOOTDELAY=3
  CONFIG_SPL=y
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x80
diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig

index d8307b0..7ed05cf 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -8,7 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_VIDEO=y
  CONFIG_CMD_HDMIDETECT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
  CONFIG_BOOTDELAY=1
  # CONFIG_CONSOLE_MUX is not set
  # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig

index a476dc2..57f46af 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -15,7 +15,7 @@ CONFIG_CMD_HDMIDETECT=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
  CONFIG_BOOTDELAY=3
  # CONFIG_SYS_STDIO_DEREGISTER is not set
  # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig

index bd38e6d..4bf7122 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -15,7 +15,7 @@ CONFIG_CMD_HDMIDETECT=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
  CONFIG_BOOTDELAY=3
  # CONFIG_SYS_STDIO_DEREGISTER is not set
  # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig

index 296f015..ea6c13d 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -16,7 +16,7 @@ CONFIG_CMD_HDMIDETECT=y
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
  CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
  CONFIG_BOOTDELAY=3
  # CONFIG_SYS_STDIO_DEREGISTER is not set
  # CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig

index 2b1bb3d..b0ba7ff 100644 (file)
--- a/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@ -13,7 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_MMC"
  CONFIG_BOOTDELAY=3
  CONFIG_SPL=y
  CONFIG_SPL_EXT_SUPPORT=y
diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig

index caf4246..f94281c 100644 (file)
--- a/configs/imx6qdl_icore_nand_defconfig
+++ b/configs/imx6qdl_icore_nand_defconfig
@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_NAND"
  CONFIG_BOOTDELAY=3
  CONFIG_SPL=y
  CONFIG_SPL_DMA_SUPPORT=y
diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig

index acc66b0..ca9eb94 100644 (file)
--- a/configs/imx6qdl_icore_rqs_defconfig
+++ b/configs/imx6qdl_icore_rqs_defconfig
@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore-rqs"
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_MMC"
  CONFIG_BOOTDELAY=3
  CONFIG_SPL=y
  CONFIG_SPL_EXT_SUPPORT=y
diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig

index c0489cb..743f859 100644 (file)
--- a/configs/imx6ul_geam_mmc_defconfig
+++ b/configs/imx6ul_geam_mmc_defconfig
@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam-kit"
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_MMC"
  CONFIG_BOOTDELAY=3
  CONFIG_SPL=y
  CONFIG_SPL_EXT_SUPPORT=y
diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig

index 411b95e..b0da6f1 100644 (file)
--- a/configs/imx6ul_geam_nand_defconfig
+++ b/configs/imx6ul_geam_nand_defconfig
@@ -11,7 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-geam-kit"
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_NAND"
  CONFIG_BOOTDELAY=3
  CONFIG_SPL=y
  CONFIG_SPL_DMA_SUPPORT=y
diff --git a/configs/imx6ul_isiot_emmc_defconfig b/configs/imx6ul_isiot_emmc_defconfig

index 8e0bbb2..9771b79 100644 (file)
--- a/configs/imx6ul_isiot_emmc_defconfig
+++ b/configs/imx6ul_isiot_emmc_defconfig
@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-emmc"
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_MMC"
  CONFIG_BOOTDELAY=3
  CONFIG_SPL=y
  CONFIG_SPL_EXT_SUPPORT=y
diff --git a/configs/imx6ul_isiot_mmc_defconfig b/configs/imx6ul_isiot_mmc_defconfig

index 69d4fc5..f4b5c8f 100644 (file)
--- a/configs/imx6ul_isiot_mmc_defconfig
+++ b/configs/imx6ul_isiot_mmc_defconfig
@@ -12,7 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-mmc"
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_MMC"
  CONFIG_BOOTDELAY=3
  CONFIG_SPL=y
  CONFIG_SPL_EXT_SUPPORT=y
diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig

index 5285120..76bfe8d 100644 (file)
--- a/configs/imx6ul_isiot_nand_defconfig
+++ b/configs/imx6ul_isiot_nand_defconfig
@@ -11,7 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6ul-isiot-nand"
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ENV_IS_IN_NAND"
  CONFIG_BOOTDELAY=3
  CONFIG_SPL=y
  CONFIG_SPL_DMA_SUPPORT=y
diff --git a/configs/liteboard_defconfig b/configs/liteboard_defconfig

index e550cf2..f849450 100644 (file)
--- a/configs/liteboard_defconfig
+++ b/configs/liteboard_defconfig
@@ -7,7 +7,7 @@ CONFIG_TARGET_LITEBOARD=y
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=1
  CONFIG_DEFAULT_FDT_FILE="imx6ul-liteboard.dtb"
  CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig

index 7530de1..c35ea92 100644 (file)
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -12,7 +12,7 @@ CONFIG_VIDEO=y
  # CONFIG_CMD_BMODE is not set
  CONFIG_CMD_HDMIDETECT=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
  # CONFIG_SYS_STDIO_DEREGISTER is not set
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL=y
diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig

index c1b3bbf..c63cc8e 100644 (file)
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL"
  CONFIG_BOOTDELAY=3
  # CONFIG_CONSOLE_MUX is not set
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig

index a1d0c84..972e971 100644 (file)
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
  CONFIG_BOOTDELAY=3
  # CONFIG_CONSOLE_MUX is not set
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig

index ad15e7a..39bb63f 100644 (file)
--- a/configs/mx6slevk_spl_defconfig
+++ b/configs/mx6slevk_spl_defconfig
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  # CONFIG_CMD_BMODE is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SL,SYS_I2C"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6SL,SYS_I2C"
  CONFIG_BOOTDELAY=3
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL=y
diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig

index 6d4fe63..90daa96 100644 (file)
--- a/configs/mx6sxsabresd_spl_defconfig
+++ b/configs/mx6sxsabresd_spl_defconfig
@@ -10,7 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_VIDEO=y
  # CONFIG_CMD_BMODE is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
  # CONFIG_CONSOLE_MUX is not set
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig

index 56e66ee..54f3231 100644 (file)
--- a/configs/mx6ul_14x14_evk_defconfig
+++ b/configs/mx6ul_14x14_evk_defconfig
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
  # CONFIG_CONSOLE_MUX is not set
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6ul_9x9_evk_defconfig b/configs/mx6ul_9x9_evk_defconfig

index aa6cc08..57ed81f 100644 (file)
--- a/configs/mx6ul_9x9_evk_defconfig
+++ b/configs/mx6ul_9x9_evk_defconfig
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
  # CONFIG_CONSOLE_MUX is not set
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig

index 3f8b98e..15cbbac 100644 (file)
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -14,7 +14,7 @@ CONFIG_SPL_FAT_SUPPORT=y
  CONFIG_CMD_HDMIDETECT=y
  CONFIG_DISTRO_DEFAULTS=y
  CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
  CONFIG_VERSION_VARIABLE=y
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL=y
diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig

index 1e3b0f7..6c33853 100644 (file)
--- a/configs/ot1200_spl_defconfig
+++ b/configs/ot1200_spl_defconfig
@@ -8,7 +8,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
  CONFIG_BOOTDELAY=3
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL=y
diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig

index c55537c..d18faf7 100644 (file)
--- a/configs/pcm058_defconfig
+++ b/configs/pcm058_defconfig
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_CMD_HDMIDETECT=y
  CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
  CONFIG_BOOTDELAY=3
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL=y
diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig

index 38423dc..d361a74 100644 (file)
--- a/configs/platinum_picon_defconfig
+++ b/configs/platinum_picon_defconfig
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_NAND_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL"
  CONFIG_BOOTDELAY=3
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL=y
diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig

index 3813b98..cf6367a 100644 (file)
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_NAND_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
  CONFIG_BOOTDELAY=3
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL=y
diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig

index 7e52bdc..ced195c 100644 (file)
--- a/configs/udoo_defconfig
+++ b/configs/udoo_defconfig
@@ -8,7 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
  CONFIG_BOOTDELAY=3
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL=y
diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig

index cad2a02..ecc03fc 100644 (file)
--- a/configs/udoo_neo_defconfig
+++ b/configs/udoo_neo_defconfig
@@ -10,7 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  # CONFIG_CMD_BMODE is not set
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_SPL=y
  CONFIG_SPL_ENV_SUPPORT=y
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig

index 95a14ca..2e5ca15 100644 (file)
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -11,7 +11,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_VIDEO=y
  CONFIG_CMD_HDMIDETECT=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL"
  # CONFIG_CONSOLE_MUX is not set
  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
diff --git a/configs/xpress_spl_defconfig b/configs/xpress_spl_defconfig

index 6f4f4bf..0286c99 100644 (file)
--- a/configs/xpress_spl_defconfig
+++ b/configs/xpress_spl_defconfig
@@ -8,7 +8,7 @@ CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
  CONFIG_SYS_CONSOLE_INFO_QUIET=y
  CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/zc5202_defconfig b/configs/zc5202_defconfig

index a2e01e6..b1f86d9 100644 (file)
--- a/configs/zc5202_defconfig
+++ b/configs/zc5202_defconfig
@@ -11,7 +11,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
  CONFIG_BOOTDELAY=3
  CONFIG_DEFAULT_FDT_FILE="imx6q-zc5202.dtb"
  CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/zc5601_defconfig b/configs/zc5601_defconfig

index e28652b..ef86cc4 100644 (file)
--- a/configs/zc5601_defconfig
+++ b/configs/zc5601_defconfig
@@ -11,7 +11,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y
  CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q"
  CONFIG_BOOTDELAY=3
  CONFIG_DEFAULT_FDT_FILE="imx6q-zc5601.dtb"
  CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/doc/README.imximage b/doc/README.imximage

index 27d3354..803682f 100644 (file)
--- a/doc/README.imximage
+++ b/doc/README.imximage
@@ -71,7 +71,7 @@ Configuration command line syntax:
                                         value shall be set to one of the
                                         values found in the file:
                                                 arch/arm/include/asm/\
-                                               imx-common/imximage.cfg
+                                               mach-imx/imximage.cfg
                                 Example:
                                 BOOT_OFFSET FLASH_OFFSET_STANDARD
  
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c

index a97fa85..fea8767 100644 (file)
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -19,8 +19,8 @@
  #include <asm/arch/clock.h>
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/dma.h>
-#include <asm/imx-common/regs-apbh.h>
+#include <asm/mach-imx/dma.h>
+#include <asm/mach-imx/regs-apbh.h>
  
  static struct mxs_dma_chan mxs_dma_channels[MXS_MAX_DMA_CHANNELS];
  
diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c

index b7a1b6a..89918e4 100644 (file)
--- a/drivers/gpio/vybrid_gpio.c
+++ b/drivers/gpio/vybrid_gpio.c
@@ -10,7 +10,7 @@
  #include <errno.h>
  #include <fdtdec.h>
  #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
+#include <asm/mach-imx/iomux-v3.h>
  #include <asm/io.h>
  #include <malloc.h>
  
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c

index 110b9d6..b7bb76c 100644 (file)
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -18,7 +18,7 @@
  #include <asm/arch/clock.h>
  #include <asm/arch/imx-regs.h>
  #include <linux/errno.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
  #include <asm/io.h>
  #include <i2c.h>
  #include <watchdog.h>
diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c

index 88610d6..8986bb4 100644 (file)
--- a/drivers/misc/mxc_ocotp.c
+++ b/drivers/misc/mxc_ocotp.c
@@ -18,7 +18,7 @@
  #include <asm/io.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
  
  #define BO_CTRL_WR_UNLOCK              16
  #define BM_CTRL_WR_UNLOCK              0xffff0000
diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c

index fe1fe70..eb014cc 100644 (file)
--- a/drivers/mmc/mxsmmc.c
+++ b/drivers/mmc/mxsmmc.c
@@ -25,7 +25,7 @@
  #include <asm/arch/clock.h>
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
  #include <bouncebuf.h>
  
  struct mxsmmc_priv {
diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c

index 5aa3608..d774ab8 100644 (file)
--- a/drivers/mtd/nand/mxs_nand.c
+++ b/drivers/mtd/nand/mxs_nand.c
@@ -22,10 +22,10 @@
  #include <asm/io.h>
  #include <asm/arch/clock.h>
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/regs-bch.h>
-#include <asm/imx-common/regs-gpmi.h>
+#include <asm/mach-imx/regs-bch.h>
+#include <asm/mach-imx/regs-gpmi.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
  
  #define        MXS_NAND_DMA_DESCRIPTOR_COUNT           4
  
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c

index 4ad4ddc..40be520 100644 (file)
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -23,7 +23,7 @@
  
  #include <asm/arch/clock.h>
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/sys_proto.h>
  
  DECLARE_GLOBAL_DATA_PTR;
  
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c

index fc2786e..e1562c3 100644 (file)
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -12,7 +12,7 @@
  #include <asm/gpio.h>
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/clock.h>
-#include <asm/imx-common/spi.h>
+#include <asm/mach-imx/spi.h>
  
  #ifdef CONFIG_MX27
  /* i.MX27 has a completely wrong register layout and register definitions in the
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c

index 61daeba..790db78 100644 (file)
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -19,7 +19,7 @@
  #include <asm/arch/clock.h>
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
  
  #define        MXS_SPI_MAX_TIMEOUT     1000000
  #define        MXS_SPI_PORT_OFFSET     0x2000
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c

index f348ec9..fe2627e 100644 (file)
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -14,8 +14,8 @@
  #include <asm/io.h>
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/clock.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/sys_proto.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/sys_proto.h>
  #include <dm.h>
  #include <asm/mach-types.h>
  #include <power/regulator.h>
diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c

index a7f6f21..5bb3763 100644 (file)
--- a/drivers/usb/host/ehci-vf.c
+++ b/drivers/usb/host/ehci-vf.c
@@ -17,8 +17,8 @@
  #include <asm/arch/clock.h>
  #include <asm/arch/imx-regs.h>
  #include <asm/arch/crm_regs.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/regs-usbphy.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/regs-usbphy.h>
  #include <usb/ehci-ci.h>
  #include <libfdt.h>
  #include <fdtdec.h>
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c

index 20455ff..0ddce3d 100644 (file)
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -15,7 +15,7 @@
  #include <linux/errno.h>
  #include <asm/io.h>
  
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
  
  #include "videomodes.h"
  
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h

index 66ee167..58cf7ad 100644 (file)
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -10,7 +10,7 @@
  #define __ADVANTECH_DMSBA16_CONFIG_H
  
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #define CONFIG_BOARD_NAME      "Advantech DMS-BA16"
  
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h

index b4006a3..a18ab12 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -19,7 +19,7 @@
  #define CONFIG_SYS_GENERIC_BOARD
  
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #ifdef CONFIG_SPL
  #include "imx6_spl.h"
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h

index 82812e5..f3335f5 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -17,7 +17,7 @@
  #define CONFIG_SYS_GENERIC_BOARD
  
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #ifdef CONFIG_SPL
  #include "imx6_spl.h"
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h

index f60a029..ad97a16 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -13,7 +13,7 @@
  #define __GE_BX50V3_CONFIG_H
  
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #define BX50V3_BOOTARGS_EXTRA
  #if defined(CONFIG_TARGET_GE_B450V3)
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h

index 1a8ab4e..f07e83b 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -22,7 +22,7 @@
  
  #include <linux/sizes.h>
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #ifndef CONFIG_MX6
  #define CONFIG_MX6
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h

index 2c40dec..d38c27a 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -11,7 +11,7 @@
  #include <asm/arch/imx-regs.h>
  #include <linux/sizes.h>
  #include "mx6_common.h"
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #define is_mx6ul_9x9_evk()     CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK)
  
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h

index 19b0630..30e7518 100644 (file)
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -12,7 +12,7 @@
  #include <asm/arch/imx-regs.h>
  #include <linux/sizes.h>
  #include "mx6_common.h"
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #ifdef CONFIG_SECURE_BOOT
  #ifndef CONFIG_CSF_SIZE
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h

index fe46010..6df6498 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -11,7 +11,7 @@
  
  #include <linux/sizes.h>
  #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  #ifndef CONFIG_MX7
  #define CONFIG_MX7
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h

index 8d78f49..38ae837 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -12,7 +12,7 @@
  #include <asm/arch/imx-regs.h>
  #include <linux/sizes.h>
  #include "mx6_common.h"
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  /* Network support */
  
diff --git a/include/configs/xpress.h b/include/configs/xpress.h

index e13b792..9edb353 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -9,7 +9,7 @@
  #define __XPRESS_CONFIG_H
  
  #include "mx6_common.h"
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
  
  /* SPL options */
  #include "imx6_spl.h"
diff --git a/tools/imximage.h b/tools/imximage.h

index 78d48bb..de1ea8f 100644 (file)
--- a/tools/imximage.h
+++ b/tools/imximage.h
@@ -16,7 +16,7 @@
  
  /*
   * NOTE: This file must be kept in sync with arch/arm/include/asm/\
- *       imx-common/imximage.cfg because tools/imximage.c can not
+ *       mach-imx/imximage.cfg because tools/imximage.c can not
   *       cross-include headers from arch/arm/ and vice-versa.
   */
  #define CMD_DATA_STR   "DATA"
author	Stefano Babic <sbabic@denx.de>
	Thu, 29 Jun 2017 08:16:06 +0000 (10:16 +0200)
committer	Stefano Babic <sbabic@denx.de>
	Wed, 12 Jul 2017 08:17:44 +0000 (10:17 +0200)
MAINTAINERS		patch \| blob \| history
Makefile		patch \| blob \| history
arch/arm/Kconfig		patch \| blob \| history
arch/arm/Makefile		patch \| blob \| history
arch/arm/cpu/arm926ejs/mx27/generic.c		patch \| blob \| history
arch/arm/cpu/arm926ejs/mxs/mxs.c		patch \| blob \| history
arch/arm/cpu/armv7/Makefile		patch \| blob \| history
arch/arm/cpu/armv7/vf610/generic.c		patch \| blob \| history
arch/arm/include/asm/arch-mx25/gpio.h		patch \| blob \| history
arch/arm/include/asm/arch-mx25/iomux-mx25.h		patch \| blob \| history
arch/arm/include/asm/arch-mx31/gpio.h		patch \| blob \| history
arch/arm/include/asm/arch-mx31/sys_proto.h		patch \| blob \| history
arch/arm/include/asm/arch-mx35/gpio.h		patch \| blob \| history
arch/arm/include/asm/arch-mx35/iomux-mx35.h		patch \| blob \| history
arch/arm/include/asm/arch-mx35/sys_proto.h		patch \| blob \| history
arch/arm/include/asm/arch-mx5/gpio.h		patch \| blob \| history
arch/arm/include/asm/arch-mx5/iomux-mx51.h		patch \| blob \| history
arch/arm/include/asm/arch-mx5/iomux-mx53.h		patch \| blob \| history
arch/arm/include/asm/arch-mx5/sys_proto.h		patch \| blob \| history
arch/arm/include/asm/arch-mx6/gpio.h		patch \| blob \| history
arch/arm/include/asm/arch-mx6/imx-regs.h		patch \| blob \| history
arch/arm/include/asm/arch-mx6/mx6-pins.h		patch \| blob \| history
arch/arm/include/asm/arch-mx6/mx6sl_pins.h		patch \| blob \| history
arch/arm/include/asm/arch-mx6/mx6sll_pins.h		patch \| blob \| history
arch/arm/include/asm/arch-mx6/mx6sx_pins.h		patch \| blob \| history
arch/arm/include/asm/arch-mx6/mx6ul_pins.h		patch \| blob \| history
arch/arm/include/asm/arch-mx6/mx6ull_pins.h		patch \| blob \| history
arch/arm/include/asm/arch-mx6/sys_proto.h		patch \| blob \| history
arch/arm/include/asm/arch-mx7/gpio.h		patch \| blob \| history
arch/arm/include/asm/arch-mx7/imx-regs.h		patch \| blob \| history
arch/arm/include/asm/arch-mx7/mx7-pins.h		patch \| blob \| history
arch/arm/include/asm/arch-mx7/mx7d_pins.h		patch \| blob \| history
arch/arm/include/asm/arch-mx7/sys_proto.h		patch \| blob \| history
arch/arm/include/asm/arch-mx7ulp/sys_proto.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/imx-regs.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-digctl.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-i2c.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-lradc.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-ocotp.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-pinctrl.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-power-mx23.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-power-mx28.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-rtc.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-ssp.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-timrot.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/regs-uartapp.h		patch \| blob \| history
arch/arm/include/asm/arch-mxs/sys_proto.h		patch \| blob \| history
arch/arm/include/asm/arch-vf610/iomux-vf610.h		patch \| blob \| history
arch/arm/include/asm/mach-imx/boot_mode.h	[moved from arch/arm/include/asm/imx-common/boot_mode.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/dma.h	[moved from arch/arm/include/asm/imx-common/dma.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/gpio.h	[moved from arch/arm/include/asm/imx-common/gpio.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/hab.h	[moved from arch/arm/include/asm/imx-common/hab.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/imximage.cfg	[moved from arch/arm/include/asm/imx-common/imximage.cfg with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/iomux-v3.h	[moved from arch/arm/include/asm/imx-common/iomux-v3.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/mx5_video.h	[moved from arch/arm/include/asm/imx-common/mx5_video.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/mxc_i2c.h	[moved from arch/arm/include/asm/imx-common/mxc_i2c.h with 98% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/rdc-sema.h	[moved from arch/arm/include/asm/imx-common/rdc-sema.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/regs-apbh.h	[moved from arch/arm/include/asm/imx-common/regs-apbh.h with 99% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/regs-bch.h	[moved from arch/arm/include/asm/imx-common/regs-bch.h with 99% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/regs-common.h	[moved from arch/arm/include/asm/imx-common/regs-common.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/regs-gpmi.h	[moved from arch/arm/include/asm/imx-common/regs-gpmi.h with 99% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/regs-lcdif.h	[moved from arch/arm/include/asm/imx-common/regs-lcdif.h with 99% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/regs-usbphy.h	[moved from arch/arm/include/asm/imx-common/regs-usbphy.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/sata.h	[moved from arch/arm/include/asm/imx-common/sata.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/spi.h	[moved from arch/arm/include/asm/imx-common/spi.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/sys_proto.h	[moved from arch/arm/include/asm/imx-common/sys_proto.h with 98% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/syscounter.h	[moved from arch/arm/include/asm/imx-common/syscounter.h with 100% similarity]	patch \| blob \| history
arch/arm/include/asm/mach-imx/video.h	[moved from arch/arm/include/asm/imx-common/video.h with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/Kconfig	[moved from arch/arm/imx-common/Kconfig with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/Makefile	[moved from arch/arm/imx-common/Makefile with 96% similarity]	patch \| blob \| history
arch/arm/mach-imx/cache.c	[moved from arch/arm/imx-common/cache.c with 98% similarity]	patch \| blob \| history
arch/arm/mach-imx/cmd_bmode.c	[moved from arch/arm/imx-common/cmd_bmode.c with 97% similarity]	patch \| blob \| history
arch/arm/mach-imx/cmd_dek.c	[moved from arch/arm/imx-common/cmd_dek.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/cmd_hdmidet.c	[moved from arch/arm/imx-common/cmd_hdmidet.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/cpu.c	[moved from arch/arm/imx-common/cpu.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/ddrmc-vf610.c	[moved from arch/arm/imx-common/ddrmc-vf610.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/hab.c	[moved from arch/arm/imx-common/hab.c with 99% similarity]	patch \| blob \| history
arch/arm/mach-imx/i2c-mxv7.c	[moved from arch/arm/imx-common/i2c-mxv7.c with 98% similarity]	patch \| blob \| history
arch/arm/mach-imx/imx_bootaux.c	[moved from arch/arm/imx-common/imx_bootaux.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/init.c	[moved from arch/arm/imx-common/init.c with 98% similarity]	patch \| blob \| history
arch/arm/mach-imx/iomux-v3.c	[moved from arch/arm/imx-common/iomux-v3.c with 97% similarity]	patch \| blob \| history
arch/arm/mach-imx/misc.c	[moved from arch/arm/imx-common/misc.c with 97% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx5/Kconfig	[moved from arch/arm/cpu/armv7/mx5/Kconfig with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx5/Makefile	[moved from arch/arm/cpu/armv7/mx5/Makefile with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx5/clock.c	[moved from arch/arm/cpu/armv7/mx5/clock.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx5/lowlevel_init.S	[moved from arch/arm/cpu/armv7/mx5/lowlevel_init.S with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx5/soc.c	[moved from arch/arm/cpu/armv7/mx5/soc.c with 98% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx6/Kconfig	[moved from arch/arm/cpu/armv7/mx6/Kconfig with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx6/Makefile	[moved from arch/arm/cpu/armv7/mx6/Makefile with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx6/clock.c	[moved from arch/arm/cpu/armv7/mx6/clock.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx6/ddr.c	[moved from arch/arm/cpu/armv7/mx6/ddr.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx6/litesom.c	[moved from arch/arm/cpu/armv7/mx6/litesom.c with 98% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx6/mp.c	[moved from arch/arm/cpu/armv7/mx6/mp.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx6/opos6ul.c	[moved from arch/arm/cpu/armv7/mx6/opos6ul.c with 99% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx6/soc.c	[moved from arch/arm/cpu/armv7/mx6/soc.c with 99% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7/Kconfig	[moved from arch/arm/cpu/armv7/mx7/Kconfig with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7/Makefile	[moved from arch/arm/cpu/armv7/mx7/Makefile with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7/clock.c	[moved from arch/arm/cpu/armv7/mx7/clock.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7/clock_slice.c	[moved from arch/arm/cpu/armv7/mx7/clock_slice.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7/psci-mx7.c	[moved from arch/arm/cpu/armv7/mx7/psci-mx7.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7/psci.S	[moved from arch/arm/cpu/armv7/mx7/psci.S with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7/soc.c	[moved from arch/arm/cpu/armv7/mx7/soc.c with 98% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7ulp/Kconfig	[moved from arch/arm/cpu/armv7/mx7ulp/Kconfig with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7ulp/Makefile	[moved from arch/arm/cpu/armv7/mx7ulp/Makefile with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7ulp/clock.c	[moved from arch/arm/cpu/armv7/mx7ulp/clock.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7ulp/iomux.c	[moved from arch/arm/cpu/armv7/mx7ulp/iomux.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7ulp/pcc.c	[moved from arch/arm/cpu/armv7/mx7ulp/pcc.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7ulp/scg.c	[moved from arch/arm/cpu/armv7/mx7ulp/scg.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/mx7ulp/soc.c	[moved from arch/arm/cpu/armv7/mx7ulp/soc.c with 99% similarity]	patch \| blob \| history
arch/arm/mach-imx/rdc-sema.c	[moved from arch/arm/imx-common/rdc-sema.c with 99% similarity]	patch \| blob \| history
arch/arm/mach-imx/sata.c	[moved from arch/arm/imx-common/sata.c with 95% similarity]	patch \| blob \| history
arch/arm/mach-imx/speed.c	[moved from arch/arm/imx-common/speed.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/spl.c	[moved from arch/arm/imx-common/spl.c with 99% similarity]	patch \| blob \| history
arch/arm/mach-imx/spl_sd.cfg	[moved from arch/arm/imx-common/spl_sd.cfg with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/syscounter.c	[moved from arch/arm/imx-common/syscounter.c with 98% similarity]	patch \| blob \| history
arch/arm/mach-imx/timer.c	[moved from arch/arm/imx-common/timer.c with 100% similarity]	patch \| blob \| history
arch/arm/mach-imx/video.c	[moved from arch/arm/imx-common/video.c with 97% similarity]	patch \| blob \| history
board/advantech/dms-ba16/dms-ba16.c		patch \| blob \| history
board/aries/m53evk/imximage.cfg		patch \| blob \| history
board/aries/m53evk/m53evk.c		patch \| blob \| history
board/aristainetos/aristainetos-v1.c		patch \| blob \| history
board/aristainetos/aristainetos-v2.c		patch \| blob \| history
board/aristainetos/aristainetos.c		patch \| blob \| history
board/armadeus/opos6uldev/Kconfig		patch \| blob \| history
board/armadeus/opos6uldev/board.c		patch \| blob \| history
board/bachmann/ot1200/ot1200.c		patch \| blob \| history
board/barco/platinum/platinum.c		patch \| blob \| history
board/barco/platinum/platinum_picon.c		patch \| blob \| history
board/barco/platinum/platinum_titanium.c		patch \| blob \| history
board/barco/platinum/spl_picon.c		patch \| blob \| history
board/barco/platinum/spl_titanium.c		patch \| blob \| history
board/barco/titanium/titanium.c		patch \| blob \| history
board/beckhoff/mx53cx9020/mx53cx9020.c		patch \| blob \| history
board/boundary/nitrogen6x/nitrogen6x.c		patch \| blob \| history
board/ccv/xpress/xpress.c		patch \| blob \| history
board/compulab/cm_fx6/cm_fx6.c		patch \| blob \| history
board/compulab/cm_fx6/common.c		patch \| blob \| history
board/compulab/cm_fx6/spl.c		patch \| blob \| history
board/congatec/cgtqmx6eval/cgtqmx6eval.c		patch \| blob \| history
board/el/el6x/el6x.c		patch \| blob \| history
board/embest/mx6boards/mx6boards.c		patch \| blob \| history
board/engicam/common/spl.c		patch \| blob \| history
board/engicam/geam6ul/geam6ul.c		patch \| blob \| history
board/engicam/icorem6/icorem6.c		patch \| blob \| history
board/engicam/icorem6_rqs/icorem6_rqs.c		patch \| blob \| history
board/engicam/isiotmx6ul/isiotmx6ul.c		patch \| blob \| history
board/freescale/mx51evk/mx51evk.c		patch \| blob \| history
board/freescale/mx53evk/mx53evk.c		patch \| blob \| history
board/freescale/mx53loco/mx53loco.c		patch \| blob \| history
board/freescale/mx6qarm2/mx6qarm2.c		patch \| blob \| history
board/freescale/mx6sabreauto/mx6sabreauto.c		patch \| blob \| history
board/freescale/mx6sabresd/mx6sabresd.c		patch \| blob \| history
board/freescale/mx6slevk/mx6slevk.c		patch \| blob \| history
board/freescale/mx6sllevk/mx6sllevk.c		patch \| blob \| history
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c		patch \| blob \| history
board/freescale/mx6sxsabresd/mx6sxsabresd.c		patch \| blob \| history
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c		patch \| blob \| history
board/freescale/mx6ullevk/mx6ullevk.c		patch \| blob \| history
board/freescale/mx7dsabresd/mx7dsabresd.c		patch \| blob \| history
board/freescale/s32v234evb/s32v234evb.cfg		patch \| blob \| history
board/freescale/vf610twr/imximage.cfg		patch \| blob \| history
board/gateworks/gw_ventana/common.c		patch \| blob \| history
board/gateworks/gw_ventana/gw_ventana.c		patch \| blob \| history
board/gateworks/gw_ventana/gw_ventana_spl.c		patch \| blob \| history
board/ge/bx50v3/bx50v3.c		patch \| blob \| history
board/grinn/liteboard/board.c		patch \| blob \| history
board/kosagi/novena/novena.c		patch \| blob \| history
board/kosagi/novena/novena_spl.c		patch \| blob \| history
board/kosagi/novena/video.c		patch \| blob \| history
board/liebherr/mccmon6/mccmon6.c		patch \| blob \| history
board/liebherr/mccmon6/spl.c		patch \| blob \| history
board/logicpd/imx6/imx6logic.c		patch \| blob \| history
board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg		patch \| blob \| history
board/phytec/pcm052/imximage.cfg		patch \| blob \| history
board/phytec/pcm058/pcm058.c		patch \| blob \| history
board/samtec/vining_2000/vining_2000.c		patch \| blob \| history
board/seco/common/mx6.c		patch \| blob \| history
board/seco/mx6quq7/mx6quq7.c		patch \| blob \| history
board/solidrun/mx6cuboxi/mx6cuboxi.c		patch \| blob \| history
board/tbs/tbs2910/tbs2910.c		patch \| blob \| history
board/technexion/pico-imx6ul/pico-imx6ul.c		patch \| blob \| history
board/technexion/pico-imx7d/pico-imx7d.c		patch \| blob \| history
board/technologic/ts4800/ts4800.c		patch \| blob \| history
board/toradex/apalis_imx6/apalis_imx6.c		patch \| blob \| history
board/toradex/apalis_imx6/pf0100.c		patch \| blob \| history
board/toradex/colibri_imx6/colibri_imx6.c		patch \| blob \| history
board/toradex/colibri_imx6/pf0100.c		patch \| blob \| history
board/toradex/colibri_imx7/colibri_imx7.c		patch \| blob \| history
board/toradex/colibri_vf/imximage.cfg		patch \| blob \| history
board/tqc/tqma6/tqma6.c		patch \| blob \| history
board/tqc/tqma6/tqma6_mba6.c		patch \| blob \| history
board/tqc/tqma6/tqma6_wru4.c		patch \| blob \| history
board/udoo/neo/neo.c		patch \| blob \| history
board/udoo/udoo.c		patch \| blob \| history
board/udoo/udoo_spl.c		patch \| blob \| history
board/wandboard/spl.c		patch \| blob \| history
board/wandboard/wandboard.c		patch \| blob \| history
board/warp/warp.c		patch \| blob \| history
board/warp7/warp7.c		patch \| blob \| history
configs/apalis_imx6_defconfig		patch \| blob \| history
configs/cgtqmx6eval_defconfig		patch \| blob \| history
configs/cm_fx6_defconfig		patch \| blob \| history
configs/colibri_imx6_defconfig		patch \| blob \| history
configs/gwventana_emmc_defconfig		patch \| blob \| history
configs/gwventana_gw5904_defconfig		patch \| blob \| history
configs/gwventana_nand_defconfig		patch \| blob \| history
configs/imx6qdl_icore_mmc_defconfig		patch \| blob \| history
configs/imx6qdl_icore_nand_defconfig		patch \| blob \| history
configs/imx6qdl_icore_rqs_defconfig		patch \| blob \| history
configs/imx6ul_geam_mmc_defconfig		patch \| blob \| history
configs/imx6ul_geam_nand_defconfig		patch \| blob \| history
configs/imx6ul_isiot_emmc_defconfig		patch \| blob \| history
configs/imx6ul_isiot_mmc_defconfig		patch \| blob \| history
configs/imx6ul_isiot_nand_defconfig		patch \| blob \| history
configs/liteboard_defconfig		patch \| blob \| history
configs/mx6cuboxi_defconfig		patch \| blob \| history
configs/mx6sabreauto_defconfig		patch \| blob \| history
configs/mx6sabresd_defconfig		patch \| blob \| history
configs/mx6slevk_spl_defconfig		patch \| blob \| history
configs/mx6sxsabresd_spl_defconfig		patch \| blob \| history
configs/mx6ul_14x14_evk_defconfig		patch \| blob \| history
configs/mx6ul_9x9_evk_defconfig		patch \| blob \| history
configs/novena_defconfig		patch \| blob \| history
configs/ot1200_spl_defconfig		patch \| blob \| history
configs/pcm058_defconfig		patch \| blob \| history
configs/platinum_picon_defconfig		patch \| blob \| history
configs/platinum_titanium_defconfig		patch \| blob \| history
configs/udoo_defconfig		patch \| blob \| history
configs/udoo_neo_defconfig		patch \| blob \| history
configs/wandboard_defconfig		patch \| blob \| history
configs/xpress_spl_defconfig		patch \| blob \| history
configs/zc5202_defconfig		patch \| blob \| history
configs/zc5601_defconfig		patch \| blob \| history
doc/README.imximage		patch \| blob \| history
drivers/dma/apbh_dma.c		patch \| blob \| history
drivers/gpio/vybrid_gpio.c		patch \| blob \| history
drivers/i2c/mxc_i2c.c		patch \| blob \| history
drivers/misc/mxc_ocotp.c		patch \| blob \| history
drivers/mmc/mxsmmc.c		patch \| blob \| history
drivers/mtd/nand/mxs_nand.c		patch \| blob \| history
drivers/net/fec_mxc.c		patch \| blob \| history
drivers/spi/mxc_spi.c		patch \| blob \| history
drivers/spi/mxs_spi.c		patch \| blob \| history
drivers/usb/host/ehci-mx6.c		patch \| blob \| history
drivers/usb/host/ehci-vf.c		patch \| blob \| history
drivers/video/mxsfb.c		patch \| blob \| history
include/configs/advantech_dms-ba16.h		patch \| blob \| history
include/configs/apalis_imx6.h		patch \| blob \| history
include/configs/colibri_imx6.h		patch \| blob \| history
include/configs/ge_bx50v3.h		patch \| blob \| history
include/configs/mx6_common.h		patch \| blob \| history
include/configs/mx6ul_14x14_evk.h		patch \| blob \| history
include/configs/mx6ullevk.h		patch \| blob \| history
include/configs/mx7_common.h		patch \| blob \| history
include/configs/pico-imx6ul.h		patch \| blob \| history
include/configs/xpress.h		patch \| blob \| history
tools/imximage.h		patch \| blob \| history