| Message ID | 1319883627-9817-1-git-send-email-js_at_ng@scharsoft.de |
|---|---|
| State | Changes Requested |
| Headers | show |
> * re-introduce the MACH_TYPE_XXXXXX for EB_CPUX9K2 board > > Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de> > --- > include/configs/eb_cpux9k2.h | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h > index 4324172..e437f25 100644 > --- a/include/configs/eb_cpux9k2.h > +++ b/include/configs/eb_cpux9k2.h > @@ -42,6 +42,10 @@ > #define CONFIG_BOARD_EARLY_INIT_F > > /*------------------------------------------------------------------------ > --*/ +#ifndef MACH_TYPE_EB_CPUX9K2 > +#define MACH_TYPE_EB_CPUX9K2 1977 > +#endif > +/*------------------------------------------------------------------------ > --*/ #define CONFIG_SYS_TEXT_BASE 0x00000000 > #define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ You don't need the ifndef. Cheers
Hi Jens, Marek, Le 30/10/2011 00:47, Marek Vasut a écrit : >> * re-introduce the MACH_TYPE_XXXXXX for EB_CPUX9K2 board >> >> Signed-off-by: Jens Scharsig<js_at_ng@scharsoft.de> >> --- >> include/configs/eb_cpux9k2.h | 4 ++++ >> 1 files changed, 4 insertions(+), 0 deletions(-) >> >> diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h >> index 4324172..e437f25 100644 >> --- a/include/configs/eb_cpux9k2.h >> +++ b/include/configs/eb_cpux9k2.h >> @@ -42,6 +42,10 @@ >> #define CONFIG_BOARD_EARLY_INIT_F >> >> /*------------------------------------------------------------------------ >> --*/ >> +#ifndef MACH_TYPE_EB_CPUX9K2 >> +#define MACH_TYPE_EB_CPUX9K2 1977 >> +#endif >> +/*------------------------------------------------------------------------ >> --*/ >> #define CONFIG_SYS_TEXT_BASE 0x00000000 >> #define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ > > You don't need the ifndef. Cheers I'd even say you need to not have them: this way, when the MACH_ID shows up eventually in machine-type, the preprocessor will emit a warning for the redefinition in the config file, thus letting us know it is time to remove the temporary MACH_TYPE there. Amicalement,
Dear Marek Vasut, In message <201110300047.46696.marek.vasut@gmail.com> you wrote: > > > /*------------------------------------------------------------------------ > > --*/ +#ifndef MACH_TYPE_EB_CPUX9K2 > > +#define MACH_TYPE_EB_CPUX9K2 1977 > > +#endif > > +/*------------------------------------------------------------------------ > > --*/ #define CONFIG_SYS_TEXT_BASE 0x00000000 > > #define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ > > You don't need the ifndef. Cheers But it doesn;t hurt either. I consider it defensive programming, just in case the #defined gets re-added to machtypes.h. Best regards, Wolfgang Denk
> Dear Marek Vasut, > > In message <201110300047.46696.marek.vasut@gmail.com> you wrote: > > > /*-------------------------------------------------------------------- > > > ---- > > > > > > --*/ +#ifndef MACH_TYPE_EB_CPUX9K2 > > > +#define MACH_TYPE_EB_CPUX9K2 1977 > > > +#endif > > > +/*-------------------------------------------------------------------- > > > ---- --*/ #define CONFIG_SYS_TEXT_BASE 0x00000000 > > > > > > #define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ > > > > You don't need the ifndef. Cheers > > But it doesn;t hurt either. I consider it defensive programming, just > in case the #defined gets re-added to machtypes.h. > > Best regards, > > Wolfgang Denk Sure, but if the machine ID is re-added, we will get a warning in here without the ifdefs. With the ifdefs, the machine ID might be different here and in the mach-types file and it might slide unnoticed.
Am 30.10.2011 11:32, schrieb Albert ARIBAUD: > Hi Jens, Marek, > > Le 30/10/2011 00:47, Marek Vasut a écrit : >>> * re-introduce the MACH_TYPE_XXXXXX for EB_CPUX9K2 board >>> >>> Signed-off-by: Jens Scharsig<js_at_ng@scharsoft.de> >>> --- >>> include/configs/eb_cpux9k2.h | 4 ++++ >>> 1 files changed, 4 insertions(+), 0 deletions(-) >>> >>> diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h >>> index 4324172..e437f25 100644 >>> --- a/include/configs/eb_cpux9k2.h >>> +++ b/include/configs/eb_cpux9k2.h >>> @@ -42,6 +42,10 @@ >>> #define CONFIG_BOARD_EARLY_INIT_F >>> >>> /*------------------------------------------------------------------------ >>> --*/ >>> +#ifndef MACH_TYPE_EB_CPUX9K2 >>> +#define MACH_TYPE_EB_CPUX9K2 1977 >>> +#endif >>> +/*------------------------------------------------------------------------ >>> --*/ >>> #define CONFIG_SYS_TEXT_BASE 0x00000000 >>> #define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ >> >> You don't need the ifndef. Cheers > > I'd even say you need to not have them: this way, when the MACH_ID shows > up eventually in machine-type, the preprocessor will emit a warning for > the redefinition in the config file, thus letting us know it is time to > remove the temporary MACH_TYPE there. > > Amicalement, Ok, I will send a straightforward variant as V2 patch Regards Jens
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h index 4324172..e437f25 100644 --- a/include/configs/eb_cpux9k2.h +++ b/include/configs/eb_cpux9k2.h @@ -42,6 +42,10 @@ #define CONFIG_BOARD_EARLY_INIT_F /*--------------------------------------------------------------------------*/ +#ifndef MACH_TYPE_EB_CPUX9K2 +#define MACH_TYPE_EB_CPUX9K2 1977 +#endif +/*--------------------------------------------------------------------------*/ #define CONFIG_SYS_TEXT_BASE 0x00000000 #define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */
* re-introduce the MACH_TYPE_XXXXXX for EB_CPUX9K2 board Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de> --- include/configs/eb_cpux9k2.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)