Message ID | 1406117482-2391-4-git-send-email-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Minkyu Kang |
Headers | show |
Dear Simon Glass, On 23/07/14 21:11, Simon Glass wrote: > A few things are common but are not in the common file. Fix this and > rename the file to fit with the other exynos*-common files. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > include/configs/{exynos5420.h => exynos5420-common.h} | 11 ++++++----- > include/configs/peach-pit.h | 7 +------ > include/configs/smdk5420.h | 7 +------ > 3 files changed, 8 insertions(+), 17 deletions(-) > rename include/configs/{exynos5420.h => exynos5420-common.h} (88%) > > diff --git a/include/configs/exynos5420.h b/include/configs/exynos5420-common.h > similarity index 88% > rename from include/configs/exynos5420.h > rename to include/configs/exynos5420-common.h > index d2a9556..685f9c1 100644 > --- a/include/configs/exynos5420.h > +++ b/include/configs/exynos5420-common.h > @@ -9,7 +9,9 @@ > #ifndef __CONFIG_EXYNOS5420_H > #define __CONFIG_EXYNOS5420_H > > -#define CONFIG_EXYNOS5420 /* which is in a Exynos5 Family */ > +#define CONFIG_EXYNOS5420 > + > +#include <configs/exynos5-common.h> > > #define MACH_TYPE_SMDK5420 8002 > #define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420 > @@ -31,10 +33,6 @@ > > #define CONFIG_MAX_I2C_NUM 11 > > -/* Enable FIT support and comparison */ > -#define CONFIG_FIT > -#define CONFIG_FIT_BEST_MATCH > - > #define CONFIG_BOARD_REV_GPIO_COUNT 2 > > #define CONFIG_BOOTCOMMAND "mmc read 20007000 451 2000; bootm 20007000" > @@ -49,4 +47,7 @@ > #define CONFIG_NR_DRAM_BANKS 7 > #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ > > +/* select serial console configuration */ > +#define CONFIG_SERIAL3 /* use SERIAL 3 */ I think it's a board specific feature. > + > #endif /* __CONFIG_EXYNOS5420_H */ > diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h > index 59192e1..407f10f 100644 > --- a/include/configs/peach-pit.h > +++ b/include/configs/peach-pit.h > @@ -9,16 +9,11 @@ > #ifndef __CONFIG_PEACH_PIT_H > #define __CONFIG_PEACH_PIT_H > > -#include <configs/exynos5-common.h> > - > -#include <configs/exynos5420.h> > +#include <configs/exynos5420-common.h> > > #undef CONFIG_DEFAULT_DEVICE_TREE > #define CONFIG_DEFAULT_DEVICE_TREE exynos5420-peach-pit > > -/* select serial console configuration */ > -#define CONFIG_SERIAL3 /* use SERIAL 3 */ > - > #define CONFIG_SYS_PROMPT "Peach # " > #define CONFIG_IDENT_STRING " for Peach" > > diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h > index 43c9808..83abc13 100644 > --- a/include/configs/smdk5420.h > +++ b/include/configs/smdk5420.h > @@ -9,18 +9,13 @@ > #ifndef __CONFIG_SMDK5420_H > #define __CONFIG_SMDK5420_H > > -#include <configs/exynos5-common.h> > - > -#include <configs/exynos5420.h> > +#include <configs/exynos5420-common.h> > > #define CONFIG_SMDK5420 /* which is in a SMDK5420 */ > > #undef CONFIG_DEFAULT_DEVICE_TREE > #define CONFIG_DEFAULT_DEVICE_TREE exynos5420-smdk5420 > > -/* select serial console configuration */ > -#define CONFIG_SERIAL3 /* use SERIAL 3 */ > - > #define CONFIG_SYS_PROMPT "SMDK5420 # " > #define CONFIG_IDENT_STRING " for SMDK5420" > > Thanks, Minkyu Kang.
Hi Minkyu, On 11 September 2014 01:38, Minkyu Kang <mk7.kang@samsung.com> wrote: > Dear Simon Glass, > > On 23/07/14 21:11, Simon Glass wrote: >> A few things are common but are not in the common file. Fix this and >> rename the file to fit with the other exynos*-common files. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> >> --- >> >> include/configs/{exynos5420.h => exynos5420-common.h} | 11 ++++++----- >> include/configs/peach-pit.h | 7 +------ >> include/configs/smdk5420.h | 7 +------ >> 3 files changed, 8 insertions(+), 17 deletions(-) >> rename include/configs/{exynos5420.h => exynos5420-common.h} (88%) >> >> diff --git a/include/configs/exynos5420.h b/include/configs/exynos5420-common.h >> similarity index 88% >> rename from include/configs/exynos5420.h >> rename to include/configs/exynos5420-common.h >> index d2a9556..685f9c1 100644 >> --- a/include/configs/exynos5420.h >> +++ b/include/configs/exynos5420-common.h >> @@ -9,7 +9,9 @@ >> #ifndef __CONFIG_EXYNOS5420_H >> #define __CONFIG_EXYNOS5420_H >> >> -#define CONFIG_EXYNOS5420 /* which is in a Exynos5 Family */ >> +#define CONFIG_EXYNOS5420 >> + >> +#include <configs/exynos5-common.h> >> >> #define MACH_TYPE_SMDK5420 8002 >> #define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420 >> @@ -31,10 +33,6 @@ >> >> #define CONFIG_MAX_I2C_NUM 11 >> >> -/* Enable FIT support and comparison */ >> -#define CONFIG_FIT >> -#define CONFIG_FIT_BEST_MATCH >> - >> #define CONFIG_BOARD_REV_GPIO_COUNT 2 >> >> #define CONFIG_BOOTCOMMAND "mmc read 20007000 451 2000; bootm 20007000" >> @@ -49,4 +47,7 @@ >> #define CONFIG_NR_DRAM_BANKS 7 >> #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ >> >> +/* select serial console configuration */ >> +#define CONFIG_SERIAL3 /* use SERIAL 3 */ > > I think it's a board specific feature. OK I'll take it out of common. [snip] Regards, Simon
diff --git a/include/configs/exynos5420.h b/include/configs/exynos5420-common.h similarity index 88% rename from include/configs/exynos5420.h rename to include/configs/exynos5420-common.h index d2a9556..685f9c1 100644 --- a/include/configs/exynos5420.h +++ b/include/configs/exynos5420-common.h @@ -9,7 +9,9 @@ #ifndef __CONFIG_EXYNOS5420_H #define __CONFIG_EXYNOS5420_H -#define CONFIG_EXYNOS5420 /* which is in a Exynos5 Family */ +#define CONFIG_EXYNOS5420 + +#include <configs/exynos5-common.h> #define MACH_TYPE_SMDK5420 8002 #define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420 @@ -31,10 +33,6 @@ #define CONFIG_MAX_I2C_NUM 11 -/* Enable FIT support and comparison */ -#define CONFIG_FIT -#define CONFIG_FIT_BEST_MATCH - #define CONFIG_BOARD_REV_GPIO_COUNT 2 #define CONFIG_BOOTCOMMAND "mmc read 20007000 451 2000; bootm 20007000" @@ -49,4 +47,7 @@ #define CONFIG_NR_DRAM_BANKS 7 #define SDRAM_BANK_SIZE (512UL << 20UL) /* 512 MB */ +/* select serial console configuration */ +#define CONFIG_SERIAL3 /* use SERIAL 3 */ + #endif /* __CONFIG_EXYNOS5420_H */ diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h index 59192e1..407f10f 100644 --- a/include/configs/peach-pit.h +++ b/include/configs/peach-pit.h @@ -9,16 +9,11 @@ #ifndef __CONFIG_PEACH_PIT_H #define __CONFIG_PEACH_PIT_H -#include <configs/exynos5-common.h> - -#include <configs/exynos5420.h> +#include <configs/exynos5420-common.h> #undef CONFIG_DEFAULT_DEVICE_TREE #define CONFIG_DEFAULT_DEVICE_TREE exynos5420-peach-pit -/* select serial console configuration */ -#define CONFIG_SERIAL3 /* use SERIAL 3 */ - #define CONFIG_SYS_PROMPT "Peach # " #define CONFIG_IDENT_STRING " for Peach" diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index 43c9808..83abc13 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -9,18 +9,13 @@ #ifndef __CONFIG_SMDK5420_H #define __CONFIG_SMDK5420_H -#include <configs/exynos5-common.h> - -#include <configs/exynos5420.h> +#include <configs/exynos5420-common.h> #define CONFIG_SMDK5420 /* which is in a SMDK5420 */ #undef CONFIG_DEFAULT_DEVICE_TREE #define CONFIG_DEFAULT_DEVICE_TREE exynos5420-smdk5420 -/* select serial console configuration */ -#define CONFIG_SERIAL3 /* use SERIAL 3 */ - #define CONFIG_SYS_PROMPT "SMDK5420 # " #define CONFIG_IDENT_STRING " for SMDK5420"
A few things are common but are not in the common file. Fix this and rename the file to fit with the other exynos*-common files. Signed-off-by: Simon Glass <sjg@chromium.org> --- include/configs/{exynos5420.h => exynos5420-common.h} | 11 ++++++----- include/configs/peach-pit.h | 7 +------ include/configs/smdk5420.h | 7 +------ 3 files changed, 8 insertions(+), 17 deletions(-) rename include/configs/{exynos5420.h => exynos5420-common.h} (88%)