[U-Boot] [PATCH 4/7] arm: socfpga: Update DE1 environment

[Dalon Westergreen]

From: Dalon Westergreen <dalon.westergreen at intel.com>

The default values for CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
and CONFIG_SYS_MMCSD_FS_OS_PARTITION have changed and as
as result the default uboot environment for this board
needs updating.  This sets the default envirnment to
use the CONFIG_SYS_MMCSD_FS_BOOT_PARTITION and
CONFIG_SYS_MMCSD_FS_OS_PARTITION configs for the boot
and os partitions.

Signed-off-by: Dalon Westergreen <dalon.westergreen at intel.com>
---
 include/configs/socfpga_de1_soc.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h
index deec647..3abd28c 100644
--- a/include/configs/socfpga_de1_soc.h
+++ b/include/configs/socfpga_de1_soc.h
@@ -41,13 +41,15 @@
 	"fdtaddr=100\0" \
 	"fdtimage=socfpga.dtb\0" \
 	"bootm ${loadaddr} - ${fdtaddr}\0" \
-	"mmcroot=/dev/mmcblk0p2\0" \
+	"mmc_boot=" __stringify(CONFIG_SYS_MMCSD_FS_BOOT_PARTITION) "\0" \
+	"mmc_os=" __stringify(CONFIG_SYS_MMCSD_FS_OS_PARTITION) "\0" \
+	"mmcroot=/dev/mmcblk0p${mmc_os}\0" \
 	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
 		" root=${mmcroot} rw rootwait;" \
 		"bootz ${loadaddr} - ${fdtaddr}\0" \
 	"mmcload=mmc rescan;" \
-		"load mmc 0:1 ${loadaddr} ${bootimage};" \
-		"load mmc 0:1 ${fdtaddr} ${fdtimage}\0" \
+		"load mmc 0:${mmc_boot} ${loadaddr} ${bootimage};" \
+		"load mmc 0:${mmc_boot} ${fdtaddr} ${fdtimage}\0" \
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
-- 
2.7.4