[U-Boot] [PATCH 4/6] arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/6] arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD
Date: Sat,  5 Dec 2015 21:44:20 +0100	[thread overview]
Message-ID: <1449348262-18488-4-git-send-email-marex@denx.de> (raw)
In-Reply-To: <1449348262-18488-1-git-send-email-marex@denx.de>

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
+
 /*
  * 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" \
-- 
2.1.4

next prev parent reply	other threads:[~2015-12-05 20:44 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-05 20:44 [U-Boot] [PATCH 1/6] arm: socfpga: de0_nano: Zap VIRTUAL_TARGET Marek Vasut
2015-12-05 20:44 ` [U-Boot] [PATCH 2/6] arm: socfpga: sockit: " Marek Vasut
2015-12-07  6:14   ` Chin Liang See
2015-12-05 20:44 ` [U-Boot] [PATCH 3/6] arm: socfpga: Switch CONFIG_G_DNL_MANUFACTURER to CONFIG_SYS_VENDOR Marek Vasut
2015-12-07  6:18   ` Chin Liang See
2015-12-05 20:44 ` Marek Vasut [this message]
2015-12-07  6:25   ` [U-Boot] [PATCH 4/6] arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD Chin Liang See
2015-12-07  8:36     ` Marek Vasut
2015-12-07 10:01       ` Chin Liang See
2015-12-07 12:01         ` Marek Vasut
2015-12-07 12:08           ` Chin Liang See
2015-12-05 20:44 ` [U-Boot] [PATCH 5/6] arm: socfpga: Introduce common board code Marek Vasut
2015-12-07 12:53   ` Chin Liang See
2015-12-07 13:23     ` Marek Vasut
2015-12-07 13:32       ` Chin Liang See
2015-12-07 14:23         ` Marek Vasut
2015-12-07 14:29           ` Chin Liang See
2015-12-07 14:37             ` Marek Vasut
2015-12-07 14:56               ` Chin Liang See
2015-12-07 17:46                 ` Marek Vasut
2015-12-08 12:34                   ` Chin Liang See
2015-12-08 12:57                     ` Marek Vasut
2015-12-09 13:46                       ` Chin Liang See
2015-12-05 20:44 ` [U-Boot] [PATCH 6/6] arm: socfpga: Drop the board boilerplate Marek Vasut
2015-12-07 12:56   ` Chin Liang See
2015-12-07 13:22     ` Marek Vasut
2015-12-07 13:29       ` Chin Liang See
2015-12-07  6:11 ` [U-Boot] [PATCH 1/6] arm: socfpga: de0_nano: Zap VIRTUAL_TARGET Chin Liang See

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:a036856 dfblob:3d5665d dfblob:4b2d246 dfblob:f74c758
dfblob:4e38d5e dfblob:d2efdda dfblob:e06ca7b dfblob:959e3af
dfblob:5fc4edb dfblob:cd63faf dfblob:d5e69fd dfblob:6cbe367
dfblob:f11c89c dfblob:1d88f4f dfblob:bccb235 dfblob:5bd2956 )
 OR (
bs:"[U-Boot] [PATCH 4/6] arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449348262-18488-4-git-send-email-marex@denx.de \
    --to=marex@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox