| Message ID | 1514870765-26519-2-git-send-email-Ashish.Kumar@nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | York Sun |
| Headers | show |
| Series | [U-Boot] armv8: ls1088aqds: Add IFC-NOR as boot source for LS1088 | expand |
On 01/01/2018 09:24 PM, Ashish Kumar wrote: > IFC-NOR and QSPI-NOR pins are muxed on SoC,so they > cannot be accessed simultaneously, but > IFC-NOR can be accessed along with SD-BOOT. > > ls1088aqds_sdcard_ifc_defconfig: is defconfig for > SD as boot source and IFC-NOR to be used as flash, > this will be used to write IFC-NOR image on IFC flash. > QSPI and DSPI cannot be accessed in this defconfig. > > IFC-NOR image is generated by ls1088aqds_defconfig. > > Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com> > --- > depends on: https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fpatch%2F853615%2F&data=02%7C01%7Cyork.sun%40nxp.com%7Cc53b3ec4db4d48e5130a08d551a1253d%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636504674905515652&sdata=j2VD3l2%2BIb7iYk8yvn3TOrvT38pPT8ARRQjN0h%2FR5b0%3D&reserved=0 > > Tested on 2018.01-rc3 > > More accurate timing are used which where provided by > validation team > > to switch to IFC-NOR use command for qspi prompt: > i2c mw 66 0x60 0x12; i2c mw 66 50 00;i2c mw 66 10 21 Can you expand qixis command to do this? You should stop using i2c command to switch any banks. Please add instructions to board README file to describe the flash map, and the qixis commands to switch between QSPI banks, and other booting sources. York
> -----Original Message----- > From: York Sun > Sent: Monday, January 08, 2018 11:11 PM > To: Ashish Kumar <ashish.kumar@nxp.com>; u-boot@lists.denx.de > Subject: Re: [PATCH] armv8: ls1088aqds: Add IFC-NOR as boot source for > LS1088 > > On 01/01/2018 09:24 PM, Ashish Kumar wrote: > > IFC-NOR and QSPI-NOR pins are muxed on SoC,so they cannot be accessed > > simultaneously, but IFC-NOR can be accessed along with SD-BOOT. > > > > ls1088aqds_sdcard_ifc_defconfig: is defconfig for SD as boot source > > and IFC-NOR to be used as flash, this will be used to write IFC-NOR > > image on IFC flash. > > QSPI and DSPI cannot be accessed in this defconfig. > > > > IFC-NOR image is generated by ls1088aqds_defconfig. > > > > Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com> > > --- > > depends on: > > > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpat > > > chwork.ozlabs.org%2Fpatch%2F853615%2F&data=02%7C01%7Cyork.sun%40 > nxp.co > > > m%7Cc53b3ec4db4d48e5130a08d551a1253d%7C686ea1d3bc2b4c6fa92cd99 > c5c30163 > > > 5%7C0%7C0%7C636504674905515652&sdata=j2VD3l2%2BIb7iYk8yvn3TOrvT > 38pPT8A > > RRQjN0h%2FR5b0%3D&reserved=0 > > > > Tested on 2018.01-rc3 > > > > More accurate timing are used which where provided by validation team > > > > to switch to IFC-NOR use command for qspi prompt: > > i2c mw 66 0x60 0x12; i2c mw 66 50 00;i2c mw 66 10 21 > > Can you expand qixis command to do this? You should stop using i2c > command to switch any banks. Will that be ok to send separate patch with expansion of qixis commands ? > Please add instructions to board README file to describe the flash map, and > the qixis commands to switch between QSPI banks, and other booting > sources. Flash map is now identical for all arm64 platform(ls2088,ls2085,ls1043,ls1046 and ls1088), do I still to add the flash map? Regards Ashish > > York
On 01/11/2018 01:26 AM, Ashish Kumar wrote: > > >> -----Original Message----- >> From: York Sun >> Sent: Monday, January 08, 2018 11:11 PM >> To: Ashish Kumar <ashish.kumar@nxp.com>; u-boot@lists.denx.de >> Subject: Re: [PATCH] armv8: ls1088aqds: Add IFC-NOR as boot source for >> LS1088 >> >> On 01/01/2018 09:24 PM, Ashish Kumar wrote: >>> IFC-NOR and QSPI-NOR pins are muxed on SoC,so they cannot be accessed >>> simultaneously, but IFC-NOR can be accessed along with SD-BOOT. >>> >>> ls1088aqds_sdcard_ifc_defconfig: is defconfig for SD as boot source >>> and IFC-NOR to be used as flash, this will be used to write IFC-NOR >>> image on IFC flash. >>> QSPI and DSPI cannot be accessed in this defconfig. >>> >>> IFC-NOR image is generated by ls1088aqds_defconfig. >>> >>> Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com> >>> --- >>> depends on: >>> >> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpat >>> >> chwork.ozlabs.org%2Fpatch%2F853615%2F&data=02%7C01%7Cyork.sun%40 >> nxp.co >>> >> m%7Cc53b3ec4db4d48e5130a08d551a1253d%7C686ea1d3bc2b4c6fa92cd99 >> c5c30163 >>> >> 5%7C0%7C0%7C636504674905515652&sdata=j2VD3l2%2BIb7iYk8yvn3TOrvT >> 38pPT8A >>> RRQjN0h%2FR5b0%3D&reserved=0 >>> >>> Tested on 2018.01-rc3 >>> >>> More accurate timing are used which where provided by validation team >>> >>> to switch to IFC-NOR use command for qspi prompt: >>> i2c mw 66 0x60 0x12; i2c mw 66 50 00;i2c mw 66 10 21 >> >> Can you expand qixis command to do this? You should stop using i2c >> command to switch any banks. > > Will that be ok to send separate patch with expansion of qixis commands ? Yes, a patch before this one. I prefer not to use i2c command at all for bank switching. If you have any comment/document showing i2c command to do similar thing, please also clean up. > >> Please add instructions to board README file to describe the flash map, and >> the qixis commands to switch between QSPI banks, and other booting >> sources. > > Flash map is now identical for all arm64 platform(ls2088,ls2085,ls1043,ls1046 and ls1088), do I still to add the flash map? No, if identical. But please add the base addresses information. York
On 01/01/2018 09:24 PM, Ashish Kumar wrote: > IFC-NOR and QSPI-NOR pins are muxed on SoC,so they > cannot be accessed simultaneously, but > IFC-NOR can be accessed along with SD-BOOT. > > ls1088aqds_sdcard_ifc_defconfig: is defconfig for > SD as boot source and IFC-NOR to be used as flash, > this will be used to write IFC-NOR image on IFC flash. > QSPI and DSPI cannot be accessed in this defconfig. > > IFC-NOR image is generated by ls1088aqds_defconfig. > > Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com> > --- > depends on: https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fpatch%2F853615%2F&data=02%7C01%7Cyork.sun%40nxp.com%7Cc53b3ec4db4d48e5130a08d551a1253d%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636504674905515652&sdata=j2VD3l2%2BIb7iYk8yvn3TOrvT38pPT8ARRQjN0h%2FR5b0%3D&reserved=0 > > Tested on 2018.01-rc3 > > More accurate timing are used which where provided by > validation team > > to switch to IFC-NOR use command for qspi prompt: > i2c mw 66 0x60 0x12; i2c mw 66 50 00;i2c mw 66 10 21 <snip> > diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h > index 8fbf890..d5075c3 100644 > --- a/include/configs/ls1088aqds.h > +++ b/include/configs/ls1088aqds.h > @@ -27,7 +27,6 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_SYS_MMC_ENV_DEV 0 > #define CONFIG_ENV_SIZE 0x2000 > #else > -#define CONFIG_ENV_IS_IN_FLASH > #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) > #define CONFIG_ENV_SECT_SIZE 0x20000 > #define CONFIG_ENV_SIZE 0x20000 > @@ -41,8 +40,9 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_SYS_CLK_FREQ 100000000 > #define CONFIG_DDR_CLK_FREQ 100000000 > #else > -#define CONFIG_SYS_CLK_FREQ get_board_sys_clk() > -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() > +#define CONFIG_QIXIS_I2C_ACCESS > +#define CONFIG_SYS_CLK_FREQ 100000000 > +#define CONFIG_DDR_CLK_FREQ 100000000 Are you sure you want to go down the path to hard-code clock speeds? You will lose the ability to change clocks. Besides, you have identical hard-coded value for both legs of the #if...#else..#endif. > #endif > > #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) > @@ -87,16 +87,10 @@ unsigned long get_board_ddr_clk(void); > CSPR_MSEL_NOR | \ > CSPR_V) > #define CONFIG_SYS_NOR_CSOR CSOR_NOR_ADM_SHIFT(12) > -#define CONFIG_SYS_NOR_FTIM0 (FTIM0_NOR_TACSE(0x4) | \ > - FTIM0_NOR_TEADC(0x5) | \ > - FTIM0_NOR_TEAHC(0x5)) > -#define CONFIG_SYS_NOR_FTIM1 (FTIM1_NOR_TACO(0x35) | \ > - FTIM1_NOR_TRAD_NOR(0x1a) |\ > - FTIM1_NOR_TSEQRAD_NOR(0x13)) > -#define CONFIG_SYS_NOR_FTIM2 (FTIM2_NOR_TCS(0x4) | \ > - FTIM2_NOR_TCH(0x4) | \ > - FTIM2_NOR_TWPH(0x0E) | \ > - FTIM2_NOR_TWP(0x1c)) > +#define CONFIG_SYS_NOR_FTIM0 (0xc0201410) > +#define CONFIG_SYS_NOR_FTIM1 (0x50009028) > +#define CONFIG_SYS_NOR_FTIM2 (0x0820501c) > +#define CONFIG_SYS_NOR_FTIM3 0x04000000 This is bad coding! Please use macros. Please triple-check your timing. I don't want to fix the timing again. See my commit for LS1046AQDS 1b7910a37c. > #define CONFIG_SYS_NOR_FTIM3 0x04000000 > #define CONFIG_SYS_IFC_CCR 0x01000000 > > @@ -193,7 +187,7 @@ unsigned long get_board_ddr_clk(void); > | CSPR_MSEL_GPCM \ > | CSPR_V) > > -#define CONFIG_SYS_FPGA_AMASK IFC_AMASK(64*1024) > +#define SYS_FPGA_AMASK IFC_AMASK(64 * 1024) > #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) > #define CONFIG_SYS_FPGA_CSOR CSOR_GPCM_ADM_SHIFT(0) > #else > @@ -222,7 +216,7 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_SYS_CSPR2_EXT CONFIG_SYS_FPGA_CSPR_EXT > #define CONFIG_SYS_CSPR2 CONFIG_SYS_FPGA_CSPR > #define CONFIG_SYS_CSPR2_FINAL SYS_FPGA_CSPR_FINAL > -#define CONFIG_SYS_AMASK2 CONFIG_SYS_FPGA_AMASK > +#define CONFIG_SYS_AMASK2 SYS_FPGA_AMASK > #define CONFIG_SYS_CSOR2 CONFIG_SYS_FPGA_CSOR > #define CONFIG_SYS_CS2_FTIM0 SYS_FPGA_CS_FTIM0 > #define CONFIG_SYS_CS2_FTIM1 SYS_FPGA_CS_FTIM1 > @@ -258,13 +252,13 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 > #define CONFIG_SYS_CSPR3_EXT CONFIG_SYS_FPGA_CSPR_EXT > #define CONFIG_SYS_CSPR3 CONFIG_SYS_FPGA_CSPR > -#define CONFIG_SYS_CSPR3_FINAL CONFIG_SYS_FPGA_CSPR_FINAL > -#define CONFIG_SYS_AMASK3 CONFIG_SYS_FPGA_AMASK > +#define CONFIG_SYS_CSPR3_FINAL SYS_FPGA_CSPR_FINAL > +#define CONFIG_SYS_AMASK3 SYS_FPGA_AMASK > #define CONFIG_SYS_CSOR3 CONFIG_SYS_FPGA_CSOR > -#define CONFIG_SYS_CS3_FTIM0 CONFIG_SYS_FPGA_CS_FTIM0 > -#define CONFIG_SYS_CS3_FTIM1 CONFIG_SYS_FPGA_CS_FTIM1 > -#define CONFIG_SYS_CS3_FTIM2 CONFIG_SYS_FPGA_CS_FTIM2 > -#define CONFIG_SYS_CS3_FTIM3 CONFIG_SYS_FPGA_CS_FTIM3 > +#define CONFIG_SYS_CS3_FTIM0 SYS_FPGA_CS_FTIM0 > +#define CONFIG_SYS_CS3_FTIM1 SYS_FPGA_CS_FTIM1 > +#define CONFIG_SYS_CS3_FTIM2 SYS_FPGA_CS_FTIM2 > +#define CONFIG_SYS_CS3_FTIM3 SYS_FPGA_CS_FTIM3 These changes have nothing to do with IFC-NOR. York
-----Original Message----- From: York Sun Sent: Tuesday, January 30, 2018 2:54 AM To: Ashish Kumar <ashish.kumar@nxp.com>; u-boot@lists.denx.de Subject: Re: [PATCH] armv8: ls1088aqds: Add IFC-NOR as boot source for LS1088 On 01/01/2018 09:24 PM, Ashish Kumar wrote: > IFC-NOR and QSPI-NOR pins are muxed on SoC,so they cannot be accessed > simultaneously, but IFC-NOR can be accessed along with SD-BOOT. > > ls1088aqds_sdcard_ifc_defconfig: is defconfig for SD as boot source > and IFC-NOR to be used as flash, this will be used to write IFC-NOR > image on IFC flash. > QSPI and DSPI cannot be accessed in this defconfig. > > IFC-NOR image is generated by ls1088aqds_defconfig. > > Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com> > --- > depends on: > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpat > chwork.ozlabs.org%2Fpatch%2F853615%2F&data=02%7C01%7Cyork.sun%40nxp.co > m%7Cc53b3ec4db4d48e5130a08d551a1253d%7C686ea1d3bc2b4c6fa92cd99c5c30163 > 5%7C0%7C0%7C636504674905515652&sdata=j2VD3l2%2BIb7iYk8yvn3TOrvT38pPT8A > RRQjN0h%2FR5b0%3D&reserved=0 > > Tested on 2018.01-rc3 > > More accurate timing are used which where provided by validation team > > to switch to IFC-NOR use command for qspi prompt: > i2c mw 66 0x60 0x12; i2c mw 66 50 00;i2c mw 66 10 21 <snip> > diff --git a/include/configs/ls1088aqds.h > b/include/configs/ls1088aqds.h index 8fbf890..d5075c3 100644 > --- a/include/configs/ls1088aqds.h > +++ b/include/configs/ls1088aqds.h > @@ -27,7 +27,6 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_SYS_MMC_ENV_DEV 0 > #define CONFIG_ENV_SIZE 0x2000 > #else > -#define CONFIG_ENV_IS_IN_FLASH > #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) > #define CONFIG_ENV_SECT_SIZE 0x20000 > #define CONFIG_ENV_SIZE 0x20000 > @@ -41,8 +40,9 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_SYS_CLK_FREQ 100000000 > #define CONFIG_DDR_CLK_FREQ 100000000 > #else > -#define CONFIG_SYS_CLK_FREQ get_board_sys_clk() > -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() > +#define CONFIG_QIXIS_I2C_ACCESS > +#define CONFIG_SYS_CLK_FREQ 100000000 > +#define CONFIG_DDR_CLK_FREQ 100000000 Are you sure you want to go down the path to hard-code clock speeds? You will lose the ability to change clocks. Besides, you have identical hard-coded value for both legs of the #if...#else..#endif. I found that I was not able to access QIXIS_READ etc, so I had to revert to fixed values. > #endif > > #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) > @@ -87,16 +87,10 @@ unsigned long get_board_ddr_clk(void); > CSPR_MSEL_NOR | \ > CSPR_V) > #define CONFIG_SYS_NOR_CSOR CSOR_NOR_ADM_SHIFT(12) > -#define CONFIG_SYS_NOR_FTIM0 (FTIM0_NOR_TACSE(0x4) | \ > - FTIM0_NOR_TEADC(0x5) | \ > - FTIM0_NOR_TEAHC(0x5)) > -#define CONFIG_SYS_NOR_FTIM1 (FTIM1_NOR_TACO(0x35) | \ > - FTIM1_NOR_TRAD_NOR(0x1a) |\ > - FTIM1_NOR_TSEQRAD_NOR(0x13)) > -#define CONFIG_SYS_NOR_FTIM2 (FTIM2_NOR_TCS(0x4) | \ > - FTIM2_NOR_TCH(0x4) | \ > - FTIM2_NOR_TWPH(0x0E) | \ > - FTIM2_NOR_TWP(0x1c)) > +#define CONFIG_SYS_NOR_FTIM0 (0xc0201410) > +#define CONFIG_SYS_NOR_FTIM1 (0x50009028) > +#define CONFIG_SYS_NOR_FTIM2 (0x0820501c) > +#define CONFIG_SYS_NOR_FTIM3 0x04000000 This is bad coding! Please use macros. Please triple-check your timing. I don't want to fix the timing again. See my commit for LS1046AQDS 1b7910a37c. How do I find timing which are correct?, I borrowed the same from validation scripts used by validation team. Should I use these "LS1046AQDS 1b7910a37c" > #define CONFIG_SYS_NOR_FTIM3 0x04000000 > #define CONFIG_SYS_IFC_CCR 0x01000000 > > @@ -193,7 +187,7 @@ unsigned long get_board_ddr_clk(void); > | CSPR_MSEL_GPCM \ > | CSPR_V) > > -#define CONFIG_SYS_FPGA_AMASK IFC_AMASK(64*1024) > +#define SYS_FPGA_AMASK IFC_AMASK(64 * 1024) > #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) > #define CONFIG_SYS_FPGA_CSOR CSOR_GPCM_ADM_SHIFT(0) > #else > @@ -222,7 +216,7 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_SYS_CSPR2_EXT CONFIG_SYS_FPGA_CSPR_EXT > #define CONFIG_SYS_CSPR2 CONFIG_SYS_FPGA_CSPR > #define CONFIG_SYS_CSPR2_FINAL SYS_FPGA_CSPR_FINAL > -#define CONFIG_SYS_AMASK2 CONFIG_SYS_FPGA_AMASK > +#define CONFIG_SYS_AMASK2 SYS_FPGA_AMASK > #define CONFIG_SYS_CSOR2 CONFIG_SYS_FPGA_CSOR > #define CONFIG_SYS_CS2_FTIM0 SYS_FPGA_CS_FTIM0 > #define CONFIG_SYS_CS2_FTIM1 SYS_FPGA_CS_FTIM1 > @@ -258,13 +252,13 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 > #define CONFIG_SYS_CSPR3_EXT CONFIG_SYS_FPGA_CSPR_EXT > #define CONFIG_SYS_CSPR3 CONFIG_SYS_FPGA_CSPR > -#define CONFIG_SYS_CSPR3_FINAL CONFIG_SYS_FPGA_CSPR_FINAL > -#define CONFIG_SYS_AMASK3 CONFIG_SYS_FPGA_AMASK > +#define CONFIG_SYS_CSPR3_FINAL SYS_FPGA_CSPR_FINAL > +#define CONFIG_SYS_AMASK3 SYS_FPGA_AMASK > #define CONFIG_SYS_CSOR3 CONFIG_SYS_FPGA_CSOR > -#define CONFIG_SYS_CS3_FTIM0 CONFIG_SYS_FPGA_CS_FTIM0 > -#define CONFIG_SYS_CS3_FTIM1 CONFIG_SYS_FPGA_CS_FTIM1 > -#define CONFIG_SYS_CS3_FTIM2 CONFIG_SYS_FPGA_CS_FTIM2 > -#define CONFIG_SYS_CS3_FTIM3 CONFIG_SYS_FPGA_CS_FTIM3 > +#define CONFIG_SYS_CS3_FTIM0 SYS_FPGA_CS_FTIM0 > +#define CONFIG_SYS_CS3_FTIM1 SYS_FPGA_CS_FTIM1 > +#define CONFIG_SYS_CS3_FTIM2 SYS_FPGA_CS_FTIM2 > +#define CONFIG_SYS_CS3_FTIM3 SYS_FPGA_CS_FTIM3 These changes have nothing to do with IFC-NOR. If I keep CONFIG_SYS_FPGA_CS_FTIM3, it ask to move to Kconfig. Should I move these out in separate patch ? York
Ashish, Please use proper quotation ">" when you reply. On 01/30/2018 06:24 AM, Ashish Kumar wrote: > > > -----Original Message----- > From: York Sun > Sent: Tuesday, January 30, 2018 2:54 AM > To: Ashish Kumar <ashish.kumar@nxp.com>; u-boot@lists.denx.de > Subject: Re: [PATCH] armv8: ls1088aqds: Add IFC-NOR as boot source for LS1088 > > On 01/01/2018 09:24 PM, Ashish Kumar wrote: >> IFC-NOR and QSPI-NOR pins are muxed on SoC,so they cannot be accessed >> simultaneously, but IFC-NOR can be accessed along with SD-BOOT. >> >> ls1088aqds_sdcard_ifc_defconfig: is defconfig for SD as boot source >> and IFC-NOR to be used as flash, this will be used to write IFC-NOR >> image on IFC flash. >> QSPI and DSPI cannot be accessed in this defconfig. >> >> IFC-NOR image is generated by ls1088aqds_defconfig. >> >> Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com> >> --- >> depends on: >> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpat >> chwork.ozlabs.org%2Fpatch%2F853615%2F&data=02%7C01%7Cyork.sun%40nxp.co >> m%7Cc53b3ec4db4d48e5130a08d551a1253d%7C686ea1d3bc2b4c6fa92cd99c5c30163 >> 5%7C0%7C0%7C636504674905515652&sdata=j2VD3l2%2BIb7iYk8yvn3TOrvT38pPT8A >> RRQjN0h%2FR5b0%3D&reserved=0 >> >> Tested on 2018.01-rc3 >> >> More accurate timing are used which where provided by validation team >> >> to switch to IFC-NOR use command for qspi prompt: >> i2c mw 66 0x60 0x12; i2c mw 66 50 00;i2c mw 66 10 21 > > <snip> > >> diff --git a/include/configs/ls1088aqds.h >> b/include/configs/ls1088aqds.h index 8fbf890..d5075c3 100644 >> --- a/include/configs/ls1088aqds.h >> +++ b/include/configs/ls1088aqds.h >> @@ -27,7 +27,6 @@ unsigned long get_board_ddr_clk(void); >> #define CONFIG_SYS_MMC_ENV_DEV 0 >> #define CONFIG_ENV_SIZE 0x2000 >> #else >> -#define CONFIG_ENV_IS_IN_FLASH >> #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) >> #define CONFIG_ENV_SECT_SIZE 0x20000 >> #define CONFIG_ENV_SIZE 0x20000 >> @@ -41,8 +40,9 @@ unsigned long get_board_ddr_clk(void); >> #define CONFIG_SYS_CLK_FREQ 100000000 >> #define CONFIG_DDR_CLK_FREQ 100000000 >> #else >> -#define CONFIG_SYS_CLK_FREQ get_board_sys_clk() >> -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() >> +#define CONFIG_QIXIS_I2C_ACCESS >> +#define CONFIG_SYS_CLK_FREQ 100000000 >> +#define CONFIG_DDR_CLK_FREQ 100000000 > > Are you sure you want to go down the path to hard-code clock speeds? You will lose the ability to change clocks. Besides, you have identical hard-coded value for both legs of the #if...#else..#endif. > > I found that I was not able to access QIXIS_READ etc, so I had to revert to fixed values. You need to find the root cause. Qixis is on both IFC and I2C. Does NOR flash takes the chip-select FPGA was using? > > >> #endif >> >> #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) >> @@ -87,16 +87,10 @@ unsigned long get_board_ddr_clk(void); >> CSPR_MSEL_NOR | \ >> CSPR_V) >> #define CONFIG_SYS_NOR_CSOR CSOR_NOR_ADM_SHIFT(12) >> -#define CONFIG_SYS_NOR_FTIM0 (FTIM0_NOR_TACSE(0x4) | \ >> - FTIM0_NOR_TEADC(0x5) | \ >> - FTIM0_NOR_TEAHC(0x5)) >> -#define CONFIG_SYS_NOR_FTIM1 (FTIM1_NOR_TACO(0x35) | \ >> - FTIM1_NOR_TRAD_NOR(0x1a) |\ >> - FTIM1_NOR_TSEQRAD_NOR(0x13)) >> -#define CONFIG_SYS_NOR_FTIM2 (FTIM2_NOR_TCS(0x4) | \ >> - FTIM2_NOR_TCH(0x4) | \ >> - FTIM2_NOR_TWPH(0x0E) | \ >> - FTIM2_NOR_TWP(0x1c)) >> +#define CONFIG_SYS_NOR_FTIM0 (0xc0201410) >> +#define CONFIG_SYS_NOR_FTIM1 (0x50009028) >> +#define CONFIG_SYS_NOR_FTIM2 (0x0820501c) >> +#define CONFIG_SYS_NOR_FTIM3 0x04000000 > > This is bad coding! Please use macros. Please triple-check your timing. > I don't want to fix the timing again. See my commit for LS1046AQDS 1b7910a37c. > > How do I find timing which are correct?, I borrowed the same from validation scripts used by validation team. > Should I use these "LS1046AQDS 1b7910a37c" If you know what you are doing, calculate the timing. If you don't, use my timing as suggested. Do not use magic numbers. > >> #define CONFIG_SYS_NOR_FTIM3 0x04000000 >> #define CONFIG_SYS_IFC_CCR 0x01000000 >> >> @@ -193,7 +187,7 @@ unsigned long get_board_ddr_clk(void); >> | CSPR_MSEL_GPCM \ >> | CSPR_V) >> >> -#define CONFIG_SYS_FPGA_AMASK IFC_AMASK(64*1024) >> +#define SYS_FPGA_AMASK IFC_AMASK(64 * 1024) >> #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) >> #define CONFIG_SYS_FPGA_CSOR CSOR_GPCM_ADM_SHIFT(0) >> #else >> @@ -222,7 +216,7 @@ unsigned long get_board_ddr_clk(void); >> #define CONFIG_SYS_CSPR2_EXT CONFIG_SYS_FPGA_CSPR_EXT >> #define CONFIG_SYS_CSPR2 CONFIG_SYS_FPGA_CSPR >> #define CONFIG_SYS_CSPR2_FINAL SYS_FPGA_CSPR_FINAL >> -#define CONFIG_SYS_AMASK2 CONFIG_SYS_FPGA_AMASK >> +#define CONFIG_SYS_AMASK2 SYS_FPGA_AMASK >> #define CONFIG_SYS_CSOR2 CONFIG_SYS_FPGA_CSOR >> #define CONFIG_SYS_CS2_FTIM0 SYS_FPGA_CS_FTIM0 >> #define CONFIG_SYS_CS2_FTIM1 SYS_FPGA_CS_FTIM1 >> @@ -258,13 +252,13 @@ unsigned long get_board_ddr_clk(void); >> #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 >> #define CONFIG_SYS_CSPR3_EXT CONFIG_SYS_FPGA_CSPR_EXT >> #define CONFIG_SYS_CSPR3 CONFIG_SYS_FPGA_CSPR >> -#define CONFIG_SYS_CSPR3_FINAL CONFIG_SYS_FPGA_CSPR_FINAL >> -#define CONFIG_SYS_AMASK3 CONFIG_SYS_FPGA_AMASK >> +#define CONFIG_SYS_CSPR3_FINAL SYS_FPGA_CSPR_FINAL >> +#define CONFIG_SYS_AMASK3 SYS_FPGA_AMASK >> #define CONFIG_SYS_CSOR3 CONFIG_SYS_FPGA_CSOR >> -#define CONFIG_SYS_CS3_FTIM0 CONFIG_SYS_FPGA_CS_FTIM0 >> -#define CONFIG_SYS_CS3_FTIM1 CONFIG_SYS_FPGA_CS_FTIM1 >> -#define CONFIG_SYS_CS3_FTIM2 CONFIG_SYS_FPGA_CS_FTIM2 >> -#define CONFIG_SYS_CS3_FTIM3 CONFIG_SYS_FPGA_CS_FTIM3 >> +#define CONFIG_SYS_CS3_FTIM0 SYS_FPGA_CS_FTIM0 >> +#define CONFIG_SYS_CS3_FTIM1 SYS_FPGA_CS_FTIM1 >> +#define CONFIG_SYS_CS3_FTIM2 SYS_FPGA_CS_FTIM2 >> +#define CONFIG_SYS_CS3_FTIM3 SYS_FPGA_CS_FTIM3 > > These changes have nothing to do with IFC-NOR. > > > If I keep CONFIG_SYS_FPGA_CS_FTIM3, it ask to move to Kconfig. Should I move these out in separate patch ? > First, these macros are local. They don't need to be prefixed with CONFIG_. Second, FPGA timing has nothing to do with this patch. Please send a separated cleanup patch. York
diff --git a/arch/arm/dts/fsl-ls1088a-qds.dts b/arch/arm/dts/fsl-ls1088a-qds.dts index 9b7bef4..acd8cfd 100644 --- a/arch/arm/dts/fsl-ls1088a-qds.dts +++ b/arch/arm/dts/fsl-ls1088a-qds.dts @@ -19,6 +19,43 @@ }; }; +&ifc { + #address-cells = <2>; + #size-cells = <1>; + /* NOR, NAND Flashes and FPGA on board */ + ranges = <0 0 0x5 0x80000000 0x08000000 + 2 0 0x5 0x30000000 0x00010000 + 3 0 0x5 0x20000000 0x00010000>; + status = "okay"; + + nor@0,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "cfi-flash"; + reg = <0x0 0x0 0x8000000>; + bank-width = <2>; + device-width = <1>; + }; + + nand@2,0 { + compatible = "fsl,ifc-nand"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x1 0x0 0x10000>; + }; + + fpga: board-control@3,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus", "fsl,ls1088aqds-fpga", + "fsl,fpga-qixis"; + reg = <0x2 0x0 0x0000100>; + bank-width = <1>; + device-width = <1>; + ranges = <0 2 0 0x100>; + }; +}; + &dspi { bus-num = <0>; status = "okay"; diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi index 64b4fcf..ce5e235 100644 --- a/arch/arm/dts/fsl-ls1088a.dtsi +++ b/arch/arm/dts/fsl-ls1088a.dtsi @@ -75,6 +75,11 @@ reg-names = "QuadSPI", "QuadSPI-memory"; num-cs = <4>; }; + ifc: ifc@1530000 { + compatible = "fsl,ifc", "simple-bus"; + reg = <0x0 0x2240000 0x0 0x20000>; + interrupts = <0 21 0x4>; /* Level high type */ + }; usb0: usb3@3100000 { compatible = "fsl,layerscape-dwc3"; diff --git a/board/freescale/ls1088a/MAINTAINERS b/board/freescale/ls1088a/MAINTAINERS index de3961d..bc91f26 100644 --- a/board/freescale/ls1088a/MAINTAINERS +++ b/board/freescale/ls1088a/MAINTAINERS @@ -15,6 +15,8 @@ F: board/freescale/ls1088a/ F: include/configs/ls1088aqds.h F: configs/ls1088aqds_qspi_defconfig F: configs/ls1088aqds_sdcard_qspi_defconfig +F: configs/ls1088aqds_defconfig +F: configs/ls1088aqds_sdcard_ifc_defconfig LS1088AQDS_QSPI_SECURE_BOOT BOARD M: Udit Agarwal <udit.agarwal@nxp.com> diff --git a/configs/ls1088aqds_defconfig b/configs/ls1088aqds_defconfig new file mode 100644 index 0000000..5624595 --- /dev/null +++ b/configs/ls1088aqds_defconfig @@ -0,0 +1,42 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1088AQDS=y +# CONFIG_SYS_MALLOC_F is not set +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds" +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" +CONFIG_HUSH_PARSER=y +CONFIG_CMD_MMC=y +CONFIG_CMD_I2C=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_OF_CONTROL=y +CONFIG_FSL_IFC=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y +CONFIG_SCSI_AHCI=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_NETDEVICES=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_ENV_IS_IN_FLASH=y +CONFIG_FSL_LS_PPA=y +CONFIG_USB=y +CONFIG_USB_GADGET=y +CONFIG_CMD_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +CONFIG_USB_STORAGE=y +# CONFIG_DISPLAY_BOARDINFO is not set +# CONFIG_USE_BOOTCOMMAND is not set diff --git a/configs/ls1088aqds_sdcard_ifc_defconfig b/configs/ls1088aqds_sdcard_ifc_defconfig new file mode 100644 index 0000000..5f175f8 --- /dev/null +++ b/configs/ls1088aqds_sdcard_ifc_defconfig @@ -0,0 +1,53 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1088AQDS=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_FSL_LS_PPA=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds" +# CONFIG_SYS_MALLOC_F is not set +CONFIG_OF_BOARD_SETUP=y +CONFIG_PARTITIONS=y +CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" +CONFIG_SD_BOOT=y +# CONFIG_DISPLAY_BOARDINFO is not set +# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_SPL=y +CONFIG_SPL_BUILD=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x8b0 +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_FSL_IFC=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_MMC=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y +CONFIG_SCSI_AHCI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_NETDEVICES=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 8fbf890..d5075c3 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -27,7 +27,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x300000) #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000 @@ -41,8 +40,9 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_CLK_FREQ 100000000 #define CONFIG_DDR_CLK_FREQ 100000000 #else -#define CONFIG_SYS_CLK_FREQ get_board_sys_clk() -#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() +#define CONFIG_QIXIS_I2C_ACCESS +#define CONFIG_SYS_CLK_FREQ 100000000 +#define CONFIG_DDR_CLK_FREQ 100000000 #endif #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) @@ -87,16 +87,10 @@ unsigned long get_board_ddr_clk(void); CSPR_MSEL_NOR | \ CSPR_V) #define CONFIG_SYS_NOR_CSOR CSOR_NOR_ADM_SHIFT(12) -#define CONFIG_SYS_NOR_FTIM0 (FTIM0_NOR_TACSE(0x4) | \ - FTIM0_NOR_TEADC(0x5) | \ - FTIM0_NOR_TEAHC(0x5)) -#define CONFIG_SYS_NOR_FTIM1 (FTIM1_NOR_TACO(0x35) | \ - FTIM1_NOR_TRAD_NOR(0x1a) |\ - FTIM1_NOR_TSEQRAD_NOR(0x13)) -#define CONFIG_SYS_NOR_FTIM2 (FTIM2_NOR_TCS(0x4) | \ - FTIM2_NOR_TCH(0x4) | \ - FTIM2_NOR_TWPH(0x0E) | \ - FTIM2_NOR_TWP(0x1c)) +#define CONFIG_SYS_NOR_FTIM0 (0xc0201410) +#define CONFIG_SYS_NOR_FTIM1 (0x50009028) +#define CONFIG_SYS_NOR_FTIM2 (0x0820501c) +#define CONFIG_SYS_NOR_FTIM3 0x04000000 #define CONFIG_SYS_NOR_FTIM3 0x04000000 #define CONFIG_SYS_IFC_CCR 0x01000000 @@ -193,7 +187,7 @@ unsigned long get_board_ddr_clk(void); | CSPR_MSEL_GPCM \ | CSPR_V) -#define CONFIG_SYS_FPGA_AMASK IFC_AMASK(64*1024) +#define SYS_FPGA_AMASK IFC_AMASK(64 * 1024) #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_SYS_FPGA_CSOR CSOR_GPCM_ADM_SHIFT(0) #else @@ -222,7 +216,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_CSPR2_EXT CONFIG_SYS_FPGA_CSPR_EXT #define CONFIG_SYS_CSPR2 CONFIG_SYS_FPGA_CSPR #define CONFIG_SYS_CSPR2_FINAL SYS_FPGA_CSPR_FINAL -#define CONFIG_SYS_AMASK2 CONFIG_SYS_FPGA_AMASK +#define CONFIG_SYS_AMASK2 SYS_FPGA_AMASK #define CONFIG_SYS_CSOR2 CONFIG_SYS_FPGA_CSOR #define CONFIG_SYS_CS2_FTIM0 SYS_FPGA_CS_FTIM0 #define CONFIG_SYS_CS2_FTIM1 SYS_FPGA_CS_FTIM1 @@ -258,13 +252,13 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_CS2_FTIM3 CONFIG_SYS_NAND_FTIM3 #define CONFIG_SYS_CSPR3_EXT CONFIG_SYS_FPGA_CSPR_EXT #define CONFIG_SYS_CSPR3 CONFIG_SYS_FPGA_CSPR -#define CONFIG_SYS_CSPR3_FINAL CONFIG_SYS_FPGA_CSPR_FINAL -#define CONFIG_SYS_AMASK3 CONFIG_SYS_FPGA_AMASK +#define CONFIG_SYS_CSPR3_FINAL SYS_FPGA_CSPR_FINAL +#define CONFIG_SYS_AMASK3 SYS_FPGA_AMASK #define CONFIG_SYS_CSOR3 CONFIG_SYS_FPGA_CSOR -#define CONFIG_SYS_CS3_FTIM0 CONFIG_SYS_FPGA_CS_FTIM0 -#define CONFIG_SYS_CS3_FTIM1 CONFIG_SYS_FPGA_CS_FTIM1 -#define CONFIG_SYS_CS3_FTIM2 CONFIG_SYS_FPGA_CS_FTIM2 -#define CONFIG_SYS_CS3_FTIM3 CONFIG_SYS_FPGA_CS_FTIM3 +#define CONFIG_SYS_CS3_FTIM0 SYS_FPGA_CS_FTIM0 +#define CONFIG_SYS_CS3_FTIM1 SYS_FPGA_CS_FTIM1 +#define CONFIG_SYS_CS3_FTIM2 SYS_FPGA_CS_FTIM2 +#define CONFIG_SYS_CS3_FTIM3 SYS_FPGA_CS_FTIM3 #endif #define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
IFC-NOR and QSPI-NOR pins are muxed on SoC,so they cannot be accessed simultaneously, but IFC-NOR can be accessed along with SD-BOOT. ls1088aqds_sdcard_ifc_defconfig: is defconfig for SD as boot source and IFC-NOR to be used as flash, this will be used to write IFC-NOR image on IFC flash. QSPI and DSPI cannot be accessed in this defconfig. IFC-NOR image is generated by ls1088aqds_defconfig. Signed-off-by: Ashish Kumar <Ashish.Kumar@nxp.com> --- depends on: https://patchwork.ozlabs.org/patch/853615/ Tested on 2018.01-rc3 More accurate timing are used which where provided by validation team to switch to IFC-NOR use command for qspi prompt: i2c mw 66 0x60 0x12; i2c mw 66 50 00;i2c mw 66 10 21 arch/arm/dts/fsl-ls1088a-qds.dts | 37 +++++++++++++++++++++++ arch/arm/dts/fsl-ls1088a.dtsi | 5 ++++ board/freescale/ls1088a/MAINTAINERS | 2 ++ configs/ls1088aqds_defconfig | 42 ++++++++++++++++++++++++++ configs/ls1088aqds_sdcard_ifc_defconfig | 53 +++++++++++++++++++++++++++++++++ include/configs/ls1088aqds.h | 36 ++++++++++------------ 6 files changed, 154 insertions(+), 21 deletions(-) create mode 100644 configs/ls1088aqds_defconfig create mode 100644 configs/ls1088aqds_sdcard_ifc_defconfig