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>
master
Marek Vasut 9 years ago
parent 92232747bb
commit a5cad67735
  1. 3
      include/configs/socfpga_arria5_socdk.h
  2. 2
      include/configs/socfpga_common.h
  3. 3
      include/configs/socfpga_cyclone5_socdk.h
  4. 3
      include/configs/socfpga_de0_nano_soc.h
  5. 3
      include/configs/socfpga_mcvevk.h
  6. 3
      include/configs/socfpga_sockit.h
  7. 3
      include/configs/socfpga_socrates.h

@ -55,9 +55,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */
#define CONFIG_ENV_OFFSET 512 /* just after the MBR */ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
/* USB */
#define CONFIG_G_DNL_MANUFACTURER "Altera"
/* Extra Environment */ /* Extra Environment */
#define CONFIG_HOSTNAME socfpga_arria5 #define CONFIG_HOSTNAME socfpga_arria5

@ -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_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM
#define CONFIG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_PRODUCT_NUM #define CONFIG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_PRODUCT_NUM
#ifndef CONFIG_G_DNL_MANUFACTURER #ifndef CONFIG_G_DNL_MANUFACTURER
#define CONFIG_G_DNL_MANUFACTURER "Altera" #define CONFIG_G_DNL_MANUFACTURER CONFIG_SYS_VENDOR
#endif #endif
#endif #endif

@ -55,9 +55,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */
#define CONFIG_ENV_OFFSET 512 /* just after the MBR */ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
/* USB */
#define CONFIG_G_DNL_MANUFACTURER "Altera"
/* Extra Environment */ /* Extra Environment */
#define CONFIG_HOSTNAME socfpga_cyclone5 #define CONFIG_HOSTNAME socfpga_cyclone5

@ -51,9 +51,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */
#define CONFIG_ENV_OFFSET 512 /* just after the MBR */ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
/* USB */
#define CONFIG_G_DNL_MANUFACTURER "Terasic"
/* Extra Environment */ /* Extra Environment */
#define CONFIG_HOSTNAME socfpga_de0_nano_soc #define CONFIG_HOSTNAME socfpga_de0_nano_soc

@ -48,9 +48,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */
#define CONFIG_ENV_OFFSET 512 /* just after the MBR */ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
/* USB */
#define CONFIG_G_DNL_MANUFACTURER "DENX"
/* Extra Environment */ /* Extra Environment */
#define CONFIG_HOSTNAME mcvevk #define CONFIG_HOSTNAME mcvevk

@ -51,9 +51,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */
#define CONFIG_ENV_OFFSET 512 /* just after the MBR */ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
/* USB */
#define CONFIG_G_DNL_MANUFACTURER "Terasic"
/* Extra Environment */ /* Extra Environment */
#define CONFIG_HOSTNAME socfpga_sockit #define CONFIG_HOSTNAME socfpga_sockit

@ -51,9 +51,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */
#define CONFIG_ENV_OFFSET 512 /* just after the MBR */ #define CONFIG_ENV_OFFSET 512 /* just after the MBR */
/* USB */
#define CONFIG_G_DNL_MANUFACTURER "EBV"
/* Extra Environment */ /* Extra Environment */
#define CONFIG_HOSTNAME socfpga_socrates #define CONFIG_HOSTNAME socfpga_socrates

Loading…
Cancel
Save