[U-Boot] [PATCH] LS2088ARDB: Fix NOR fall back option failure

2018-01-08 Thread Vinitha Pillai-B57223
From: Vinitha V Pillai 

Signed-off-by: Vinitha V Pillai 
---
 include/configs/ls2080ardb.h | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 6f3301c..8770c6b 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -375,7 +375,7 @@ unsigned long get_board_sys_clk(void);
"fdt_high=0xa000\0" \
"initrd_high=0x\0"  \
"fdt_addr=0x64f0\0" \
-   "kernel_addr=0x6500\0"  \
+   "kernel_addr=0x58100\0" \
"kernel_start=0x100\0"  \
"kernelheader_start=0x80\0" \
"scriptaddr=0x8000\0"   \
@@ -445,8 +445,8 @@ unsigned long get_board_sys_clk(void);
"&& esbc_validate 0x2078; " \
"env exists mcinitcmd && "  \
"fsl_mc lazyapply dpl 0x20d0; " \
-   "run distro_bootcmd;env exists secureboot " \
-   " && esbc_halt;run qspi_bootcmd; "
+   "run distro_bootcmd;run qspi_bootcmd; " \
+   "env exists secureboot && esbc_halt;"
 #elif defined(CONFIG_SD_BOOT)
 /* Try to boot an on-SD kernel first, then do normal distro boot */
 #define CONFIG_BOOTCOMMAND \
@@ -456,16 +456,16 @@ unsigned long get_board_sys_clk(void);
"env exists mcinitcmd && run mcinitcmd "\
"&& mmc read 0x8800 0x6800 0x800 "  \
"&& fsl_mc lazyapply dpl 0x8800; "  \
-   "run distro_bootcmd;env exists secureboot " \
-   "&& esbc_halt;run sd_bootcmd;"
+   "run distro_bootcmd;run sd_bootcmd; "   \
+   "env exists secureboot && esbc_halt;"
 #else
 /* Try to boot an on-NOR kernel first, then do normal distro boot */
 #define CONFIG_BOOTCOMMAND \
"env exists mcinitcmd && env exists secureboot "\
"&& esbc_validate 0x58078; env exists mcinitcmd "\
"&& fsl_mc lazyapply dpl 0x580d0;"  \
-   "run distro_bootcmd; env exists secureboot "\
-   "&& esbc_halt; run nor_bootcmd;"
+   "run distro_bootcmd;run nor_bootcmd; "  \
+   "env exists secureboot && esbc_halt;"
 #endif
 
 /* MAC/PHY configuration */
-- 
2.7.4

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot


Re: [U-Boot] [PATCH] LS2088ARDB: Fix NOR fall back option failure

2018-01-15 Thread York Sun
On 01/08/2018 10:03 PM, Vinitha Pillai-B57223 wrote:
> From: Vinitha V Pillai 
> 
> Signed-off-by: Vinitha V Pillai 
> ---
>  include/configs/ls2080ardb.h | 14 +++---
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
> index 6f3301c..8770c6b 100644
> --- a/include/configs/ls2080ardb.h
> +++ b/include/configs/ls2080ardb.h
> @@ -375,7 +375,7 @@ unsigned long get_board_sys_clk(void);
>   "fdt_high=0xa000\0" \
>   "initrd_high=0x\0"  \
>   "fdt_addr=0x64f0\0" \
> - "kernel_addr=0x6500\0"  \
> + "kernel_addr=0x58100\0" \

Why change this?

>   "kernel_start=0x100\0"  \
>   "kernelheader_start=0x80\0" \
>   "scriptaddr=0x8000\0"   \
> @@ -445,8 +445,8 @@ unsigned long get_board_sys_clk(void);
>   "&& esbc_validate 0x2078; " \
>   "env exists mcinitcmd && "  \
>   "fsl_mc lazyapply dpl 0x20d0; " \
> - "run distro_bootcmd;env exists secureboot " \
> - " && esbc_halt;run qspi_bootcmd; "
> + "run distro_bootcmd;run qspi_bootcmd; " \
> + "env exists secureboot && esbc_halt;"
>  #elif defined(CONFIG_SD_BOOT)
>  /* Try to boot an on-SD kernel first, then do normal distro boot */
>  #define CONFIG_BOOTCOMMAND   \
> @@ -456,16 +456,16 @@ unsigned long get_board_sys_clk(void);
>   "env exists mcinitcmd && run mcinitcmd "\
>   "&& mmc read 0x8800 0x6800 0x800 "  \
>   "&& fsl_mc lazyapply dpl 0x8800; "  \
> - "run distro_bootcmd;env exists secureboot " \
> - "&& esbc_halt;run sd_bootcmd;"
> + "run distro_bootcmd;run sd_bootcmd; "   \
> + "env exists secureboot && esbc_halt;"
>  #else
>  /* Try to boot an on-NOR kernel first, then do normal distro boot */
>  #define CONFIG_BOOTCOMMAND   \
>   "env exists mcinitcmd && env exists secureboot "\
>   "&& esbc_validate 0x58078; env exists mcinitcmd "\
>   "&& fsl_mc lazyapply dpl 0x580d0;"  \
> - "run distro_bootcmd; env exists secureboot "\
> - "&& esbc_halt; run nor_bootcmd;"
> + "run distro_bootcmd;run nor_bootcmd; "  \
> + "env exists secureboot && esbc_halt;"
>  #endif
>  
>  /* MAC/PHY configuration */
> 

You changed not only NOR boot, but also QSPI and SD boot. Please update
your subject and write commit message to explain.

York

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot