ARM: mvebu: enable SPI for helios4 and sata and uart images for clearfog
Subsystems (3)
In an effort to build SPI images for clearfog and helios4 I needed to make some minor changes to the dts and Kconfig for the helios4 and set some variables for UART and SATA images for ClearFog.
Version 2 dropped changes for db-mv784mp-gp as the board turns out to be currently broken, the serial port is not available and the system bails after loading the SPL the dts changes for the helios4 have been shrunk back to remove everything not needed or valid
Dennis
PATCH v2 1/3 ARM: mvebu: helios4 adjust env sizes to enable SPI to work
From: Dennis Gilmore <[email protected]>
mirror the clearfog setup to enable SPI to work
--- arch/arm/mach-mvebu/Kconfig | 1 + board/kobol/helios4/Kconfig | 24 ++++++++++++++++++++++++ configs/helios4_defconfig | 2 -- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 board/kobol/helios4/Kconfig
arch/arm/mach-mvebu/Kconfig +1 -0
@@ -293,5 +293,6 @@ config SECURED_MODE_CSK_INDEX depends on SECURED_MODE_IMAGE source "board/solidrun/clearfog/Kconfig" +source "board/kobol/helios4/Kconfig" endif
board/kobol/helios4/Kconfig new file +24 -0
@@ -0,0 +1,24 @@ +menu "Helios4 configuration" + depends on TARGET_HELIOS4 + +config ENV_SIZE + hex "Environment Size" + default 0x10000 + +config ENV_OFFSET + hex "Environment offset" + default 0xF0000 + +config ENV_SECT_SIZE + hex "Environment Sector-Size" + # Use SPI or SATA flash erase block size of 4 KiB + default 0x1000 if MVEBU_SPL_BOOT_DEVICE_SPI || MVEBU_SPL_BOOT_DEVICE_SATA + # Use optimistic 64 KiB erase block, will vary between actual media + default 0x10000 if MVEBU_SPL_BOOT_DEVICE_MMC || MVEBU_SPL_BOOT_DEVICE_UART + +config SYS_SPI_U_BOOT_OFFS + hex "address of u-boot payload in SPI flash" + default 0x20000 + depends on MVEBU_SPL_BOOT_DEVICE_SPI + +endmenu
configs/helios4_defconfig +0 -2
@@ -9,8 +9,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_HELIOS4=y CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y -CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0xFE000 CONFIG_DM_GPIO=y CONFIG_SPL_TEXT_BASE=0x40000030 CONFIG_SPL_SERIAL_SUPPORT=y
Signature · 1 line
2.28.0
PATCH v2 2/3 ARM: mvebu: helios4 dts changes to enable SPI
In reply to dgilmore at redhat.comFrom: Dennis Gilmore <[email protected]>
Move all aliases defintions into the main dts file Add u-boot definiton to i2c0 based on clearfog set spi1 status to okay
--- arch/arm/dts/armada-388-helios4-u-boot.dtsi | 23 ++++++++++++--------- arch/arm/dts/armada-388-helios4.dts | 14 ++++++++++++- 2 files changed, 26 insertions(+), 11 deletions(-)
arch/arm/dts/armada-388-helios4-u-boot.dtsi +13 -10
@@ -1,13 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ -/ { - aliases { - i2c0 = &i2c0; - i2c1 = &i2c1; - spi1 = &spi1; - }; -}; - ð0 { phy-reset-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; };
@@ -20,7 +12,6 @@ }; &w25q32 { - status = "okay"; u-boot,dm-spl; };
@@ -37,5 +28,17 @@ }; &sdhci { - u-boot,dm-spl; + u-boot,dm-spl; +}; + +&i2c0 { + u-boot,dm-spl; + + eeprom at 52 { + u-boot,dm-spl; + }; + + eeprom at 53 { + u-boot,dm-spl; + }; };
arch/arm/dts/armada-388-helios4.dts +13 -1
@@ -22,10 +22,14 @@ }; aliases { - /* So that mvebu u-boot can update the MAC addresses */ + /* So that mvebu u-boot can update the MAC address */ ethernet1 = ð0; + spi1 = &spi1; + i2c0 = &i2c0; + i2c1 = &i2c1; }; + chosen { stdout-path = "serial0:115200n8"; };
@@ -306,3 +310,11 @@ }; }; }; + +&w25q32 { + status = "okay"; +}; + +&spi1 { + status = "okay"; +};
Signature · 1 line
2.28.0
PATCH v2 2/3 ARM: mvebu: helios4 dts changes to enable SPI
could I please get someone to review this patch
Dennis
Quoted 93 lines · On Tue, Dec 8, 2020 at 9:07 PM <[email protected]> wrote:
From: Dennis Gilmore <[email protected]>
Move all aliases defintions into the main dts file Add u-boot definiton to i2c0 based on clearfog set spi1 status to okay
Signed-off-by Dennis Gilmore <[email protected]>--- arch/arm/dts/armada-388-helios4-u-boot.dtsi | 23 ++++++++++++--------- arch/arm/dts/armada-388-helios4.dts | 14 ++++++++++++- 2 files changed, 26 insertions(+), 11 deletions(-)arch/arm/dts/armada-388-helios4-u-boot.dtsi +13
-10@@ -1,13 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ -/ { - aliases { - i2c0 = &i2c0; - i2c1 = &i2c1; - spi1 = &spi1; - }; -}; - ð0 { phy-reset-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; };@@ -20,7 +12,6 @@ }; &w25q32 { - status = "okay"; u-boot,dm-spl; };@@ -37,5 +28,17 @@ }; &sdhci { - u-boot,dm-spl; + u-boot,dm-spl; +}; + +&i2c0 { + u-boot,dm-spl; + + eeprom at 52 { + u-boot,dm-spl; + }; + + eeprom at 53 { + u-boot,dm-spl; + }; };arch/arm/dts/armada-388-helios4.dts +13
-2@@ -22,10 +22,14 @@ }; aliases { - /* So that mvebu u-boot can update the MAC addresses */ + /* So that mvebu u-boot can update the MAC address */ ethernet1 = ð0; + spi1 = &spi1; + i2c0 = &i2c0; + i2c1 = &i2c1; }; + chosen { stdout-path = "serial0:115200n8"; };@@ -306,3 +310,11 @@ }; }; }; + +&w25q32 { + status = "okay"; +}; + +&spi1 { + status = "okay"; +}; --2.28.0
PATCH v2 2/3 ARM: mvebu: helios4 dts changes to enable SPI
Quoted 1 line · Dennis Gilmore
could I please get someone to review this patch
Do the changes in armada-388-helios4.dts bring us more in sync with the Linux kernel side? Thanks.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210210/a867a2cc/attachment.sig>
PATCH v2 2/3 ARM: mvebu: helios4 dts changes to enable SPI
In reply to Dennis GilmoreHi Dennis,
Quoted 3 lines · Dennis Gilmore
could I please get someone to review this patch
Dennis
It's already included in mainline. I pulled it in a few days ago. Please check if something else is missing.
Thanks,
Stefan
Quoted 86 lines · On Tue, Dec 8, 2020 at 9:07 PM <[email protected]> wrote:
Quoted 85 lines
From: Dennis Gilmore <[email protected]>
Move all aliases defintions into the main dts file Add u-boot definiton to i2c0 based on clearfog set spi1 status to okay
Signed-off-by Dennis Gilmore <[email protected]>--- arch/arm/dts/armada-388-helios4-u-boot.dtsi | 23 ++++++++++++--------- arch/arm/dts/armada-388-helios4.dts | 14 ++++++++++++- 2 files changed, 26 insertions(+), 11 deletions(-)arch/arm/dts/armada-388-helios4-u-boot.dtsi +13
-10@@ -1,13 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ -/ { - aliases { - i2c0 = &i2c0; - i2c1 = &i2c1; - spi1 = &spi1; - }; -}; - ð0 { phy-reset-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; };@@ -20,7 +12,6 @@ }; &w25q32 { - status = "okay"; u-boot,dm-spl; };@@ -37,5 +28,17 @@ }; &sdhci { - u-boot,dm-spl; + u-boot,dm-spl; +}; + +&i2c0 { + u-boot,dm-spl; + + eeprom at 52 { + u-boot,dm-spl; + }; + + eeprom at 53 { + u-boot,dm-spl; + }; };arch/arm/dts/armada-388-helios4.dts +8
-1@@ -22,10 +22,14 @@ }; aliases { - /* So that mvebu u-boot can update the MAC addresses */ + /* So that mvebu u-boot can update the MAC address */ ethernet1 = ð0; + spi1 = &spi1; + i2c0 = &i2c0; + i2c1 = &i2c1; }; + chosen { stdout-path = "serial0:115200n8"; };@@ -306,3 +310,11 @@ }; }; }; + +&w25q32 { + status = "okay";
Quoted 8 lines
Quoted 8 lines
arch/arm/dts/armada-388-helios4.dts +5
-1+}; + +&spi1 { + status = "okay"; +}; --2.28.0
Viele Gr??e,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
PATCH v2 3/3 ARM: mvebu: ClearFog make sure that SATA and UART images are buildable
In reply to dgilmore at redhat.comFrom: Dennis Gilmore <[email protected]>
SATA and UART ClearFog imaages are not buildable as ENV_SECT_SIZE is not defined set values for both possible targets
--- board/solidrun/clearfog/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
board/solidrun/clearfog/Kconfig +2 -2
@@ -50,9 +50,9 @@ config ENV_OFFSET config ENV_SECT_SIZE hex "Environment Sector-Size" # Use SPI flash erase block size of 4 KiB - default 0x1000 if MVEBU_SPL_BOOT_DEVICE_SPI + default 0x1000 if MVEBU_SPL_BOOT_DEVICE_SPI || MVEBU_SPL_BOOT_DEVICE_SATA # Use optimistic 64 KiB erase block, will vary between actual media - default 0x10000 if MVEBU_SPL_BOOT_DEVICE_MMC + default 0x10000 if MVEBU_SPL_BOOT_DEVICE_MMC || MVEBU_SPL_BOOT_DEVICE_UART config SYS_SPI_U_BOOT_OFFS hex "address of u-boot payload in SPI flash"
Signature · 1 line
2.28.0
Hi Dennis,
Quoted 8 lines · dgilmore at redhat.com
In an effort to build SPI images for clearfog and helios4 I needed to make some minor changes to the dts and
Kconfigfor the helios4 and set some variables for UART and SATA images for ClearFog.Version 2 dropped changes for db-mv784mp-gp as the board turns out to be currently broken, the serial port is not available and the system bails after loading the SPL the dts changes for the helios4 have been shrunk back to remove everything not needed or valid
Could you please test this small patch on the db-mv784mp-gp and report back, if this works:
arch/arm/dts/armada-xp-gp.dts +1 -0
@@ -93,6 +93,7 @@ internal-regs { serial at 12000 { status = "okay"; + u-boot,dm-pre-reloc; }; serial at 12100 { status = "okay";
Thanks,
Stefan
Quoted 21 lines · Stefan Roese
Hi Dennis,
Quoted 8 lines · dgilmore at redhat.com
In an effort to build SPI images for clearfog and helios4 I needed to make some minor changes to the dts and
Kconfigfor the helios4 and set some variables for UART and SATA images for ClearFog.Version 2 dropped changes for db-mv784mp-gp as the board turns out to be currently broken, the serial port is not available and the system bails after loading the SPL the dts changes for the helios4 have been shrunk back to remove everything not needed or valid
Could you please test this small patch on the db-mv784mp-gp and report back, if this works:
arch/arm/dts/armada-xp-gp.dts +0
-0
arch/arm/dts/armada-xp-gp.dts line 96
Quoted 4 lines
arch/arm/dts/armada-xp-gp.dts +1
-0@@ -93,6 +93,7 @@ internal-regs { serial at 12000 { status = "okay"; + u-boot,dm-pre-reloc;
with this dts change the serial port is registered correctly
Dennis
Quoted 8 lines
arch/arm/dts/armada-xp-gp.dts +0
-0}; serial at 12100 { status = "okay";Thanks,
Stefan
Signature · 3 lines
Dennis Gilmore Multiple Architecture Portfolio Enablement T: +1-312-660-3523