From a5cad67735a1f098c22ec30941f1bd0422459069 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marex@denx.de>
Date: Sat, 5 Dec 2015 20:05:46 +0100
Subject: 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 <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 d2411e6..a036856 100644
--- 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 b0bc689..4b2d246 100644
--- 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 76d29a3..4e38d5e 100644
--- 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 6007895..e06ca7b 100644
--- 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 b2c1f75..5fc4edb 100644
--- 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 924de3f..d5e69fd 100644
--- 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 1b0888f..f11c89c 100644
--- 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
 
-- 
cgit v0.10.2