[U-Boot] [PATCH 3/5] ARM: Exynos5250: move feature defines out of generic config file

[Andre Przywara]

On 12/05/2013 11:44 AM, Rajeshwari Birje wrote:

Minkyu, Rajeshwari,

> I have submitted a patch set for support of exynos5420 in which I
> separate the config files to form one
> common exynos5-dt.h and which is inherited in 5420 and 5250 config file.
> May be u can use the same patch.

Thanks for the info and the other comments. Did the patch already appear 
in some tree I could base my work on?
I will try to find some time in the next week to look at that again.

Thanks,
Andre.

> On Thu, Dec 5, 2013 at 1:38 PM, Minkyu Kang <mk7.kang at samsung.com> wrote:
>> On 25/09/13 19:42, Andre Przywara wrote:
>>> The config file exynos5250-dt.h is used by two boards currently.
>>> To allow the Arndale board to use it too in the future, move some
>>> board specific defines out of that generic file.
>>> Update the copyright, header comment and include protection define
>>> on the way.
>>>
>>> Signed-off-by: Andre Przywara <andre.przywara at linaro.org>
>>> ---
>>>   include/configs/exynos5250-dt.h | 15 ++++-----------
>>>   include/configs/smdk5250.h      | 10 +++++++++-
>>>   include/configs/snow.h          | 10 +++++++++-
>>>   3 files changed, 22 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
>>> index c8c4b35..e855745 100644
>>> --- a/include/configs/exynos5250-dt.h
>>> +++ b/include/configs/exynos5250-dt.h
>>> @@ -1,13 +1,13 @@
>>>   /*
>>> - * Copyright (C) 2012 Samsung Electronics
>>> + * Copyright (C) 2012,2013 Samsung Electronics
>>>    *
>>> - * Configuration settings for the SAMSUNG EXYNOS5250 board.
>>> + * Configuration settings for SAMSUNG EXYNOS5250 based boards.
>>>    *
>>>    * SPDX-License-Identifier:  GPL-2.0+
>>>    */
>>>
>>> -#ifndef __CONFIG_H
>>> -#define __CONFIG_H
>>> +#ifndef __CONFIG_EXYNOS_5250_DT_H
>>> +#define __CONFIG_EXYNOS_5250_DT_H
>>>
>>>   /* High Level Configuration Options */
>>>   #define CONFIG_SAMSUNG                       /* in a SAMSUNG core */
>>> @@ -165,7 +165,6 @@
>>>   /* Miscellaneous configurable options */
>>>   #define CONFIG_SYS_LONGHELP          /* undef to save memory */
>>>   #define CONFIG_SYS_HUSH_PARSER               /* use "hush" command parser    */
>>> -#define CONFIG_SYS_PROMPT            "SMDK5250 # "
>>>   #define CONFIG_SYS_CBSIZE            256     /* Console I/O Buffer Size */
>>>   #define CONFIG_SYS_PBSIZE            384     /* Print Buffer Size */
>>>   #define CONFIG_SYS_MAXARGS           16      /* max number of command args */
>>> @@ -205,7 +204,6 @@
>>>   /* FLASH and environment organization */
>>>   #define CONFIG_SYS_NO_FLASH
>>>   #undef CONFIG_CMD_IMLS
>>> -#define CONFIG_IDENT_STRING          " for SMDK5250"
>>>
>>>   #define CONFIG_SYS_MMC_ENV_DEV               0
>>>
>>> @@ -258,9 +256,6 @@
>>>   #define CONFIG_I2C_EDID
>>>
>>>   /* SPI */
>>> -#define CONFIG_ENV_IS_IN_SPI_FLASH
>>> -#define CONFIG_SPI_FLASH
>>> -
>>>   #ifdef CONFIG_SPI_FLASH
>>>   #define CONFIG_EXYNOS_SPI
>>>   #define CONFIG_CMD_SF
>>> @@ -299,7 +294,6 @@
>>>   #endif
>>>
>>>   /* Sound */
>>> -#define CONFIG_CMD_SOUND
>>>   #ifdef CONFIG_CMD_SOUND
>>>   #define CONFIG_SOUND
>>>   #define CONFIG_I2S
>>> @@ -317,7 +311,6 @@
>>>   #define CONFIG_SHA256
>>>
>>>   /* Display */
>>> -#define CONFIG_LCD
>>>   #ifdef CONFIG_LCD
>>>   #define CONFIG_EXYNOS_FB
>>>   #define CONFIG_EXYNOS_DP
>>> diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
>>> index 183aae7..b1bb783 100644
>>> --- a/include/configs/smdk5250.h
>>> +++ b/include/configs/smdk5250.h
>>> @@ -9,9 +9,17 @@
>>>   #ifndef __CONFIG_SMDK_H
>>>   #define __CONFIG_SMDK_H
>>>
>>> +#define CONFIG_ENV_IS_IN_SPI_FLASH
>>> +#define CONFIG_SPI_FLASH
>>> +#define CONFIG_LCD
>>> +#define CONFIG_CMD_SOUND
>>> +
>>>   #include <configs/exynos5250-dt.h>
>>>
>>> -#undef CONFIG_DEFAULT_DEVICE_TREE
>>>   #define CONFIG_DEFAULT_DEVICE_TREE   exynos5250-smdk5250
>>>
>>> +#define CONFIG_SYS_PROMPT       "SMDK5250 # "
>>> +
>>> +#define CONFIG_IDENT_STRING  " for SMDK5250"
>>> +
>>>   #endif       /* __CONFIG_SMDK_H */
>>> diff --git a/include/configs/snow.h b/include/configs/snow.h
>>> index ed5c0b6..4d34c48 100644
>>> --- a/include/configs/snow.h
>>> +++ b/include/configs/snow.h
>>> @@ -9,9 +9,17 @@
>>>   #ifndef __CONFIG_SNOW_H
>>>   #define __CONFIG_SNOW_H
>>>
>>> +#define CONFIG_ENV_IS_IN_SPI_FLASH
>>> +#define CONFIG_SPI_FLASH
>>> +#define CONFIG_LCD
>>> +#define CONFIG_CMD_SOUND
>>> +
>>>   #include <configs/exynos5250-dt.h>
>>>
>>> -#undef CONFIG_DEFAULT_DEVICE_TREE
>>>   #define CONFIG_DEFAULT_DEVICE_TREE   exynos5250-snow
>>>
>>> +#define CONFIG_SYS_PROMPT       "SMDK5250 # "
>>
>> "SNOW #"?
>>
>>> +
>>> +#define CONFIG_IDENT_STRING  " for SMDK5250"
>>
>> SNOW?
>>
>>> +
>>>   #endif       /* __CONFIG_SNOW_H */
>>>
>>
>> Thanks,
>> Minkyu Kang.
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot at lists.denx.de
>> http://lists.denx.de/mailman/listinfo/u-boot