X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fsocfpga_vining_fpga.h;h=4bb15cf46293272f24dc0af711cc169fb5eaae2f;hb=454712f67cc0531599bea16dbaf0abab56ba1a86;hp=06976d804c7fdc3d70b1208adab908eea54a6929;hpb=3275f26bb6cda9e24966423460e74281e1a71888;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index 06976d8..4bb15cf 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -11,16 +11,8 @@
 #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_LOADADDR		0x01000000
-#define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
-
-/* Ethernet on SoC (EMAC) */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME			"socfpga_vining_fpga"
 
 /*
  * Active LOW GPIO buttons:
@@ -35,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"						\
@@ -65,7 +57,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),"						\
@@ -122,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"					\
@@ -192,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>