| Message ID | 1456914723-33160-3-git-send-email-yao.yuan@freescale.com |
|---|---|
| State | Accepted |
| Commit | 82d13340e9d051f193d46596343aa692b0acd92c |
| Headers | show |
> -----Original Message----- > From: Yuan Yao [mailto:yao.yuan@freescale.com] > Sent: Wednesday, March 02, 2016 4:02 PM > To: york sun <york.sun@nxp.com> > Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; > pratiyush.srivastava@freescale.com; u-boot@lists.denx.de; Yunhui Cui > <yunhui.cui@nxp.com>; Yao Yuan <yao.yuan@nxp.com> > Subject: [PATCH 02/12] configs: ls2080a_common: Remove duplicate NOR > configs > > From: Yuan Yao <yao.yuan@nxp.com> > > The NOR flash related configure options also appear in ls2080aqds.h and > ls2080ardb.h, and the two files all have included ls2080a_common.h. > This patch remove the duplicated options in ls2080a_common.h. > > Signed-off-by: Yuan Yao <yao.yuan@nxp.com> > --- > include/configs/ls2080a_common.h | 7 ------- > include/configs/ls2080a_simu.h | 7 +++++++ > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/include/configs/ls2080a_common.h > b/include/configs/ls2080a_common.h > index 64b82e8..82af464 100644 > --- a/include/configs/ls2080a_common.h > +++ b/include/configs/ls2080a_common.h > @@ -148,13 +148,6 @@ > #define CONFIG_SYS_FLASH1_BASE_PHYS 0xC0000000 > #define CONFIG_SYS_FLASH1_BASE_PHYS_EARLY 0x8000000 > > -#ifndef CONFIG_SYS_NO_FLASH > -#define CONFIG_FLASH_CFI_DRIVER > -#define CONFIG_SYS_FLASH_CFI > -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define > CONFIG_SYS_FLASH_QUIET_TEST -#endif > - > #ifndef __ASSEMBLY__ > unsigned long long get_qixis_addr(void); #endif diff --git > a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index > 2c2ce7b..6a59afe 100644 > --- a/include/configs/ls2080a_simu.h > +++ b/include/configs/ls2080a_simu.h > @@ -38,6 +38,13 @@ > #define CONFIG_SYS_NOR0_CSPR_EXT (0x0) > #define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024) > > +#ifndef CONFIG_SYS_NO_FLASH > +#define CONFIG_FLASH_CFI_DRIVER > +#define CONFIG_SYS_FLASH_CFI > +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define > +CONFIG_SYS_FLASH_QUIET_TEST #endif > + > /* > * NOR Flash Timing Params > */ > -- I will suggest other way around-->. Remove above defines from qds, rdb, simu header file and put in ls2080a_common.h. --prabhakar
On 03/03/2016 10:58AM, Prabhakar Kushwaha wrote: > > -----Original Message----- > > From: Yuan Yao [mailto:yao.yuan@freescale.com] > > Sent: Wednesday, March 02, 2016 4:02 PM > > To: york sun <york.sun@nxp.com> > > Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; > > pratiyush.srivastava@freescale.com; u-boot@lists.denx.de; Yunhui Cui > > <yunhui.cui@nxp.com>; Yao Yuan <yao.yuan@nxp.com> > > Subject: [PATCH 02/12] configs: ls2080a_common: Remove duplicate NOR > > configs > > > > From: Yuan Yao <yao.yuan@nxp.com> > > > > The NOR flash related configure options also appear in ls2080aqds.h > > and ls2080ardb.h, and the two files all have included ls2080a_common.h. > > This patch remove the duplicated options in ls2080a_common.h. > > > > Signed-off-by: Yuan Yao <yao.yuan@nxp.com> > > --- > > include/configs/ls2080a_common.h | 7 ------- > > include/configs/ls2080a_simu.h | 7 +++++++ > > 2 files changed, 7 insertions(+), 7 deletions(-) > > > > diff --git a/include/configs/ls2080a_common.h > > b/include/configs/ls2080a_common.h > > index 64b82e8..82af464 100644 > > --- a/include/configs/ls2080a_common.h > > +++ b/include/configs/ls2080a_common.h > > @@ -148,13 +148,6 @@ > > #define CONFIG_SYS_FLASH1_BASE_PHYS 0xC0000000 > > #define CONFIG_SYS_FLASH1_BASE_PHYS_EARLY 0x8000000 > > > > -#ifndef CONFIG_SYS_NO_FLASH > > -#define CONFIG_FLASH_CFI_DRIVER > > -#define CONFIG_SYS_FLASH_CFI > > -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define > > CONFIG_SYS_FLASH_QUIET_TEST -#endif > > - > > #ifndef __ASSEMBLY__ > > unsigned long long get_qixis_addr(void); #endif diff --git > > a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h > > index 2c2ce7b..6a59afe 100644 > > --- a/include/configs/ls2080a_simu.h > > +++ b/include/configs/ls2080a_simu.h > > @@ -38,6 +38,13 @@ > > #define CONFIG_SYS_NOR0_CSPR_EXT (0x0) > > #define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024) > > > > +#ifndef CONFIG_SYS_NO_FLASH > > +#define CONFIG_FLASH_CFI_DRIVER > > +#define CONFIG_SYS_FLASH_CFI > > +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #define > > +CONFIG_SYS_FLASH_QUIET_TEST #endif > > + > > /* > > * NOR Flash Timing Params > > */ > > -- > > I will suggest other way around-->. Remove above defines from qds, rdb, simu > header file and put in ls2080a_common.h. > > --prabhakar > > Hi Prabhakar, Because of the macro CONFIG_SYS_NO_FLASH Is must be define or not define in different board config file. So the #ifndef CONFIG_SYS_NO_FLASH can't put in ls2080a_common.h.
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 64b82e8..82af464 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -148,13 +148,6 @@ #define CONFIG_SYS_FLASH1_BASE_PHYS 0xC0000000 #define CONFIG_SYS_FLASH1_BASE_PHYS_EARLY 0x8000000 -#ifndef CONFIG_SYS_NO_FLASH -#define CONFIG_FLASH_CFI_DRIVER -#define CONFIG_SYS_FLASH_CFI -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define CONFIG_SYS_FLASH_QUIET_TEST -#endif - #ifndef __ASSEMBLY__ unsigned long long get_qixis_addr(void); #endif diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index 2c2ce7b..6a59afe 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -38,6 +38,13 @@ #define CONFIG_SYS_NOR0_CSPR_EXT (0x0) #define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024) +#ifndef CONFIG_SYS_NO_FLASH +#define CONFIG_FLASH_CFI_DRIVER +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE +#define CONFIG_SYS_FLASH_QUIET_TEST +#endif + /* * NOR Flash Timing Params */