diff options
author | Tom Rini <trini@konsulko.com> | 2015-12-24 09:31:35 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-12-24 09:31:35 -0500 |
commit | 40253dd12a64086885097d253b665c9876635e76 (patch) | |
tree | ab93904ec84b33c1e9336baa8eae710dd957683f /include/configs/socfpga_arria5_socdk.h | |
parent | 8182b41994f0b1824c31652d64171ffa596517fc (diff) | |
parent | e662573822d24dcdc079d29ff397cb8bacf97b27 (diff) | |
download | blackbird-obmc-uboot-40253dd12a64086885097d253b665c9876635e76.tar.gz blackbird-obmc-uboot-40253dd12a64086885097d253b665c9876635e76.zip |
Merge git://git.denx.de/u-boot-socfpga
Conflicts:
include/configs/axs101.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/socfpga_arria5_socdk.h')
-rw-r--r-- | include/configs/socfpga_arria5_socdk.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index 3d5665dbf5..a0161bc7d1 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -52,8 +52,6 @@ #endif #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */ -#define CONFIG_ENV_OFFSET 512 /* just after the MBR */ /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -72,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" /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> |