All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v4 0/7]
@ 2017-01-24 17:05 Dalon Westergreen
  2017-01-24 17:05 ` [U-Boot] [PATCH v4 1/7] arm: socfpga: add env settings to common header Dalon Westergreen
                   ` (7 more replies)
  0 siblings, 8 replies; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-24 17:05 UTC (permalink / raw)
  To: u-boot

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

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

-- 
2.7.4

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 1/7] arm: socfpga: add env settings to common header
  2017-01-24 17:05 [U-Boot] [PATCH v4 0/7] Dalon Westergreen
@ 2017-01-24 17:05 ` Dalon Westergreen
  2017-01-25  3:31   ` Dinh Nguyen
  2017-01-24 17:05 ` [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment Dalon Westergreen
                   ` (6 subsequent siblings)
  7 siblings, 1 reply; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-24 17:05 UTC (permalink / raw)
  To: u-boot

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

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 <dalon.westergreen@intel.com>
---
 include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 6285266..bdd6e2f 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -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__ */
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment
  2017-01-24 17:05 [U-Boot] [PATCH v4 0/7] Dalon Westergreen
  2017-01-24 17:05 ` [U-Boot] [PATCH v4 1/7] arm: socfpga: add env settings to common header Dalon Westergreen
@ 2017-01-24 17:05 ` Dalon Westergreen
  2017-01-25  3:08   ` Dinh Nguyen
  2017-01-24 17:05 ` [U-Boot] [PATCH v4 3/7] arm: socfpga: update cyclone5 socdk " Dalon Westergreen
                   ` (5 subsequent siblings)
  7 siblings, 1 reply; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-24 17:05 UTC (permalink / raw)
  To: u-boot

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

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 <dalon.westergreen@intel.com>
---
 configs/socfpga_de0_nano_soc_defconfig |  3 +--
 include/configs/socfpga_de0_nano_soc.h | 19 +------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
index af41e1e..4837809 100644
--- a/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_defconfig
@@ -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
diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index 6b9546e..97216ea 100644
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -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>
 
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 3/7] arm: socfpga: update cyclone5 socdk default environment
  2017-01-24 17:05 [U-Boot] [PATCH v4 0/7] Dalon Westergreen
  2017-01-24 17:05 ` [U-Boot] [PATCH v4 1/7] arm: socfpga: add env settings to common header Dalon Westergreen
  2017-01-24 17:05 ` [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment Dalon Westergreen
@ 2017-01-24 17:05 ` Dalon Westergreen
  2017-01-24 17:06 ` [U-Boot] [PATCH v4 4/7] arm: socfpga: update arria5 " Dalon Westergreen
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-24 17:05 UTC (permalink / raw)
  To: u-boot

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

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 <dalon.westergreen@intel.com>
---
 configs/socfpga_cyclone5_defconfig       |  1 +
 include/configs/socfpga_cyclone5_socdk.h | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index 8b050b9..cba1e9c 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -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
diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index 7ced6a6..96b2b87 100644
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -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>
 
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 4/7] arm: socfpga: update arria5 socdk default environment
  2017-01-24 17:05 [U-Boot] [PATCH v4 0/7] Dalon Westergreen
                   ` (2 preceding siblings ...)
  2017-01-24 17:05 ` [U-Boot] [PATCH v4 3/7] arm: socfpga: update cyclone5 socdk " Dalon Westergreen
@ 2017-01-24 17:06 ` Dalon Westergreen
  2017-01-24 17:06 ` [U-Boot] [PATCH v4 5/7] arm: socfpga: Update DE1 environment Dalon Westergreen
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-24 17:06 UTC (permalink / raw)
  To: u-boot

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

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 <dalon.westergreen@intel.com>
---
 configs/socfpga_arria5_defconfig       |  1 +
 include/configs/socfpga_arria5_socdk.h | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index 43c51fe..6a473a9 100644
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -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
diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index 3b0b416..481a032 100644
--- a/include/configs/socfpga_arria5_socdk.h
+++ b/include/configs/socfpga_arria5_socdk.h
@@ -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>
 
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 5/7] arm: socfpga: Update DE1 environment
  2017-01-24 17:05 [U-Boot] [PATCH v4 0/7] Dalon Westergreen
                   ` (3 preceding siblings ...)
  2017-01-24 17:06 ` [U-Boot] [PATCH v4 4/7] arm: socfpga: update arria5 " Dalon Westergreen
@ 2017-01-24 17:06 ` Dalon Westergreen
  2017-01-25  3:20   ` Dinh Nguyen
  2017-01-24 17:06 ` [U-Boot] [PATCH v4 6/7] arm: socfpga: Update SoCKit environment Dalon Westergreen
                   ` (2 subsequent siblings)
  7 siblings, 1 reply; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-24 17:06 UTC (permalink / raw)
  To: u-boot

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

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 <dalon.westergreen@intel.com>
---
 configs/socfpga_de1_soc_defconfig |  1 +
 include/configs/socfpga_de1_soc.h | 19 +------------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig
index 032deef..19ff608 100644
--- a/configs/socfpga_de1_soc_defconfig
+++ b/configs/socfpga_de1_soc_defconfig
@@ -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
diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h
index deec647..3142bd1 100644
--- a/include/configs/socfpga_de1_soc.h
+++ b/include/configs/socfpga_de1_soc.h
@@ -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>
 
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 6/7] arm: socfpga: Update SoCKit environment
  2017-01-24 17:05 [U-Boot] [PATCH v4 0/7] Dalon Westergreen
                   ` (4 preceding siblings ...)
  2017-01-24 17:06 ` [U-Boot] [PATCH v4 5/7] arm: socfpga: Update DE1 environment Dalon Westergreen
@ 2017-01-24 17:06 ` Dalon Westergreen
  2017-01-25  3:27   ` Dinh Nguyen
  2017-01-24 17:06 ` [U-Boot] [PATCH v4 7/7] arm: socfpga: Update sr1500 environment Dalon Westergreen
  2017-01-24 17:11 ` [U-Boot] [PATCH v4 0/7] Marek Vasut
  7 siblings, 1 reply; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-24 17:06 UTC (permalink / raw)
  To: u-boot

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

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 <dalon.westergreen@intel.com>
---
 configs/socfpga_sockit_defconfig |  1 +
 include/configs/socfpga_sockit.h | 27 +--------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig
index d0c2bda..130c4e2 100644
--- a/configs/socfpga_sockit_defconfig
+++ b/configs/socfpga_sockit_defconfig
@@ -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
diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
index 3fceb31..c51cc72 100644
--- a/include/configs/socfpga_sockit.h
+++ b/include/configs/socfpga_sockit.h
@@ -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>
 
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 7/7] arm: socfpga: Update sr1500 environment
  2017-01-24 17:05 [U-Boot] [PATCH v4 0/7] Dalon Westergreen
                   ` (5 preceding siblings ...)
  2017-01-24 17:06 ` [U-Boot] [PATCH v4 6/7] arm: socfpga: Update SoCKit environment Dalon Westergreen
@ 2017-01-24 17:06 ` Dalon Westergreen
  2017-01-24 17:11 ` [U-Boot] [PATCH v4 0/7] Marek Vasut
  7 siblings, 0 replies; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-24 17:06 UTC (permalink / raw)
  To: u-boot

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

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 <dalon.westergreen@intel.com>
Acked-by: Stefan Roese
---
 configs/socfpga_sr1500_defconfig |  1 +
 include/configs/socfpga_sr1500.h | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig
index 6fd7bc0..b0b08da 100644
--- a/configs/socfpga_sr1500_defconfig
+++ b/configs/socfpga_sr1500_defconfig
@@ -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
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index 0407f03..3c63e80 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -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
 
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 0/7]
  2017-01-24 17:05 [U-Boot] [PATCH v4 0/7] Dalon Westergreen
                   ` (6 preceding siblings ...)
  2017-01-24 17:06 ` [U-Boot] [PATCH v4 7/7] arm: socfpga: Update sr1500 environment Dalon Westergreen
@ 2017-01-24 17:11 ` Marek Vasut
  2017-01-25  2:58   ` Dinh Nguyen
  7 siblings, 1 reply; 30+ messages in thread
From: Marek Vasut @ 2017-01-24 17:11 UTC (permalink / raw)
  To: u-boot

On 01/24/2017 06:05 PM, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen@intel.com>
> 
> 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(-)
> 

Whole series
Acked-by: Marek Vasut <marex@denx.de>

Dinh, any comments ?

-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 0/7]
  2017-01-24 17:11 ` [U-Boot] [PATCH v4 0/7] Marek Vasut
@ 2017-01-25  2:58   ` Dinh Nguyen
  2017-01-25  3:07     ` Dalon Westergreen
  0 siblings, 1 reply; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  2:58 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 11:11 AM, Marek Vasut wrote:
> On 01/24/2017 06:05 PM, Dalon Westergreen wrote:
>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>
>> 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(-)
>>
> 
> Whole series
> Acked-by: Marek Vasut <marex@denx.de>
> 
> 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

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 0/7]
  2017-01-25  2:58   ` Dinh Nguyen
@ 2017-01-25  3:07     ` Dalon Westergreen
  2017-01-25  3:27       ` Marek Vasut
  0 siblings, 1 reply; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-25  3:07 UTC (permalink / raw)
  To: u-boot

On Tue, 2017-01-24 at 20:58 -0600, Dinh Nguyen wrote:
> 
> On 01/24/2017 11:11 AM, Marek Vasut wrote:
> > 
> > On 01/24/2017 06:05 PM, Dalon Westergreen wrote:
> > > 
> > > From: Dalon Westergreen <dalon.westergreen@intel.com>
> > > 
> > > 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(-)
> > > 
> > 
> > Whole series
> > Acked-by: Marek Vasut <marex@denx.de>
> > 
> > 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.

> Dinh
-- 
------------------------------------------
Thanks,
Dalon Westergreen

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

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment
  2017-01-24 17:05 ` [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment Dalon Westergreen
@ 2017-01-25  3:08   ` Dinh Nguyen
  2017-01-25  3:11     ` Westergreen, Dalon
  0 siblings, 1 reply; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:08 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen@intel.com>
> 
> 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 <dalon.westergreen@intel.com>
> ---
>  configs/socfpga_de0_nano_soc_defconfig |  3 +--
>  include/configs/socfpga_de0_nano_soc.h | 19 +------------------
>  2 files changed, 2 insertions(+), 20 deletions(-)
> 
> diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
> index af41e1e..4837809 100644
> --- a/configs/socfpga_de0_nano_soc_defconfig
> +++ b/configs/socfpga_de0_nano_soc_defconfig
> @@ -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

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment
  2017-01-25  3:08   ` Dinh Nguyen
@ 2017-01-25  3:11     ` Westergreen, Dalon
  2017-01-25  3:16       ` Dinh Nguyen
  0 siblings, 1 reply; 30+ messages in thread
From: Westergreen, Dalon @ 2017-01-25  3:11 UTC (permalink / raw)
  To: u-boot

On Tue, 2017-01-24 at 21:08 -0600, Dinh Nguyen wrote:
> 
> On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
> > 
> > From: Dalon Westergreen <dalon.westergreen@intel.com>
> > 
> > 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 <dalon.westergreen@intel.com>
> > ---
> > ?configs/socfpga_de0_nano_soc_defconfig |??3 +--
> > ?include/configs/socfpga_de0_nano_soc.h | 19 +------------------
> > ?2 files changed, 2 insertions(+), 20 deletions(-)
> > 
> > diff --git a/configs/socfpga_de0_nano_soc_defconfig
> > b/configs/socfpga_de0_nano_soc_defconfig
> > index af41e1e..4837809 100644
> > --- a/configs/socfpga_de0_nano_soc_defconfig
> > +++ b/configs/socfpga_de0_nano_soc_defconfig
> > @@ -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.
> Dinh
> 

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment
  2017-01-25  3:11     ` Westergreen, Dalon
@ 2017-01-25  3:16       ` Dinh Nguyen
  2017-01-25  3:22         ` Dinh Nguyen
  2017-01-25  3:23         ` Westergreen, Dalon
  0 siblings, 2 replies; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:16 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 09:11 PM, Westergreen, Dalon wrote:
> On Tue, 2017-01-24 at 21:08 -0600, Dinh Nguyen wrote:
>>
>> On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
>>>
>>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>>
>>> 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 <dalon.westergreen@intel.com>
>>> ---
>>>  configs/socfpga_de0_nano_soc_defconfig |  3 +--
>>>  include/configs/socfpga_de0_nano_soc.h | 19 +------------------
>>>  2 files changed, 2 insertions(+), 20 deletions(-)
>>>
>>> diff --git a/configs/socfpga_de0_nano_soc_defconfig
>>> b/configs/socfpga_de0_nano_soc_defconfig
>>> index af41e1e..4837809 100644
>>> --- a/configs/socfpga_de0_nano_soc_defconfig
>>> +++ b/configs/socfpga_de0_nano_soc_defconfig
>>> @@ -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.
> 

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 <dinguyen@opensource.altera.com>
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

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 5/7] arm: socfpga: Update DE1 environment
  2017-01-24 17:06 ` [U-Boot] [PATCH v4 5/7] arm: socfpga: Update DE1 environment Dalon Westergreen
@ 2017-01-25  3:20   ` Dinh Nguyen
  2017-01-25  3:25     ` Dalon Westergreen
  0 siblings, 1 reply; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:20 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 11:06 AM, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen@intel.com>
> 
> 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 <dalon.westergreen@intel.com>
> ---
>  configs/socfpga_de1_soc_defconfig |  1 +
>  include/configs/socfpga_de1_soc.h | 19 +------------------
>  2 files changed, 2 insertions(+), 18 deletions(-)
> 
> diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig
> index 032deef..19ff608 100644
> --- a/configs/socfpga_de1_soc_defconfig
> +++ b/configs/socfpga_de1_soc_defconfig
> @@ -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

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment
  2017-01-25  3:16       ` Dinh Nguyen
@ 2017-01-25  3:22         ` Dinh Nguyen
  2017-01-25  3:23         ` Westergreen, Dalon
  1 sibling, 0 replies; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:22 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 09:16 PM, Dinh Nguyen wrote:
> 
> 
> On 01/24/2017 09:11 PM, Westergreen, Dalon wrote:
>> On Tue, 2017-01-24 at 21:08 -0600, Dinh Nguyen wrote:
>>>
>>> On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
>>>>
>>>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>>>
>>>> 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 <dalon.westergreen@intel.com>
>>>> ---
>>>>  configs/socfpga_de0_nano_soc_defconfig |  3 +--
>>>>  include/configs/socfpga_de0_nano_soc.h | 19 +------------------
>>>>  2 files changed, 2 insertions(+), 20 deletions(-)
>>>>
>>>> diff --git a/configs/socfpga_de0_nano_soc_defconfig
>>>> b/configs/socfpga_de0_nano_soc_defconfig
>>>> index af41e1e..4837809 100644
>>>> --- a/configs/socfpga_de0_nano_soc_defconfig
>>>> +++ b/configs/socfpga_de0_nano_soc_defconfig
>>>> @@ -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.
>>
> 
> 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 <dinguyen@opensource.altera.com>
> 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

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment
  2017-01-25  3:16       ` Dinh Nguyen
  2017-01-25  3:22         ` Dinh Nguyen
@ 2017-01-25  3:23         ` Westergreen, Dalon
  2017-01-25  3:25           ` Dinh Nguyen
  1 sibling, 1 reply; 30+ messages in thread
From: Westergreen, Dalon @ 2017-01-25  3:23 UTC (permalink / raw)
  To: u-boot

On Tue, 2017-01-24 at 21:16 -0600, Dinh Nguyen wrote:
> 
> On 01/24/2017 09:11 PM, Westergreen, Dalon wrote:
> > 
> > On Tue, 2017-01-24 at 21:08 -0600, Dinh Nguyen wrote:
> > > 
> > > 
> > > On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
> > > > 
> > > > 
> > > > From: Dalon Westergreen <dalon.westergreen@intel.com>
> > > > 
> > > > 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 <dalon.westergreen@intel.com>
> > > > ---
> > > > ?configs/socfpga_de0_nano_soc_defconfig |??3 +--
> > > > ?include/configs/socfpga_de0_nano_soc.h | 19 +------------------
> > > > ?2 files changed, 2 insertions(+), 20 deletions(-)
> > > > 
> > > > diff --git a/configs/socfpga_de0_nano_soc_defconfig
> > > > b/configs/socfpga_de0_nano_soc_defconfig
> > > > index af41e1e..4837809 100644
> > > > --- a/configs/socfpga_de0_nano_soc_defconfig
> > > > +++ b/configs/socfpga_de0_nano_soc_defconfig
> > > > @@ -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.
> > 
> 
> 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 <dinguyen@opensource.altera.com>
> 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.
> 
> 
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? ?


> Dinh
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
-- 
------------------------------------------
Dalon Westergreen
Embedded Specialist
Intel Programmable Solutions Group
Phone :?1.858.202.3518
------------------------------------------

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment
  2017-01-25  3:23         ` Westergreen, Dalon
@ 2017-01-25  3:25           ` Dinh Nguyen
  0 siblings, 0 replies; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:25 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 09:23 PM, Westergreen, Dalon wrote:
> On Tue, 2017-01-24 at 21:16 -0600, Dinh Nguyen wrote:
>>
>> On 01/24/2017 09:11 PM, Westergreen, Dalon wrote:
>>>
>>> On Tue, 2017-01-24 at 21:08 -0600, Dinh Nguyen wrote:
>>>>
>>>>
>>>> On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
>>>>>
>>>>>
>>>>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>>>>
>>>>> 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 <dalon.westergreen@intel.com>
>>>>> ---
>>>>>  configs/socfpga_de0_nano_soc_defconfig |  3 +--
>>>>>  include/configs/socfpga_de0_nano_soc.h | 19 +------------------
>>>>>  2 files changed, 2 insertions(+), 20 deletions(-)
>>>>>
>>>>> diff --git a/configs/socfpga_de0_nano_soc_defconfig
>>>>> b/configs/socfpga_de0_nano_soc_defconfig
>>>>> index af41e1e..4837809 100644
>>>>> --- a/configs/socfpga_de0_nano_soc_defconfig
>>>>> +++ b/configs/socfpga_de0_nano_soc_defconfig
>>>>> @@ -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.
>>>
>>
>> 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 <dinguyen@opensource.altera.com>
>> 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.
>>
>>
> 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

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 5/7] arm: socfpga: Update DE1 environment
  2017-01-25  3:20   ` Dinh Nguyen
@ 2017-01-25  3:25     ` Dalon Westergreen
  2017-01-25  3:30       ` Dinh Nguyen
  0 siblings, 1 reply; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-25  3:25 UTC (permalink / raw)
  To: u-boot

On Tue, 2017-01-24 at 21:20 -0600, Dinh Nguyen wrote:
> 
> On 01/24/2017 11:06 AM, Dalon Westergreen wrote:
> > 
> > From: Dalon Westergreen <dalon.westergreen@intel.com>
> > 
> > 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 <dalon.westergreen@intel.com>
> > ---
> > ?configs/socfpga_de1_soc_defconfig |??1 +
> > ?include/configs/socfpga_de1_soc.h | 19 +------------------
> > ?2 files changed, 2 insertions(+), 18 deletions(-)
> > 
> > diff --git a/configs/socfpga_de1_soc_defconfig
> > b/configs/socfpga_de1_soc_defconfig
> > index 032deef..19ff608 100644
> > --- a/configs/socfpga_de1_soc_defconfig
> > +++ b/configs/socfpga_de1_soc_defconfig
> > @@ -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.

> Dinh

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 0/7]
  2017-01-25  3:07     ` Dalon Westergreen
@ 2017-01-25  3:27       ` Marek Vasut
  2017-01-25  3:40         ` Dinh Nguyen
  0 siblings, 1 reply; 30+ messages in thread
From: Marek Vasut @ 2017-01-25  3:27 UTC (permalink / raw)
  To: u-boot

On 01/25/2017 04:07 AM, Dalon Westergreen wrote:
> On Tue, 2017-01-24 at 20:58 -0600, Dinh Nguyen wrote:
>>
>> On 01/24/2017 11:11 AM, Marek Vasut wrote:
>>>
>>> On 01/24/2017 06:05 PM, Dalon Westergreen wrote:
>>>>
>>>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>>>
>>>> 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(-)
>>>>
>>>
>>> Whole series
>>> Acked-by: Marek Vasut <marex@denx.de>
>>>
>>> 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 ...

-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 6/7] arm: socfpga: Update SoCKit environment
  2017-01-24 17:06 ` [U-Boot] [PATCH v4 6/7] arm: socfpga: Update SoCKit environment Dalon Westergreen
@ 2017-01-25  3:27   ` Dinh Nguyen
  2017-01-25  3:30     ` Dalon Westergreen
  0 siblings, 1 reply; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:27 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 11:06 AM, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen@intel.com>
> 
> 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 <dalon.westergreen@intel.com>
> ---
>  configs/socfpga_sockit_defconfig |  1 +
>  include/configs/socfpga_sockit.h | 27 +--------------------------
>  2 files changed, 2 insertions(+), 26 deletions(-)
> 
> diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig
> index d0c2bda..130c4e2 100644
> --- a/configs/socfpga_sockit_defconfig
> +++ b/configs/socfpga_sockit_defconfig
> @@ -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

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 6/7] arm: socfpga: Update SoCKit environment
  2017-01-25  3:27   ` Dinh Nguyen
@ 2017-01-25  3:30     ` Dalon Westergreen
  2017-01-25  3:34       ` Dinh Nguyen
  0 siblings, 1 reply; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-25  3:30 UTC (permalink / raw)
  To: u-boot

On Tue, 2017-01-24 at 21:27 -0600, Dinh Nguyen wrote:
> 
> On 01/24/2017 11:06 AM, Dalon Westergreen wrote:
> > 
> > From: Dalon Westergreen <dalon.westergreen@intel.com>
> > 
> > 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 <dalon.westergreen@intel.com>
> > ---
> > ?configs/socfpga_sockit_defconfig |??1 +
> > ?include/configs/socfpga_sockit.h | 27 +--------------------------
> > ?2 files changed, 2 insertions(+), 26 deletions(-)
> > 
> > diff --git a/configs/socfpga_sockit_defconfig
> > b/configs/socfpga_sockit_defconfig
> > index d0c2bda..130c4e2 100644
> > --- a/configs/socfpga_sockit_defconfig
> > +++ b/configs/socfpga_sockit_defconfig
> > @@ -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.?

> 
> Dinh

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 5/7] arm: socfpga: Update DE1 environment
  2017-01-25  3:25     ` Dalon Westergreen
@ 2017-01-25  3:30       ` Dinh Nguyen
  0 siblings, 0 replies; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:30 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 09:25 PM, Dalon Westergreen wrote:
> On Tue, 2017-01-24 at 21:20 -0600, Dinh Nguyen wrote:
>>
>> On 01/24/2017 11:06 AM, Dalon Westergreen wrote:
>>>
>>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>>
>>> 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 <dalon.westergreen@intel.com>
>>> ---
>>>  configs/socfpga_de1_soc_defconfig |  1 +
>>>  include/configs/socfpga_de1_soc.h | 19 +------------------
>>>  2 files changed, 2 insertions(+), 18 deletions(-)
>>>
>>> diff --git a/configs/socfpga_de1_soc_defconfig
>>> b/configs/socfpga_de1_soc_defconfig
>>> index 032deef..19ff608 100644
>>> --- a/configs/socfpga_de1_soc_defconfig
>>> +++ b/configs/socfpga_de1_soc_defconfig
>>> @@ -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.

Ok.

Dinh

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 1/7] arm: socfpga: add env settings to common header
  2017-01-24 17:05 ` [U-Boot] [PATCH v4 1/7] arm: socfpga: add env settings to common header Dalon Westergreen
@ 2017-01-25  3:31   ` Dinh Nguyen
  2017-01-25  3:35     ` Westergreen, Dalon
  0 siblings, 1 reply; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:31 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen@intel.com>
> 
> 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 <dalon.westergreen@intel.com>
> ---
>  include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
> 
> diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
> index 6285266..bdd6e2f 100644
> --- a/include/configs/socfpga_common.h
> +++ b/include/configs/socfpga_common.h
> @@ -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" \

Should this be mmcblk0p2?

Dinh

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 6/7] arm: socfpga: Update SoCKit environment
  2017-01-25  3:30     ` Dalon Westergreen
@ 2017-01-25  3:34       ` Dinh Nguyen
  2017-01-25  3:40         ` Marek Vasut
  0 siblings, 1 reply; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:34 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 09:30 PM, Dalon Westergreen wrote:
> On Tue, 2017-01-24 at 21:27 -0600, Dinh Nguyen wrote:
>>
>> On 01/24/2017 11:06 AM, Dalon Westergreen wrote:
>>>
>>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>>
>>> 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 <dalon.westergreen@intel.com>
>>> ---
>>>  configs/socfpga_sockit_defconfig |  1 +
>>>  include/configs/socfpga_sockit.h | 27 +--------------------------
>>>  2 files changed, 2 insertions(+), 26 deletions(-)
>>>
>>> diff --git a/configs/socfpga_sockit_defconfig
>>> b/configs/socfpga_sockit_defconfig
>>> index d0c2bda..130c4e2 100644
>>> --- a/configs/socfpga_sockit_defconfig
>>> +++ b/configs/socfpga_sockit_defconfig
>>> @@ -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. 
> 

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

Dinh

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 1/7] arm: socfpga: add env settings to common header
  2017-01-25  3:31   ` Dinh Nguyen
@ 2017-01-25  3:35     ` Westergreen, Dalon
  2017-01-25  3:37       ` Dinh Nguyen
  0 siblings, 1 reply; 30+ messages in thread
From: Westergreen, Dalon @ 2017-01-25  3:35 UTC (permalink / raw)
  To: u-boot

On Tue, 2017-01-24 at 21:31 -0600, Dinh Nguyen wrote:
> 
> On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
> > 
> > From: Dalon Westergreen <dalon.westergreen@intel.com>
> > 
> > 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 <dalon.westergreen@intel.com>
> > ---
> > ?include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++
> > ?1 file changed, 27 insertions(+)
> > 
> > diff --git a/include/configs/socfpga_common.h
> > b/include/configs/socfpga_common.h
> > index 6285266..bdd6e2f 100644
> > --- a/include/configs/socfpga_common.h
> > +++ b/include/configs/socfpga_common.h
> > @@ -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" \
> 
> 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.

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

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 1/7] arm: socfpga: add env settings to common header
  2017-01-25  3:35     ` Westergreen, Dalon
@ 2017-01-25  3:37       ` Dinh Nguyen
  0 siblings, 0 replies; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:37 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 09:35 PM, Westergreen, Dalon wrote:
> On Tue, 2017-01-24 at 21:31 -0600, Dinh Nguyen wrote:
>>
>> On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
>>>
>>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>>
>>> 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 <dalon.westergreen@intel.com>
>>> ---
>>>  include/configs/socfpga_common.h | 27 +++++++++++++++++++++++++++
>>>  1 file changed, 27 insertions(+)
>>>
>>> diff --git a/include/configs/socfpga_common.h
>>> b/include/configs/socfpga_common.h
>>> index 6285266..bdd6e2f 100644
>>> --- a/include/configs/socfpga_common.h
>>> +++ b/include/configs/socfpga_common.h
>>> @@ -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" \
>>
>> 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.
> 

Ok, sorry about that.

Dinh

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 0/7]
  2017-01-25  3:27       ` Marek Vasut
@ 2017-01-25  3:40         ` Dinh Nguyen
  0 siblings, 0 replies; 30+ messages in thread
From: Dinh Nguyen @ 2017-01-25  3:40 UTC (permalink / raw)
  To: u-boot



On 01/24/2017 09:27 PM, Marek Vasut wrote:
> On 01/25/2017 04:07 AM, Dalon Westergreen wrote:
>> On Tue, 2017-01-24 at 20:58 -0600, Dinh Nguyen wrote:
>>>
>>> On 01/24/2017 11:11 AM, Marek Vasut wrote:
>>>>
>>>> On 01/24/2017 06:05 PM, Dalon Westergreen wrote:
>>>>>
>>>>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>>>>
>>>>> 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(-)
>>>>>
>>>>
>>>> Whole series
>>>> Acked-by: Marek Vasut <marex@denx.de>
>>>>
>>>> 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 ...
> 

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

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 6/7] arm: socfpga: Update SoCKit environment
  2017-01-25  3:34       ` Dinh Nguyen
@ 2017-01-25  3:40         ` Marek Vasut
  2017-01-25  3:46           ` Dalon Westergreen
  0 siblings, 1 reply; 30+ messages in thread
From: Marek Vasut @ 2017-01-25  3:40 UTC (permalink / raw)
  To: u-boot

On 01/25/2017 04:34 AM, Dinh Nguyen wrote:
> 
> 
> On 01/24/2017 09:30 PM, Dalon Westergreen wrote:
>> On Tue, 2017-01-24 at 21:27 -0600, Dinh Nguyen wrote:
>>>
>>> On 01/24/2017 11:06 AM, Dalon Westergreen wrote:
>>>>
>>>> From: Dalon Westergreen <dalon.westergreen@intel.com>
>>>>
>>>> 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 <dalon.westergreen@intel.com>
>>>> ---
>>>>  configs/socfpga_sockit_defconfig |  1 +
>>>>  include/configs/socfpga_sockit.h | 27 +--------------------------
>>>>  2 files changed, 2 insertions(+), 26 deletions(-)
>>>>
>>>> diff --git a/configs/socfpga_sockit_defconfig
>>>> b/configs/socfpga_sockit_defconfig
>>>> index d0c2bda..130c4e2 100644
>>>> --- a/configs/socfpga_sockit_defconfig
>>>> +++ b/configs/socfpga_sockit_defconfig
>>>> @@ -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. 
>>
> 
> I think there is mainline DTS file for the sockit,
> (socfpga_cyclone5_sockit.dts), or am I confused again?

Yeah, that's sockit .


-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 30+ messages in thread
* [U-Boot] [PATCH v4 6/7] arm: socfpga: Update SoCKit environment
  2017-01-25  3:40         ` Marek Vasut
@ 2017-01-25  3:46           ` Dalon Westergreen
  0 siblings, 0 replies; 30+ messages in thread
From: Dalon Westergreen @ 2017-01-25  3:46 UTC (permalink / raw)
  To: u-boot

On Wed, 2017-01-25 at 04:40 +0100, Marek Vasut wrote:
> On 01/25/2017 04:34 AM, Dinh Nguyen wrote:
> > 
> > 
> > 
> > On 01/24/2017 09:30 PM, Dalon Westergreen wrote:
> > > 
> > > On Tue, 2017-01-24 at 21:27 -0600, Dinh Nguyen wrote:
> > > > 
> > > > 
> > > > On 01/24/2017 11:06 AM, Dalon Westergreen wrote:
> > > > > 
> > > > > 
> > > > > From: Dalon Westergreen <dalon.westergreen@intel.com>
> > > > > 
> > > > > 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 <dalon.westergreen@intel.com>
> > > > > ---
> > > > > ?configs/socfpga_sockit_defconfig |??1 +
> > > > > ?include/configs/socfpga_sockit.h | 27 +--------------------------
> > > > > ?2 files changed, 2 insertions(+), 26 deletions(-)
> > > > > 
> > > > > diff --git a/configs/socfpga_sockit_defconfig
> > > > > b/configs/socfpga_sockit_defconfig
> > > > > index d0c2bda..130c4e2 100644
> > > > > --- a/configs/socfpga_sockit_defconfig
> > > > > +++ b/configs/socfpga_sockit_defconfig
> > > > > @@ -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.?
> > > 
> > 
> > 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.
> 

^ permalink raw reply	[flat|nested] 30+ messages in thread
end of thread, other threads:[~2017-01-25  3:46 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-24 17:05 [U-Boot] [PATCH v4 0/7] Dalon Westergreen
2017-01-24 17:05 ` [U-Boot] [PATCH v4 1/7] arm: socfpga: add env settings to common header Dalon Westergreen
2017-01-25  3:31   ` Dinh Nguyen
2017-01-25  3:35     ` Westergreen, Dalon
2017-01-25  3:37       ` Dinh Nguyen
2017-01-24 17:05 ` [U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment Dalon Westergreen
2017-01-25  3:08   ` Dinh Nguyen
2017-01-25  3:11     ` Westergreen, Dalon
2017-01-25  3:16       ` Dinh Nguyen
2017-01-25  3:22         ` Dinh Nguyen
2017-01-25  3:23         ` Westergreen, Dalon
2017-01-25  3:25           ` Dinh Nguyen
2017-01-24 17:05 ` [U-Boot] [PATCH v4 3/7] arm: socfpga: update cyclone5 socdk " Dalon Westergreen
2017-01-24 17:06 ` [U-Boot] [PATCH v4 4/7] arm: socfpga: update arria5 " Dalon Westergreen
2017-01-24 17:06 ` [U-Boot] [PATCH v4 5/7] arm: socfpga: Update DE1 environment Dalon Westergreen
2017-01-25  3:20   ` Dinh Nguyen
2017-01-25  3:25     ` Dalon Westergreen
2017-01-25  3:30       ` Dinh Nguyen
2017-01-24 17:06 ` [U-Boot] [PATCH v4 6/7] arm: socfpga: Update SoCKit environment Dalon Westergreen
2017-01-25  3:27   ` Dinh Nguyen
2017-01-25  3:30     ` Dalon Westergreen
2017-01-25  3:34       ` Dinh Nguyen
2017-01-25  3:40         ` Marek Vasut
2017-01-25  3:46           ` Dalon Westergreen
2017-01-24 17:06 ` [U-Boot] [PATCH v4 7/7] arm: socfpga: Update sr1500 environment Dalon Westergreen
2017-01-24 17:11 ` [U-Boot] [PATCH v4 0/7] Marek Vasut
2017-01-25  2:58   ` Dinh Nguyen
2017-01-25  3:07     ` Dalon Westergreen
2017-01-25  3:27       ` Marek Vasut
2017-01-25  3:40         ` Dinh Nguyen

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.