Skip to contentSkip to conversation

arm: socfpga: update de0 nano default environment

PATCH New Dalon Westergreen 1 participant 2 messages Jan 21, 2017

lore
Share & tools
lore

Dalon Westergreen

author
#0 lore raw

PATCH 1/7 arm: socfpga: update de0 nano default environment

From: Dalon Westergreen <[email protected]>

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.

Also set the default fdtimage value to match the devicetree name in the linux kernel for this board.

Signed-off-by Dalon Westergreen <[email protected]>

de0 fix spaces

---
 include/configs/socfpga_de0_nano_soc.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
include/configs/socfpga_de0_nano_soc.h +6 -4
index 6b9546e..205b859 100644
@@ -39,15 +39,17 @@
 		"bootm ${loadaddr} - ${fdt_addr}\0" \
 	"bootimage=zImage\0" \
 	"fdt_addr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
+	"fdtimage=socfpga_cyclone5_de0_sockit.dtb\0" \
 	"bootm ${loadaddr} - ${fdt_addr}\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} - ${fdt_addr}\0" \
 	"mmcload=mmc rescan;" \
-		"load mmc 0:1 ${loadaddr} ${bootimage};" \
-		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
+		"load mmc 0:${mmc_boot} ${loadaddr} ${bootimage};" \
+		"load mmc 0:${mmc_boot} ${fdt_addr} ${fdtimage}\0" \
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 2/7 arm: socfpga: update cyclone5 socdk default environment

From: Dalon Westergreen <[email protected]>

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.

Also set the default fdtimage value to match the devicetree name in the linux kernel for this board.

Signed-off-by Dalon Westergreen <[email protected]>
---
 include/configs/socfpga_cyclone5_socdk.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
include/configs/socfpga_cyclone5_socdk.h +6 -4
index 7ced6a6..94355ce 100644
@@ -44,15 +44,17 @@
 		"bootm ${loadaddr} - ${fdt_addr}\0" \
 	"bootimage=zImage\0" \
 	"fdt_addr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
+	"fdtimage=socfpga_cyclone5_socdk.dtb\0" \
 	"bootm ${loadaddr} - ${fdt_addr}\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} - ${fdt_addr}\0" \
 	"mmcload=mmc rescan;" \
-		"load mmc 0:1 ${loadaddr} ${bootimage};" \
-		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
+		"load mmc 0:${mmc_boot} ${loadaddr} ${bootimage};" \
+		"load mmc 0:${mmc_boot} ${fdt_addr} ${fdtimage}\0" \
 	"qspiload=sf probe && mtdparts default && run ubiload\0" \
 	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
 		" ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
Signature · 1 line
2.7.4