arm: socfpga: Switch CONFIG_G_DNL_MANUFACTURER to CONFIG_SYS_VENDOR

We already have the CONFIG_SYS_VENDOR variable, which defines the
manufacturer of the board. The value in CONFIG_G_DNL_MANUFACTURER
is just a duplicity, so switch it to reuse CONFIG_SYS_VENDOR .

Signed-off-by: Marek Vasut <[email protected]>
Cc: Chin Liang See <[email protected]>
Cc: Dinh Nguyen <[email protected]>

diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index d2411e6700c104eb9e6e83c35ef165a2485e9b67..a036856eee5645e3ea62bd1ded04377d46896730 100644 (file)
--- a/include/configs/socfpga_arria5_socdk.h
+++ b/include/configs/socfpga_arria5_socdk.h
@@ -55,9 +55,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV         0       /* device 0 */
 #define CONFIG_ENV_OFFSET              512     /* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "Altera"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME                socfpga_arria5
 

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index b0bc68952ce408764793f87c5f47690647e028e2..4b2d246db4da8f5604e40b0fbdcb98fbd88c3ba2 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -262,7 +262,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_G_DNL_UMS_VENDOR_NUM    CONFIG_G_DNL_VENDOR_NUM
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM   CONFIG_G_DNL_PRODUCT_NUM
 #ifndef CONFIG_G_DNL_MANUFACTURER
-#define CONFIG_G_DNL_MANUFACTURER      "Altera"
+#define CONFIG_G_DNL_MANUFACTURER      CONFIG_SYS_VENDOR
 #endif
 #endif
 

diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index 76d29a3f7807c6a30800133c1a2b1882c79edc87..4e38d5ebd87d0147324d425934c0fcb58f44d5fe 100644 (file)
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -55,9 +55,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV         0       /* device 0 */
 #define CONFIG_ENV_OFFSET              512     /* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "Altera"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME                socfpga_cyclone5
 

diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index 600789509a4c788291c70e76f3623173d5054708..e06ca7be0430f4d3dcbaf2036779d33e788c4e56 100644 (file)
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -51,9 +51,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV         0       /* device 0 */
 #define CONFIG_ENV_OFFSET              512     /* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "Terasic"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME                socfpga_de0_nano_soc
 

diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index b2c1f75e99c33f054f3655fd6398d8cd3315dc72..5fc4edbb404e2e900d6367d16c6baa2aafe6570b 100644 (file)
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -48,9 +48,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV         0       /* device 0 */
 #define CONFIG_ENV_OFFSET              512     /* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "DENX"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME                        mcvevk
 

diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
index 924de3f7abff8a2c39ecf944f68dbc156623691f..d5e69fde29ea417f2c8ca0d586b83d887eeb682e 100644 (file)
--- a/include/configs/socfpga_sockit.h
+++ b/include/configs/socfpga_sockit.h
@@ -51,9 +51,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV         0       /* device 0 */
 #define CONFIG_ENV_OFFSET              512     /* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "Terasic"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME                socfpga_sockit
 

diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h
index 1b0888f36be01e040ce6ee7ff0c8184e02ececff..f11c89c1e8d4a9d3734f51df103b6533d245b519 100644 (file)
--- a/include/configs/socfpga_socrates.h
+++ b/include/configs/socfpga_socrates.h
@@ -51,9 +51,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV         0       /* device 0 */
 #define CONFIG_ENV_OFFSET              512     /* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "EBV"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME                socfpga_socrates