Convert CONFIG_SYS_BOOTM_LEN to Kconfig

[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 1679982..70d9f36 100644 (file)
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -11,12 +11,6 @@
 #define PHYS_SDRAM_1_SIZE              0x40000000      /* 1GiB on VINING_FPGA */
 
 /* Booting Linux */
-#define CONFIG_BOOTFILE                "fitImage"
-#define CONFIG_BOOTCOMMAND     "run selboot"
-#define CONFIG_SYS_BOOTM_LEN   0x2000000       /* 32 MiB */
-#define CONFIG_SYS_LOAD_ADDR           0x01000000
-
-/* Ethernet on SoC (EMAC) */
 
 /* Extra Environment */
 #define CONFIG_HOSTNAME                        "socfpga_vining_fpga"
@@ -64,7 +58,7 @@
                "256k(softing1),"                                       \
                "256k(softing2),"                                       \
                "14720k(rcvrfs),"       /* Recovery */                  \
-               "64m(rootfs),"          /* Root */                      \
+               "192m(rootfs),"         /* Root */                      \
                "-(userfs)\0"           /* User */                      \
        "mtdparts_1_128m=ff705000.spi.1:" /* 16MiB+128MiB SF config */  \
                "64m(rootfs),"                                          \
@@ -121,7 +115,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"                                      \
@@ -191,9 +186,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>