Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / socfpga_vining_fpga.h

diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index c333c93..4bb15cf 100644 (file)
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -11,10 +11,8 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on VINING_FPGA */
 
 /* Booting Linux */
-#define CONFIG_SYS_BOOTM_LEN   0x2000000       /* 32 MiB */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME                        "socfpga_vining_fpga"
 
 /*
  * Active LOW GPIO buttons:
@@ -29,7 +27,7 @@
  *                            Linux system after 5 seconds
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "verify=n\0" \
        "consdev=ttyS0\0"                                               \
        "baudrate=115200\0"                                             \