[U-Boot] [PATCH V3 24/32] mx6: use CONFIG_MX6 instead of CONFIG_MX6Q

Troy Kisky
2012-10-08T21:49:36Z

On 10/8/2012 6:41 AM, Stefano Babic wrote:
> On 04/10/2012 03:47, Troy Kisky wrote:
>> Use CONFIG_MX6 when the particular processor
>> variant isn't important.
>>
>> Reserve the use of CONFIG_MX6Q to
>> specifically test for quad cores variant.
>>
>> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
>> ---
>> drivers/gpio/mxc_gpio.c | 6 +++---
>> drivers/video/ipu_regs.h | 2 +-
>> include/configs/mx6qarm2.h | 1 +
>> include/configs/mx6qsabre_common.h | 1 +
>> include/configs/mx6qsabrelite.h | 1 +
>> 5 files changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
>> index 2c79bff..a388064 100644
>> --- a/drivers/gpio/mxc_gpio.c
>> +++ b/drivers/gpio/mxc_gpio.c
>> @@ -42,14 +42,14 @@ static unsigned long gpio_ports[] = {
>> [1] = GPIO2_BASE_ADDR,
>> [2] = GPIO3_BASE_ADDR,
>> #if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
>> - defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
>> + 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/video/ipu_regs.h b/drivers/video/ipu_regs.h
>> index a43aa03..982e252 100644
>> --- a/drivers/video/ipu_regs.h
>> +++ b/drivers/video/ipu_regs.h
>> @@ -55,7 +55,7 @@
>> #define IPU_TPM_REG_BASE 0x01060000
>> #define IPU_DC_TMPL_REG_BASE 0x01080000
>> #define IPU_ISP_TBPR_REG_BASE 0x010C0000
>> -#elif defined(CONFIG_MX6Q)
>> +#elif defined(CONFIG_MX6)
>> #define IPU_CPMEM_REG_BASE 0x00100000
>> #define IPU_LUT_REG_BASE 0x00120000
>> #define IPU_SRM_REG_BASE 0x00140000
>> diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
>> index 965bea3..8e5b81e 100644
>> --- a/include/configs/mx6qarm2.h
>> +++ b/include/configs/mx6qarm2.h
>> @@ -22,6 +22,7 @@
>> #ifndef __CONFIG_H
>> #define __CONFIG_H
>>
>> +#define CONFIG_MX6
>> #define CONFIG_MX6Q
>> #define CONFIG_DISPLAY_CPUINFO
>> #define CONFIG_DISPLAY_BOARDINFO
>> diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
>> index 247e8d6..5a940da 100644
>> --- a/include/configs/mx6qsabre_common.h
>> +++ b/include/configs/mx6qsabre_common.h
>> @@ -17,6 +17,7 @@
>> #ifndef __MX6QSABRE_COMMON_CONFIG_H
>> #define __MX6QSABRE_COMMON_CONFIG_H
>>
>> +#define CONFIG_MX6
>> #define CONFIG_MX6Q
>> #define CONFIG_DISPLAY_CPUINFO
>> #define CONFIG_DISPLAY_BOARDINFO
>> diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
>> index e7bf658..6a10232 100644
>> --- a/include/configs/mx6qsabrelite.h
>> +++ b/include/configs/mx6qsabrelite.h
>> @@ -22,6 +22,7 @@
>> #ifndef __CONFIG_H
>> #define __CONFIG_H
>>
>> +#define CONFIG_MX6
>> #define CONFIG_MX6Q
>> #define CONFIG_DISPLAY_CPUINFO
>> #define CONFIG_DISPLAY_BOARDINFO
>>
> This changes affects also mx6qsabreauto and mx6qsabresd, that I have
> already merged.
>
> Best regards,
> Stefano Babic
They should be covered by
#include "mx6qsabre_common.h"