[U-Boot] [PATCH 0/3] Support distro boot in pico-imx7d BL33 case

[U-Boot] [PATCH 0/3] Support distro boot in pico-imx7d BL33 case

[Jun Nie]

Support distro boot in pico-imx7d BL33 case with changing the enviroment
variables. While the other two patches are for polishing clock code and
for feature enablement.

Jun Nie (3):
  pico-imx7d: add config to enable CAAM
  pico-imx7d: Support distro boot for FIT image case
  pico-imx7d: polish uart clock id definition

 arch/arm/include/asm/arch-mx7/clock.h | 18 +----------------
 configs/pico-imx7d_bl33_defconfig     |  1 +
 include/configs/pico-imx7d.h          | 37 +++++++++++------------------------
 3 files changed, 13 insertions(+), 43 deletions(-)

-- 
2.7.4

[U-Boot] [PATCH 1/3] pico-imx7d: add config to enable CAAM

[Jun Nie]

Add config to enable CAAM so that hardware random number generator
works.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
---
 configs/pico-imx7d_bl33_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig
index b609b6d..5ef55d3 100644
--- a/configs/pico-imx7d_bl33_defconfig
+++ b/configs/pico-imx7d_bl33_defconfig
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SECURE_BOOT=y
 CONFIG_TARGET_PICO_IMX7D=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
-- 
2.7.4

[U-Boot] [PATCH 2/3] pico-imx7d: Support distro boot for FIT image case

[Jun Nie]

Support distro boot for pico imx7d in FIT image case.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
---
 include/configs/pico-imx7d.h | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 9101540..7b2bd00 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -55,17 +55,17 @@
 /* When booting with FIT specify the node entry containing boot.scr */
 #if defined(CONFIG_FIT)
 #define PICO_BOOT_ENV \
-	"bootscr_fitimage_name=bootscr\0" \
-	"bootscriptaddr=0x83200000\0" \
-	"fdtovaddr=0x83100000\0" \
-	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-	"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
-	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-		"rootwait rw;\0" \
-	"loadbootscript=" \
-		"load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr} ${script};\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-	"source ${bootscriptaddr}:${bootscr_fitimage_name}\0"
+	BOOTENV								\
+	"fdtovaddr=0x83100000\0"					\
+	"scriptaddr=0x83200000\0"					\
+	"mmcargs=setenv bootargs console=${console},${baudrate} "	\
+		"rootwait rw\0"						\
+	"boot_a_script="						\
+		"load ${devtype} ${devnum}:${distro_bootpart} "		\
+			"${scriptaddr} ${prefix}${script}; "		\
+		"iminfo ${scriptaddr};"					\
+		"if test $? -eq 1; then hab_failsafe; fi;"		\
+		"source ${scriptaddr}:bootscr\0"
 #else
 #define PICO_BOOT_ENV \
 	"bootmenu_0=Boot using PICO-Hobbit baseboard=" \
@@ -107,21 +107,6 @@
 	"setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \
 	PICO_BOOT_ENV
 
-#if defined(CONFIG_FIT)
-#define CONFIG_BOOTCOMMAND \
-	"mmc dev ${mmcdev};" \
-	"mmc dev ${mmcdev}; if mmc rescan; then " \
-		"if run loadbootscript; then " \
-			"iminfo ${bootscriptaddr};" \
-			"if test $? -eq 1; then hab_failsafe; fi;" \
-			"run bootscript; " \
-		"else " \
-			"echo Fail to load fitImage with boot script;" \
-			"hab_failsafe;" \
-		"fi; " \
-	"fi"
-#endif
-
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
 	func(USB, usb, 0) \
-- 
2.7.4

[U-Boot] [PATCH 3/3] pico-imx7d: polish uart clock id definition

[Jun Nie]

Polish uart clock id definition. Default IMX7 UART ID is UART1
as original parameter in imx_get_uartclk().

Signed-off-by: Jun Nie <jun.nie@linaro.org>
---
 arch/arm/include/asm/arch-mx7/clock.h | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h
index 1d07fde..a8e6097 100644
--- a/arch/arm/include/asm/arch-mx7/clock.h
+++ b/arch/arm/include/asm/arch-mx7/clock.h
@@ -175,23 +175,7 @@ enum clk_root_index {
 	CLK_ROOT_MAX,
 };
 
-#if (CONFIG_CONS_INDEX == 0)
-#define UART_CLK_ROOT UART1_CLK_ROOT
-#elif (CONFIG_CONS_INDEX == 1)
-#define UART_CLK_ROOT UART2_CLK_ROOT
-#elif (CONFIG_CONS_INDEX == 2)
-#define UART_CLK_ROOT UART3_CLK_ROOT
-#elif (CONFIG_CONS_INDEX == 3)
-#define UART_CLK_ROOT UART4_CLK_ROOT
-#elif (CONFIG_CONS_INDEX == 4)
-#define UART_CLK_ROOT UART5_CLK_ROOT
-#elif (CONFIG_CONS_INDEX == 5)
-#define UART_CLK_ROOT UART6_CLK_ROOT
-#elif (CONFIG_CONS_INDEX == 6)
-#define UART_CLK_ROOT UART7_CLK_ROOT
-#else
-#error "Invalid IMX UART ID for serial console is defined"
-#endif
+#define UART_CLK_ROOT (UART1_CLK_ROOT + CONFIG_CONS_INDEX)
 
 struct clk_root_setting {
 	enum clk_root_index root;
-- 
2.7.4

[U-Boot] [PATCH 2/3] pico-imx7d: Support distro boot for FIT image case

[Joris OFFOUGA]

Hi Jun,

Le mar. 16 juil. 2019 à 09:48, Jun Nie <jun.nie@linaro.org> a écrit :

> Support distro boot for pico imx7d in FIT image case.
>
> Signed-off-by: Jun Nie <jun.nie@linaro.org>
> ---
>  include/configs/pico-imx7d.h | 37 +++++++++++--------------------------
>  1 file changed, 11 insertions(+), 26 deletions(-)
>
> diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
> index 9101540..7b2bd00 100644
> --- a/include/configs/pico-imx7d.h
> +++ b/include/configs/pico-imx7d.h
> @@ -55,17 +55,17 @@
>  /* When booting with FIT specify the node entry containing boot.scr */
>  #if defined(CONFIG_FIT)
>  #define PICO_BOOT_ENV \
> -       "bootscr_fitimage_name=bootscr\0" \
> -       "bootscriptaddr=0x83200000\0" \
> -       "fdtovaddr=0x83100000\0" \
> -       "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> -       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
> -       "mmcargs=setenv bootargs console=${console},${baudrate} " \
> -               "rootwait rw;\0" \
> -       "loadbootscript=" \
> -               "load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr}
> ${script};\0" \
> -       "bootscript=echo Running bootscript from mmc ...; " \
> -       "source ${bootscriptaddr}:${bootscr_fitimage_name}\0"
> +       BOOTENV                                                         \
> +       "fdtovaddr=0x83100000\0"                                        \
> +       "scriptaddr=0x83200000\0"                                       \
> +       "mmcargs=setenv bootargs console=${console},${baudrate} "       \
> +               "rootwait rw\0"                                         \
> +       "boot_a_script="                                                \
> +               "load ${devtype} ${devnum}:${distro_bootpart} "         \
> +                       "${scriptaddr} ${prefix}${script}; "            \
> +               "iminfo ${scriptaddr};"                                 \
> +               "if test $? -eq 1; then hab_failsafe; fi;"              \
> +               "source ${scriptaddr}:bootscr\0"
>  #else
>  #define PICO_BOOT_ENV \
>         "bootmenu_0=Boot using PICO-Hobbit baseboard=" \
> @@ -107,21 +107,6 @@
>         "setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \
>         PICO_BOOT_ENV
>
> -#if defined(CONFIG_FIT)
> -#define CONFIG_BOOTCOMMAND \
> -       "mmc dev ${mmcdev};" \
> -       "mmc dev ${mmcdev}; if mmc rescan; then " \
> -               "if run loadbootscript; then " \
> -                       "iminfo ${bootscriptaddr};" \
> -                       "if test $? -eq 1; then hab_failsafe; fi;" \
> -                       "run bootscript; " \
> -               "else " \
> -                       "echo Fail to load fitImage with boot script;" \
> -                       "hab_failsafe;" \
> -               "fi; " \
> -       "fi"
> -#endif
> -
>  #define BOOT_TARGET_DEVICES(func) \
>         func(MMC, mmc, 0) \
>         func(USB, usb, 0) \
> --
> 2.7.4
>
> It's work from my side
for my setup i disable iminfo and hab_failsafe

See log:

run bootcmd
switch to partitions #0, OK
mmc0(part 0) is current device
Scanning mmc 0:1...
Found U-Boot script /boot.scr
245 bytes read in 8 ms (29.3 KiB/s)
Unknown command 'iminfo' - try 'help'
Unknown command 'hab_failsafe' - try 'help'
## Executing script at 83200000
8961308 bytes read in 217 ms (39.4 MiB/s)
## Loading kernel from FIT Image at 86000000 ...
   Using 'conf at imx7d-pico-pi.dtb' configuration
   Trying 'kernel at 1' kernel subimage
     Description:  Linux kernel
     Type:         Kernel Image
     Compression:  uncompressed
     Data Start:   0x86000114
     Data Size:    8925040 Bytes = 8.5 MiB
     Architecture: ARM
     OS:           Linux
     Load Address: 0x80008000
     Entry Point:  0x80008000
     Hash algo:    sha1
     Hash value:   7d8af1016b4cf8ea90fa1a767bfbeda052043f6c
   Verifying Hash Integrity ... sha1+ OK
## Loading fdt from FIT Image at 86000000 ...
   Using 'conf at imx7d-pico-pi.dtb' configuration
   Trying 'fdt at imx7d-pico-pi.dtb' fdt subimage
     Description:  Flattened Device Tree blob
     Type:         Flat Device Tree
     Compression:  uncompressed
     Data Start:   0x86883188
     Data Size:    34325 Bytes = 33.5 KiB
     Architecture: ARM
     Hash algo:    sha1
     Hash value:   75c81556e9bb9681cd14c96c4627da04205b2583
   Verifying Hash Integrity ... sha1+ OK
   Booting using the fdt blob at 0x86883188
   Loading Kernel Image ... OK
   Using Device Tree in place at 86883188, end 8688e79c

Starting kernel ...

Tested-by: Joris Offouga <offougajoris@gmail.com>

Best Regards,
Joris Offouga

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

[U-Boot] [PATCH 0/3] Support distro boot in pico-imx7d BL33 case

[Jun Nie]

Jun Nie <jun.nie@linaro.org> 于2019年7月16日周二 下午3:43写道：
>
> Support distro boot in pico-imx7d BL33 case with changing the enviroment
> variables. While the other two patches are for polishing clock code and
> for feature enablement.
>

Hi,

any comments?

Thanks!
Jun

[U-Boot] [PATCH 0/3] Support distro boot in pico-imx7d BL33 case

[Jun Nie]

Jun Nie <jun.nie@linaro.org> 于2019年7月16日周二 下午3:43写道：
>
> Support distro boot in pico-imx7d BL33 case with changing the enviroment
> variables. While the other two patches are for polishing clock code and
> for feature enablement.
>
> Jun Nie (3):
>   pico-imx7d: add config to enable CAAM
>   pico-imx7d: Support distro boot for FIT image case
>   pico-imx7d: polish uart clock id definition
>
>  arch/arm/include/asm/arch-mx7/clock.h | 18 +----------------
>  configs/pico-imx7d_bl33_defconfig     |  1 +
>  include/configs/pico-imx7d.h          | 37 +++++++++++------------------------
>  3 files changed, 13 insertions(+), 43 deletions(-)
>
> --

Hi Vanessa,

Do you have any comments on these 3 patches? Or we can merge it now? Thanks!

Best Regards
Jun

[U-Boot] [PATCH 0/3] Support distro boot in pico-imx7d BL33 case

[Jun Nie]

Jun Nie <jun.nie@linaro.org> 于2019年8月8日周四 下午12:04写道：
>
> Jun Nie <jun.nie@linaro.org> 于2019年7月16日周二 下午3:43写道：
> >
> > Support distro boot in pico-imx7d BL33 case with changing the enviroment
> > variables. While the other two patches are for polishing clock code and
> > for feature enablement.
> >
> > Jun Nie (3):
> >   pico-imx7d: add config to enable CAAM
> >   pico-imx7d: Support distro boot for FIT image case
> >   pico-imx7d: polish uart clock id definition
> >
> >  arch/arm/include/asm/arch-mx7/clock.h | 18 +----------------
> >  configs/pico-imx7d_bl33_defconfig     |  1 +
> >  include/configs/pico-imx7d.h          | 37 +++++++++++------------------------
> >  3 files changed, 13 insertions(+), 43 deletions(-)
> >
> > --
>
> Hi Vanessa,
>
> Do you have any comments on these 3 patches? Or we can merge it now? Thanks!
>
> Best Regards
> Jun

Hi,

Does anyone has comments on these patches? Maybe we can merge them as
no comments for a long time. Thanks!

Regards,
Jun

[U-Boot] [PATCH 0/3] Support distro boot in pico-imx7d BL33 case

[Peng Fan]

Hi Jun,

> Subject: Re: [PATCH 0/3] Support distro boot in pico-imx7d BL33 case
> 
> Jun Nie <jun.nie@linaro.org> 于2019年8月8日周四 下午12:04写道：
> >
> > Jun Nie <jun.nie@linaro.org> 于2019年7月16日周二 下午3:43写道：
> > >
> > > Support distro boot in pico-imx7d BL33 case with changing the
> > > enviroment variables. While the other two patches are for polishing
> > > clock code and for feature enablement.
> > >
> > > Jun Nie (3):
> > >   pico-imx7d: add config to enable CAAM
> > >   pico-imx7d: Support distro boot for FIT image case
> > >   pico-imx7d: polish uart clock id definition
> > >
> > >  arch/arm/include/asm/arch-mx7/clock.h | 18 +----------------
> > >  configs/pico-imx7d_bl33_defconfig     |  1 +
> > >  include/configs/pico-imx7d.h          | 37
> +++++++++++------------------------
> > >  3 files changed, 13 insertions(+), 43 deletions(-)
> > >
> > > --
> >
> > Hi Vanessa,
> >
> > Do you have any comments on these 3 patches? Or we can merge it now?
> Thanks!
> >
> > Best Regards
> > Jun
> 
> Hi,
> 
> Does anyone has comments on these patches? Maybe we can merge them as
> no comments for a long time. Thanks!

I could merge this patchset into nxp-imx and send pull request to Stefano, if you
are fine with that.

Regards,
Peng. 

> 
> Regards,
> Jun

[U-Boot] [PATCH 0/3] Support distro boot in pico-imx7d BL33 case

[Jun Nie]

Peng Fan <peng.fan@nxp.com> 于2019年9月3日周二 上午9:39写道：
>
> Hi Jun,
>
> > Subject: Re: [PATCH 0/3] Support distro boot in pico-imx7d BL33 case
> >
> > Jun Nie <jun.nie@linaro.org> 于2019年8月8日周四 下午12:04写道：
> > >
> > > Jun Nie <jun.nie@linaro.org> 于2019年7月16日周二 下午3:43写道：
> > > >
> > > > Support distro boot in pico-imx7d BL33 case with changing the
> > > > enviroment variables. While the other two patches are for polishing
> > > > clock code and for feature enablement.
> > > >
> > > > Jun Nie (3):
> > > >   pico-imx7d: add config to enable CAAM
> > > >   pico-imx7d: Support distro boot for FIT image case
> > > >   pico-imx7d: polish uart clock id definition
> > > >
> > > >  arch/arm/include/asm/arch-mx7/clock.h | 18 +----------------
> > > >  configs/pico-imx7d_bl33_defconfig     |  1 +
> > > >  include/configs/pico-imx7d.h          | 37
> > +++++++++++------------------------
> > > >  3 files changed, 13 insertions(+), 43 deletions(-)
> > > >
> > > > --
> > >
> > > Hi Vanessa,
> > >
> > > Do you have any comments on these 3 patches? Or we can merge it now?
> > Thanks!
> > >
> > > Best Regards
> > > Jun
> >
> > Hi,
> >
> > Does anyone has comments on these patches? Maybe we can merge them as
> > no comments for a long time. Thanks!
>
> I could merge this patchset into nxp-imx and send pull request to Stefano, if you
> are fine with that.
>
> Regards,
> Peng.

Hi Peng,

I am fine. Thank you!

Jun
>
> >
> > Regards,
> > Jun

[U-Boot] [PATCH 0/3] Support distro boot in pico-imx7d BL33 case

[Jun Nie]

Peng Fan <peng.fan@nxp.com> 于2019年9月3日周二 上午9:39写道：
>
> Hi Jun,
>
> > Subject: Re: [PATCH 0/3] Support distro boot in pico-imx7d BL33 case
> >
> > Jun Nie <jun.nie@linaro.org> 于2019年8月8日周四 下午12:04写道：
> > >
> > > Jun Nie <jun.nie@linaro.org> 于2019年7月16日周二 下午3:43写道：
> > > >
> > > > Support distro boot in pico-imx7d BL33 case with changing the
> > > > enviroment variables. While the other two patches are for polishing
> > > > clock code and for feature enablement.
> > > >
> > > > Jun Nie (3):
> > > >   pico-imx7d: add config to enable CAAM
> > > >   pico-imx7d: Support distro boot for FIT image case
> > > >   pico-imx7d: polish uart clock id definition
> > > >
> > > >  arch/arm/include/asm/arch-mx7/clock.h | 18 +----------------
> > > >  configs/pico-imx7d_bl33_defconfig     |  1 +
> > > >  include/configs/pico-imx7d.h          | 37
> > +++++++++++------------------------
> > > >  3 files changed, 13 insertions(+), 43 deletions(-)
> > > >
> > > > --
> > >
> > > Hi Vanessa,
> > >
> > > Do you have any comments on these 3 patches? Or we can merge it now?
> > Thanks!
> > >
> > > Best Regards
> > > Jun
> >
> > Hi,
> >
> > Does anyone has comments on these patches? Maybe we can merge them as
> > no comments for a long time. Thanks!
>
> I could merge this patchset into nxp-imx and send pull request to Stefano, if you
> are fine with that.
>
> Regards,
> Peng.

Peng,

It is appreciated to help on this. Any comments from Stefan? Thanks!

Regards,
Jun
>
> >
> > Regards,
> > Jun

[U-Boot] [PATCH 0/3] Support distro boot in pico-imx7d BL33 case

[Peng Fan]

> -----Original Message-----
> From: Jun Nie <jun.nie@linaro.org>
> Sent: 2019年9月9日 21:47
> To: Peng Fan <peng.fan@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>; Fabio Estevam <festevam@gmail.com>;
> Otavio Salvador <otavio@ossystems.com.br>; Vanessa Maegima
> <vanessa.maegima@nxp.com>; Bryan O'Donoghue
> <bryan.odonoghue@linaro.org>; U-Boot Mailing List <u-boot@lists.denx.de>
> Subject: Re: [PATCH 0/3] Support distro boot in pico-imx7d BL33 case
> 
> Peng Fan <peng.fan@nxp.com> 于2019年9月3日周二 上午9:39写道：
> >
> > Hi Jun,
> >
> > > Subject: Re: [PATCH 0/3] Support distro boot in pico-imx7d BL33 case
> > >
> > > Jun Nie <jun.nie@linaro.org> 于2019年8月8日周四 下午12:04写道：
> > > >
> > > > Jun Nie <jun.nie@linaro.org> 于2019年7月16日周二 下午3:43写
> 道：
> > > > >
> > > > > Support distro boot in pico-imx7d BL33 case with changing the
> > > > > enviroment variables. While the other two patches are for
> > > > > polishing clock code and for feature enablement.
> > > > >
> > > > > Jun Nie (3):
> > > > >   pico-imx7d: add config to enable CAAM
> > > > >   pico-imx7d: Support distro boot for FIT image case
> > > > >   pico-imx7d: polish uart clock id definition
> > > > >
> > > > >  arch/arm/include/asm/arch-mx7/clock.h | 18 +----------------
> > > > >  configs/pico-imx7d_bl33_defconfig     |  1 +
> > > > >  include/configs/pico-imx7d.h          | 37
> > > +++++++++++------------------------
> > > > >  3 files changed, 13 insertions(+), 43 deletions(-)
> > > > >
> > > > > --
> > > >
> > > > Hi Vanessa,
> > > >
> > > > Do you have any comments on these 3 patches? Or we can merge it
> now?
> > > Thanks!
> > > >
> > > > Best Regards
> > > > Jun
> > >
> > > Hi,
> > >
> > > Does anyone has comments on these patches? Maybe we can merge them
> > > as no comments for a long time. Thanks!
> >
> > I could merge this patchset into nxp-imx and send pull request to
> > Stefano, if you are fine with that.
> >
> > Regards,
> > Peng.
> 
> Peng,
> 
> It is appreciated to help on this. Any comments from Stefan? Thanks!

CI build failed:
https://travis-ci.org/MrVan/u-boot/jobs/583445551
I need drop your patchset.

Thanks,
Peng.

> 
> Regards,
> Jun
> >
> > >
> > > Regards,
> > > Jun

[U-Boot] [PATCH 0/3] Support distro boot in pico-imx7d BL33 case

[Jun Nie]

Peng Fan <peng.fan@nxp.com> 于2019年9月11日周三 下午2:02写道：
>
>
>
> > -----Original Message-----
> > From: Jun Nie <jun.nie@linaro.org>
> > Sent: 2019年9月9日 21:47
> > To: Peng Fan <peng.fan@nxp.com>
> > Cc: Stefano Babic <sbabic@denx.de>; Fabio Estevam <festevam@gmail.com>;
> > Otavio Salvador <otavio@ossystems.com.br>; Vanessa Maegima
> > <vanessa.maegima@nxp.com>; Bryan O'Donoghue
> > <bryan.odonoghue@linaro.org>; U-Boot Mailing List <u-boot@lists.denx.de>
> > Subject: Re: [PATCH 0/3] Support distro boot in pico-imx7d BL33 case
> >
> > Peng Fan <peng.fan@nxp.com> 于2019年9月3日周二 上午9:39写道：
> > >
> > > Hi Jun,
> > >
> > > > Subject: Re: [PATCH 0/3] Support distro boot in pico-imx7d BL33 case
> > > >
> > > > Jun Nie <jun.nie@linaro.org> 于2019年8月8日周四 下午12:04写道：
> > > > >
> > > > > Jun Nie <jun.nie@linaro.org> 于2019年7月16日周二 下午3:43写
> > 道：
> > > > > >
> > > > > > Support distro boot in pico-imx7d BL33 case with changing the
> > > > > > enviroment variables. While the other two patches are for
> > > > > > polishing clock code and for feature enablement.
> > > > > >
> > > > > > Jun Nie (3):
> > > > > >   pico-imx7d: add config to enable CAAM
> > > > > >   pico-imx7d: Support distro boot for FIT image case
> > > > > >   pico-imx7d: polish uart clock id definition
> > > > > >
> > > > > >  arch/arm/include/asm/arch-mx7/clock.h | 18 +----------------
> > > > > >  configs/pico-imx7d_bl33_defconfig     |  1 +
> > > > > >  include/configs/pico-imx7d.h          | 37
> > > > +++++++++++------------------------
> > > > > >  3 files changed, 13 insertions(+), 43 deletions(-)
> > > > > >
> > > > > > --
> > > > >
> > > > > Hi Vanessa,
> > > > >
> > > > > Do you have any comments on these 3 patches? Or we can merge it
> > now?
> > > > Thanks!
> > > > >
> > > > > Best Regards
> > > > > Jun
> > > >
> > > > Hi,
> > > >
> > > > Does anyone has comments on these patches? Maybe we can merge them
> > > > as no comments for a long time. Thanks!
> > >
> > > I could merge this patchset into nxp-imx and send pull request to
> > > Stefano, if you are fine with that.
> > >
> > > Regards,
> > > Peng.
> >
> > Peng,
> >
> > It is appreciated to help on this. Any comments from Stefan? Thanks!
>
> CI build failed:
> https://travis-ci.org/MrVan/u-boot/jobs/583445551
> I need drop your patchset.
>
> Thanks,
> Peng.

Thanks for the result. Can you help to only drop the patch for
polishing clock? The three patches are not tightly coupled actually.

Regards,
Jun

>
> >
> > Regards,
> > Jun
> > >
> > > >
> > > > Regards,
> > > > Jun

[U-Boot] [PATCH 3/3] pico-imx7d: polish uart clock id definition

[Stefano Babic]

Hi Jun,

I am just trying to check if some patch was silently lost, I found yours:

On 16/07/19 09:42, Jun Nie wrote:
> Polish uart clock id definition. Default IMX7 UART ID is UART1
> as original parameter in imx_get_uartclk().
> 
> Signed-off-by: Jun Nie <jun.nie@linaro.org>
> ---
>  arch/arm/include/asm/arch-mx7/clock.h | 18 +-----------------
>  1 file changed, 1 insertion(+), 17 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h
> index 1d07fde..a8e6097 100644
> --- a/arch/arm/include/asm/arch-mx7/clock.h
> +++ b/arch/arm/include/asm/arch-mx7/clock.h
> @@ -175,23 +175,7 @@ enum clk_root_index {
>  	CLK_ROOT_MAX,
>  };
>  
> -#if (CONFIG_CONS_INDEX == 0)
> -#define UART_CLK_ROOT UART1_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 1)
> -#define UART_CLK_ROOT UART2_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 2)
> -#define UART_CLK_ROOT UART3_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 3)
> -#define UART_CLK_ROOT UART4_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 4)
> -#define UART_CLK_ROOT UART5_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 5)
> -#define UART_CLK_ROOT UART6_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 6)
> -#define UART_CLK_ROOT UART7_CLK_ROOT
> -#else
> -#error "Invalid IMX UART ID for serial console is defined"
> -#endif
> +#define UART_CLK_ROOT (UART1_CLK_ROOT + CONFIG_CONS_INDEX)
>  
>  struct clk_root_setting {
>  	enum clk_root_index root;
> 

It looks ok but CONFIG_CONS_INDEX *must* be set, else it breaks boards.
Patch breaks at least the colibri boards.

Best regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 2/3] pico-imx7d: Support distro boot for FIT image case

[sbabic at denx.de]

> Support distro boot for pico imx7d in FIT image case.
> Signed-off-by: Jun Nie <jun.nie@linaro.org>
> Tested-by: Joris Offouga <offougajoris@gmail.com>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 3/3] pico-imx7d: polish uart clock id definition

[Jun Nie]

Stefano Babic <sbabic@denx.de> 于2019年10月13日周日 下午9:35写道：
>
> Hi Jun,
>
> I am just trying to check if some patch was silently lost, I found yours:
>
> On 16/07/19 09:42, Jun Nie wrote:
> > Polish uart clock id definition. Default IMX7 UART ID is UART1
> > as original parameter in imx_get_uartclk().
> >
> > Signed-off-by: Jun Nie <jun.nie@linaro.org>
> > ---
> >  arch/arm/include/asm/arch-mx7/clock.h | 18 +-----------------
> >  1 file changed, 1 insertion(+), 17 deletions(-)
> >
> > diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h
> > index 1d07fde..a8e6097 100644
> > --- a/arch/arm/include/asm/arch-mx7/clock.h
> > +++ b/arch/arm/include/asm/arch-mx7/clock.h
> > @@ -175,23 +175,7 @@ enum clk_root_index {
> >       CLK_ROOT_MAX,
> >  };
> >
> > -#if (CONFIG_CONS_INDEX == 0)
> > -#define UART_CLK_ROOT UART1_CLK_ROOT
> > -#elif (CONFIG_CONS_INDEX == 1)
> > -#define UART_CLK_ROOT UART2_CLK_ROOT
> > -#elif (CONFIG_CONS_INDEX == 2)
> > -#define UART_CLK_ROOT UART3_CLK_ROOT
> > -#elif (CONFIG_CONS_INDEX == 3)
> > -#define UART_CLK_ROOT UART4_CLK_ROOT
> > -#elif (CONFIG_CONS_INDEX == 4)
> > -#define UART_CLK_ROOT UART5_CLK_ROOT
> > -#elif (CONFIG_CONS_INDEX == 5)
> > -#define UART_CLK_ROOT UART6_CLK_ROOT
> > -#elif (CONFIG_CONS_INDEX == 6)
> > -#define UART_CLK_ROOT UART7_CLK_ROOT
> > -#else
> > -#error "Invalid IMX UART ID for serial console is defined"
> > -#endif
> > +#define UART_CLK_ROOT (UART1_CLK_ROOT + CONFIG_CONS_INDEX)
> >
> >  struct clk_root_setting {
> >       enum clk_root_index root;
> >
>
> It looks ok but CONFIG_CONS_INDEX *must* be set, else it breaks boards.
> Patch breaks at least the colibri boards.
>
> Best regards,
> Stefano

Thanks for finding the bug! I will test more boards in next round.
This patch is an independent optimization patch to other patches. So I
will sumit next version later.

Regards,
Jun

[U-Boot] [PATCH 3/3] pico-imx7d: polish uart clock id definition

[Stefano Babic]

On 16/10/19 16:57, Jun Nie wrote:
> Stefano Babic <sbabic@denx.de> 于2019年10月13日周日 下午9:35写道：
>>
>> Hi Jun,
>>
>> I am just trying to check if some patch was silently lost, I found yours:
>>
>> On 16/07/19 09:42, Jun Nie wrote:
>>> Polish uart clock id definition. Default IMX7 UART ID is UART1
>>> as original parameter in imx_get_uartclk().
>>>
>>> Signed-off-by: Jun Nie <jun.nie@linaro.org>
>>> ---
>>>  arch/arm/include/asm/arch-mx7/clock.h | 18 +-----------------
>>>  1 file changed, 1 insertion(+), 17 deletions(-)
>>>
>>> diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h
>>> index 1d07fde..a8e6097 100644
>>> --- a/arch/arm/include/asm/arch-mx7/clock.h
>>> +++ b/arch/arm/include/asm/arch-mx7/clock.h
>>> @@ -175,23 +175,7 @@ enum clk_root_index {
>>>       CLK_ROOT_MAX,
>>>  };
>>>
>>> -#if (CONFIG_CONS_INDEX == 0)
>>> -#define UART_CLK_ROOT UART1_CLK_ROOT
>>> -#elif (CONFIG_CONS_INDEX == 1)
>>> -#define UART_CLK_ROOT UART2_CLK_ROOT
>>> -#elif (CONFIG_CONS_INDEX == 2)
>>> -#define UART_CLK_ROOT UART3_CLK_ROOT
>>> -#elif (CONFIG_CONS_INDEX == 3)
>>> -#define UART_CLK_ROOT UART4_CLK_ROOT
>>> -#elif (CONFIG_CONS_INDEX == 4)
>>> -#define UART_CLK_ROOT UART5_CLK_ROOT
>>> -#elif (CONFIG_CONS_INDEX == 5)
>>> -#define UART_CLK_ROOT UART6_CLK_ROOT
>>> -#elif (CONFIG_CONS_INDEX == 6)
>>> -#define UART_CLK_ROOT UART7_CLK_ROOT
>>> -#else
>>> -#error "Invalid IMX UART ID for serial console is defined"
>>> -#endif
>>> +#define UART_CLK_ROOT (UART1_CLK_ROOT + CONFIG_CONS_INDEX)
>>>
>>>  struct clk_root_setting {
>>>       enum clk_root_index root;
>>>
>>
>> It looks ok but CONFIG_CONS_INDEX *must* be set, else it breaks boards.
>> Patch breaks at least the colibri boards.
>>
>> Best regards,
>> Stefano
> 
> Thanks for finding the bug! I will test more boards in next round.
> This patch is an independent optimization patch to other patches. So I
> will sumit next version later.

Ok, thanks !

Regards,
Stefano

> 
> Regards,
> Jun
> 


-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================