[U-Boot] [PATCH v3 0/6] Update support for Helios4 board

[Aditya Prayoga]

Hi everyone,

This series add some missing peripheral support and fixed that was
implemented on U-Boot 2013.01 Marvell version: 2015_T1.0p16
- helios4: mmc: move environment before 1M
- helios4: Enable I2C and IO Expander
- helios4: Reset uSOM onboard phy during board init

and added new peripheral support and improvement
- helios4: Enable mvebu GPIO
- helios4: Enable SPI flash support
- helios4: Reduce U-Boot image size

---
Notes
checkpatch.pl emit "WARNING: added, moved or deleted file(s), does
MAINTAINERS need updating?" on 0002-arm-mvebu-helios4-Enable-I2C-and-
IO-Expander.patch due to new file, armada-388-helios4-u-boot.dtsi

---
Changes v1 -> v2:
* Remove arm: mvebu: helios4: Update Load address patch.
* Rearrange the patch, enabling I2C and convert I2C IO expander to DM
should applied together.
* Move u-boot specific properties into armada-388-helios4-u-boot.dtsi
(Dennis Gilmore)
* Use generic gpio_* API to do phy reset (Baruch Siach)
Changes v2 -> v3:
* Use named gpios for PHY reset (Stefan Roese)
---
Aditya Prayoga (6):
arm: mvebu: helios4: mmc: move environment before 1M
arm: mvebu: helios4: Enable I2C and IO Expander
arm: mvebu: helios4: Enable mvebu GPIO
arm: mvebu: helios4: Reduce U-Boot image size
arm: mvebu: helios4: Enable SPI flash support
arm: mvebu: helios4: Reset uSOM onboard phy during board init

arch/arm/dts/armada-388-helios4-u-boot.dtsi | 22 +++++++++++++
board/kobol/helios4/helios4.c | 32 -------------------
configs/helios4_defconfig | 13 +++++---
include/configs/helios4.h | 48 ++++++++++++++++++++---------
4 files changed, 64 insertions(+), 51 deletions(-)
create mode 100644 arch/arm/dts/armada-388-helios4-u-boot.dtsi

[Aditya Prayoga]

Store the environment before 1M into the block device.
This constant is easier to remember, saves a little space,
and is in line with what SolidRun's 2018.01-based fork does for the
clearfog.

Signed-off-by: Josua Mayer <***@gmail.com>
[ Aditya Prayoga:
* Port forward]
Signed-off-by: Aditya Prayoga <***@kobol.io>
---
include/configs/helios4.h | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index ce912ea..c71055f 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -46,14 +46,9 @@
/* Environment in MMC */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SECT_SIZE 0x200
-#define CONFIG_ENV_SIZE 0x10000
-/*
- * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC
- * boot image starts @ LBA-0.
- * As result in MMC/eMMC case it will be a 1 sector gap between u-boot
- * image and environment
- */
-#define CONFIG_ENV_OFFSET 0xf0000
+#define CONFIG_ENV_SIZE 0x2000
+/* stay within first 1M */
+#define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE)
#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET

#define CONFIG_PHY_MARVELL /* there is a marvell phy */

[Stefan Roese]

Post by Aditya Prayoga
Store the environment before 1M into the block device.
This constant is easier to remember, saves a little space,
and is in line with what SolidRun's 2018.01-based fork does for the
clearfog.
* Port forward]
---
include/configs/helios4.h | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index ce912ea..c71055f 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -46,14 +46,9 @@
/* Environment in MMC */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SECT_SIZE 0x200
-#define CONFIG_ENV_SIZE 0x10000
-/*
- * For SD - reserve 1 LBA for MBR + 1M for u-boot image. The MMC/eMMC
- * As result in MMC/eMMC case it will be a 1 sector gap between u-boot
- * image and environment
- */
-#define CONFIG_ENV_OFFSET 0xf0000
+#define CONFIG_ENV_SIZE 0x2000
+/* stay within first 1M */
+#define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE)
#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET
#define CONFIG_PHY_MARVELL /* there is a marvell phy */

Reviewed-by: Stefan Roese <***@denx.de>

Thanks,
Stefan

[Aditya Prayoga]

Enable Marvell I2C driver and I2C IO expander. Set default bus to
external I2C bus. Define I2C aliases in device tree so it can be
recognized by the driver.

Signed-off-by: Aditya Prayoga <***@kobol.io>
---
v2:
* Rearrange the patch, enabling I2C and convert I2C IO expander to DM
should applied together.
* Move u-boot specific properties into armada-388-helios4-u-boot.dtsi
(Dennis Gilmore)
---
arch/arm/dts/armada-388-helios4-u-boot.dtsi | 8 ++++++++
board/kobol/helios4/helios4.c | 32 -----------------------------
configs/helios4_defconfig | 4 ++++
3 files changed, 12 insertions(+), 32 deletions(-)
create mode 100644 arch/arm/dts/armada-388-helios4-u-boot.dtsi

diff --git a/arch/arm/dts/armada-388-helios4-u-boot.dtsi b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
new file mode 100644
index 0000000..bd8c6ce
--- /dev/null
+++ b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/ {
+ aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ };
+};
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index 3416783..37c46a5 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -33,18 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define BOARD_GPP_POL_LOW 0x0
#define BOARD_GPP_POL_MID 0x0

-/* IO expander on Marvell GP board includes e.g. fan enabling */
-struct marvell_io_exp {
- u8 addr;
- u8 val;
-};
-
-static struct marvell_io_exp io_exp[] = {
- {6, 0xf9},
- {2, 0x46}, /* Assert reset signals and enable USB3 current limiter */
- {6, 0xb9}
-};
-
static struct serdes_map board_serdes_map[] = {
{SATA0, SERDES_SPEED_6_GBPS, SERDES_DEFAULT_MODE, 0, 0},
{USB3_HOST0, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0},
@@ -123,29 +111,9 @@ int board_early_init_f(void)

int board_init(void)
{
- int i;
-
/* Address of boot parameters */
gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;

- /* Init I2C IO expanders */
- for (i = 0; i < ARRAY_SIZE(io_exp); i++) {
- struct udevice *dev;
- int ret;
-
- ret = i2c_get_chip_for_busnum(0, io_exp[i].addr, 1, &dev);
- if (ret) {
- printf("Cannot find I2C: %d\n", ret);
- return 0;
- }
-
- ret = dm_i2c_write(dev, io_exp[i].val, &io_exp[i].val, 1);
- if (ret) {
- printf("Failed to set IO expander via I2C\n");
- return -EIO;
- }
- }
-
return 0;
}

diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
index e30eb3d..6471fa3 100644
--- a/configs/helios4_defconfig
+++ b/configs/helios4_defconfig
@@ -38,7 +38,11 @@ CONFIG_ENV_IS_IN_MMC=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_OF_TRANSLATE=y
CONFIG_SCSI_AHCI=y
+CONFIG_DM_PCA953X=y
CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MVTWSI=y
+CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_I2C_DEFAULT_BUS_NUMBER=0x1
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
CONFIG_MMC_SDHCI_MV=y

[Stefan Roese]

Post by Aditya Prayoga
Enable Marvell I2C driver and I2C IO expander. Set default bus to
external I2C bus. Define I2C aliases in device tree so it can be
recognized by the driver.
---
* Rearrange the patch, enabling I2C and convert I2C IO expander to DM
should applied together.
* Move u-boot specific properties into armada-388-helios4-u-boot.dtsi
(Dennis Gilmore)

Reviewed-by: Stefan Roese <***@denx.de>

Thanks,
Stefan

[Aditya Prayoga]

This post might be inappropriate. Click to display it.

[Stefan Roese]

Post by Aditya Prayoga
Make use of U-Boot's GPIO DM to control native GPIO and I2C IO expander.
---
* Rearrange the patch, move I2C IO expander DM convertion together
with I2C.

Reviewed-by: Stefan Roese <***@denx.de>

Thanks,
Stefan

[Aditya Prayoga]

Similar to Clearfog rev 2.1, GPIO 19 also used to reset onboard ethernet
PHY.

This patch depend on
net: mvneta: Add GPIO configuration support
[URL: https://patchwork.ozlabs.org/patch/1007736/]

Signed-off-by: Aditya Prayoga <***@kobol.io>
---
v2:
* Use generic gpio_* API (Baruch Siach)
v3:
* Use named gpios (Stefan Roese)
---
arch/arm/dts/armada-388-helios4-u-boot.dtsi | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/arm/dts/armada-388-helios4-u-boot.dtsi b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
index 4bc00ae..4b20610 100644
--- a/arch/arm/dts/armada-388-helios4-u-boot.dtsi
+++ b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
@@ -8,6 +8,10 @@
};
};

+&eth0 {
+ phy-reset-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
+};
+
&spi1 {
u-boot,dm-spl;
};

[Stefan Roese]

Post by Aditya Prayoga
Similar to Clearfog rev 2.1, GPIO 19 also used to reset onboard ethernet
PHY.
This patch depend on
net: mvneta: Add GPIO configuration support
[URL: https://patchwork.ozlabs.org/patch/1007736/]
---
* Use generic gpio_* API (Baruch Siach)
* Use named gpios (Stefan Roese)

Reviewed-by: Stefan Roese <***@denx.de>

Thanks,
Stefan

[Aditya Prayoga]

Enable SPI flash support under U-Boot and SPL. The ENV size and offset,
ported from U-Boot 2013.01 Marvell version: 2015_T1.0p16

To create U-Boot image for SPI flash, user would need to replace
* CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC with CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
* CONFIG_ENV_IS_IN_MMC with CONFIG_ENV_IS_IN_SPI_FLASH

Signed-off-by: Aditya Prayoga <***@kobol.io>
---
v2:
* Move u-boot specific properties into armada-388-helios4-u-boot.dtsi
(Dennis Gilmore)
---
arch/arm/dts/armada-388-helios4-u-boot.dtsi | 10 ++++++++++
configs/helios4_defconfig | 1 -
include/configs/helios4.h | 31 +++++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/armada-388-helios4-u-boot.dtsi b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
index bd8c6ce..4bc00ae 100644
--- a/arch/arm/dts/armada-388-helios4-u-boot.dtsi
+++ b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
@@ -4,5 +4,15 @@
aliases {
i2c0 = &i2c0;
i2c1 = &i2c1;
+ spi1 = &spi1;
};
};
+
+&spi1 {
+ u-boot,dm-spl;
+};
+
+&w25q32 {
+ status = "okay";
+ u-boot,dm-spl;
+};
diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
index 53995fe..3bb4622 100644
--- a/configs/helios4_defconfig
+++ b/configs/helios4_defconfig
@@ -6,7 +6,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_HELIOS4=y
CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y
-CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL=y
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index e665340..3157225 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -6,6 +6,8 @@
#ifndef _CONFIG_HELIOS4_H
#define _CONFIG_HELIOS4_H

+#include <linux/sizes.h>
+
/*
* High Level Configuration Options (easy to change)
*/
@@ -23,6 +25,9 @@

/* SPI NOR flash default params, used by sf commands */
#define CONFIG_SF_DEFAULT_BUS 1
+#define CONFIG_SF_DEFAULT_CS 0
+#define CONFIG_SF_DEFAULT_SPEED 104000000
+#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3

/*
* SDIO/MMC Card Configuration
@@ -43,6 +48,21 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)

+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
+/*
+ * SPI Flash configuration for the environment access
+ */
+#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS
+#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS
+#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
+
+/* Environment in SPI NOR flash */
+#define CONFIG_ENV_SECT_SIZE SZ_64K
+#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
+#define CONFIG_ENV_OFFSET SZ_1M
+#endif
+
+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
/* Environment in MMC */
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_SECT_SIZE 0x200
@@ -50,6 +70,7 @@
/* stay within first 1M */
#define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE)
#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET
+#endif

#define CONFIG_PHY_MARVELL /* there is a marvell phy */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
@@ -69,7 +90,13 @@
*/
#define SPL_BOOT_SPI_NOR_FLASH 1
#define SPL_BOOT_SDIO_MMC_CARD 2
+
+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
+#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH
+#endif
+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SDIO_MMC_CARD
+#endif

/* Defines for SPL */
#define CONFIG_SPL_SIZE (140 << 10)
@@ -88,12 +115,16 @@

#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH
/* SPL related SPI defines */
+#define CONFIG_SPL_SPI_FLASH_SUPPORT
+#define CONFIG_SPL_SPI_LOAD
+#define CONFIG_SPL_SPI_SUPPORT
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS
#endif

#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD
/* SPL related MMC defines */
+#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10)
#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS
#ifdef CONFIG_SPL_BUILD

[Stefan Roese]

Post by Aditya Prayoga
Enable SPI flash support under U-Boot and SPL. The ENV size and offset,
ported from U-Boot 2013.01 Marvell version: 2015_T1.0p16
To create U-Boot image for SPI flash, user would need to replace
* CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC with CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
* CONFIG_ENV_IS_IN_MMC with CONFIG_ENV_IS_IN_SPI_FLASH
---
* Move u-boot specific properties into armada-388-helios4-u-boot.dtsi
(Dennis Gilmore)

Reviewed-by: Stefan Roese <***@denx.de>

Thanks,
Stefan

[Aditya Prayoga]

Remove unused I2C support in SPL and use simple_malloc functions to
reduce SPL image size.
Since Helios4 does not have any PCIe allocated on SerDes, remove PCI
support. MTD layer on top of SPI flash is not needed, remove it also.

Signed-off-by: Aditya Prayoga <***@kobol.io>
---
configs/helios4_defconfig | 5 +----
include/configs/helios4.h | 6 ------
2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
index 69dd774..53995fe 100644
--- a/configs/helios4_defconfig
+++ b/configs/helios4_defconfig
@@ -8,6 +8,7 @@ CONFIG_TARGET_HELIOS4=y
CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y
CONFIG_SPL_MMC_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL=y
CONFIG_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_CLOCK=250000000
@@ -20,12 +21,10 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x141
-CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
-CONFIG_CMD_PCI=y
CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y
CONFIG_CMD_USB=y
@@ -52,11 +51,9 @@ CONFIG_MMC_SDHCI_MV=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_SPI_FLASH_MTD=y
CONFIG_PHY_GIGE=y
CONFIG_MVNETA=y
CONFIG_MII=y
-CONFIG_PCI=y
CONFIG_SCSI=y
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y
diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index c71055f..e665340 100644
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -54,12 +54,6 @@
#define CONFIG_PHY_MARVELL /* there is a marvell phy */
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */

-/* PCIe support */
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_PCI_MVEBU
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
/* Keep device tree and initrd in lower memory so the kernel can access them */
#define RELOCATION_LIMITS_ENV_SETTINGS \
"fdt_high=0x10000000\0" \

[Stefan Roese]

Post by Aditya Prayoga
Remove unused I2C support in SPL and use simple_malloc functions to
reduce SPL image size.
Since Helios4 does not have any PCIe allocated on SerDes, remove PCI
support. MTD layer on top of SPI flash is not needed, remove it also.

Reviewed-by: Stefan Roese <***@denx.de>

Thanks,
Stefan

[Dennis Gilmore]

Series

Post by Aditya Prayoga
Hi everyone,
This series add some missing peripheral support and fixed that was
implemented on U-Boot 2013.01 Marvell version: 2015_T1.0p16
- helios4: mmc: move environment before 1M
- helios4: Enable I2C and IO Expander
- helios4: Reset uSOM onboard phy during board init
and added new peripheral support and improvement
- helios4: Enable mvebu GPIO
- helios4: Enable SPI flash support
- helios4: Reduce U-Boot image size
---
Notes
checkpatch.pl emit "WARNING: added, moved or deleted file(s), does
MAINTAINERS need updating?" on 0002-arm-mvebu-helios4-Enable-I2C-
and-
IO-Expander.patch due to new file, armada-388-helios4-u-boot.dtsi
---
* Remove arm: mvebu: helios4: Update Load address patch.
* Rearrange the patch, enabling I2C and convert I2C IO expander to DM
should applied together.
* Move u-boot specific properties into armada-388-helios4-u-
boot.dtsi
(Dennis Gilmore)
* Use generic gpio_* API to do phy reset (Baruch Siach)
* Use named gpios for PHY reset (Stefan Roese)
---
arm: mvebu: helios4: mmc: move environment before 1M
arm: mvebu: helios4: Enable I2C and IO Expander
arm: mvebu: helios4: Enable mvebu GPIO
arm: mvebu: helios4: Reduce U-Boot image size
arm: mvebu: helios4: Enable SPI flash support
arm: mvebu: helios4: Reset uSOM onboard phy during board init
arch/arm/dts/armada-388-helios4-u-boot.dtsi | 22 +++++++++++++
board/kobol/helios4/helios4.c | 32 -------------------
configs/helios4_defconfig | 13 +++++---
include/configs/helios4.h | 48
++++++++++++++++++++---------
4 files changed, 64 insertions(+), 51 deletions(-)
create mode 100644 arch/arm/dts/armada-388-helios4-u-boot.dtsi

[Stefan Roese]

Post by Aditya Prayoga
Hi everyone,
This series add some missing peripheral support and fixed that was
implemented on U-Boot 2013.01 Marvell version: 2015_T1.0p16
- helios4: mmc: move environment before 1M
- helios4: Enable I2C and IO Expander
- helios4: Reset uSOM onboard phy during board init
and added new peripheral support and improvement
- helios4: Enable mvebu GPIO
- helios4: Enable SPI flash support
- helios4: Reduce U-Boot image size

Applied to u-boot-marvell/master.

Thanks,
Stefan