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 2905e0e..4bb15cf 100644 (file)
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -11,11 +11,8 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on VINING_FPGA */
 
 /* Booting Linux */
-#define CONFIG_BOOTFILE                "fitImage"
-#define CONFIG_SYS_BOOTM_LEN   0x2000000       /* 32 MiB */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME                        "socfpga_vining_fpga"
 
 /*
  * Active LOW GPIO buttons:
@@ -30,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"                                             \
@@ -117,7 +114,8 @@
        "addargs=run addcons addmtd addmisc\0"                          \
        "ubiload="                                                      \
                "ubi part ${ubimtd} ; ubifsmount ${ubipart} ; "         \
-               "ubifsload ${kernel_addr_r} /boot/${bootfile}\0"        \
+               "ubifsload ${kernel_addr_r} /boot/${bootfile} ; "       \
+               "ubifsumount ; ubi detach\0"                            \
        "netload="                                                      \
                "tftp ${kernel_addr_r} ${hostname}/${bootfile}\0"       \
        "miscargs=nohlt panic=1\0"                                      \
@@ -187,9 +185,6 @@
                "fi\0"                                                  \
                "socfpga_legacy_reset_compat=1\0"
 
-/* Support changing the prompt string */
-#define CONFIG_CMDLINE_PS_SUPPORT
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>