| Message ID | 1457020659-30313-2-git-send-email-sr@denx.de |
|---|---|
| State | Deferred |
| Delegated to: | Marek Vasut |
| Headers | show |
On 03/03/2016 04:57 PM, Stefan Roese wrote: > This patch makes the following changes to the SR1500 board port: > > - Update defconfig to support SPI NOR (use make savedefconfig). > - Increase SPI speed to a maximum of 100MHz for faster system > bootup. > - Change environment location, so that its not between SPL and > main U-Boot. This way the combined SPL / U-Boot image can > be used for updates. > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Marek Vasut <marex@denx.de> > --- > arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 +- > configs/socfpga_sr1500_defconfig | 11 ++++++----- > include/configs/socfpga_sr1500.h | 19 ++++++++++++------- > 3 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/dts/socfpga_cyclone5_sr1500.dts b/arch/arm/dts/socfpga_cyclone5_sr1500.dts > index 3729ca0..32c6aad 100644 > --- a/arch/arm/dts/socfpga_cyclone5_sr1500.dts > +++ b/arch/arm/dts/socfpga_cyclone5_sr1500.dts > @@ -88,7 +88,7 @@ > #size-cells = <1>; > compatible = "n25q00", "spi-flash"; > reg = <0>; /* chip select */ > - spi-max-frequency = <50000000>; > + spi-max-frequency = <100000000>; > m25p,fast-read; > page-size = <256>; > block-size = <16>; /* 2^16, 64KB */ > diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig > index a4f0835..a87dc61 100644 > --- a/configs/socfpga_sr1500_defconfig > +++ b/configs/socfpga_sr1500_defconfig > @@ -4,18 +4,19 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_SPL_DM=y > CONFIG_DM_GPIO=y > CONFIG_TARGET_SOCFPGA_SR1500=y > +CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500" > CONFIG_SPL=y > -CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_SPL_STACK_R=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > # CONFIG_CMD_IMLS is not set > # CONFIG_CMD_FLASH is not set > -CONFIG_SPL_SIMPLE_BUS=y > +CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_DWAPB_GPIO=y > +CONFIG_DM_MMC=y > CONFIG_SPI_FLASH=y > +CONFIG_SPI_FLASH_STMICRO=y > +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set > CONFIG_DM_ETH=y > CONFIG_ETH_DESIGNWARE=y > CONFIG_SYS_NS16550=y > -CONFIG_DM_MMC=y > -# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set > +CONFIG_CADENCE_QSPI=y > diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h > index e4aafaa..6414eeb 100644 > --- a/include/configs/socfpga_sr1500.h > +++ b/include/configs/socfpga_sr1500.h > @@ -93,22 +93,27 @@ > #define CONFIG_SYS_BOOTCOUNT_BE > > /* Environment setting for SPI flash */ > -#undef CONFIG_ENV_SIZE > #define CONFIG_SYS_REDUNDAND_ENVIRONMENT > #define CONFIG_ENV_SECT_SIZE (64 * 1024) > #define CONFIG_ENV_SIZE (16 * 1024) > -#define CONFIG_ENV_OFFSET 0x00040000 > +#define CONFIG_ENV_OFFSET 0x000e0000 > #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) > #define CONFIG_ENV_SPI_BUS 0 > #define CONFIG_ENV_SPI_CS 0 > #define CONFIG_ENV_SPI_MODE SPI_MODE_3 > -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED > +#define CONFIG_ENV_SPI_MAX_HZ 100000000 /* Use max of 100MHz */ > +#define CONFIG_SF_DEFAULT_SPEED 100000000 > + > +/* > + * The QSPI NOR flash layout on SR1500: > + * > + * 0000.0000 - 0003.ffff: SPL (4 times) > + * 0004.0000 - 000d.ffff: U-Boot > + * 000e.0000 - 000e.ffff: env1 > + * 000f.0000 - 000f.ffff: env2 > + */ > > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> > > -/* U-Boot payload is stored at offset 0x60000 */ > -#undef CONFIG_SYS_SPI_U_BOOT_OFFS > -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x60000 > - > #endif /* __CONFIG_SOCFPGA_SR1500_H__ */ > Applied, thanks!
diff --git a/arch/arm/dts/socfpga_cyclone5_sr1500.dts b/arch/arm/dts/socfpga_cyclone5_sr1500.dts index 3729ca0..32c6aad 100644 --- a/arch/arm/dts/socfpga_cyclone5_sr1500.dts +++ b/arch/arm/dts/socfpga_cyclone5_sr1500.dts @@ -88,7 +88,7 @@ #size-cells = <1>; compatible = "n25q00", "spi-flash"; reg = <0>; /* chip select */ - spi-max-frequency = <50000000>; + spi-max-frequency = <100000000>; m25p,fast-read; page-size = <256>; block-size = <16>; /* 2^16, 64KB */ diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index a4f0835..a87dc61 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -4,18 +4,19 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_DM=y CONFIG_DM_GPIO=y CONFIG_TARGET_SOCFPGA_SR1500=y +CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500" CONFIG_SPL=y -CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_ADDR=0x00800000 # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set -CONFIG_SPL_SIMPLE_BUS=y +CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DWAPB_GPIO=y +CONFIG_DM_MMC=y CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_STMICRO=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_SYS_NS16550=y -CONFIG_DM_MMC=y -# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_CADENCE_QSPI=y diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index e4aafaa..6414eeb 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -93,22 +93,27 @@ #define CONFIG_SYS_BOOTCOUNT_BE /* Environment setting for SPI flash */ -#undef CONFIG_ENV_SIZE #define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SIZE (16 * 1024) -#define CONFIG_ENV_OFFSET 0x00040000 +#define CONFIG_ENV_OFFSET 0x000e0000 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MODE SPI_MODE_3 -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED +#define CONFIG_ENV_SPI_MAX_HZ 100000000 /* Use max of 100MHz */ +#define CONFIG_SF_DEFAULT_SPEED 100000000 + +/* + * The QSPI NOR flash layout on SR1500: + * + * 0000.0000 - 0003.ffff: SPL (4 times) + * 0004.0000 - 000d.ffff: U-Boot + * 000e.0000 - 000e.ffff: env1 + * 000f.0000 - 000f.ffff: env2 + */ /* The rest of the configuration is shared */ #include <configs/socfpga_common.h> -/* U-Boot payload is stored at offset 0x60000 */ -#undef CONFIG_SYS_SPI_U_BOOT_OFFS -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x60000 - #endif /* __CONFIG_SOCFPGA_SR1500_H__ */
This patch makes the following changes to the SR1500 board port: - Update defconfig to support SPI NOR (use make savedefconfig). - Increase SPI speed to a maximum of 100MHz for faster system bootup. - Change environment location, so that its not between SPL and main U-Boot. This way the combined SPL / U-Boot image can be used for updates. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Marek Vasut <marex@denx.de> --- arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 +- configs/socfpga_sr1500_defconfig | 11 ++++++----- include/configs/socfpga_sr1500.h | 19 ++++++++++++------- 3 files changed, 19 insertions(+), 13 deletions(-)