diff mbox series

[U-Boot,v2,2/2] armv8: ls1088ardb: Add environment variable address location for QSPI-NOR

Message ID 1513253229-22335-2-git-send-email-Ashish.Kumar@nxp.com
State Accepted
Delegated to: York Sun
Headers show
Series [U-Boot,v2,1/2] env: sf: Add support for env init for QSPI-NOR | expand

Commit Message

Ashish Kumar Dec. 14, 2017, 12:07 p.m. UTC 
Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
---
 include/configs/ls1088a_common.h | 6 ++++++
 include/configs/ls1088aqds.h     | 1 -
 include/configs/ls1088ardb.h     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

Comments

York Sun Jan. 15, 2018, 6:05 p.m. UTC | #1 
On 12/14/2017 04:06 AM, Ashish Kumar wrote:
> Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
> ---
>  include/configs/ls1088a_common.h | 6 ++++++
>  include/configs/ls1088aqds.h     | 1 -
>  include/configs/ls1088ardb.h     | 2 +-
>  3 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
> index b99257e..c96d48d 100644
> --- a/include/configs/ls1088a_common.h
> +++ b/include/configs/ls1088a_common.h
> @@ -32,6 +32,12 @@
>  
>  #define CONFIG_SUPPORT_RAW_INITRD
>  
> +#ifdef CONFIG_QSPI_BOOT
> +#define CONFIG_SYS_FSL_QSPI_BASE	0x20000000
> +#define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
> +#define CONFIG_ENV_ADDR			(CONFIG_SYS_FSL_QSPI_BASE + \
> +						CONFIG_ENV_OFFSET)
> +#endif
>  
>  #define CONFIG_SKIP_LOWLEVEL_INIT
>  
> diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
> index e97091d..6b94667 100644
> --- a/include/configs/ls1088aqds.h
> +++ b/include/configs/ls1088aqds.h
> @@ -21,7 +21,6 @@ unsigned long get_board_ddr_clk(void);
>  
>  #if defined(CONFIG_QSPI_BOOT)
>  #define CONFIG_ENV_SIZE			0x2000          /* 8KB */
> -#define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
>  #define CONFIG_ENV_SECT_SIZE		0x40000
>  #elif defined(CONFIG_SD_BOOT)
>  #define CONFIG_ENV_OFFSET		(3 * 1024 * 1024)
> diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
> index 1da8153..bffaa76 100644
> --- a/include/configs/ls1088ardb.h
> +++ b/include/configs/ls1088ardb.h
> @@ -12,8 +12,8 @@
>  #define CONFIG_DISPLAY_BOARDINFO_LATE
>  
>  #if defined(CONFIG_QSPI_BOOT)
> +#define CONFIG_SYS_FSL_QSPI_BASE	0x20000000

Looks like you are redefining this macro. Will remove when I merge it.

York
Ashish Kumar Jan. 16, 2018, 6:41 a.m. UTC | #2 
> -----Original Message-----
> From: York Sun
> Sent: Monday, January 15, 2018 11:36 PM
> To: Ashish Kumar <ashish.kumar@nxp.com>; u-boot@lists.denx.de
> Subject: Re: [PATCH v2 2/2] armv8: ls1088ardb: Add environment variable
> address location for QSPI-NOR
> 
> On 12/14/2017 04:06 AM, Ashish Kumar wrote:
> > Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
> > ---
> >  include/configs/ls1088a_common.h | 6 ++++++
> >  include/configs/ls1088aqds.h     | 1 -
> >  include/configs/ls1088ardb.h     | 2 +-
> >  3 files changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/configs/ls1088a_common.h
> > b/include/configs/ls1088a_common.h
> > index b99257e..c96d48d 100644
> > --- a/include/configs/ls1088a_common.h
> > +++ b/include/configs/ls1088a_common.h
> > @@ -32,6 +32,12 @@
> >
> >  #define CONFIG_SUPPORT_RAW_INITRD
> >
> > +#ifdef CONFIG_QSPI_BOOT
> > +#define CONFIG_SYS_FSL_QSPI_BASE	0x20000000
> > +#define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
> > +#define CONFIG_ENV_ADDR			(CONFIG_SYS_FSL_QSPI_BASE
> + \
> > +						CONFIG_ENV_OFFSET)
> > +#endif
> >
> >  #define CONFIG_SKIP_LOWLEVEL_INIT
> >
> > diff --git a/include/configs/ls1088aqds.h
> > b/include/configs/ls1088aqds.h index e97091d..6b94667 100644
> > --- a/include/configs/ls1088aqds.h
> > +++ b/include/configs/ls1088aqds.h
> > @@ -21,7 +21,6 @@ unsigned long get_board_ddr_clk(void);
> >
> >  #if defined(CONFIG_QSPI_BOOT)
> >  #define CONFIG_ENV_SIZE			0x2000          /* 8KB */
> > -#define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
> >  #define CONFIG_ENV_SECT_SIZE		0x40000
> >  #elif defined(CONFIG_SD_BOOT)
> >  #define CONFIG_ENV_OFFSET		(3 * 1024 * 1024)
> > diff --git a/include/configs/ls1088ardb.h
> > b/include/configs/ls1088ardb.h index 1da8153..bffaa76 100644
> > --- a/include/configs/ls1088ardb.h
> > +++ b/include/configs/ls1088ardb.h
> > @@ -12,8 +12,8 @@
> >  #define CONFIG_DISPLAY_BOARDINFO_LATE
> >
> >  #if defined(CONFIG_QSPI_BOOT)
> > +#define CONFIG_SYS_FSL_QSPI_BASE	0x20000000
> 
> Looks like you are redefining this macro. Will remove when I merge it.
Yes. Thanks York.
> 
> York
York Sun Jan. 19, 2018, 12:58 a.m. UTC | #3 
On 12/14/2017 04:06 AM, Ashish Kumar wrote:
> Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com>
> ---

Applied to fsl-qoriq master. Thanks.

York
diff mbox series

Patch

diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index b99257e..c96d48d 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -32,6 +32,12 @@ 
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
+#ifdef CONFIG_QSPI_BOOT
+#define CONFIG_SYS_FSL_QSPI_BASE	0x20000000
+#define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
+#define CONFIG_ENV_ADDR			(CONFIG_SYS_FSL_QSPI_BASE + \
+						CONFIG_ENV_OFFSET)
+#endif
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index e97091d..6b94667 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -21,7 +21,6 @@  unsigned long get_board_ddr_clk(void);
 
 #if defined(CONFIG_QSPI_BOOT)
 #define CONFIG_ENV_SIZE			0x2000          /* 8KB */
-#define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
 #define CONFIG_ENV_SECT_SIZE		0x40000
 #elif defined(CONFIG_SD_BOOT)
 #define CONFIG_ENV_OFFSET		(3 * 1024 * 1024)
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 1da8153..bffaa76 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -12,8 +12,8 @@ 
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
 #if defined(CONFIG_QSPI_BOOT)
+#define CONFIG_SYS_FSL_QSPI_BASE	0x20000000
 #define CONFIG_ENV_SIZE			0x2000          /* 8KB */
-#define CONFIG_ENV_OFFSET		0x300000        /* 3MB */
 #define CONFIG_ENV_SECT_SIZE		0x40000
 #elif defined(CONFIG_SD_BOOT)
 #define CONFIG_ENV_OFFSET		(3 * 1024 * 1024)