use CONFIG_MX6 instead of CONFIG_MX6Q

diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
index a02f2e75c0381be51485524a730d0f1d217fe707..fc166d8c9ef72c3c649e24c94b4fe251a0b1686d 100644 (file)
--- a/arch/arm/imx-common/cpu.c
+++ b/arch/arm/imx-common/cpu.c
@@ -64,7 +64,7 @@ char *get_reset_cause(void)
        }
 }
 
        }
 }
 

-#if defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6)

 #if defined(CONFIG_MX53)
 #define MEMCTL_BASE    ESDCTL_BASE_ADDR;
 #else
 #if defined(CONFIG_MX53)
 #define MEMCTL_BASE    ESDCTL_BASE_ADDR;
 #else

diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c
index b2ce8fee1777a6afcc30099000d389652fd92c71..7405b82afab0bf362778281e0883509070a3acca 100644 (file)
--- a/arch/arm/imx-common/timer.c
+++ b/arch/arm/imx-common/timer.c
@@ -48,7 +48,7 @@ static struct mxc_gpt *cur_gpt = (struct mxc_gpt *)GPT1_BASE_ADDR;
 #define GPTCR_CLKSOURCE_IPG    (1 << 6)        /* Clock source */
 #define GPTCR_CLKSOURCE_CKIH   (2 << 6)
 #define GPTCR_CLKSOURCE_32kHz  (4 << 6)
 #define GPTCR_CLKSOURCE_IPG    (1 << 6)        /* Clock source */
 #define GPTCR_CLKSOURCE_CKIH   (2 << 6)
 #define GPTCR_CLKSOURCE_32kHz  (4 << 6)

-#ifdef CONFIG_MX6Q
+#ifdef CONFIG_MX6

 #define GPTCR_CLKSOURCE_OSC_DIV_8      (5 << 6)
 #define GPTCR_CLKSOURCE_OSC    (7 << 6)
 #else
 #define GPTCR_CLKSOURCE_OSC_DIV_8      (5 << 6)
 #define GPTCR_CLKSOURCE_OSC    (7 << 6)
 #else

diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 35e9246977e1a2f65b9a1a05e631b3801fac7548..0c73a2bf689fd1eab8b9a793b5fd34c2f811cdc1 100644 (file)
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -45,11 +45,11 @@ static unsigned long gpio_ports[] = {
                defined(CONFIG_MX53) || defined(CONFIG_MX6)
        [3] = GPIO4_BASE_ADDR,
 #endif
                defined(CONFIG_MX53) || defined(CONFIG_MX6)
        [3] = GPIO4_BASE_ADDR,
 #endif

-#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
+#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6)

        [4] = GPIO5_BASE_ADDR,
        [5] = GPIO6_BASE_ADDR,
 #endif
        [4] = GPIO5_BASE_ADDR,
        [5] = GPIO6_BASE_ADDR,
 #endif

-#if defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
+#if defined(CONFIG_MX53) || defined(CONFIG_MX6)

        [6] = GPIO7_BASE_ADDR,
 #endif
 };
        [6] = GPIO7_BASE_ADDR,
 #endif
 };

diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
index 37ed099641194b2ed8ff072df1fdfbab38251a29..78af818fd61d31c2e1aaf3276b75fe772916ca7c 100644 (file)
--- a/drivers/mtd/nand/mxs_nand.c
+++ b/drivers/mtd/nand/mxs_nand.c
@@ -42,7 +42,7 @@
 
 #define        MXS_NAND_DMA_DESCRIPTOR_COUNT           4
 
 
 #define        MXS_NAND_DMA_DESCRIPTOR_COUNT           4
 

-#ifndef CONFIG_MX6Q
+#ifndef CONFIG_MX6

 #define        MXS_NAND_CHUNK_DATA_CHUNK_SIZE          512
 #else
 #define        MXS_NAND_CHUNK_DATA_CHUNK_SIZE          (512 / 4)
 #define        MXS_NAND_CHUNK_DATA_CHUNK_SIZE          512
 #else
 #define        MXS_NAND_CHUNK_DATA_CHUNK_SIZE          (512 / 4)

diff --git a/include/configs/tx6q.h b/include/configs/tx6q.h
index 7bdd1847b5511c01b88aa539828f5b927463317e..3eb05e91ea95e31554aa209a1510153509fb7591 100644 (file)
--- a/include/configs/tx6q.h
+++ b/include/configs/tx6q.h
@@ -18,6 +18,7 @@
 /*
  * Ka-Ro TX6Q board - SoC configuration
  */
 /*
  * Ka-Ro TX6Q board - SoC configuration
  */

+#define CONFIG_MX6

 #define CONFIG_MX6Q
 #define CONFIG_SYS_MX6_HCLK            24000000
 #define CONFIG_SYS_MX6_CLK32           32768
 #define CONFIG_MX6Q
 #define CONFIG_SYS_MX6_HCLK            24000000
 #define CONFIG_SYS_MX6_CLK32           32768