arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD

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>

diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index a036856eee5645e3ea62bd1ded04377d46896730..3d5665dbf5cb93d4f4ec29d02845b277f5da2b0d 100644 (file)
--- 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 4b2d246db4da8f5604e40b0fbdcb98fbd88c3ba2..f74c758f5a0054949e762d621dd5622b1618a9fa 100644 (file)
--- 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 4e38d5ebd87d0147324d425934c0fcb58f44d5fe..d2efdda105cbc898ee01977d92aeaa864fe5bfad 100644 (file)
--- 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 e06ca7be0430f4d3dcbaf2036779d33e788c4e56..959e3afbe04762d70c8a77e77fbae78e9682fc8d 100644 (file)
--- 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 5fc4edbb404e2e900d6367d16c6baa2aafe6570b..cd63faf2fc9382b1b54084462924940f1c11ac4f 100644 (file)
--- 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 d5e69fde29ea417f2c8ca0d586b83d887eeb682e..6cbe3675e2c6230ad6039388f8714c44335f8530 100644 (file)
--- 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 f11c89c1e8d4a9d3734f51df103b6533d245b519..1d88f4f7a134284ee48541a07b48653580a6d41f 100644 (file)
--- 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 bccb235a1172ac9b5df96b8fc7842d6e479b4216..5bd29563b8f9ed9dbb83f1b8054e80c41d26ba22 100644 (file)
--- 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" \