imx: nitrogen6x: Convert Sabrelite to distro boot support

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

Hi Guillaume,

On Wed, Apr 11, 2018 at 7:38 AM, Guillaume GARDET
<[email protected]> wrote:

Please explain in the commit log why this is needed. Thanks

Quoted 6 lines

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

This is for efi fdtfile fallback definition for default distro config for nitrogen6x board.
Is it ok for you?

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

---
 arch/arm/mach-imx/mx6/soc.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

arch/arm/mach-imx/mx6/soc.c +0 -0

index 9b3d8f69b2..c4cb752c76 100644
@@ -446,6 +446,40 @@ int arch_cpu_init(void)
 	return 0;
 }
 

Hi Guillaume,

Quoted 18 lines · Guillaume GARDET

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

---
  arch/arm/mach-imx/mx6/soc.c | 34 ++++++++++++++++++++++++++++++++++
  1 file changed, 34 insertions(+)

arch/arm/mach-imx/mx6/soc.c +0 -0

index 9b3d8f69b2..c4cb752c76 100644
@@ -446,6 +446,40 @@ int arch_cpu_init(void)
  	return 0;
  }
 

arch/arm/mach-imx/mx6/soc.c int arch_cpu_init(void) · line 458

Quoted 10 lines

arch/arm/mach-imx/mx6/soc.c +10 -0

+ #ifdef CONFIG_ARCH_MISC_INIT
+ int arch_misc_init(void)
+ {
+ #ifdef CONFIG_ENV_VARS_UBOOT_CONFIG
+	if (is_cpu_type(MXC_CPU_MX6QP))
+		env_set("soc", "imx6qp");
+	else if (is_cpu_type(MXC_CPU_MX6Q))
+		env_set("soc", "imx6q");
+	else if (is_cpu_type(MXC_CPU_MX6DP))
+		env_set("soc", "imx6dp");

If we want that soc variable to be used for dtb names, then the above won't work. A i.MX6DP platform has its dtb named imx6qp-board.dtb.

arch/arm/mach-imx/mx6/soc.c int arch_cpu_init(void) · line 460

Quoted 2 lines

arch/arm/mach-imx/mx6/soc.c +2 -0

+	else if (is_cpu_type(MXC_CPU_MX6D))
+		env_set("soc", "imx6d");

Same here, a Dual CPU actually uses a imx6q-board.dtb.

arch/arm/mach-imx/mx6/soc.c int arch_cpu_init(void) · line 468

Quoted 8 lines

arch/arm/mach-imx/mx6/soc.c +8 -0

+	else if (is_mx6dl( ))
+		env_set("soc", "imx6dl");
+	else if (is_mx6sx( ))
+		env_set("soc", "imx6sx");
+	else if (is_mx6sl( ))
+		env_set("soc", "imx6sl");
+	else if (is_mx6solo( ))
+		env_set("soc", "imx6solo");

Same here, a Solo CPU uses a imx6dl-board.dtb.

arch/arm/mach-imx/mx6/soc.c int arch_cpu_init(void) · line 476

Quoted 9 lines

arch/arm/mach-imx/mx6/soc.c +8 -0

+	else if (is_mx6ul( ))
+		env_set("soc", "imx6ul");
+	else if (is_mx6ull( ))
+		env_set("soc", "imx6ull");
+	else if (is_mx6sll( ))
+		env_set("soc", "imx6sll");
+	else
+		env_set("soc", "imx6");

In that case we most likely miss a CPU definition, maybe "unknown" would be more explicit?

Regards,
Gary

So, how to handle dtb filenames? Update with wrong soc definition ? Or drop this patch and define a FDTFILE for each flavor?

Quoted 2 lines · Guillaume Gardet

So, how to handle dtb filenames? Update with wrong soc definition ? Or drop this patch and define a FDTFILE for each flavor?

You can take a look at how we handle this for wandboard, cuboxi, sabresd, for example.

Taking mx6sabresd as an example you can look at board_late_init() in board/freescale/mx6sabresd/mx6sabresd.c

Then inside include/configs/mx6sabre_common.h check for the findfdt script that picks the correct dtb.

Quoted 1 line

Ok. So, how would you like to proceed?
Remove the generic mx6 'soc' definition and use a board sepcific 'board_rev' (or maybe a static definition if one configuration match a single dtb) to define the right dtb?

Could you tell me which DTB should work with the various nitrogen6x boards config?

On Thu, Apr 12, 2018 at 5:13 AM, Guillaume Gardet
<[email protected]> wrote:
script that picks the correct dtb.

Quoted 5 lines

Quoted 1 line

Ok. So, how would you like to proceed?
Remove the generic mx6 'soc' definition and use a board sepcific 'board_rev' (or maybe a static definition if one configuration match a single dtb) to define the right dtb?

I prefer to keep the same solution as done in other boards sucn as mx6sabresd, wandboard and cuboxi.

Hi Fabio, Guillaume

Quoted 9 lines · Fabio Estevam

On Thu, Apr 12, 2018 at 5:13 AM, Guillaume Gardet
<[email protected]> wrote:
script that picks the correct dtb.

Quoted 4 lines

Ok. So, how would you like to proceed?
Remove the generic mx6 'soc' definition and use a board sepcific 'board_rev' (or maybe a static definition if one configuration match a single dtb) to define the right dtb?

I prefer to keep the same solution as done in other boards sucn as mx6sabresd, wandboard and cuboxi.

Ok. My suggestion was to have something generic so that it matches the fdt name set in config_distro_bootcmd.h (${soc}-${board}${boardver}.dtb).

I especially like the naming in that standard, don't think board_rev should be the SOC name.

This would also avoid redundancy in each board_late_init functions since only the board name would need to be setup (and boardver in some cases like wandboard).

Guillaume, please forget that point for now and just set your fdtfile name in the config file. I'll update the board file later on.

Le 12/04/2018 à 14:36, Gary Bisson a écrit :

Quoted 19 lines

Hi Fabio, Guillaume

Quoted 9 lines · Fabio Estevam

On Thu, Apr 12, 2018 at 5:13 AM, Guillaume Gardet
<[email protected]> wrote:
script that picks the correct dtb.

Quoted 4 lines

Ok. So, how would you like to proceed?
Remove the generic mx6 'soc' definition and use a board sepcific 'board_rev' (or maybe a static definition if one configuration match a single dtb) to define the right dtb?

I prefer to keep the same solution as done in other boards sucn as mx6sabresd, wandboard and cuboxi.

Ok. My suggestion was to have something generic so that it matches the fdt name set in config_distro_bootcmd.h (${soc}-${board}${boardver}.dtb).

I especially like the naming in that standard, don't think board_rev should be the SOC name.

Quoted 6 lines

This would also avoid redundancy in each board_late_init functions since only the board name would need to be setup (and boardver in some cases like wandboard).

Guillaume, please forget that point for now and just set your fdtfile name in the config file. I'll update the board file later on.

Ok.

Could you just confirm which DTB should work with the various nitrogen6x boards config, please? Are the following ok?
* imx6q-nitrogen6x.dts     =>     nitrogen6q2g_defconfig nitrogen6q_defconfig
* imx6dl-nitrogen6x.dts     =>     nitrogen6dl2g_defconfig nitrogen6dl_defconfig
* imx6sx-nitrogen6sx.dts     =>     nitrogen6s1g_defconfig nitrogen6s_defconfig

Hi Guillaume,

Quoted 27 lines · Guillaume Gardet

Le 12/04/2018 à 14:36, Gary Bisson a écrit :

Quoted 19 lines

Hi Fabio, Guillaume

Quoted 9 lines · Fabio Estevam

On Thu, Apr 12, 2018 at 5:13 AM, Guillaume Gardet
<[email protected]> wrote:
script that picks the correct dtb.

Quoted 4 lines

Ok. So, how would you like to proceed?
Remove the generic mx6 'soc' definition and use a board sepcific 'board_rev' (or maybe a static definition if one configuration match a single dtb) to define the right dtb?

I prefer to keep the same solution as done in other boards sucn as mx6sabresd, wandboard and cuboxi.

Ok. My suggestion was to have something generic so that it matches the fdt name set in config_distro_bootcmd.h (${soc}-${board}${boardver}.dtb).

I especially like the naming in that standard, don't think board_rev should be the SOC name.

Quoted 6 lines

This would also avoid redundancy in each board_late_init functions since only the board name would need to be setup (and boardver in some cases like wandboard).

Guillaume, please forget that point for now and just set your fdtfile name in the config file. I'll update the board file later on.

Quoted 7 lines

Ok.

Could you just confirm which DTB should work with the various nitrogen6x boards config, please? Are the following ok?
* imx6q-nitrogen6x.dts     =>     nitrogen6q2g_defconfig nitrogen6q_defconfig
* imx6dl-nitrogen6x.dts     =>     nitrogen6dl2g_defconfig nitrogen6dl_defconfig
* imx6sx-nitrogen6sx.dts     =>     nitrogen6s1g_defconfig nitrogen6s_defconfig

No, imx6sx is different than imx6s. Solo is the same as imx6dl as far as the kernl is concerned.

Maybe just leave fdt_file blank for nitrogen6x for now, it's only necessary for PXE which isn't enabled in nitrogen6*defconfig.

Regards,
Gary

Boot tested on sabrelite board.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

---
 include/configs/nitrogen6x.h | 180 +++++++++++++------------------------------
 1 file changed, 54 insertions(+), 126 deletions(-)

include/configs/nitrogen6x.h +0 -0

index 7d2cf0bd8c..f6dce6c069 100644

include/configs/nitrogen6x.h +54 -126

+#ifdef CONFIG_CMD_MMC
+#define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
+#else
+#define DISTRO_BOOT_DEV_MMC(func)
+#endif
+
+#ifdef CONFIG_CMD_SATA
+#define DISTRO_BOOT_DEV_SATA(func) func(SATA, sata, 0)
+#else
+#define DISTRO_BOOT_DEV_SATA(func)
+#endif
+
+#ifdef CONFIG_USB_STORAGE
+#define DISTRO_BOOT_DEV_USB(func) func(USB, usb, 0)
+#else
+#define DISTRO_BOOT_DEV_USB(func)
+#endif
+
+#ifdef CONFIG_CMD_PXE
+#define DISTRO_BOOT_DEV_PXE(func) func(PXE, pxe, na)
+#else
+#define DISTRO_BOOT_DEV_PXE(func)
+#endif
+
+#ifdef CONFIG_CMD_DHCP
+#define DISTRO_BOOT_DEV_DHCP(func) func(DHCP, dhcp, na)
+#else
+#define DISTRO_BOOT_DEV_DHCP(func)
+#endif
+
+
 #if defined(CONFIG_SABRELITE)
+#define FDTFILE "fdtfile=imx6q-sabrelite.dtb\0"
+#else
+/* FIXME: nitrogen6x covers multiple configs. Define fdtfile for each supported config. */
+#define FDTFILE
+#endif
+
+#define BOOT_TARGET_DEVICES(func) \
+	DISTRO_BOOT_DEV_MMC(func) \
+	DISTRO_BOOT_DEV_SATA(func) \
+	DISTRO_BOOT_DEV_USB(func) \
+	DISTRO_BOOT_DEV_PXE(func) \
+	DISTRO_BOOT_DEV_DHCP(func)
+
+#include <config_distro_bootcmd.h>
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"script=boot.scr\0" \
-	"uimage=uImage\0" \
 	"console=ttymxc1\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
-	"fdt_file=imx6q-sabrelite.dtb\0" \
-	"fdt_addr=0x18000000\0" \
-	"boot_fdt=try\0" \
+	"fdt_addr_r=0x18000000\0" \
+	FDTFILE \
+	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0"  \
+	"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+	"ramdisk_addr_r=0x13000000\0" \
+	"ramdiskaddr=0x13000000\0" \
 	"ip_dyn=yes\0" \
 	"usb_pgood_delay=2000\0" \
-	"mmcdevs=0 1\0" \
-	"mmcpart=1\0" \
-	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
-	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-		"root=${mmcroot}\0" \
-	"loadbootscript=" \
-		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source\0" \
-	"loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
-	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-	"mmcboot=echo Booting from mmc ...; " \
-		"run mmcargs; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if run loadfdt; then " \
-				"bootm ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootm; " \
-				"else " \
-					"echo WARN: Cannot load the DT; " \
-				"fi; " \
-			"fi; " \
-		"else " \
-			"bootm; " \
-		"fi;\0" \
-	"netargs=setenv bootargs console=${console},${baudrate} " \
-		"root=/dev/nfs " \
-	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-		"netboot=echo Booting from net ...; " \
-		"run netargs; " \
-		"if test ${ip_dyn} = yes; then " \
-			"setenv get_cmd dhcp; " \
-		"else " \
-			"setenv get_cmd tftp; " \
-		"fi; " \
-		"${get_cmd} ${uimage}; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-				"bootm ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootm; " \
-				"else " \
-					"echo WARN: Cannot load the DT; " \
-				"fi; " \
-			"fi; " \
-		"else " \
-			"bootm; " \
-		"fi;\0"
-
-#define CONFIG_BOOTCOMMAND \
-	"for mmcdev in ${mmcdevs}; do " \
-		"mmc dev ${mmcdev}; " \
-		"if mmc rescan; then " \
-			"if run loadbootscript; then " \
-				"run bootscript; " \
-			"else " \
-				"if run loaduimage; then " \
-					"run mmcboot; " \
-				"fi; " \
-			"fi; " \
-		"fi; " \
-	"done; " \
-	"run netboot; "
-#else
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"bootdevs=" CONFIG_DRIVE_TYPES "\0" \
-	"umsdevs=" CONFIG_UMSDEVS "\0" \
-	"usb_pgood_delay=2000\0" \
-	"console=ttymxc1\0" \
-	"clearenv=if sf probe || sf probe || sf probe 1 ; then " \
-		"sf erase 0xc0000 0x2000 && " \
-		"echo restored environment to factory default ; fi\0" \
-	"bootcmd=for dtype in ${bootdevs}" \
-		"; do " \
-			"if itest.s \"xusb\" == \"x${dtype}\" ; then " \
-				"usb start ;" \
-			"fi; " \
-			"for disk in 0 1 ; do ${dtype} dev ${disk} ;" \
-				"load " \
-					"${dtype} ${disk}:1 " \
-					"10008000 " \
-					"/6x_bootscript" \
-					"&& source 10008000 ; " \
-			"done ; " \
-		"done; " \
-		"setenv stdout serial,vga ; " \
-		"echo ; echo 6x_bootscript not found ; " \
-		"echo ; echo serial console at 115200, 8N1 ; echo ; " \
-		"echo details at http://boundarydevices.com/6q_bootscript ; " \
-		"setenv stdout serial;" \
-		"setenv stdin serial,usbkbd;" \
-		"for dtype in ${umsdevs} ; do " \
-			"if itest.s sata == ${dtype}; then " \
-				"initcmd='sata init' ;" \
-			"else " \
-				"initcmd='mmc rescan' ;" \
-			"fi; " \
-			"for disk in 0 1 ; do " \
-				"if $initcmd && $dtype dev $disk ; then " \
-					"setenv stdout serial,vga; " \
-					"echo expose ${dtype} ${disk} " \
-						"over USB; " \
-					"ums 0 $dtype $disk ;" \
-				"fi; " \
-		"	done; " \
-		"done ;" \
-		"setenv stdout serial,vga; " \
-		"echo no block devices found;" \
-		"\0" \
-	"initrd_high=0xffffffff\0" \
-	"upgradeu=for dtype in ${bootdevs}" \
-		"; do " \
-		"for disk in 0 1 ; do ${dtype} dev ${disk} ;" \
-			"load ${dtype} ${disk}:1 10008000 " \
-				"/6x_upgrade " \
-				"&& source 10008000 ; " \
-		"done ; " \
-	"done\0" \
+	BOOTENV
 
-#endif
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END	       0x10010000

Signature · 1 line

2.13.6

Boot tested on sabrelite board.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

Boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots on sabrelite board.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

---
 configs/mx6qsabrelite_defconfig | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

configs/mx6qsabrelite_defconfig +0 -0

index 7499704058..fee33cfff1 100644

Hi Guillaume,

Quoted 17 lines · Guillaume GARDET

Boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots on sabrelite board.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

---
  configs/mx6qsabrelite_defconfig | 15 +++++----------
  1 file changed, 5 insertions(+), 10 deletions(-)

configs/mx6qsabrelite_defconfig +0 -0

index 7499704058..fee33cfff1 100644

configs/mx6qsabrelite_defconfig CONFIG_ARCH_MX6=y · line 11

Quoted 10 lines

configs/mx6qsabrelite_defconfig +3 -1

@@ -3,15 +3,15 @@ CONFIG_ARCH_MX6=y
  CONFIG_SYS_TEXT_BASE=0x17800000
  CONFIG_TARGET_NITROGEN6X=y
  CONFIG_CMD_HDMIDETECT=y
+CONFIG_DISTRO_DEFAULTS=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
  CONFIG_BOOTDELAY=3
+# CONFIG_USE_BOOTCOMMAND is not set
  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
-CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_ARCH_MISC_INIT=y

The above config breaks the build since there's no arch_misc_init function in the board file.

configs/mx6qsabrelite_defconfig CONFIG_ARCH_MX6=y · line 17

Quoted 8 lines

configs/mx6qsabrelite_defconfig +0 -2

  CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_HUSH_PARSER=y
  CONFIG_FASTBOOT=y
  CONFIG_FASTBOOT_BUF_ADDR=0x12000000
-CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_MEMTEST=y
  CONFIG_SYS_ALT_MEMTEST=y
  # CONFIG_CMD_FLASH is not set

Also, can you add CMD_GPT so that GPT parition tables are supported?

Many of our OS images now rely on it.

Regards,
Gary

Boot tested on sabrelite board.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

---
  include/configs/nitrogen6x.h | 179 +++++++++++--------------------------------
  1 file changed, 43 insertions(+), 136 deletions(-)

This patch serie updates sabrelite and nitrogen6x boards to use distro boot support. Sabrelite has been boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots. Nitrogen6* boards have been build tested only.

Currently, only the Sabrelite has fdtfile defined.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

Changes in V6:
* added CONFIG_CMD_GPT to sabrelite defconfig
* remove CONFIG_ARCH_MISC_INIT to sabrelite defconfig

Changes in V5:
* remove obsolete code from include/configs/nitrogen6x.h

Changes in V4:
* Remove imx6 soc definition
* Change comment on not defined fdtfile (no more fallback)

Changes in V3:
* Add imx6 soc definition
* Also update nitrogen6x config, not only sabrelite
* Split mx6qsabrelite_defconfig update to a separate patch
Changes in V2:
* add mx6qsabrelite_defconfig update

Guillaume GARDET (2):
imx6: Convert sabrelite and nitrogen6x boards to distro boot support
imx6: sabrelite: update defconfig to use distro defaults

  configs/mx6qsabrelite_defconfig |  15 ++--
  include/configs/nitrogen6x.h    | 179 ++++++++++------------------------------
  2 files changed, 48 insertions(+), 146 deletions(-)

This patch serie updates sabrelite and nitrogen6x boards to use distro boot support. Sabrelite has been boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots. Nitrogen6* boards have been build tested only.

Currently, only the Sabrelite has fdtfile defined.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Gary Bisson <[email protected]>

Changes in V6:
* added CONFIG_CMD_GPT to sabrelite defconfig
* remove CONFIG_ARCH_MISC_INIT to sabrelite defconfig

Changes in V5:
* remove obsolete code from include/configs/nitrogen6x.h

Changes in V4:
* Remove imx6 soc definition
* Change comment on not defined fdtfile (no more fallback)

Changes in V3:
* Add imx6 soc definition
* Also update nitrogen6x config, not only sabrelite
* Split mx6qsabrelite_defconfig update to a separate patch
Changes in V2:
* add mx6qsabrelite_defconfig update

Guillaume GARDET (2):
imx6: Convert sabrelite and nitrogen6x boards to distro boot support
imx6: sabrelite: update defconfig to use distro defaults

 configs/mx6qsabrelite_defconfig |  15 ++--
 include/configs/nitrogen6x.h    | 179 ++++++++++------------------------------
 2 files changed, 48 insertions(+), 146 deletions(-)

Hi Guillaume,

Quoted 6 lines · Guillaume GARDET

This patch serie updates sabrelite and nitrogen6x boards to use distro boot support. Sabrelite has been boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots. Nitrogen6* boards have been build tested only.

Currently, only the Sabrelite has fdtfile defined.

Fine, but Troy is the maintainer for this board and I have not yet seen if he agrees to switch the board to the distro environment. I would like to have his ACK before pushing this.

Best regards,
Stefano Babic

Quoted 10 lines · Stefano Babic

Hi Guillaume,

Quoted 6 lines · Guillaume GARDET

This patch serie updates sabrelite and nitrogen6x boards to use distro boot support. Sabrelite has been boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots. Nitrogen6* boards have been build tested only.

Currently, only the Sabrelite has fdtfile defined.

Quoted 6 lines

Fine, but Troy is the maintainer for this board and I have not yet seen if he agrees to switch the board to the distro environment. I would like to have his ACK before pushing this.

Best regards,
Stefano Babic

Sorry, for the delay

Acked-by Troy Kisky <[email protected]>

Boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

---
 include/configs/nitrogen6x.h | 86 ++++++++++----------------------------------
 1 file changed, 18 insertions(+), 68 deletions(-)

include/configs/nitrogen6x.h +0 -0

index c73cfb7f7e..2e2c499cb6 100644

include/configs/nitrogen6x.h +7 -65

-	"boot_fdt=try\0" \
+	"fdt_addr_r=0x18000000\0" \
+	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0"  \
+	"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+	"ramdisk_addr_r=0x13000000\0" \
+	"ramdiskaddr=0x13000000\0" \
 	"ip_dyn=yes\0" \
 	"usb_pgood_delay=2000\0" \
-	"mmcdevs=0 1\0" \
-	"mmcpart=1\0" \
-	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
-	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-		"root=${mmcroot}\0" \
-	"loadbootscript=" \
-		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source\0" \
-	"loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
-	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-	"mmcboot=echo Booting from mmc ...; " \
-		"run mmcargs; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if run loadfdt; then " \
-				"bootm ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootm; " \
-				"else " \
-					"echo WARN: Cannot load the DT; " \
-				"fi; " \
-			"fi; " \
-		"else " \
-			"bootm; " \
-		"fi;\0" \
-	"netargs=setenv bootargs console=${console},${baudrate} " \
-		"root=/dev/nfs " \
-	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-		"netboot=echo Booting from net ...; " \
-		"run netargs; " \
-		"if test ${ip_dyn} = yes; then " \
-			"setenv get_cmd dhcp; " \
-		"else " \
-			"setenv get_cmd tftp; " \
-		"fi; " \
-		"${get_cmd} ${uimage}; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-				"bootm ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootm; " \
-				"else " \
-					"echo WARN: Cannot load the DT; " \
-				"fi; " \
-			"fi; " \
-		"else " \
-			"bootm; " \
-		"fi;\0"
+	BOOTENV
 
-#define CONFIG_BOOTCOMMAND \
-	"for mmcdev in ${mmcdevs}; do " \
-		"mmc dev ${mmcdev}; " \
-		"if mmc rescan; then " \
-			"if run loadbootscript; then " \
-				"run bootscript; " \
-			"else " \
-				"if run loaduimage; then " \
-					"run mmcboot; " \
-				"fi; " \
-			"fi; " \
-		"fi; " \
-	"done; " \
-	"run netboot; "
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootdevs=" CONFIG_DRIVE_TYPES "\0" \

Signature · 1 line

2.13.6

Hi Guillaume,

Thanks for your patch! Switching the upstream nitrogen6x configuration to distro bootcmd has been in our todo list for some time since we also use that in our own git repo.

Quoted 17 lines · Guillaume GARDET

Boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

---
  include/configs/nitrogen6x.h | 86 ++++++++++----------------------------------
  1 file changed, 18 insertions(+), 68 deletions(-)

include/configs/nitrogen6x.h +0 -0

index c73cfb7f7e..2e2c499cb6 100644
@@ -102,82 +102,32 @@
  #define CONFIG_UMSDEVS CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC
 

include/configs/nitrogen6x.h line 104

Quoted 1 line

include/configs/nitrogen6x.h +0 -0

  #if defined(CONFIG_SABRELITE)

Please also switch nitrogen6x to it, not only sabrelite.

include/configs/nitrogen6x.h line 110

Quoted 7 lines

include/configs/nitrogen6x.h +6 -0

+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(MMC, mmc, 1) \
+	func(SATA, sata, 0) \
+	func(USB, usb, 0) \
+	func(PXE, pxe, na) \

That currently doesn't build because CMD_PXE isn't selected in the sabrelite defconfig. "include/config_distro_bootcmd.h:319:2: error: expected ‘}’ before ‘BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE’"

Which brings a good point, all the above should depend on the storage command being present, like done here [1].

include/configs/nitrogen6x.h line 119

Quoted 13 lines

include/configs/nitrogen6x.h +5 -3

+	func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
  #define CONFIG_EXTRA_ENV_SETTINGS \
-	"script=boot.scr\0" \
-	"uimage=uImage\0" \
  	"console=ttymxc1\0" \
  	"fdt_high=0xffffffff\0" \
  	"initrd_high=0xffffffff\0" \
-	"fdt_file=imx6q-sabrelite.dtb\0" \
+	"fdtfile=imx6q-sabrelite.dtb\0" \

I wish the default efi_fdtfile would work, Fabio is there any plan to populate the ${soc} variable like it is done for i.MX7? [2] Then a small patch in the nitrogen6x.c would set the proper board env variable.

That way there would be no difference in this header between sabrelite vs. nitrogen6x.

include/configs/nitrogen6x.h line 120

Quoted 1 line

include/configs/nitrogen6x.h +0 -0

  	"fdt_addr=0x18000000\0" \

Do we need to keep fdt_addr since we define fdt_addr_r below?

Quoted 74 lines

include/configs/nitrogen6x.h +7 -63

-	"boot_fdt=try\0" \
+	"fdt_addr_r=0x18000000\0" \
+	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0"  \
+	"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
+	"ramdisk_addr_r=0x13000000\0" \
+	"ramdiskaddr=0x13000000\0" \
  	"ip_dyn=yes\0" \
  	"usb_pgood_delay=2000\0" \
-	"mmcdevs=0 1\0" \
-	"mmcpart=1\0" \
-	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
-	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-		"root=${mmcroot}\0" \
-	"loadbootscript=" \
-		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source\0" \
-	"loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
-	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-	"mmcboot=echo Booting from mmc ...; " \
-		"run mmcargs; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if run loadfdt; then " \
-				"bootm ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootm; " \
-				"else " \
-					"echo WARN: Cannot load the DT; " \
-				"fi; " \
-			"fi; " \
-		"else " \
-			"bootm; " \
-		"fi;\0" \
-	"netargs=setenv bootargs console=${console},${baudrate} " \
-		"root=/dev/nfs " \
-	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-		"netboot=echo Booting from net ...; " \
-		"run netargs; " \
-		"if test ${ip_dyn} = yes; then " \
-			"setenv get_cmd dhcp; " \
-		"else " \
-			"setenv get_cmd tftp; " \
-		"fi; " \
-		"${get_cmd} ${uimage}; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-				"bootm ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootm; " \
-				"else " \
-					"echo WARN: Cannot load the DT; " \
-				"fi; " \
-			"fi; " \
-		"else " \
-			"bootm; " \
-		"fi;\0"
+	BOOTENV
 
-#define CONFIG_BOOTCOMMAND \
-	"for mmcdev in ${mmcdevs}; do " \
-		"mmc dev ${mmcdev}; " \
-		"if mmc rescan; then " \
-			"if run loadbootscript; then " \
-				"run bootscript; " \
-			"else " \
-				"if run loaduimage; then " \
-					"run mmcboot; " \
-				"fi; " \
-			"fi; " \
-		"fi; " \

Quoted 7 lines

include/configs/nitrogen6x.h +0 -2

-	"done; " \
-	"run netboot; "
  #else
  #define CONFIG_EXTRA_ENV_SETTINGS \
  	"bootdevs=" CONFIG_DRIVE_TYPES "\0" \

Signature · 1 line

2.13.6

The rest looks good to me.

Regards,
Gary

[1] https://github.com/boundarydevices/u-boot-imx6/blob/boundary-v2017.07/include/configs/boundary.h#L209
[2] http://git.denx.de/?p=u-boot.git;a=blob;f=arch/arm/mach-imx/mx7/soc.c;hb=HEAD#l188

Le 09/04/2018 à 16:40, Gary Bisson a écrit :

Quoted 17 lines

Hi Guillaume,

Thanks for your patch! Switching the upstream nitrogen6x configuration to distro bootcmd has been in our todo list for some time since we also use that in our own git repo.

Quoted 10 lines · Guillaume GARDET

Boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

---
  include/configs/nitrogen6x.h | 86 ++++++++++----------------------------------
  1 file changed, 18 insertions(+), 68 deletions(-)

Quoted 8 lines

include/configs/nitrogen6x.h line 103

Quoted 7 lines

include/configs/nitrogen6x.h +0 -0

index c73cfb7f7e..2e2c499cb6 100644
@@ -102,82 +102,32 @@
  #define CONFIG_UMSDEVS CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC
  #if defined(CONFIG_SABRELITE)

Please also switch nitrogen6x to it, not only sabrelite.

Should we keep all the 6x scripts stuff or not?

Quoted 11 lines

include/configs/nitrogen6x.h line 110

Quoted 6 lines

include/configs/nitrogen6x.h +6 -0

+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(MMC, mmc, 1) \
+	func(SATA, sata, 0) \
+	func(USB, usb, 0) \
+	func(PXE, pxe, na) \

That currently doesn't build because CMD_PXE isn't selected in the sabrelite defconfig. "include/config_distro_bootcmd.h:319:2: error: expected ‘}’ before ‘BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE’"

Quoted 2 lines

Which brings a good point, all the above should depend on the storage command being present, like done here [1].

No, we just need to update the defconfig, see V2 of this patch sent earlier today.

Quoted 17 lines

include/configs/nitrogen6x.h line 119

Quoted 12 lines

include/configs/nitrogen6x.h +5 -3

+	func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
  #define CONFIG_EXTRA_ENV_SETTINGS \
-	"script=boot.scr\0" \
-	"uimage=uImage\0" \
  	"console=ttymxc1\0" \
  	"fdt_high=0xffffffff\0" \
  	"initrd_high=0xffffffff\0" \
-	"fdt_file=imx6q-sabrelite.dtb\0" \
+	"fdtfile=imx6q-sabrelite.dtb\0" \

I wish the default efi_fdtfile would work, Fabio is there any plan to populate the ${soc} variable like it is done for i.MX7? [2] Then a small patch in the nitrogen6x.c would set the proper board env variable.

Quoted 5 lines

That way there would be no difference in this header between sabrelite vs. nitrogen6x.

include/configs/nitrogen6x.h line 120

Quoted 1 line

include/configs/nitrogen6x.h +0 -0

  	"fdt_addr=0x18000000\0" \

Do we need to keep fdt_addr since we define fdt_addr_r below?

It was for backward compatibility, if people had some script using it.

Hi Guillaume,

Quoted 29 lines · Guillaume Gardet

Quoted 17 lines · Gary Bisson

Hi Guillaume,

Thanks for your patch! Switching the upstream nitrogen6x configuration to distro bootcmd has been in our todo list for some time since we also use that in our own git repo.

Quoted 10 lines · Guillaume GARDET

Boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots.

Signed-off-by Guillaume GARDET <[email protected]>

Cc Troy Kisky <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Fabio Estevam <[email protected]>

---
  include/configs/nitrogen6x.h | 86 ++++++++++----------------------------------
  1 file changed, 18 insertions(+), 68 deletions(-)

Quoted 8 lines

include/configs/nitrogen6x.h line 103

Quoted 7 lines

include/configs/nitrogen6x.h +0 -0

index c73cfb7f7e..2e2c499cb6 100644
@@ -102,82 +102,32 @@
  #define CONFIG_UMSDEVS CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC
  #if defined(CONFIG_SABRELITE)

Please also switch nitrogen6x to it, not only sabrelite.

Quoted 1 line

Should we keep all the 6x scripts stuff or not?

No, we need to switch to something standard, let's remove it.

Quoted 11 lines

Quoted 11 lines

include/configs/nitrogen6x.h line 110

Quoted 6 lines

include/configs/nitrogen6x.h +6 -0

+#define BOOT_TARGET_DEVICES(func) \
+ func(MMC, mmc, 0) \
+ func(MMC, mmc, 1) \
+ func(SATA, sata, 0) \
+ func(USB, usb, 0) \
+ func(PXE, pxe, na) \

That currently doesn't build because CMD_PXE isn't selected in the sabrelite defconfig. "include/config_distro_bootcmd.h:319:2: error: expected ‘}’ before ‘BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE’"

Quoted 4 lines

Quoted 2 lines

Which brings a good point, all the above should depend on the storage command being present, like done here [1].

No, we just need to update the defconfig, see V2 of this patch sent earlier today.

I know updating the defconfig makes it build. My point is that it would be more flexible to do like in the link provided so that someone that removes CMD_PXE from the defconfig for any reason can still build.

Quoted 17 lines

Quoted 17 lines

include/configs/nitrogen6x.h line 119

Quoted 12 lines

include/configs/nitrogen6x.h +5 -3

+ func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
  #define CONFIG_EXTRA_ENV_SETTINGS \
- "script=boot.scr\0" \
- "uimage=uImage\0" \
          "console=ttymxc1\0" \
          "fdt_high=0xffffffff\0" \
          "initrd_high=0xffffffff\0" \
- "fdt_file=imx6q-sabrelite.dtb\0" \
+ "fdtfile=imx6q-sabrelite.dtb\0" \

I wish the default efi_fdtfile would work, Fabio is there any plan to populate the ${soc} variable like it is done for i.MX7? [2] Then a small patch in the nitrogen6x.c would set the proper board env variable.

Quoted 7 lines

Quoted 5 lines

That way there would be no difference in this header between sabrelite vs. nitrogen6x.

include/configs/nitrogen6x.h line 120

Quoted 1 line

include/configs/nitrogen6x.h +0 -0

          "fdt_addr=0x18000000\0" \

Do we need to keep fdt_addr since we define fdt_addr_r below?

It was for backward compatibility, if people had some script using it.

I think it should be dropped.

Regards,
Gary
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

include/configs/nitrogen6x.h line 119

Quoted 8 lines

#define CONFIG_EXTRA_ENV_SETTINGS \

include/configs/nitrogen6x.h +1 -3

-     "script=boot.scr\0" \
-     "uimage=uImage\0" \
      "console=ttymxc1\0" \
      "fdt_high=0xffffffff\0" \
      "initrd_high=0xffffffff\0" \
-     "fdt_file=imx6q-sabrelite.dtb\0" \
+     "fdtfile=imx6q-sabrelite.dtb\0" \

I wish the default efi_fdtfile would work, Fabio is there any plan to populate the ${soc} variable like it is done for i.MX7? [2]

Hi Gary,

Quoted 9 lines · Gary Bisson

Quoted 8 lines

#define CONFIG_EXTRA_ENV_SETTINGS \

include/configs/nitrogen6x.h +1 -3

-     "script=boot.scr\0" \
-     "uimage=uImage\0" \
      "console=ttymxc1\0" \
      "fdt_high=0xffffffff\0" \
      "initrd_high=0xffffffff\0" \
-     "fdt_file=imx6q-sabrelite.dtb\0" \
+     "fdtfile=imx6q-sabrelite.dtb\0" \

Quoted 2 lines

I wish the default efi_fdtfile would work, Fabio is there any plan to populate the ${soc} variable like it is done for i.MX7? [2]

It seems we didn't need to do this yet, but if you see a need for it, please post a patch.