[U-Boot] [PATCH v4 0/7]

PATCH Superseded Dalon Westergreen 4 participants 30 messages Jan 24, 2017 – Jan 25, 2017

lore

Share & tools

lore

Dalon Westergreen

author

2017-01-24 17:05 UTC #0 lore raw

v4 cover [U-Boot] [PATCH v4 0/7]

From: Dalon Westergreen <[email protected]>

These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.

Changes in v4:
- Removed extraneous define in socfpga_common.h
and only use CONFIG_EXTRA_ENV_SETTINGS for
common uboot environment
Changes in v3:
- Corrected error in common default environment

Dalon Westergreen (7):
arm: socfpga: add env settings to common header
arm: socfpga: update de0 nano default environment
arm: socfpga: update cyclone5 socdk default environment
arm: socfpga: update arria5 socdk default environment
arm: socfpga: Update DE1 environment
arm: socfpga: Update SoCKit environment
arm: socfpga: Update sr1500 environment

 configs/socfpga_arria5_defconfig         |  1 +
 configs/socfpga_cyclone5_defconfig       |  1 +
 configs/socfpga_de0_nano_soc_defconfig   |  3 +--
 configs/socfpga_de1_soc_defconfig        |  1 +
 configs/socfpga_sockit_defconfig         |  1 +
 configs/socfpga_sr1500_defconfig         |  1 +
 include/configs/socfpga_arria5_socdk.h   | 25 -------------------------
 include/configs/socfpga_common.h         | 27 +++++++++++++++++++++++++++
 include/configs/socfpga_cyclone5_socdk.h | 25 -------------------------
 include/configs/socfpga_de0_nano_soc.h   | 19 +------------------
 include/configs/socfpga_de1_soc.h        | 19 +------------------
 include/configs/socfpga_sockit.h         | 27 +--------------------------
 include/configs/socfpga_sr1500.h         | 25 -------------------------
 13 files changed, 36 insertions(+), 139 deletions(-)

Signature · 1 line

2.7.4

Dalon Westergreen

author

2017-01-24 17:05 UTC #1 lore raw

PATCH v4 1/7 arm: socfpga: add env settings to common header

From: Dalon Westergreen <[email protected]>

Move repeated environment settings for socfpga boards to a common header.

The default values for the boot partition and the OS filesystem partition have changed and as as result the default uboot environment for socfpga boards needs updating.

Move to using CONFIG_DEFAULT_DEVICE_TREE for setting the default linux devicetree used during linux boot.

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

---
 include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

include/configs/socfpga_common.h +27 -0

index 6285266..bdd6e2f 100644
@@ -336,5 +336,32 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * Stack setup
  */
 #define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
+	
+/* Extra Environment */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"verify=n\0" \
+	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+	"bootimage=" CONFIG_BOOTFILE "\0" \
+	"fdt_addr=100\0" \
+	"fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
+		"bootm ${loadaddr} - ${fdt_addr}\0" \
+	"mmcroot=/dev/mmcblk0p3\0" \
+	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
+		" root=${mmcroot} rw rootwait;" \
+		"bootz ${loadaddr} - ${fdt_addr}\0" \
+	"mmcload=mmc rescan;" \
+		"load mmc 0:2 ${loadaddr} ${bootimage};" \
+		"load mmc 0:2 ${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;"\
+		"bootz ${loadaddr} - ${fdt_addr}\0" \
+	"ubiload=ubi part UBI && ubifsmount ubi0 && " \
+		"ubifsload ${loadaddr} /boot/${bootimage} && " \
+		"ubifsload ${fdt_addr} /boot/${fdtimage}\0"
+
+#endif
 
 #endif	/* __CONFIG_SOCFPGA_COMMON_H__ */

Signature · 1 line

2.7.4

Dinh Nguyen

2017-01-25 03:31 UTC #2 lore raw

PATCH v4 1/7 arm: socfpga: add env settings to common header

Quoted 28 lines · Dalon Westergreen

From: Dalon Westergreen <[email protected]>
Move repeated environment settings for socfpga boards to a common header.
The default values for the boot partition and the OS filesystem partition have changed and as as result the default uboot environment for socfpga boards needs updating.
Move to using CONFIG_DEFAULT_DEVICE_TREE for setting the default linux devicetree used during linux boot.
Signed-off-by Dalon Westergreen <[email protected]>
---
 include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
include/configs/socfpga_common.h +2 -0
index 6285266..bdd6e2f 100644
@@ -336,5 +336,32 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * Stack setup
  */
 #define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
+	
+/* Extra Environment */

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 350

Quoted 10 lines

include/configs/socfpga_common.h +10 -0

+#ifndef CONFIG_EXTRA_ENV_SETTINGS
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"verify=n\0" \
+	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+	"bootimage=" CONFIG_BOOTFILE "\0" \
+	"fdt_addr=100\0" \
+	"fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
+		"bootm ${loadaddr} - ${fdt_addr}\0" \
+	"mmcroot=/dev/mmcblk0p3\0" \

Should this be mmcblk0p2?

Dinh

Westergreen

2017-01-25 03:35 UTC #3 lore raw

PATCH v4 1/7 arm: socfpga: add env settings to common header

Quoted 36 lines · Dinh Nguyen

Quoted 34 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Move repeated environment settings for socfpga boards to a common header.
The default values for the boot partition and the OS filesystem partition have changed and as as result the default uboot environment for socfpga boards needs updating.
Move to using??CONFIG_DEFAULT_DEVICE_TREE for setting the default linux devicetree used during linux boot.
Signed-off-by Dalon Westergreen <[email protected]>
---
?include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++ ?1 file changed, 27 insertions(+)
include/configs/socfpga_common.h +0 -0
index 6285266..bdd6e2f 100644
@@ -336,5 +336,32 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
? * Stack setup
? */
?#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR
include/configs/socfpga_common.h +6 -0
+	
+/* Extra Environment */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"verify=n\0" \
+	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

Quoted 8 lines

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 350
Quoted 6 lines
include/configs/socfpga_common.h +6 -0
+	"bootimage=" CONFIG_BOOTFILE "\0" \
+	"fdt_addr=100\0" \
+	"fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
+		"bootm ${loadaddr} - ${fdt_addr}\0" \
+	"mmcroot=/dev/mmcblk0p3\0" \
Should this be mmcblk0p2?

that was the point of the patches, p1 is now the
a2 partition, so the fat and root partition?
shifted up by 1.

Quoted 2 lines

Dinh

Signature · 6 lines

------------------------------------------
Dalon Westergreen
Embedded Specialist
Intel Programmable Solutions Group
Phone :?1.858.202.3518
------------------------------------------

Dinh Nguyen

2017-01-25 03:37 UTC #4 lore raw

PATCH v4 1/7 arm: socfpga: add env settings to common header

Quoted 45 lines · Dalon

Quoted 36 lines · Dinh Nguyen
Quoted 34 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Move repeated environment settings for socfpga boards to a common header.
The default values for the boot partition and the OS filesystem partition have changed and as as result the default uboot environment for socfpga boards needs updating.
Move to using CONFIG_DEFAULT_DEVICE_TREE for setting the default linux devicetree used during linux boot.
Signed-off-by Dalon Westergreen <[email protected]>
---
 include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
include/configs/socfpga_common.h +6 -0
index 6285266..bdd6e2f 100644
@@ -336,5 +336,32 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * Stack setup
  */
 #define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
+	
+/* Extra Environment */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"verify=n\0" \
+	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
Quoted 8 lines
include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 350
Quoted 6 lines
include/configs/socfpga_common.h +6 -0
+	"bootimage=" CONFIG_BOOTFILE "\0" \
+	"fdt_addr=100\0" \
+	"fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
+		"bootm ${loadaddr} - ${fdt_addr}\0" \
+	"mmcroot=/dev/mmcblk0p3\0" \
Should this be mmcblk0p2?

Quoted 4 lines

that was the point of the patches, p1 is now the
a2 partition, so the fat and root partition
shifted up by 1.

Ok, sorry about that.

Dinh

Dalon Westergreen

author

2017-01-24 17:05 UTC #5 lore raw

PATCH v4 2/7 arm: socfpga: update de0 nano default environment

In reply to Dalon Westergreen

From: Dalon Westergreen <[email protected]>

Remove the default environment as it is now in a common header.

Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.

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

---
 configs/socfpga_de0_nano_soc_defconfig |  3 +--
 include/configs/socfpga_de0_nano_soc.h | 19 +------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

configs/socfpga_de0_nano_soc_defconfig +1 -2

index af41e1e..4837809 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
+CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

@@ -20,7 +21,6 @@ CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
-CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y

@@ -35,7 +35,6 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_CMD_UBI=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y

include/configs/socfpga_de0_nano_soc.h +1 ~~-18~~

index 6b9546e..97216ea 100644
@@ -18,7 +18,7 @@
 #define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB */
 
 /* Booting Linux */
-#define CONFIG_BOOTFILE		"fitImage"
+#define CONFIG_BOOTFILE		"zImage"
 #define CONFIG_BOOTARGS		"console=ttyS0," __stringify(CONFIG_BAUDRATE)
 #define CONFIG_BOOTCOMMAND	"run mmcload; run mmcboot"
 #define CONFIG_LOADADDR		0x01000000

@@ -32,23 +32,6 @@
 
 #define CONFIG_ENV_IS_IN_MMC
 
-/* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
-		"bootm ${loadaddr} - ${fdt_addr}\0" \
-	"bootimage=zImage\0" \
-	"fdt_addr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
-	"bootm ${loadaddr} - ${fdt_addr}\0" \
-	"mmcroot=/dev/mmcblk0p2\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" \
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>

Signature · 1 line

2.7.4

Dinh Nguyen

2017-01-25 03:08 UTC #6 lore raw

PATCH v4 2/7 arm: socfpga: update de0 nano default environment

Quoted 19 lines · Dalon Westergreen

From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
 configs/socfpga_de0_nano_soc_defconfig |  3 +--
 include/configs/socfpga_de0_nano_soc.h | 19 +------------------
 2 files changed, 2 insertions(+), 20 deletions(-)
configs/socfpga_de0_nano_soc_defconfig +0 -0
index af41e1e..4837809 100644

configs/socfpga_de0_nano_soc_defconfig CONFIG_SYS_MALLOC_F_LEN=0x2000 · line 7

Quoted 4 lines

configs/socfpga_de0_nano_soc_defconfig +1 -0

@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
+CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"

This should be socfpga_cyclone5_de0_nano_soc.dtb

Dinh

Westergreen

2017-01-25 03:11 UTC #7 lore raw

PATCH v4 2/7 arm: socfpga: update de0 nano default environment

Quoted 17 lines · Dinh Nguyen

Quoted 15 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
?configs/socfpga_de0_nano_soc_defconfig |??3 +-- ?include/configs/socfpga_de0_nano_soc.h | 19 +------------------ ?2 files changed, 2 insertions(+), 20 deletions(-)

Quoted 13 lines

Quoted 10 lines
configs/socfpga_de0_nano_soc_defconfig +0 -0
index af41e1e..4837809 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
?CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y ?CONFIG_SPL_STACK_R_ADDR=0x00800000 ?CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"
This should be socfpga_cyclone5_de0_nano_soc.dtb

No, just checked the dts in the kernel source. ?it is socfpga_cyclone5_de0_sockit.dts. I can change this to what you like, but my intent had been to match names in the kernel source where possible.

thanks.

Quoted 2 lines

Dinh

Dinh Nguyen

2017-01-25 03:16 UTC #8 lore raw

PATCH v4 2/7 arm: socfpga: update de0 nano default environment

Quoted 31 lines · Dalon

Quoted 17 lines · Dinh Nguyen
Quoted 15 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
 configs/socfpga_de0_nano_soc_defconfig |  3 +--
 include/configs/socfpga_de0_nano_soc.h | 19 +------------------
 2 files changed, 2 insertions(+), 20 deletions(-)
Quoted 13 lines
configs/socfpga_de0_nano_soc_defconfig CONFIG_SYS_MALLOC_F_LEN=0x2000 · line 7
Quoted 10 lines
configs/socfpga_de0_nano_soc_defconfig +1 -0
index af41e1e..4837809 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
+CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"
This should be socfpga_cyclone5_de0_nano_soc.dtb

Quoted 5 lines

No, just checked the dts in the kernel source. it is socfpga_cyclone5_de0_sockit.dts. I can change this to what you like, but my intent had been to match names in the kernel source where possible.

This is U-Boot: check under U-Boot's arch/arm/dts/

socfpga_cyclone5_sockit.dtb is for the sockit socfpga_cyclone5_de0_nano_soc.dtb is for the DE0 Nano board.

commit 55c7a765f63ab10b9a3b8cbd38bf1483901a7b36

Author: Dinh Nguyen <[email protected]>
Date:   Tue Sep 1 17:41:52 2015 -0500

arm: socfpga: Add support for the Terasic DE-0 Atlas board

Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is CycloneV based board. The board can boot from SD/MMC. Ethernet is also supported.

Dinh

Dinh Nguyen

2017-01-25 03:22 UTC #9 lore raw

PATCH v4 2/7 arm: socfpga: update de0 nano default environment

Quoted 47 lines · Dinh Nguyen

Quoted 31 lines · Dalon
Quoted 17 lines · Dinh Nguyen
Quoted 15 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
 configs/socfpga_de0_nano_soc_defconfig |  3 +--
 include/configs/socfpga_de0_nano_soc.h | 19 +------------------
 2 files changed, 2 insertions(+), 20 deletions(-)
Quoted 13 lines
configs/socfpga_de0_nano_soc_defconfig CONFIG_SYS_MALLOC_F_LEN=0x2000 · line 7
Quoted 10 lines
configs/socfpga_de0_nano_soc_defconfig +1 -0
index af41e1e..4837809 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
+CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"
This should be socfpga_cyclone5_de0_nano_soc.dtb
Quoted 5 lines
No, just checked the dts in the kernel source. it is socfpga_cyclone5_de0_sockit.dts. I can change this to what you like, but my intent had been to match names in the kernel source where possible.
This is U-Boot: check under U-Boot's arch/arm/dts/
socfpga_cyclone5_sockit.dtb is for the sockit socfpga_cyclone5_de0_nano_soc.dtb is for the DE0 Nano board.
commit 55c7a765f63ab10b9a3b8cbd38bf1483901a7b36

Quoted 9 lines

Author: Dinh Nguyen <[email protected]>
Date:   Tue Sep 1 17:41:52 2015 -0500
arm: socfpga: Add support for the Terasic DE-0 Atlas board
Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is CycloneV based board. The board can boot from SD/MMC. Ethernet is also supported.

Oh you're right...I got confused. You're matching the DTS in the kernel. Sorry about that...

Dinh

Westergreen

2017-01-25 03:23 UTC #10 lore raw

PATCH v4 2/7 arm: socfpga: update de0 nano default environment

In reply to Dinh Nguyen

Quoted 52 lines · Dinh Nguyen

Quoted 34 lines · Dalon
Quoted 19 lines · Dinh Nguyen
Quoted 16 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
?configs/socfpga_de0_nano_soc_defconfig |??3 +-- ?include/configs/socfpga_de0_nano_soc.h | 19 +------------------ ?2 files changed, 2 insertions(+), 20 deletions(-)
Quoted 13 lines
Quoted 10 lines
configs/socfpga_de0_nano_soc_defconfig +0 -0
index af41e1e..4837809 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
?CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y ?CONFIG_SPL_STACK_R_ADDR=0x00800000 ?CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"
This should be socfpga_cyclone5_de0_nano_soc.dtb
Quoted 5 lines
No, just checked the dts in the kernel source.??it is socfpga_cyclone5_de0_sockit.dts. I can change this to what you like, but my intent had been to match names in the kernel source where possible.
This is U-Boot: check under U-Boot's arch/arm/dts/
socfpga_cyclone5_sockit.dtb is for the sockit socfpga_cyclone5_de0_nano_soc.dtb is for the DE0 Nano board.
commit 55c7a765f63ab10b9a3b8cbd38bf1483901a7b36
Author: Dinh Nguyen <[email protected]> Date:???Tue Sep 1 17:41:52 2015 -0500

Quoted 7 lines

arm: socfpga: Add support for the Terasic DE-0 Atlas board
Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is CycloneV based board. The board can boot from SD/MMC. Ethernet is also supported.

Ah, i see. ?I was under the impression?CONFIG_DEFAULT_FDT_FILE was only being used for the uboot env and?CONFIG_DEFAULT_DEVICE_TREE was for the dts being used by uboot. I am using? CONFIG_DEFAULT_FDT_FILE to set the uboot env fdtimage variable. ?Is that not the case? ?

Quoted 5 lines

Dinh
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 6 lines

------------------------------------------
Dalon Westergreen
Embedded Specialist
Intel Programmable Solutions Group
Phone :?1.858.202.3518
------------------------------------------

Dinh Nguyen

2017-01-25 03:25 UTC #11 lore raw

PATCH v4 2/7 arm: socfpga: update de0 nano default environment

Quoted 60 lines · Dalon

Quoted 49 lines · Dinh Nguyen
Quoted 34 lines · Dalon
Quoted 19 lines · Dinh Nguyen
Quoted 16 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
 configs/socfpga_de0_nano_soc_defconfig |  3 +--
 include/configs/socfpga_de0_nano_soc.h | 19 +------------------
 2 files changed, 2 insertions(+), 20 deletions(-)
Quoted 13 lines
configs/socfpga_de0_nano_soc_defconfig CONFIG_SYS_MALLOC_F_LEN=0x2000 · line 7
Quoted 10 lines
configs/socfpga_de0_nano_soc_defconfig +1 -0
index af41e1e..4837809 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
+CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"
This should be socfpga_cyclone5_de0_nano_soc.dtb
Quoted 5 lines
No, just checked the dts in the kernel source. it is socfpga_cyclone5_de0_sockit.dts. I can change this to what you like, but my intent had been to match names in the kernel source where possible.
This is U-Boot: check under U-Boot's arch/arm/dts/
socfpga_cyclone5_sockit.dtb is for the sockit socfpga_cyclone5_de0_nano_soc.dtb is for the DE0 Nano board.
commit 55c7a765f63ab10b9a3b8cbd38bf1483901a7b36
Quoted 10 lines
Author: Dinh Nguyen <[email protected]>
Date:   Tue Sep 1 17:41:52 2015 -0500
arm: socfpga: Add support for the Terasic DE-0 Atlas board
Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is CycloneV based board. The board can boot from SD/MMC. Ethernet is also supported.

Quoted 6 lines

Ah, i see. I was under the impression CONFIG_DEFAULT_FDT_FILE was only being used for the uboot env and CONFIG_DEFAULT_DEVICE_TREE was for the dts being used by uboot. I am using CONFIG_DEFAULT_FDT_FILE to set the uboot env fdtimage variable. Is that not the case?

No, you're right! I got confused..see follow up message.

Dinh

Dalon Westergreen

author

2017-01-24 17:05 UTC #12 lore raw

PATCH v4 3/7 arm: socfpga: update cyclone5 socdk default environment

In reply to Dalon Westergreen

From: Dalon Westergreen <[email protected]>

Remove the default environment as it is now in a common header.

Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.

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

---
 configs/socfpga_cyclone5_defconfig       |  1 +
 include/configs/socfpga_cyclone5_socdk.h | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

configs/socfpga_cyclone5_defconfig +1 -0

index 8b050b9..cba1e9c 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
+CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_socdk.dtb"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

include/configs/socfpga_cyclone5_socdk.h +0 ~~-25~~

index 7ced6a6..96b2b87 100644
@@ -36,31 +36,6 @@
 
 #define CONFIG_ENV_IS_IN_MMC
 
-/* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"verify=n\0" \
-	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
-		"bootm ${loadaddr} - ${fdt_addr}\0" \
-	"bootimage=zImage\0" \
-	"fdt_addr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
-	"bootm ${loadaddr} - ${fdt_addr}\0" \
-	"mmcroot=/dev/mmcblk0p2\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" \
-	"qspiload=sf probe && mtdparts default && run ubiload\0" \
-	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
-		" 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>

Signature · 1 line

2.7.4

Dalon Westergreen

author

2017-01-24 17:06 UTC #13 lore raw

PATCH v4 4/7 arm: socfpga: update arria5 socdk default environment

In reply to Dalon Westergreen

From: Dalon Westergreen <[email protected]>

Remove the default environment as it is now in a common header.

Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.

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

---
 configs/socfpga_arria5_defconfig       |  1 +
 include/configs/socfpga_arria5_socdk.h | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

configs/socfpga_arria5_defconfig +1 -0

index 43c51fe..6a473a9 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
+CONFIG_DEFAULT_FDT_FILE="socfpga_arria5_socdk.dtb"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

include/configs/socfpga_arria5_socdk.h +0 ~~-25~~

index 3b0b416..481a032 100644
@@ -36,31 +36,6 @@
 
 #define CONFIG_ENV_IS_IN_MMC
 
-/* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"verify=n\0" \
-	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
-		"bootm ${loadaddr} - ${fdt_addr}\0" \
-	"bootimage=zImage\0" \
-	"fdt_addr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
-	"bootm ${loadaddr} - ${fdt_addr}\0" \
-	"mmcroot=/dev/mmcblk0p2\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" \
-	"qspiload=sf probe && mtdparts default && run ubiload\0" \
-	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
-		" 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>

Signature · 1 line

2.7.4

Dalon Westergreen

author

2017-01-24 17:06 UTC #14 lore raw

PATCH v4 5/7 arm: socfpga: Update DE1 environment

In reply to Dalon Westergreen

From: Dalon Westergreen <[email protected]>

Remove the default environment as it is now in a common header.

Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.

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

---
 configs/socfpga_de1_soc_defconfig |  1 +
 include/configs/socfpga_de1_soc.h | 19 +------------------
 2 files changed, 2 insertions(+), 18 deletions(-)

configs/socfpga_de1_soc_defconfig +1 -0

index 032deef..19ff608 100644
@@ -6,6 +6,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc"
+CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

include/configs/socfpga_de1_soc.h +1 ~~-18~~

index deec647..3142bd1 100644
@@ -18,7 +18,7 @@
 #define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB */
 
 /* Booting Linux */
-#define CONFIG_BOOTFILE		"fitImage"
+#define CONFIG_BOOTFILE		"zImage"
 #define CONFIG_BOOTARGS		"console=ttyS0," __stringify(CONFIG_BAUDRATE)
 #define CONFIG_BOOTCOMMAND	"run mmcload; run mmcboot"
 #define CONFIG_LOADADDR		0x01000000

@@ -32,23 +32,6 @@
 
 #define CONFIG_ENV_IS_IN_MMC
 
-/* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
-		"bootm ${loadaddr} - ${fdtaddr}\0" \
-	"bootimage=zImage\0" \
-	"fdtaddr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
-	"bootm ${loadaddr} - ${fdtaddr}\0" \
-	"mmcroot=/dev/mmcblk0p2\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" \
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>

Signature · 1 line

2.7.4

Dinh Nguyen

2017-01-25 03:20 UTC #15 lore raw

PATCH v4 5/7 arm: socfpga: Update DE1 environment

Quoted 19 lines · Dalon Westergreen

From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
 configs/socfpga_de1_soc_defconfig |  1 +
 include/configs/socfpga_de1_soc.h | 19 +------------------
 2 files changed, 2 insertions(+), 18 deletions(-)
configs/socfpga_de1_soc_defconfig +0 -0
index 032deef..19ff608 100644

configs/socfpga_de1_soc_defconfig CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y · line 9

Quoted 4 lines

configs/socfpga_de1_soc_defconfig +1 -0

@@ -6,6 +6,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc"
+CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"

Why not socfpga_cyclone5_de1_soc.dtb ?

Dinh

Dalon Westergreen

author

2017-01-25 03:25 UTC #16 lore raw

PATCH v4 5/7 arm: socfpga: Update DE1 environment

Quoted 17 lines · Dinh Nguyen

Quoted 15 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
?configs/socfpga_de1_soc_defconfig |??1 + ?include/configs/socfpga_de1_soc.h | 19 +------------------ ?2 files changed, 2 insertions(+), 18 deletions(-)

Quoted 13 lines

Quoted 10 lines
configs/socfpga_de1_soc_defconfig +0 -0
index 032deef..19ff608 100644
@@ -6,6 +6,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y
?CONFIG_SPL_STACK_R_ADDR=0x00800000 ?CONFIG_SPL_YMODEM_SUPPORT=y ?CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc" +CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
Why not socfpga_cyclone5_de1_soc.dtb ?

There was no mainlined linux dts for this board so i just left it as it was.

Quoted 1 line

Dinh

Dinh Nguyen

2017-01-25 03:30 UTC #17 lore raw

PATCH v4 5/7 arm: socfpga: Update DE1 environment

Quoted 31 lines · Dalon Westergreen

Quoted 17 lines · Dinh Nguyen
Quoted 15 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
 configs/socfpga_de1_soc_defconfig |  1 +
 include/configs/socfpga_de1_soc.h | 19 +------------------
 2 files changed, 2 insertions(+), 18 deletions(-)
Quoted 13 lines
configs/socfpga_de1_soc_defconfig CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y · line 9
Quoted 10 lines
configs/socfpga_de1_soc_defconfig +1 -0
index 032deef..19ff608 100644
@@ -6,6 +6,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc"
+CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
Why not socfpga_cyclone5_de1_soc.dtb ?

Quoted 2 lines

There was no mainlined linux dts for this board so i just left it as it was.

Ok.

Dinh

Dalon Westergreen

author

2017-01-24 17:06 UTC #18 lore raw

PATCH v4 6/7 arm: socfpga: Update SoCKit environment

In reply to Dalon Westergreen

From: Dalon Westergreen <[email protected]>

Remove the default environment as it is now in a common header.

Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.

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

---
 configs/socfpga_sockit_defconfig |  1 +
 include/configs/socfpga_sockit.h | 27 +--------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

configs/socfpga_sockit_defconfig +1 -0

index d0c2bda..130c4e2 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
+CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

include/configs/socfpga_sockit.h +1 ~~-26~~

index 3fceb31..c51cc72 100644
@@ -18,7 +18,7 @@
 #define PHYS_SDRAM_1_SIZE		0x40000000	/* 1GiB on SoCDK */
 
 /* Booting Linux */
-#define CONFIG_BOOTFILE		"fitImage"
+#define CONFIG_BOOTFILE		"zImage"
 #define CONFIG_BOOTARGS		"console=ttyS0," __stringify(CONFIG_BAUDRATE)
 #define CONFIG_BOOTCOMMAND	"run mmcload; run mmcboot"
 #define CONFIG_LOADADDR		0x01000000

@@ -32,31 +32,6 @@
 
 #define CONFIG_ENV_IS_IN_MMC
 
-/* Extra Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"verify=n\0" \
-	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
-		"bootm ${loadaddr} - ${fdt_addr}\0" \
-	"bootimage=zImage\0" \
-	"fdt_addr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
-	"bootm ${loadaddr} - ${fdt_addr}\0" \
-	"mmcroot=/dev/mmcblk0p2\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" \
-	"qspiload=sf probe && mtdparts default && run ubiload\0" \
-	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
-		" 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>

Signature · 1 line

2.7.4

Dinh Nguyen

2017-01-25 03:27 UTC #19 lore raw

PATCH v4 6/7 arm: socfpga: Update SoCKit environment

Quoted 19 lines · Dalon Westergreen

From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
 configs/socfpga_sockit_defconfig |  1 +
 include/configs/socfpga_sockit.h | 27 +--------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
configs/socfpga_sockit_defconfig +0 -0
index d0c2bda..130c4e2 100644

configs/socfpga_sockit_defconfig CONFIG_SYS_MALLOC_F_LEN=0x2000 · line 7

Quoted 4 lines

configs/socfpga_sockit_defconfig +1 -0

@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
+CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"

Should this be "socfpga_cyclone5_sockit.dtb" ?

Dinh

Dalon Westergreen

author

2017-01-25 03:30 UTC #20 lore raw

PATCH v4 6/7 arm: socfpga: Update SoCKit environment

Quoted 17 lines · Dinh Nguyen

Quoted 15 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
?configs/socfpga_sockit_defconfig |??1 + ?include/configs/socfpga_sockit.h | 27 +-------------------------- ?2 files changed, 2 insertions(+), 26 deletions(-)

Quoted 12 lines

Quoted 10 lines
configs/socfpga_sockit_defconfig +0 -0
index d0c2bda..130c4e2 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
?CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y ?CONFIG_SPL_STACK_R_ADDR=0x00800000 ?CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit" +CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
Should this be "socfpga_cyclone5_sockit.dtb" ?

I can certainly do that, but as before i just left the default b/c there is no mainlined dts in linux. That said, i think you are correct, i will update all the socfpga.dtb's to reflect the board name.?

Quoted 2 lines

Dinh

Dinh Nguyen

2017-01-25 03:34 UTC #21 lore raw

PATCH v4 6/7 arm: socfpga: Update SoCKit environment

Quoted 31 lines · Dalon Westergreen

Quoted 17 lines · Dinh Nguyen
Quoted 15 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
 configs/socfpga_sockit_defconfig |  1 +
 include/configs/socfpga_sockit.h | 27 +--------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
Quoted 12 lines
configs/socfpga_sockit_defconfig CONFIG_SYS_MALLOC_F_LEN=0x2000 · line 7
Quoted 10 lines
configs/socfpga_sockit_defconfig +1 -0
index d0c2bda..130c4e2 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
+CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
Should this be "socfpga_cyclone5_sockit.dtb" ?

Quoted 5 lines

I can certainly do that, but as before i just left the default b/c there is no mainlined dts in linux. That said, i think you are correct, i will update all the socfpga.dtb's to reflect the board name.

I think there is mainline DTS file for the sockit, (socfpga_cyclone5_sockit.dts), or am I confused again?

Dinh

Marek Vasut

2017-01-25 03:40 UTC #22 lore raw

PATCH v4 6/7 arm: socfpga: Update SoCKit environment

Quoted 34 lines · Dinh Nguyen

Quoted 31 lines · Dalon Westergreen
Quoted 29 lines · Dinh Nguyen
Quoted 21 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
 configs/socfpga_sockit_defconfig |  1 +
 include/configs/socfpga_sockit.h | 27 +--------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
configs/socfpga_sockit_defconfig +0 -0
index d0c2bda..130c4e2 100644
configs/socfpga_sockit_defconfig CONFIG_SYS_MALLOC_F_LEN=0x2000 · line 7
Quoted 4 lines
configs/socfpga_sockit_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
+CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
Should this be "socfpga_cyclone5_sockit.dtb" ?

Quoted 8 lines

Quoted 5 lines
I can certainly do that, but as before i just left the default b/c there is no mainlined dts in linux. That said, i think you are correct, i will update all the socfpga.dtb's to reflect the board name.
I think there is mainline DTS file for the sockit, (socfpga_cyclone5_sockit.dts), or am I confused again?

Yeah, that's sockit .

Signature · 2 lines

Best regards,
Marek Vasut

Dalon Westergreen

author

2017-01-25 03:46 UTC #23 lore raw

PATCH v4 6/7 arm: socfpga: Update SoCKit environment

Quoted 45 lines · Marek Vasut

Quoted 44 lines · Dinh Nguyen
Quoted 39 lines · Dalon Westergreen
Quoted 19 lines · Dinh Nguyen
Quoted 16 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
Remove the default environment as it is now in a common header.
Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.
Signed-off-by Dalon Westergreen <[email protected]>
---
?configs/socfpga_sockit_defconfig |??1 + ?include/configs/socfpga_sockit.h | 27 +-------------------------- ?2 files changed, 2 insertions(+), 26 deletions(-)
Quoted 12 lines
Quoted 10 lines
configs/socfpga_sockit_defconfig +0 -0
index d0c2bda..130c4e2 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
?CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y ?CONFIG_SPL_STACK_R_ADDR=0x00800000 ?CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit" +CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
Should this be "socfpga_cyclone5_sockit.dtb" ?
I can certainly do that, but as before i just left the default b/c there is no mainlined dts in linux. That said, i think you are correct, i will update all the socfpga.dtb's to reflect the board name.?

Quoted 5 lines

Quoted 2 lines
I think there is mainline DTS file for the sockit, (socfpga_cyclone5_sockit.dts), or am I confused again?
Yeah, that's sockit .

missed that. thanks. ?i am updating all of the socfpga.dtbs in any case. ?i figure once (or if) their dts's are upstreamed these files wont need changing.

Quoted 1 line

Dalon Westergreen

author

2017-01-24 17:06 UTC #24 lore raw

PATCH v4 7/7 arm: socfpga: Update sr1500 environment

In reply to Dalon Westergreen

From: Dalon Westergreen <[email protected]>

Remove the default environment as it is now in a common header.

Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name.

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

Acked-by Stefan Roese

---
 configs/socfpga_sr1500_defconfig |  1 +
 include/configs/socfpga_sr1500.h | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

configs/socfpga_sr1500_defconfig +1 -0

index 6fd7bc0..b0b08da 100644
@@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SOCFPGA_SR1500=y
 CONFIG_SPL_STACK_R_ADDR=0x00800000
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
+CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
 CONFIG_FIT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y

include/configs/socfpga_sr1500.h +0 ~~-25~~

index 0407f03..3c63e80 100644
@@ -32,31 +32,6 @@
 #define CONFIG_PHY_MARVELL
 #define PHY_ANEG_TIMEOUT	8000
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"verify=n\0" \
-	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
-	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
-		"bootm ${loadaddr} - ${fdt_addr}\0" \
-	"bootimage=zImage\0" \
-	"fdt_addr=100\0" \
-	"fdtimage=socfpga.dtb\0" \
-		"fsloadcmd=ext2load\0" \
-	"bootm ${loadaddr} - ${fdt_addr}\0" \
-	"mmcroot=/dev/mmcblk0p2\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" \
-	"qspiload=sf probe && mtdparts default && run ubiload\0" \
-	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
-		" 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"
-
 /* Environment */
 #define CONFIG_ENV_IS_IN_SPI_FLASH

Signature · 1 line

2.7.4

Marek Vasut

2017-01-24 17:11 UTC #25 lore raw

v4 cover [U-Boot] [PATCH v4 0/7]

In reply to Dalon Westergreen

Quoted 23 lines · Dalon Westergreen

From: Dalon Westergreen <[email protected]>
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
Changes in v4:
- Removed extraneous define in socfpga_common.h
and only use CONFIG_EXTRA_ENV_SETTINGS for
common uboot environment
Changes in v3:
- Corrected error in common default environment
Dalon Westergreen (7):
arm: socfpga: add env settings to common header
arm: socfpga: update de0 nano default environment
arm: socfpga: update cyclone5 socdk default environment
arm: socfpga: update arria5 socdk default environment
arm: socfpga: Update DE1 environment
arm: socfpga: Update SoCKit environment
arm: socfpga: Update sr1500 environment

Quoted 15 lines

 configs/socfpga_arria5_defconfig         |  1 +
 configs/socfpga_cyclone5_defconfig       |  1 +
 configs/socfpga_de0_nano_soc_defconfig   |  3 +--
 configs/socfpga_de1_soc_defconfig        |  1 +
 configs/socfpga_sockit_defconfig         |  1 +
 configs/socfpga_sr1500_defconfig         |  1 +
 include/configs/socfpga_arria5_socdk.h   | 25 -------------------------
 include/configs/socfpga_common.h         | 27 +++++++++++++++++++++++++++
 include/configs/socfpga_cyclone5_socdk.h | 25 -------------------------
 include/configs/socfpga_de0_nano_soc.h   | 19 +------------------
 include/configs/socfpga_de1_soc.h        | 19 +------------------
 include/configs/socfpga_sockit.h         | 27 +--------------------------
 include/configs/socfpga_sr1500.h         | 25 -------------------------
 13 files changed, 36 insertions(+), 139 deletions(-)

Whole series

Acked-by Marek Vasut <[email protected]>

Dinh, any comments ?

Signature · 2 lines

Best regards,
Marek Vasut

Dinh Nguyen

2017-01-25 02:58 UTC #26 lore raw

v4 cover [U-Boot] [PATCH v4 0/7]

Quoted 40 lines · Marek Vasut

Quoted 23 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
Changes in v4:
- Removed extraneous define in socfpga_common.h
and only use CONFIG_EXTRA_ENV_SETTINGS for
common uboot environment
Changes in v3:
- Corrected error in common default environment
Dalon Westergreen (7):
arm: socfpga: add env settings to common header
arm: socfpga: update de0 nano default environment
arm: socfpga: update cyclone5 socdk default environment
arm: socfpga: update arria5 socdk default environment
arm: socfpga: Update DE1 environment
arm: socfpga: Update SoCKit environment
arm: socfpga: Update sr1500 environment
Quoted 15 lines
 configs/socfpga_arria5_defconfig         |  1 +
 configs/socfpga_cyclone5_defconfig       |  1 +
 configs/socfpga_de0_nano_soc_defconfig   |  3 +--
 configs/socfpga_de1_soc_defconfig        |  1 +
 configs/socfpga_sockit_defconfig         |  1 +
 configs/socfpga_sr1500_defconfig         |  1 +
 include/configs/socfpga_arria5_socdk.h   | 25 -------------------------
 include/configs/socfpga_common.h         | 27 +++++++++++++++++++++++++++
 include/configs/socfpga_cyclone5_socdk.h | 25 -------------------------
 include/configs/socfpga_de0_nano_soc.h   | 19 +------------------
 include/configs/socfpga_de1_soc.h        | 19 +------------------
 include/configs/socfpga_sockit.h         | 27 +--------------------------
 include/configs/socfpga_sr1500.h         | 25 -------------------------
 13 files changed, 36 insertions(+), 139 deletions(-)

Quoted 4 lines

Whole series
Acked-by Marek Vasut <[email protected]>
Dinh, any comments ?

I thought you had a comment on why this series changes the default bootfile from a fitImage to zImage. Was that comment addressed?

Dinh

Dalon Westergreen

author

2017-01-25 03:07 UTC #27 lore raw

v4 cover [U-Boot] [PATCH v4 0/7]

Quoted 44 lines · Dinh Nguyen

Quoted 42 lines · Marek Vasut
Quoted 39 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
These patches update the boot and os partition numbers in the? default uboot environment for a number of socfpga boards.??Per request, common environment configurations have been moved to a shared header.
Changes in v4:
?- Removed extraneous define in socfpga_common.h
???and only use CONFIG_EXTRA_ENV_SETTINGS for
???common uboot environment
Changes in v3:
?- Corrected error in common default environment
Dalon Westergreen (7):
? arm: socfpga: add env settings to common header ? arm: socfpga: update de0 nano default environment ? arm: socfpga: update cyclone5 socdk default environment ? arm: socfpga: update arria5 socdk default environment ? arm: socfpga: Update DE1 environment
? arm: socfpga: Update SoCKit environment
? arm: socfpga: Update sr1500 environment
?configs/socfpga_arria5_defconfig?????????|??1 +
?configs/socfpga_cyclone5_defconfig???????|??1 +
?configs/socfpga_de0_nano_soc_defconfig???|??3 +--
?configs/socfpga_de1_soc_defconfig????????|??1 +
?configs/socfpga_sockit_defconfig?????????|??1 +
?configs/socfpga_sr1500_defconfig?????????|??1 +
?include/configs/socfpga_arria5_socdk.h???| 25 -------------------------
?include/configs/socfpga_common.h?????????| 27 +++++++++++++++++++++++++++
?include/configs/socfpga_cyclone5_socdk.h | 25 -------------------------
?include/configs/socfpga_de0_nano_soc.h???| 19 +------------------
?include/configs/socfpga_de1_soc.h????????| 19 +------------------
?include/configs/socfpga_sockit.h?????????| 27 +--------------------------
?include/configs/socfpga_sr1500.h?????????| 25 -------------------------
?13 files changed, 36 insertions(+), 139 deletions(-)

Quoted 7 lines

Quoted 4 lines
Whole series
Acked-by Marek Vasut <[email protected]>
Dinh, any comments ?
I thought you had a comment on why this series changes the default bootfile from a fitImage to zImage. Was that comment addressed?

Yes, my comment was that none of the boards were currently using fitimages.

Quoted 1 line

Dinh

Signature · 5 lines

------------------------------------------
Thanks,
Dalon Westergreen

-----------------------------------------

Marek Vasut

2017-01-25 03:27 UTC #28 lore raw

v4 cover [U-Boot] [PATCH v4 0/7]

Quoted 48 lines · Dalon Westergreen

Quoted 47 lines · Dinh Nguyen
Quoted 45 lines · Marek Vasut
Quoted 24 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
Changes in v4:
- Removed extraneous define in socfpga_common.h
and only use CONFIG_EXTRA_ENV_SETTINGS for
common uboot environment
Changes in v3:
- Corrected error in common default environment
Dalon Westergreen (7):
arm: socfpga: add env settings to common header
arm: socfpga: update de0 nano default environment
arm: socfpga: update cyclone5 socdk default environment
arm: socfpga: update arria5 socdk default environment
arm: socfpga: Update DE1 environment
arm: socfpga: Update SoCKit environment
arm: socfpga: Update sr1500 environment
Quoted 15 lines
 configs/socfpga_arria5_defconfig         |  1 +
 configs/socfpga_cyclone5_defconfig       |  1 +
 configs/socfpga_de0_nano_soc_defconfig   |  3 +--
 configs/socfpga_de1_soc_defconfig        |  1 +
 configs/socfpga_sockit_defconfig         |  1 +
 configs/socfpga_sr1500_defconfig         |  1 +
 include/configs/socfpga_arria5_socdk.h   | 25 -------------------------
 include/configs/socfpga_common.h         | 27 +++++++++++++++++++++++++++
 include/configs/socfpga_cyclone5_socdk.h | 25 -------------------------
 include/configs/socfpga_de0_nano_soc.h   | 19 +------------------
 include/configs/socfpga_de1_soc.h        | 19 +------------------
 include/configs/socfpga_sockit.h         | 27 +--------------------------
 include/configs/socfpga_sr1500.h         | 25 -------------------------
 13 files changed, 36 insertions(+), 139 deletions(-)
Whole series
Acked-by Marek Vasut <[email protected]>

Quoted 7 lines

Quoted 4 lines
Quoted 1 line
Dinh, any comments ?
I thought you had a comment on why this series changes the default bootfile from a fitImage to zImage. Was that comment addressed?
Yes, my comment was that none of the boards were currently using fitimages.

Yes, it seems the default altera SD card images use zImage + separate DTB. I constantly regret bringing bootz into U-Boot tbh, but such are the mistakes of youth ...

Signature · 2 lines

Best regards,
Marek Vasut

Dinh Nguyen

2017-01-25 03:40 UTC #29 lore raw

v4 cover [U-Boot] [PATCH v4 0/7]

Quoted 54 lines · Marek Vasut

Quoted 53 lines · Dalon Westergreen
Quoted 51 lines · Dinh Nguyen
Quoted 42 lines · Marek Vasut
Quoted 24 lines · Dalon Westergreen
From: Dalon Westergreen <[email protected]>
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
Changes in v4:
- Removed extraneous define in socfpga_common.h
and only use CONFIG_EXTRA_ENV_SETTINGS for
common uboot environment
Changes in v3:
- Corrected error in common default environment
Dalon Westergreen (7):
arm: socfpga: add env settings to common header
arm: socfpga: update de0 nano default environment
arm: socfpga: update cyclone5 socdk default environment
arm: socfpga: update arria5 socdk default environment
arm: socfpga: Update DE1 environment
arm: socfpga: Update SoCKit environment
arm: socfpga: Update sr1500 environment
Quoted 15 lines
 configs/socfpga_arria5_defconfig         |  1 +
 configs/socfpga_cyclone5_defconfig       |  1 +
 configs/socfpga_de0_nano_soc_defconfig   |  3 +--
 configs/socfpga_de1_soc_defconfig        |  1 +
 configs/socfpga_sockit_defconfig         |  1 +
 configs/socfpga_sr1500_defconfig         |  1 +
 include/configs/socfpga_arria5_socdk.h   | 25 -------------------------
 include/configs/socfpga_common.h         | 27 +++++++++++++++++++++++++++
 include/configs/socfpga_cyclone5_socdk.h | 25 -------------------------
 include/configs/socfpga_de0_nano_soc.h   | 19 +------------------
 include/configs/socfpga_de1_soc.h        | 19 +------------------
 include/configs/socfpga_sockit.h         | 27 +--------------------------
 include/configs/socfpga_sr1500.h         | 25 -------------------------
 13 files changed, 36 insertions(+), 139 deletions(-)
Quoted 4 lines
Whole series
Acked-by Marek Vasut <[email protected]>
Dinh, any comments ?
I thought you had a comment on why this series changes the default bootfile from a fitImage to zImage. Was that comment addressed?

Quoted 7 lines

Quoted 2 lines
Yes, my comment was that none of the boards were currently using fitimages.
Yes, it seems the default altera SD card images use zImage + separate DTB. I constantly regret bringing bootz into U-Boot tbh, but such are the mistakes of youth ...

So I think my only valid comment is for patch "[6/7] arm: socfpga:
Update SoCKit environment"

There is mainline kernel support for this board:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts?id=refs/tags/v4.10-rc5

Dinh