| Message ID | 1449348262-18488-4-git-send-email-marex@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Marek Vasut |
| Headers | show |
On Sat, 2015-12-05 at 21:44 +0100, Marek Vasut wrote: > We already have the CONFIG_SYS_BOARD variable, which defines the name > of the board. The value in CONFIG_HOSTNAME is exactly the same and is > thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD . > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Chin Liang See <clsee@altera.com> > Cc: Dinh Nguyen <dinguyen@opensource.altera.com> > --- > include/configs/socfpga_arria5_socdk.h | 2 -- > include/configs/socfpga_common.h | 4 ++++ > include/configs/socfpga_cyclone5_socdk.h | 2 -- > include/configs/socfpga_de0_nano_soc.h | 2 -- > include/configs/socfpga_mcvevk.h | 2 -- > include/configs/socfpga_sockit.h | 2 -- > include/configs/socfpga_socrates.h | 2 -- > include/configs/socfpga_sr1500.h | 3 --- > 8 files changed, 4 insertions(+), 15 deletions(-) > > diff --git a/include/configs/socfpga_arria5_socdk.h > b/include/configs/socfpga_arria5_socdk.h > index a036856..3d5665d 100644 > --- a/include/configs/socfpga_arria5_socdk.h > +++ b/include/configs/socfpga_arria5_socdk.h > @@ -56,8 +56,6 @@ > #define CONFIG_ENV_OFFSET 512 /* just after > the MBR */ > > /* Extra Environment */ > -#define CONFIG_HOSTNAME socfpga_arria5 > - > #define CONFIG_EXTRA_ENV_SETTINGS \ > "verify=n\0" \ > "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ > diff --git a/include/configs/socfpga_common.h > b/include/configs/socfpga_common.h > index 4b2d246..f74c758 100644 > --- a/include/configs/socfpga_common.h > +++ b/include/configs/socfpga_common.h > @@ -69,6 +69,10 @@ > #define CONFIG_CMDLINE_EDITING /* Command > history etc */ > #define CONFIG_SYS_HUSH_PARSER > > +#ifndef CONFIG_SYS_HOSTNAME > +#define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD > +#endif > + > I saw the change of hostname for socdk would be "socfpga_cyclone5" to "cyclone5-socdk" and same for other board. Wonder any impact on this change? Thanks Chin Liang
On Monday, December 07, 2015 at 07:25:31 AM, Chin Liang See wrote: > On Sat, 2015-12-05 at 21:44 +0100, Marek Vasut wrote: > > We already have the CONFIG_SYS_BOARD variable, which defines the name > > of the board. The value in CONFIG_HOSTNAME is exactly the same and is > > thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD . > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > Cc: Chin Liang See <clsee@altera.com> > > Cc: Dinh Nguyen <dinguyen@opensource.altera.com> > > --- > > > > include/configs/socfpga_arria5_socdk.h | 2 -- > > include/configs/socfpga_common.h | 4 ++++ > > include/configs/socfpga_cyclone5_socdk.h | 2 -- > > include/configs/socfpga_de0_nano_soc.h | 2 -- > > include/configs/socfpga_mcvevk.h | 2 -- > > include/configs/socfpga_sockit.h | 2 -- > > include/configs/socfpga_socrates.h | 2 -- > > include/configs/socfpga_sr1500.h | 3 --- > > 8 files changed, 4 insertions(+), 15 deletions(-) > > > > diff --git a/include/configs/socfpga_arria5_socdk.h > > b/include/configs/socfpga_arria5_socdk.h > > index a036856..3d5665d 100644 > > --- a/include/configs/socfpga_arria5_socdk.h > > +++ b/include/configs/socfpga_arria5_socdk.h > > @@ -56,8 +56,6 @@ > > > > #define CONFIG_ENV_OFFSET 512 /* just after > > > > the MBR */ > > > > /* Extra Environment */ > > > > -#define CONFIG_HOSTNAME socfpga_arria5 > > - > > > > #define CONFIG_EXTRA_ENV_SETTINGS \ > > > > "verify=n\0" \ > > "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ > > > > diff --git a/include/configs/socfpga_common.h > > b/include/configs/socfpga_common.h > > index 4b2d246..f74c758 100644 > > --- a/include/configs/socfpga_common.h > > +++ b/include/configs/socfpga_common.h > > @@ -69,6 +69,10 @@ > > > > #define CONFIG_CMDLINE_EDITING /* Command > > > > history etc */ > > > > #define CONFIG_SYS_HUSH_PARSER > > > > +#ifndef CONFIG_SYS_HOSTNAME > > +#define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD > > +#endif > > + > > I saw the change of hostname for socdk would be "socfpga_cyclone5" to > "cyclone5-socdk" and same for other board. Wonder any impact on this > change? It should have no impact, unless you're using the hostname in your scripts for something. You would have no way to tell apart the cyclone5 boards with the old hostname though, since socfpga_cyclone5 is too generic. In case this breaks some script of yours, setenv hostname socfpga_cyclone5 would fix it. Best regards, Marek Vasut
On Mon, 2015-12-07 at 09:36 +0100, Marek Vasut wrote: > On Monday, December 07, 2015 at 07:25:31 AM, Chin Liang See wrote: > > On Sat, 2015-12-05 at 21:44 +0100, Marek Vasut wrote: > > > We already have the CONFIG_SYS_BOARD variable, which defines the > > > name > > > of the board. The value in CONFIG_HOSTNAME is exactly the same > > > and is > > > thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD . > > > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > > Cc: Chin Liang See <clsee@altera.com> > > > Cc: Dinh Nguyen <dinguyen@opensource.altera.com> > > > --- > > > > > > include/configs/socfpga_arria5_socdk.h | 2 -- > > > include/configs/socfpga_common.h | 4 ++++ > > > include/configs/socfpga_cyclone5_socdk.h | 2 -- > > > include/configs/socfpga_de0_nano_soc.h | 2 -- > > > include/configs/socfpga_mcvevk.h | 2 -- > > > include/configs/socfpga_sockit.h | 2 -- > > > include/configs/socfpga_socrates.h | 2 -- > > > include/configs/socfpga_sr1500.h | 3 --- > > > 8 files changed, 4 insertions(+), 15 deletions(-) > > > > > > diff --git a/include/configs/socfpga_arria5_socdk.h > > > b/include/configs/socfpga_arria5_socdk.h > > > index a036856..3d5665d 100644 > > > --- a/include/configs/socfpga_arria5_socdk.h > > > +++ b/include/configs/socfpga_arria5_socdk.h > > > @@ -56,8 +56,6 @@ > > > > > > #define CONFIG_ENV_OFFSET 512 /* just > > > after > > > > > > the MBR */ > > > > > > /* Extra Environment */ > > > > > > -#define CONFIG_HOSTNAME socfpga_arria5 > > > - > > > > > > #define CONFIG_EXTRA_ENV_SETTINGS \ > > > > > > "verify=n\0" \ > > > "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ > > > > > > diff --git a/include/configs/socfpga_common.h > > > b/include/configs/socfpga_common.h > > > index 4b2d246..f74c758 100644 > > > --- a/include/configs/socfpga_common.h > > > +++ b/include/configs/socfpga_common.h > > > @@ -69,6 +69,10 @@ > > > > > > #define CONFIG_CMDLINE_EDITING /* Command > > > > > > history etc */ > > > > > > #define CONFIG_SYS_HUSH_PARSER > > > > > > +#ifndef CONFIG_SYS_HOSTNAME > > > +#define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD > > > +#endif > > > + > > > > I saw the change of hostname for socdk would be "socfpga_cyclone5" > > to > > "cyclone5-socdk" and same for other board. Wonder any impact on > > this > > change? > > It should have no impact, unless you're using the hostname in your > scripts > for something. You would have no way to tell apart the cyclone5 > boards with > the old hostname though, since socfpga_cyclone5 is too generic. In > case this > breaks some script of yours, setenv hostname socfpga_cyclone5 would > fix it. I grep previously and its not used. But will take note if any side effect noticed. Thanks Chin Liang > > Best regards, > Marek Vasut
On Monday, December 07, 2015 at 11:01:24 AM, Chin Liang See wrote: > On Mon, 2015-12-07 at 09:36 +0100, Marek Vasut wrote: > > On Monday, December 07, 2015 at 07:25:31 AM, Chin Liang See wrote: > > > On Sat, 2015-12-05 at 21:44 +0100, Marek Vasut wrote: > > > > We already have the CONFIG_SYS_BOARD variable, which defines the > > > > name > > > > of the board. The value in CONFIG_HOSTNAME is exactly the same > > > > and is > > > > thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD . > > > > > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > > > Cc: Chin Liang See <clsee@altera.com> > > > > Cc: Dinh Nguyen <dinguyen@opensource.altera.com> > > > > --- > > > > > > > > include/configs/socfpga_arria5_socdk.h | 2 -- > > > > include/configs/socfpga_common.h | 4 ++++ > > > > include/configs/socfpga_cyclone5_socdk.h | 2 -- > > > > include/configs/socfpga_de0_nano_soc.h | 2 -- > > > > include/configs/socfpga_mcvevk.h | 2 -- > > > > include/configs/socfpga_sockit.h | 2 -- > > > > include/configs/socfpga_socrates.h | 2 -- > > > > include/configs/socfpga_sr1500.h | 3 --- > > > > 8 files changed, 4 insertions(+), 15 deletions(-) > > > > > > > > diff --git a/include/configs/socfpga_arria5_socdk.h > > > > b/include/configs/socfpga_arria5_socdk.h > > > > index a036856..3d5665d 100644 > > > > --- a/include/configs/socfpga_arria5_socdk.h > > > > +++ b/include/configs/socfpga_arria5_socdk.h > > > > @@ -56,8 +56,6 @@ > > > > > > > > #define CONFIG_ENV_OFFSET 512 /* just > > > > > > > > after > > > > > > > > the MBR */ > > > > > > > > /* Extra Environment */ > > > > > > > > -#define CONFIG_HOSTNAME socfpga_arria5 > > > > - > > > > > > > > #define CONFIG_EXTRA_ENV_SETTINGS \ > > > > > > > > "verify=n\0" \ > > > > "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ > > > > > > > > diff --git a/include/configs/socfpga_common.h > > > > b/include/configs/socfpga_common.h > > > > index 4b2d246..f74c758 100644 > > > > --- a/include/configs/socfpga_common.h > > > > +++ b/include/configs/socfpga_common.h > > > > @@ -69,6 +69,10 @@ > > > > > > > > #define CONFIG_CMDLINE_EDITING /* Command > > > > > > > > history etc */ > > > > > > > > #define CONFIG_SYS_HUSH_PARSER > > > > > > > > +#ifndef CONFIG_SYS_HOSTNAME > > > > +#define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD > > > > +#endif > > > > + > > > > > > I saw the change of hostname for socdk would be "socfpga_cyclone5" > > > to > > > "cyclone5-socdk" and same for other board. Wonder any impact on > > > this > > > change? > > > > It should have no impact, unless you're using the hostname in your > > scripts > > for something. You would have no way to tell apart the cyclone5 > > boards with > > the old hostname though, since socfpga_cyclone5 is too generic. In > > case this > > breaks some script of yours, setenv hostname socfpga_cyclone5 would > > fix it. > > I grep previously and its not used. But will take note if any side > effect noticed. OK, thanks
On Mon, 2015-12-07 at 13:01 +0100, Marek Vasut wrote: > On Monday, December 07, 2015 at 11:01:24 AM, Chin Liang See wrote: > > On Mon, 2015-12-07 at 09:36 +0100, Marek Vasut wrote: > > > On Monday, December 07, 2015 at 07:25:31 AM, Chin Liang See > > > wrote: > > > > On Sat, 2015-12-05 at 21:44 +0100, Marek Vasut wrote: > > > > > We already have the CONFIG_SYS_BOARD variable, which defines > > > > > the > > > > > name > > > > > of the board. The value in CONFIG_HOSTNAME is exactly the > > > > > same > > > > > and is > > > > > thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD > > > > > . > > > > > > > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > > > > Cc: Chin Liang See <clsee@altera.com> > > > > > Cc: Dinh Nguyen <dinguyen@opensource.altera.com> > > > > > --- > > > > > > > > > > include/configs/socfpga_arria5_socdk.h | 2 -- > > > > > include/configs/socfpga_common.h | 4 ++++ > > > > > include/configs/socfpga_cyclone5_socdk.h | 2 -- > > > > > include/configs/socfpga_de0_nano_soc.h | 2 -- > > > > > include/configs/socfpga_mcvevk.h | 2 -- > > > > > include/configs/socfpga_sockit.h | 2 -- > > > > > include/configs/socfpga_socrates.h | 2 -- > > > > > include/configs/socfpga_sr1500.h | 3 --- > > > > > 8 files changed, 4 insertions(+), 15 deletions(-) > > > > > > > > > > diff --git a/include/configs/socfpga_arria5_socdk.h > > > > > b/include/configs/socfpga_arria5_socdk.h > > > > > index a036856..3d5665d 100644 > > > > > --- a/include/configs/socfpga_arria5_socdk.h > > > > > +++ b/include/configs/socfpga_arria5_socdk.h > > > > > @@ -56,8 +56,6 @@ > > > > > > > > > > #define CONFIG_ENV_OFFSET 512 /* just > > > > > > > > > > after > > > > > > > > > > the MBR */ > > > > > > > > > > /* Extra Environment */ > > > > > > > > > > -#define CONFIG_HOSTNAME socfpga_arria5 > > > > > - > > > > > > > > > > #define CONFIG_EXTRA_ENV_SETTINGS \ > > > > > > > > > > "verify=n\0" \ > > > > > "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" > > > > > \ > > > > > > > > > > diff --git a/include/configs/socfpga_common.h > > > > > b/include/configs/socfpga_common.h > > > > > index 4b2d246..f74c758 100644 > > > > > --- a/include/configs/socfpga_common.h > > > > > +++ b/include/configs/socfpga_common.h > > > > > @@ -69,6 +69,10 @@ > > > > > > > > > > #define CONFIG_CMDLINE_EDITING /* > > > > > Command > > > > > > > > > > history etc */ > > > > > > > > > > #define CONFIG_SYS_HUSH_PARSER > > > > > > > > > > +#ifndef CONFIG_SYS_HOSTNAME > > > > > +#define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD > > > > > +#endif > > > > > + > > > > > > > > I saw the change of hostname for socdk would be > > > > "socfpga_cyclone5" > > > > to > > > > "cyclone5-socdk" and same for other board. Wonder any impact on > > > > this > > > > change? > > > > > > It should have no impact, unless you're using the hostname in > > > your > > > scripts > > > for something. You would have no way to tell apart the cyclone5 > > > boards with > > > the old hostname though, since socfpga_cyclone5 is too generic. > > > In > > > case this > > > breaks some script of yours, setenv hostname socfpga_cyclone5 > > > would > > > fix it. > > > > I grep previously and its not used. But will take note if any side > > effect noticed. > > OK, thanks Acked-by: Chin Liang See <clsee@altera.com> Thanks Chin Liang
diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index a036856..3d5665d 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -56,8 +56,6 @@ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */ /* Extra Environment */ -#define CONFIG_HOSTNAME socfpga_arria5 - #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 4b2d246..f74c758 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -69,6 +69,10 @@ #define CONFIG_CMDLINE_EDITING /* Command history etc */ #define CONFIG_SYS_HUSH_PARSER +#ifndef CONFIG_SYS_HOSTNAME +#define CONFIG_SYS_HOSTNAME CONFIG_SYS_BOARD +#endif + /* * Cache */ diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 4e38d5e..d2efdda 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -56,8 +56,6 @@ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */ /* Extra Environment */ -#define CONFIG_HOSTNAME socfpga_cyclone5 - #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index e06ca7b..959e3af 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -52,8 +52,6 @@ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */ /* Extra Environment */ -#define CONFIG_HOSTNAME socfpga_de0_nano_soc - #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index 5fc4edb..cd63faf 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -49,8 +49,6 @@ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */ /* Extra Environment */ -#define CONFIG_HOSTNAME mcvevk - #define CONFIG_EXTRA_ENV_SETTINGS \ "consdev=ttyS0\0" \ "baudrate=115200\0" \ diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index d5e69fd..6cbe367 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -52,8 +52,6 @@ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */ /* Extra Environment */ -#define CONFIG_HOSTNAME socfpga_sockit - #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index f11c89c..1d88f4f 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -52,8 +52,6 @@ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */ /* Extra Environment */ -#define CONFIG_HOSTNAME socfpga_socrates - #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index bccb235..5bd2956 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -53,9 +53,6 @@ #define CONFIG_PHY_MARVELL #define PHY_ANEG_TIMEOUT 8000 -/* Extra Environment */ -#define CONFIG_HOSTNAME sr1500 - #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
We already have the CONFIG_SYS_BOARD variable, which defines the name of the board. The value in CONFIG_HOSTNAME is exactly the same and is thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD . Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <clsee@altera.com> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> --- include/configs/socfpga_arria5_socdk.h | 2 -- include/configs/socfpga_common.h | 4 ++++ include/configs/socfpga_cyclone5_socdk.h | 2 -- include/configs/socfpga_de0_nano_soc.h | 2 -- include/configs/socfpga_mcvevk.h | 2 -- include/configs/socfpga_sockit.h | 2 -- include/configs/socfpga_socrates.h | 2 -- include/configs/socfpga_sr1500.h | 3 --- 8 files changed, 4 insertions(+), 15 deletions(-)