arm: socfpga: update de0 nano default environment

PATCH New Dalon Westergreen 3 participants 18 messages Jan 21, 2017 – Jan 22, 2017

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/socfpga architecture

lore

Share & tools

lore

Dalon Westergreen

author

2017-01-21 17:31 UTC #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

Dalon Westergreen

author

2017-01-21 17:31 UTC #1 lore raw

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

From: Dalon Westergreen <[email protected]>

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

Marek Vasut

2017-01-21 19:29 UTC #2 lore raw

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

Quoted 10 lines · Dalon Westergreen

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.

Quoted 4 lines

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]>

Acked-by Marek Vasut <[email protected]>

but please see my comment on 1/7

Quoted 31 lines

---
 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 · 2 lines

Best regards,
Marek Vasut

Dalon Westergreen

author

2017-01-21 17:31 UTC #3 lore raw

PATCH 3/7 arm: socfpga: update arria5 socdk default environment

In reply to Dalon Westergreen

From: Dalon Westergreen <[email protected]>

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_arria5_socdk.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

include/configs/socfpga_arria5_socdk.h +6 -4

index 3b0b416..0a7fcd2 100644
@@ -44,15 +44,17 @@
 		"bootm ${loadaddr} - ${fdt_addr}\0" \
 	"bootimage=zImage\0" \
 	"fdt_addr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
+	"fdtimage=socfpga_arria5_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

Marek Vasut

2017-01-21 19:29 UTC #4 lore raw

PATCH 3/7 arm: socfpga: update arria5 socdk default environment

Quoted 10 lines · Dalon Westergreen

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.

Quoted 4 lines

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]>

Acked-by Marek Vasut <[email protected]>

but please see my comment on 1/7

btw I think this is repeating too much, why don't we pull the env into socfpga_common.h first ?

Quoted 31 lines

---
 include/configs/socfpga_arria5_socdk.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

include/configs/socfpga_arria5_socdk.h +6 -4

index 3b0b416..0a7fcd2 100644
@@ -44,15 +44,17 @@
 		"bootm ${loadaddr} - ${fdt_addr}\0" \
 	"bootimage=zImage\0" \
 	"fdt_addr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
+	"fdtimage=socfpga_arria5_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 · 2 lines

Best regards,
Marek Vasut

Westergreen

2017-01-21 23:04 UTC #5 lore raw

PATCH 3/7 arm: socfpga: update arria5 socdk default environment

Quoted 15 lines · Marek Vasut

Quoted 14 lines · Dalon Westergreen
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.

Quoted 8 lines

Quoted 1 line
Signed-off-by Dalon Westergreen <[email protected]>
Acked-by Marek Vasut <[email protected]>
but please see my comment on 1/7
btw I think this is repeating too much, why don't we pull the env into socfpga_common.h first ?

I'd prefer to keep the boards separate and look at moving to disto boot.

Quoted 36 lines

Quoted 34 lines

---
?include/configs/socfpga_arria5_socdk.h | 10 ++++++---- ?1 file changed, 6 insertions(+), 4 deletions(-)

include/configs/socfpga_arria5_socdk.h +6 -4

index 3b0b416..0a7fcd2 100644
@@ -44,15 +44,17 @@
 ?		"bootm ${loadaddr} - ${fdt_addr}\0" \
 ?	"bootimage=zImage\0" \
 ?	"fdt_addr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
+	"fdtimage=socfpga_arria5_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;"\

Marek Vasut

2017-01-22 00:36 UTC #6 lore raw

PATCH 3/7 arm: socfpga: update arria5 socdk default environment

Quoted 20 lines · Dalon

Quoted 19 lines · Marek Vasut
Quoted 11 lines · Dalon Westergreen
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.
Quoted 4 lines
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]>
Acked-by Marek Vasut <[email protected]>

Quoted 7 lines

Quoted 4 lines
but please see my comment on 1/7
btw I think this is repeating too much, why don't we pull the env into socfpga_common.h first ?
I'd prefer to keep the boards separate and look at moving to disto boot.

If you create common env in socfpga_common.h first and then update it, the update will be in a single patch changing a single file. So will then be the switch to distro bootcmd. I would prefer such course of action over many patches doing the same thing in many files.

Given how similar (and broken) the envs are for those boards, pulling the common env should be easy and very beneficial.

Signature · 2 lines

Best regards,
Marek Vasut

Westergreen

2017-01-22 06:29 UTC #7 lore raw

PATCH 3/7 arm: socfpga: update arria5 socdk default environment

Quoted 32 lines · Marek Vasut

Quoted 23 lines · Dalon
Quoted 21 lines · Marek Vasut
Quoted 12 lines · Dalon Westergreen
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.
Quoted 4 lines
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]>
Acked-by Marek Vasut <[email protected]>
Quoted 7 lines
Quoted 4 lines
but please see my comment on 1/7
btw I think this is repeating too much, why don't we pull the env into socfpga_common.h first ?
I'd prefer to keep the boards separate and look at moving to disto boot.

Quoted 8 lines

If you create common env in socfpga_common.h first and then update it, the update will be in a single patch changing a single file. So will then be the switch to distro bootcmd. I would prefer such course of action over many patches doing the same thing in many files.
Given how similar (and broken) the envs are for those boards, pulling the common env should be easy and very beneficial.

Okay, agreed. ?I will move all of the common env variables to? socfpga_common.h. ?I will change the new board patch to do the same.

Signature · 2 lines

Thanks,
Dalon

Marek Vasut

2017-01-22 14:47 UTC #8 lore raw

PATCH 3/7 arm: socfpga: update arria5 socdk default environment

Quoted 38 lines · Dalon

Quoted 37 lines · Marek Vasut
Quoted 23 lines · Dalon
Quoted 21 lines · Marek Vasut
Quoted 12 lines · Dalon Westergreen
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.
Quoted 4 lines
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]>
Acked-by Marek Vasut <[email protected]>
Quoted 7 lines
Quoted 4 lines
but please see my comment on 1/7
btw I think this is repeating too much, why don't we pull the env into socfpga_common.h first ?
I'd prefer to keep the boards separate and look at moving to disto boot.
If you create common env in socfpga_common.h first and then update it, the update will be in a single patch changing a single file. So will then be the switch to distro bootcmd. I would prefer such course of action over many patches doing the same thing in many files.

Quoted 7 lines

Quoted 3 lines
Given how similar (and broken) the envs are for those boards, pulling the common env should be easy and very beneficial.
Okay, agreed. I will move all of the common env variables to socfpga_common.h. I will change the new board patch to do the same.

Thanks!

Signature · 2 lines

Best regards,
Marek Vasut

Dalon Westergreen

author

2017-01-21 17:31 UTC #9 lore raw

PATCH 4/7 arm: socfpga: Update DE1 environment

In reply to Dalon Westergreen

From: Dalon Westergreen <[email protected]>

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

---
 include/configs/socfpga_de1_soc.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

include/configs/socfpga_de1_soc.h +5 -3

index deec647..3abd28c 100644
@@ -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>

Signature · 1 line

2.7.4

Dalon Westergreen

author

2017-01-21 17:31 UTC #10 lore raw

PATCH 5/7 arm: socfpga: Update SoCKit environment

In reply to Dalon Westergreen

From: Dalon Westergreen <[email protected]>

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

---
 include/configs/socfpga_sockit.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

include/configs/socfpga_sockit.h +5 -3

index 3fceb31..de609ba 100644
@@ -42,13 +42,15 @@
 	"fdt_addr=100\0" \
 	"fdtimage=socfpga.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

Dalon Westergreen

author

2017-01-21 17:31 UTC #11 lore raw

PATCH 6/7 arm: socfpga: Update sr1500 environment

In reply to Dalon Westergreen

From: Dalon Westergreen <[email protected]>

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

---
 include/configs/socfpga_sr1500.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

include/configs/socfpga_sr1500.h +5 -3

index 0407f03..6f7baad 100644
@@ -42,13 +42,15 @@
 	"fdtimage=socfpga.dtb\0" \
 		"fsloadcmd=ext2load\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

Marek Vasut

2017-01-21 19:30 UTC #12 lore raw

PATCH 6/7 arm: socfpga: Update sr1500 environment

Quoted 11 lines · Dalon Westergreen

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.
Signed-off-by Dalon Westergreen <[email protected]>

Please CC Stefan on this patch next time, I want his ACK on this patch too.

Quoted 28 lines

---
 include/configs/socfpga_sr1500.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

include/configs/socfpga_sr1500.h +5 -3

index 0407f03..6f7baad 100644
@@ -42,13 +42,15 @@
 	"fdtimage=socfpga.dtb\0" \
 		"fsloadcmd=ext2load\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 · 2 lines

Best regards,
Marek Vasut

Dalon Westergreen

author

2017-01-21 17:31 UTC #13 lore raw

PATCH 7/7 arm: socfpga: add support for Terasic DE10-Nano board

In reply to Dalon Westergreen

Add CycloneV based Terasic DE10 Nano board. The
board is based on the DE0 Nano but has a larger
fpga.

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

---
 arch/arm/dts/Makefile                       |   1 +
 arch/arm/dts/socfpga_cyclone5_de10_nano.dts |  68 +++
 arch/arm/mach-socfpga/Kconfig               |   7 +
 board/terasic/de10-nano/MAINTAINERS         |   5 +
 board/terasic/de10-nano/Makefile            |   9 +
 board/terasic/de10-nano/qts/iocsr_config.h  | 660 ++++++++++++++++++++++++++++
 board/terasic/de10-nano/qts/pinmux_config.h | 219 +++++++++
 board/terasic/de10-nano/qts/pll_config.h    |  85 ++++
 board/terasic/de10-nano/qts/sdram_config.h  | 344 +++++++++++++++
 board/terasic/de10-nano/socfpga.c           |   6 +
 configs/socfpga_de10_nano_defconfig         |  60 +++
 include/configs/socfpga_de10_nano.h         |  57 +++
 12 files changed, 1521 insertions(+)
 create mode 100644 arch/arm/dts/socfpga_cyclone5_de10_nano.dts
 create mode 100644 board/terasic/de10-nano/MAINTAINERS
 create mode 100644 board/terasic/de10-nano/Makefile
 create mode 100644 board/terasic/de10-nano/qts/iocsr_config.h
 create mode 100644 board/terasic/de10-nano/qts/pinmux_config.h
 create mode 100644 board/terasic/de10-nano/qts/pll_config.h
 create mode 100644 board/terasic/de10-nano/qts/sdram_config.h
 create mode 100644 board/terasic/de10-nano/socfpga.c
 create mode 100644 configs/socfpga_de10_nano_defconfig
 create mode 100644 include/configs/socfpga_de10_nano.h

arch/arm/dts/Makefile +1 -0

index 66ea0b3..1b92e47 100644
@@ -134,6 +134,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) +=				\
 	socfpga_cyclone5_socdk.dtb			\
 	socfpga_cyclone5_de0_nano_soc.dtb			\
 	socfpga_cyclone5_de1_soc.dtb			\
+	socfpga_cyclone5_de10_nano.dtb			\
 	socfpga_cyclone5_sockit.dtb			\
 	socfpga_cyclone5_socrates.dtb			\
 	socfpga_cyclone5_sr1500.dtb			\

arch/arm/dts/socfpga_cyclone5_de10_nano.dts new file +68 -0

68 lines not on this page · raw message

arch/arm/mach-socfpga/Kconfig +7 -0

index 6991af8..5da2acd 100644
@@ -78,6 +78,10 @@ config TARGET_SOCFPGA_TERASIC_DE1_SOC
 	bool "Terasic DE1-SoC (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
 
+config TARGET_SOCFPGA_TERASIC_DE10_NANO
+	bool "Terasic DE10-Nano (Cyclone V)"
+	select TARGET_SOCFPGA_CYCLONE5
+
 config TARGET_SOCFPGA_TERASIC_SOCKIT
 	bool "Terasic SoCkit (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5

@@ -89,6 +93,7 @@ config SYS_BOARD
 	default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
 	default "de0-nano-soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "de1-soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC
+	default "de10-nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 	default "is1" if TARGET_SOCFPGA_IS1
 	default "mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
 	default "sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT

@@ -105,6 +110,7 @@ config SYS_VENDOR
 	default "terasic" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "terasic" if TARGET_SOCFPGA_TERASIC_DE1_SOC
 	default "terasic" if TARGET_SOCFPGA_TERASIC_SOCKIT
+	default "terasic" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 
 config SYS_SOC
 	default "socfpga"

@@ -114,6 +120,7 @@ config SYS_CONFIG_NAME
 	default "socfpga_cyclone5_socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
 	default "socfpga_de0_nano_soc" if TARGET_SOCFPGA_TERASIC_DE0_NANO
 	default "socfpga_de1_soc" if TARGET_SOCFPGA_TERASIC_DE1_SOC
+	default "socfpga_de10_nano" if TARGET_SOCFPGA_TERASIC_DE10_NANO
 	default "socfpga_is1" if TARGET_SOCFPGA_IS1
 	default "socfpga_mcvevk" if TARGET_SOCFPGA_DENX_MCVEVK
 	default "socfpga_sockit" if TARGET_SOCFPGA_TERASIC_SOCKIT

board/terasic/de10-nano/MAINTAINERS new file +5 -0

new file mode 100644
index 0000000..f4dd0df
@@ -0,0 +1,5 @@
+DE10-NANO BOARD
+M:	Dalon Westergreen <[email protected]>
+S:	Maintained
+F:	include/configs/socfpga_de10_nano.h
+F:	configs/socfpga_de10_nano_defconfig

board/terasic/de10-nano/Makefile new file +9 -0

new file mode 100644
index 0000000..86f9b78
@@ -0,0 +1,9 @@
+#
+# (C) Copyright 2001-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+# (C) Copyright 2010, Thomas Chou <[email protected]>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= socfpga.o

board/terasic/de10-nano/qts/iocsr_config.h new file +660 -0

660 lines not on this page · raw message

board/terasic/de10-nano/qts/pinmux_config.h new file +219 -0

219 lines not on this page · raw message

board/terasic/de10-nano/qts/pll_config.h new file +85 -0

85 lines not on this page · raw message

board/terasic/de10-nano/qts/sdram_config.h new file +344 -0

344 lines not on this page · raw message

board/terasic/de10-nano/socfpga.c new file +6 -0

new file mode 100644
index 0000000..c5852e7
@@ -0,0 +1,6 @@
+/*
+ * Copyright (C) 2017, Intel Corporation
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+#include <common.h>

configs/socfpga_de10_nano_defconfig new file +60 -0

60 lines not on this page · raw message

include/configs/socfpga_de10_nano.h new file +57 -0

57 lines not on this page · raw message

Signature · 1 line

2.7.4

Marek Vasut

2017-01-21 19:33 UTC #14 lore raw

PATCH 7/7 arm: socfpga: add support for Terasic DE10-Nano board

Quoted 5 lines · Dalon Westergreen

Add CycloneV based Terasic DE10 Nano board. The
board is based on the DE0 Nano but has a larger
fpga.
Signed-off-by Dalon Westergreen <[email protected]>

This should be sent as a separate patch from the env update patchset. Please send this again, but add my

Acked-by Marek Vasut <[email protected]>

I'd still like Dinh's review though.

Thanks!

Quoted 24 lines

---
 arch/arm/dts/Makefile                       |   1 +
 arch/arm/dts/socfpga_cyclone5_de10_nano.dts |  68 +++
 arch/arm/mach-socfpga/Kconfig               |   7 +
 board/terasic/de10-nano/MAINTAINERS         |   5 +
 board/terasic/de10-nano/Makefile            |   9 +
 board/terasic/de10-nano/qts/iocsr_config.h  | 660 ++++++++++++++++++++++++++++
 board/terasic/de10-nano/qts/pinmux_config.h | 219 +++++++++
 board/terasic/de10-nano/qts/pll_config.h    |  85 ++++
 board/terasic/de10-nano/qts/sdram_config.h  | 344 +++++++++++++++
 board/terasic/de10-nano/socfpga.c           |   6 +
 configs/socfpga_de10_nano_defconfig         |  60 +++
 include/configs/socfpga_de10_nano.h         |  57 +++
 12 files changed, 1521 insertions(+)
 create mode 100644 arch/arm/dts/socfpga_cyclone5_de10_nano.dts
 create mode 100644 board/terasic/de10-nano/MAINTAINERS
 create mode 100644 board/terasic/de10-nano/Makefile
 create mode 100644 board/terasic/de10-nano/qts/iocsr_config.h
 create mode 100644 board/terasic/de10-nano/qts/pinmux_config.h
 create mode 100644 board/terasic/de10-nano/qts/pll_config.h
 create mode 100644 board/terasic/de10-nano/qts/sdram_config.h
 create mode 100644 board/terasic/de10-nano/socfpga.c
 create mode 100644 configs/socfpga_de10_nano_defconfig
 create mode 100644 include/configs/socfpga_de10_nano.h

[...]

Signature · 2 lines

Best regards,
Marek Vasut

Marek Vasut

2017-01-21 19:28 UTC #15 lore raw

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

In reply to Dalon Westergreen

Quoted 10 lines · Dalon Westergreen

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.

Quoted 4 lines

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]>

While I'm fine with the patch, wouldn't it make more sense to move toward distro bootcmd (git grep for DISTRO_BOOTCMD, ie RPi is using it). Major distros agreed on how to handle the U-Boot env, so it'd be nice to have Altera SoCs follow.

What do you think ?

Quoted 2 lines

de0 fix spaces

This is probably not supposed to be part of the description ? :)

Quoted 31 lines

---
 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 · 2 lines

Best regards,
Marek Vasut

Westergreen

2017-01-21 21:55 UTC #16 lore raw

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

On Sat, 2017-01-21 at 20:28 +0100, Marek Vasut wrote:

On 01/21/2017 06:31 PM, Dalon Westergreen wrote:

From: Dalon Westergreen <dalon.westergreen at intel.com<mailto:[email protected]>>

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

Signed-off-by Dalon Westergreen <dalon.westergreen at intel.com<mailto:[email protected]>>

What do you think ?

I like the idea, I think moving in that direction makes sense. For now i suggest just cleaning up the current environment so it boots with the current default sdcard image. Agreed?

de0 fix spaces

This is probably not supposed to be part of the description ? :)

---
 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>

Marek Vasut

2017-01-21 22:03 UTC #17 lore raw

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

Quoted 28 lines · Dalon

On Sat, 2017-01-21 at 20:28 +0100, Marek Vasut wrote:
On 01/21/2017 06:31 PM, Dalon Westergreen wrote:
From: Dalon Westergreen <dalon.westergreen at intel.com<mailto:[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 <dalon.westergreen at intel.com<mailto:[email protected]>>
While I'm fine with the patch, wouldn't it make more sense to move toward distro bootcmd (git grep for DISTRO_BOOTCMD, ie RPi is using it). Major distros agreed on how to handle the U-Boot env, so it'd be nice to have Altera SoCs follow.

Quoted 6 lines

What do you think ?
I like the idea, I think moving in that direction makes sense. For now i suggest just cleaning up the current environment so it boots with the current default sdcard image. Agreed?

That's fine.

btw please fix your mailer and stop top-posting.

Quoted 44 lines

de0 fix spaces

This is probably not supposed to be part of the description ? :)

---
 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 · 2 lines

Best regards,
Marek Vasut