From f3991e5967a93cd8ac3a59d0092b03271288c679 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Mon, 24 Jun 2013 16:20:28 +0200 Subject: [PATCH] use CONFIG_MX6 instead of CONFIG_MX6Q --- arch/arm/imx-common/cpu.c | 2 +- arch/arm/imx-common/timer.c | 2 +- drivers/gpio/mxc_gpio.c | 4 ++-- drivers/mtd/nand/mxs_nand.c | 2 +- include/configs/tx6q.h | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index a02f2e75c0..fc166d8c9e 100644 --- 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 diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c index b2ce8fee17..7405b82afa 100644 --- 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) -#ifdef CONFIG_MX6Q +#ifdef CONFIG_MX6 #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 35e9246977..0c73a2bf68 100644 --- 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 -#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 -#if defined(CONFIG_MX53) || defined(CONFIG_MX6Q) +#if defined(CONFIG_MX53) || defined(CONFIG_MX6) [6] = GPIO7_BASE_ADDR, #endif }; diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index 37ed099641..78af818fd6 100644 --- 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 -#ifndef CONFIG_MX6Q +#ifndef CONFIG_MX6 #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 7bdd1847b5..3eb05e91ea 100644 --- a/include/configs/tx6q.h +++ b/include/configs/tx6q.h @@ -18,6 +18,7 @@ /* * Ka-Ro TX6Q board - SoC configuration */ +#define CONFIG_MX6 #define CONFIG_MX6Q #define CONFIG_SYS_MX6_HCLK 24000000 #define CONFIG_SYS_MX6_CLK32 32768 -- 2.39.2