Adjust boot parameters for new layout.

include/configs/socfpga_de10_nano.h

@@ -36,37 +36,31 @@
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
 #endif
 
-#ifndef CONFIG_SYS_MMCSD_FS_OS_PARTITION
-#define CONFIG_SYS_MMCSD_FS_OS_PARTITION 2
-#endif
-
 /* Extra Environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"preboot=usb start\0" \
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	"bootimage=zImage\0" \
+	"bootimage=zImage_dtb\0" \
 	"fdt_addr=100\0" \
 	"fdtimage=socfpga.dtb\0" \
 	"fpgadata=0x02000000\0" \
 	"core=menu.rbf\0" \
 	"fpgacheck=if mt 0xFFD05054 0;then run fpgaload;else if mt 0x1FFFF000 0x87654321;then env import 0x1FFFF004;run fpgaload;fi;fi\0" \
 	"fpgaload=load mmc 0:$mmc_boot $fpgadata $core;fpga load 0 $fpgadata $filesize;bridge enable;mw 0x1FFFF000 0;mw 0xFFD05054 0x12345678\0" \
-	"scrload1=load mmc 0:$mmc_boot $loadaddr u-boot.scr;source $loadaddr\0" \
-	"scrload2=load mmc 0:$mmc_os $loadaddr u-boot.scr;source $loadaddr\0" \
-	"scrtest=if test -e mmc 0:$mmc_boot /u-boot.scr;then run scrload1;fi;" \
-		"if test -e mmc 0:$mmc_os /u-boot.scr;then run scrload2;fi\0" \
+	"scrload1=load mmc 0:$mmc_boot $loadaddr /linux/u-boot.scr;source $loadaddr\0" \
+	"scrtest=if test -e mmc 0:$mmc_boot /linux/u-boot.scr;then run scrload1;fi\0" \
 	"ethaddr=02:03:04:05:06:07\0" \
 	"bootm $loadaddr - $fdt_addr\0" \
 	"mmc_boot=" __stringify(CONFIG_SYS_MMCSD_FS_BOOT_PARTITION) "\0" \
-	"mmc_os=" __stringify(CONFIG_SYS_MMCSD_FS_OS_PARTITION) "\0" \
-	"mmcroot=/dev/mmcblk0p" __stringify(CONFIG_SYS_MMCSD_FS_OS_PARTITION) "\0" \
+	"mmcroot=/dev/mmcblk0p" __stringify(CONFIG_SYS_MMCSD_FS_BOOT_PARTITION) "\0" \
 	"v=loglevel=4\0" \
-	"mmcboot=setenv bootargs " CONFIG_BOOTARGS " root=$mmcroot ro rootwait;" "bootz $loadaddr - $fdt_addr\0" \
+	"mmcboot=setenv bootargs " CONFIG_BOOTARGS " root=$mmcroot loop=linux/linux.img ro rootwait;" "bootz $loadaddr - $fdt_addr\0" \
 	"mmcload=mmc rescan;" \
 		"run fpgacheck;" \
 		"run scrtest;" \
-		"load mmc 0:$mmc_os $loadaddr /boot/$bootimage;" \
-		"load mmc 0:$mmc_os $fdt_addr /boot/$fdtimage\0" \
+		"load mmc 0:$mmc_boot $loadaddr /linux/$bootimage;" \
+		"setexpr.l fdt_addr $loadaddr + 0x2C;" \
+		"setexpr.l fdt_addr *$fdt_addr + $loadaddr\0"
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>