Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[u-boot] / include / configs / socfpga_sr1500.h

diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index bccb235a1172ac9b5df96b8fc7842d6e479b4216..fdf67ca09896867ccc46f80a5096c5cf7c73b7c7 100644 (file)
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -53,9 +53,6 @@
 #define CONFIG_PHY_MARVELL
 #define PHY_ANEG_TIMEOUT       8000
 
-/* Extra Environment */
-#define CONFIG_HOSTNAME                sr1500
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "verify=n\0" \
        "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
@@ -73,11 +70,13 @@
        "mmcload=mmc rescan;" \
                "load mmc 0:1 ${loadaddr} ${bootimage};" \
                "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
-       "qspiroot=/dev/mtdblock0\0" \
-       "qspirootfstype=jffs2\0" \
+       "qspiload=sf probe && mtdparts default && run ubiload\0" \
        "qspiboot=setenv bootargs " CONFIG_BOOTARGS \
-               " root=${qspiroot} rw rootfstype=${qspirootfstype};"\
-               "bootm ${loadaddr} - ${fdt_addr}\0"
+               " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
+               "bootz ${loadaddr} - ${fdt_addr}\0" \
+       "ubiload=ubi part UBI && ubifsmount ubi0 && " \
+               "ubifsload ${loadaddr} /boot/${bootimage} && " \
+               "ubifsload ${fdt_addr} /boot/${fdtimage}\0"
 
 /* Environment */
 #define CONFIG_ENV_IS_IN_SPI_FLASH