* [PATCH u-boot-marvell 01/12] arm: mvebu: turris_mox: Drop SF_DEFAULT_MODE from defconfig
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:30 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 02/12] arm: mvebu: turris_mox: Move options to defconfig Marek Behún
` (11 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
This config option defaults to 0, so it is redundant in defconfig.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
configs/turris_mox_defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index 82ad68b6a1..6ff551e477 100644
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -67,7 +67,6 @@ CONFIG_MMC_SDHCI_SDMA=y
CONFIG_MMC_SDHCI_XENON=y
CONFIG_MTD=y
CONFIG_DM_MTD=y
-CONFIG_SF_DEFAULT_MODE=0
CONFIG_SF_DEFAULT_SPEED=20000000
CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 01/12] arm: mvebu: turris_mox: Drop SF_DEFAULT_MODE from defconfig
2021-10-09 17:33 ` [PATCH u-boot-marvell 01/12] arm: mvebu: turris_mox: Drop SF_DEFAULT_MODE from defconfig Marek Behún
@ 2021-10-21 5:30 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:30 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> This config option defaults to 0, so it is redundant in defconfig.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Already removed by Tom's recent sync.
Thanks,
Stefan
> ---
> configs/turris_mox_defconfig | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
> index 82ad68b6a1..6ff551e477 100644
> --- a/configs/turris_mox_defconfig
> +++ b/configs/turris_mox_defconfig
> @@ -67,7 +67,6 @@ CONFIG_MMC_SDHCI_SDMA=y
> CONFIG_MMC_SDHCI_XENON=y
> CONFIG_MTD=y
> CONFIG_DM_MTD=y
> -CONFIG_SF_DEFAULT_MODE=0
> CONFIG_SF_DEFAULT_SPEED=20000000
> CONFIG_SPI_FLASH_MACRONIX=y
> CONFIG_SPI_FLASH_SPANSION=y
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 02/12] arm: mvebu: turris_mox: Move options to defconfig
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
2021-10-09 17:33 ` [PATCH u-boot-marvell 01/12] arm: mvebu: turris_mox: Drop SF_DEFAULT_MODE from defconfig Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:31 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 03/12] arm: mvebu: a3720: Create Kconfig option for I2C_MV Marek Behún
` (10 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
Move config options CONFIG_LAST_STAGE_INIT and
CONFIG_DISPLAY_BOARDINFO_LATE to turris_mox_defconfig.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
configs/turris_mox_defconfig | 2 ++
include/configs/turris_mox.h | 7 -------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index 6ff551e477..e494aebecc 100644
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -24,7 +24,9 @@ CONFIG_USE_PREBOOT=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_ARCH_EARLY_INIT_R=y
+CONFIG_LAST_STAGE_INIT=y
CONFIG_MISC_INIT_R=y
CONFIG_CMD_SHA1SUM=y
CONFIG_CMD_CLK=y
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 0bbc984753..0fcf216eb1 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -10,13 +10,6 @@
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
-#define CONFIG_LAST_STAGE_INIT
-
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
/* additions for new ARM relocation support */
#define CONFIG_SYS_SDRAM_BASE 0x00000000
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 02/12] arm: mvebu: turris_mox: Move options to defconfig
2021-10-09 17:33 ` [PATCH u-boot-marvell 02/12] arm: mvebu: turris_mox: Move options to defconfig Marek Behún
@ 2021-10-21 5:31 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:31 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Move config options CONFIG_LAST_STAGE_INIT and
> CONFIG_DISPLAY_BOARDINFO_LATE to turris_mox_defconfig.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> configs/turris_mox_defconfig | 2 ++
> include/configs/turris_mox.h | 7 -------
> 2 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
> index 6ff551e477..e494aebecc 100644
> --- a/configs/turris_mox_defconfig
> +++ b/configs/turris_mox_defconfig
> @@ -24,7 +24,9 @@ CONFIG_USE_PREBOOT=y
> CONFIG_SYS_CONSOLE_INFO_QUIET=y
> # CONFIG_DISPLAY_CPUINFO is not set
> # CONFIG_DISPLAY_BOARDINFO is not set
> +CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_ARCH_EARLY_INIT_R=y
> +CONFIG_LAST_STAGE_INIT=y
> CONFIG_MISC_INIT_R=y
> CONFIG_CMD_SHA1SUM=y
> CONFIG_CMD_CLK=y
> diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
> index 0bbc984753..0fcf216eb1 100644
> --- a/include/configs/turris_mox.h
> +++ b/include/configs/turris_mox.h
> @@ -10,13 +10,6 @@
>
> #define CONFIG_SYS_BOOTM_LEN (64 << 20)
>
> -#define CONFIG_LAST_STAGE_INIT
> -
> -/*
> - * High Level Configuration Options (easy to change)
> - */
> -#define CONFIG_DISPLAY_BOARDINFO_LATE
> -
> /* additions for new ARM relocation support */
> #define CONFIG_SYS_SDRAM_BASE 0x00000000
>
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 03/12] arm: mvebu: a3720: Create Kconfig option for I2C_MV
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
2021-10-09 17:33 ` [PATCH u-boot-marvell 01/12] arm: mvebu: turris_mox: Drop SF_DEFAULT_MODE from defconfig Marek Behún
2021-10-09 17:33 ` [PATCH u-boot-marvell 02/12] arm: mvebu: turris_mox: Move options to defconfig Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:31 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 04/12] arm: kirkwood, mvebu: Remove CONFIG_SYS_RESET_ADDRESS option Marek Behún
` (9 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
Move the config option CONFIG_I2C_MV to a Kconfig option
CONFIG_SYS_I2C_MV and move the default definition from config header
files into defconfigs.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
configs/mvebu_db-88f3720_defconfig | 1 +
configs/mvebu_espressobin-88f3720_defconfig | 1 +
configs/turris_mox_defconfig | 1 +
configs/uDPU_defconfig | 1 +
drivers/i2c/Kconfig | 6 ++++++
drivers/i2c/Makefile | 2 +-
include/configs/mvebu_armada-37xx.h | 5 -----
include/configs/turris_mox.h | 5 -----
scripts/config_whitelist.txt | 1 -
9 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
index d401f4765f..6c2a2180a4 100644
--- a/configs/mvebu_db-88f3720_defconfig
+++ b/configs/mvebu_db-88f3720_defconfig
@@ -45,6 +45,7 @@ CONFIG_CLK=y
CONFIG_CLK_MVEBU=y
# CONFIG_MVEBU_GPIO is not set
CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MV=y
CONFIG_MISC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
index 01cf24aec9..b783246562 100644
--- a/configs/mvebu_espressobin-88f3720_defconfig
+++ b/configs/mvebu_espressobin-88f3720_defconfig
@@ -54,6 +54,7 @@ CONFIG_AHCI_MVEBU=y
CONFIG_CLK=y
CONFIG_CLK_MVEBU=y
CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MV=y
CONFIG_MISC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index e494aebecc..3cae32f69b 100644
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -61,6 +61,7 @@ CONFIG_CLK=y
CONFIG_CLK_MVEBU=y
# CONFIG_MVEBU_GPIO is not set
CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MV=y
CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_MISC=y
diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig
index a06a25378e..6a222f3d6c 100644
--- a/configs/uDPU_defconfig
+++ b/configs/uDPU_defconfig
@@ -54,6 +54,7 @@ CONFIG_CLK=y
CONFIG_CLK_MVEBU=y
CONFIG_DM_I2C=y
CONFIG_DM_I2C_GPIO=y
+CONFIG_SYS_I2C_MV=y
CONFIG_MISC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 57cac4483f..b1c3a96dc0 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -611,6 +611,12 @@ config SYS_I2C_VERSATILE
Add support for the Arm Ltd Versatile Express I2C driver. The I2C host
controller is present in the development boards manufactured by Arm Ltd.
+config SYS_I2C_MV
+ bool "Marvell PXA (Armada 3720) I2C driver"
+ help
+ Support for PXA based I2C controller used on Armada 3720 SoC.
+ In Linux, this driver is called i2c-pxa.
+
config SYS_I2C_MVTWSI
bool "Marvell I2C driver"
help
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 67841bf3e0..7cfb3b9043 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_$(SPL_)DM_I2C_GPIO) += i2c-gpio.o
obj-$(CONFIG_$(SPL_)I2C_CROS_EC_TUNNEL) += cros_ec_tunnel.o
obj-$(CONFIG_$(SPL_)I2C_CROS_EC_LDO) += cros_ec_ldo.o
-obj-$(CONFIG_I2C_MV) += mv_i2c.o
obj-$(CONFIG_$(SPL_)SYS_I2C_LEGACY) += i2c_core.o
obj-$(CONFIG_SYS_I2C_ASPEED) += ast_i2c.o
obj-$(CONFIG_SYS_I2C_AT91) += at91_i2c.o
@@ -29,6 +28,7 @@ obj-$(CONFIG_SYS_I2C_IPROC) += iproc_i2c.o
obj-$(CONFIG_SYS_I2C_KONA) += kona_i2c.o
obj-$(CONFIG_SYS_I2C_LPC32XX) += lpc32xx_i2c.o
obj-$(CONFIG_SYS_I2C_MESON) += meson_i2c.o
+obj-$(CONFIG_SYS_I2C_MV) += mv_i2c.o
obj-$(CONFIG_SYS_I2C_MVTWSI) += mvtwsi.o
obj-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o
obj-$(CONFIG_SYS_I2C_NEXELL) += nx_i2c.o
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 755f59eee9..8c315eb563 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -36,11 +36,6 @@
/* End of 16M scrubbed by training in bootrom */
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
-/*
- * I2C
- */
-#define CONFIG_I2C_MV
-
/*
* Environment
*/
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 0fcf216eb1..ab7931d35b 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -34,11 +34,6 @@
/* End of 16M scrubbed by training in bootrom */
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
-/*
- * I2C
- */
-#define CONFIG_I2C_MV
-
/* Environment in SPI NOR flash */
/*
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 02d86d79cf..3475d0bc6d 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -601,7 +601,6 @@ CONFIG_I2C_ENV_EEPROM_BUS
CONFIG_I2C_GSC
CONFIG_I2C_MBB_TIMEOUT
CONFIG_I2C_MULTI_BUS
-CONFIG_I2C_MV
CONFIG_I2C_MVTWSI
CONFIG_I2C_MVTWSI_BASE
CONFIG_I2C_MVTWSI_BASE0
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 03/12] arm: mvebu: a3720: Create Kconfig option for I2C_MV
2021-10-09 17:33 ` [PATCH u-boot-marvell 03/12] arm: mvebu: a3720: Create Kconfig option for I2C_MV Marek Behún
@ 2021-10-21 5:31 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:31 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Move the config option CONFIG_I2C_MV to a Kconfig option
> CONFIG_SYS_I2C_MV and move the default definition from config header
> files into defconfigs.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> configs/mvebu_db-88f3720_defconfig | 1 +
> configs/mvebu_espressobin-88f3720_defconfig | 1 +
> configs/turris_mox_defconfig | 1 +
> configs/uDPU_defconfig | 1 +
> drivers/i2c/Kconfig | 6 ++++++
> drivers/i2c/Makefile | 2 +-
> include/configs/mvebu_armada-37xx.h | 5 -----
> include/configs/turris_mox.h | 5 -----
> scripts/config_whitelist.txt | 1 -
> 9 files changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
> index d401f4765f..6c2a2180a4 100644
> --- a/configs/mvebu_db-88f3720_defconfig
> +++ b/configs/mvebu_db-88f3720_defconfig
> @@ -45,6 +45,7 @@ CONFIG_CLK=y
> CONFIG_CLK_MVEBU=y
> # CONFIG_MVEBU_GPIO is not set
> CONFIG_DM_I2C=y
> +CONFIG_SYS_I2C_MV=y
> CONFIG_MISC=y
> CONFIG_MMC_SDHCI=y
> CONFIG_MMC_SDHCI_SDMA=y
> diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
> index 01cf24aec9..b783246562 100644
> --- a/configs/mvebu_espressobin-88f3720_defconfig
> +++ b/configs/mvebu_espressobin-88f3720_defconfig
> @@ -54,6 +54,7 @@ CONFIG_AHCI_MVEBU=y
> CONFIG_CLK=y
> CONFIG_CLK_MVEBU=y
> CONFIG_DM_I2C=y
> +CONFIG_SYS_I2C_MV=y
> CONFIG_MISC=y
> CONFIG_MMC_SDHCI=y
> CONFIG_MMC_SDHCI_SDMA=y
> diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
> index e494aebecc..3cae32f69b 100644
> --- a/configs/turris_mox_defconfig
> +++ b/configs/turris_mox_defconfig
> @@ -61,6 +61,7 @@ CONFIG_CLK=y
> CONFIG_CLK_MVEBU=y
> # CONFIG_MVEBU_GPIO is not set
> CONFIG_DM_I2C=y
> +CONFIG_SYS_I2C_MV=y
> CONFIG_LED=y
> CONFIG_LED_GPIO=y
> CONFIG_MISC=y
> diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig
> index a06a25378e..6a222f3d6c 100644
> --- a/configs/uDPU_defconfig
> +++ b/configs/uDPU_defconfig
> @@ -54,6 +54,7 @@ CONFIG_CLK=y
> CONFIG_CLK_MVEBU=y
> CONFIG_DM_I2C=y
> CONFIG_DM_I2C_GPIO=y
> +CONFIG_SYS_I2C_MV=y
> CONFIG_MISC=y
> CONFIG_MMC_SDHCI=y
> CONFIG_MMC_SDHCI_SDMA=y
> diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
> index 57cac4483f..b1c3a96dc0 100644
> --- a/drivers/i2c/Kconfig
> +++ b/drivers/i2c/Kconfig
> @@ -611,6 +611,12 @@ config SYS_I2C_VERSATILE
> Add support for the Arm Ltd Versatile Express I2C driver. The I2C host
> controller is present in the development boards manufactured by Arm Ltd.
>
> +config SYS_I2C_MV
> + bool "Marvell PXA (Armada 3720) I2C driver"
> + help
> + Support for PXA based I2C controller used on Armada 3720 SoC.
> + In Linux, this driver is called i2c-pxa.
> +
> config SYS_I2C_MVTWSI
> bool "Marvell I2C driver"
> help
> diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
> index 67841bf3e0..7cfb3b9043 100644
> --- a/drivers/i2c/Makefile
> +++ b/drivers/i2c/Makefile
> @@ -10,7 +10,6 @@ obj-$(CONFIG_$(SPL_)DM_I2C_GPIO) += i2c-gpio.o
> obj-$(CONFIG_$(SPL_)I2C_CROS_EC_TUNNEL) += cros_ec_tunnel.o
> obj-$(CONFIG_$(SPL_)I2C_CROS_EC_LDO) += cros_ec_ldo.o
>
> -obj-$(CONFIG_I2C_MV) += mv_i2c.o
> obj-$(CONFIG_$(SPL_)SYS_I2C_LEGACY) += i2c_core.o
> obj-$(CONFIG_SYS_I2C_ASPEED) += ast_i2c.o
> obj-$(CONFIG_SYS_I2C_AT91) += at91_i2c.o
> @@ -29,6 +28,7 @@ obj-$(CONFIG_SYS_I2C_IPROC) += iproc_i2c.o
> obj-$(CONFIG_SYS_I2C_KONA) += kona_i2c.o
> obj-$(CONFIG_SYS_I2C_LPC32XX) += lpc32xx_i2c.o
> obj-$(CONFIG_SYS_I2C_MESON) += meson_i2c.o
> +obj-$(CONFIG_SYS_I2C_MV) += mv_i2c.o
> obj-$(CONFIG_SYS_I2C_MVTWSI) += mvtwsi.o
> obj-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o
> obj-$(CONFIG_SYS_I2C_NEXELL) += nx_i2c.o
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index 755f59eee9..8c315eb563 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -36,11 +36,6 @@
> /* End of 16M scrubbed by training in bootrom */
> #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
>
> -/*
> - * I2C
> - */
> -#define CONFIG_I2C_MV
> -
> /*
> * Environment
> */
> diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
> index 0fcf216eb1..ab7931d35b 100644
> --- a/include/configs/turris_mox.h
> +++ b/include/configs/turris_mox.h
> @@ -34,11 +34,6 @@
> /* End of 16M scrubbed by training in bootrom */
> #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
>
> -/*
> - * I2C
> - */
> -#define CONFIG_I2C_MV
> -
> /* Environment in SPI NOR flash */
>
> /*
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 02d86d79cf..3475d0bc6d 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -601,7 +601,6 @@ CONFIG_I2C_ENV_EEPROM_BUS
> CONFIG_I2C_GSC
> CONFIG_I2C_MBB_TIMEOUT
> CONFIG_I2C_MULTI_BUS
> -CONFIG_I2C_MV
> CONFIG_I2C_MVTWSI
> CONFIG_I2C_MVTWSI_BASE
> CONFIG_I2C_MVTWSI_BASE0
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 04/12] arm: kirkwood, mvebu: Remove CONFIG_SYS_RESET_ADDRESS option
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
` (2 preceding siblings ...)
2021-10-09 17:33 ` [PATCH u-boot-marvell 03/12] arm: mvebu: a3720: Create Kconfig option for I2C_MV Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:31 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 05/12] arm: mvebu: turris_mox: Cosmetic update for board config header Marek Behún
` (8 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
This option is not used anywhere.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
include/configs/SBx81LIFKW.h | 5 -----
include/configs/SBx81LIFXCAT.h | 5 -----
include/configs/edminiv2.h | 6 ------
include/configs/mv-common.h | 1 -
include/configs/mvebu_armada-37xx.h | 1 -
include/configs/mvebu_armada-8k.h | 1 -
include/configs/turris_mox.h | 1 -
include/configs/x530.h | 5 -----
8 files changed, 25 deletions(-)
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index fc6167cf96..462619ff69 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -59,11 +59,6 @@
/* There is no PHY directly connected so don't ask it for link status */
#undef CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-/*
- * Other required minimal configurations
- */
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
-
/*
* Ethernet Driver configuration
*/
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 06be63e242..a271567f85 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -64,11 +64,6 @@
/* There is no PHY directly connected so don't ask it for link status */
#undef CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-/*
- * Other required minimal configurations
- */
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
-
/*
* Ethernet Driver configuration
*/
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index fbe468010b..664d6d1f34 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -151,12 +151,6 @@
* Environment variables configurations
*/
-/*
- * Other required minimal configurations
- */
-
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000
-
/* Enable command line editing */
/* provide extensive help */
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index e460f69a08..cc3b597f28 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -55,7 +55,6 @@
/*
* Other required minimal configurations
*/
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
/* ====> Include platform Common Definitions */
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 8c315eb563..e7f7e772fc 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -30,7 +30,6 @@
/*
* Other required minimal configurations
*/
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
/* End of 16M scrubbed by training in bootrom */
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 2f8be2ee49..886f44c903 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -24,7 +24,6 @@
/*
* Other required minimal configurations
*/
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
/* End of 16M scrubbed by training in bootrom */
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index ab7931d35b..070abe38db 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -28,7 +28,6 @@
/*
* Other required minimal configurations
*/
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
/* End of 16M scrubbed by training in bootrom */
diff --git a/include/configs/x530.h b/include/configs/x530.h
index d6aec6d7f2..699deffbe0 100644
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -61,11 +61,6 @@
#include <asm/arch/config.h>
-/*
- * Other required minimal configurations
- */
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
-
/* Keep device tree and initrd in low memory so the kernel can access them */
#define CONFIG_EXTRA_ENV_SETTINGS \
"fdt_high=0x10000000\0" \
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 04/12] arm: kirkwood, mvebu: Remove CONFIG_SYS_RESET_ADDRESS option
2021-10-09 17:33 ` [PATCH u-boot-marvell 04/12] arm: kirkwood, mvebu: Remove CONFIG_SYS_RESET_ADDRESS option Marek Behún
@ 2021-10-21 5:31 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:31 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> This option is not used anywhere.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> include/configs/SBx81LIFKW.h | 5 -----
> include/configs/SBx81LIFXCAT.h | 5 -----
> include/configs/edminiv2.h | 6 ------
> include/configs/mv-common.h | 1 -
> include/configs/mvebu_armada-37xx.h | 1 -
> include/configs/mvebu_armada-8k.h | 1 -
> include/configs/turris_mox.h | 1 -
> include/configs/x530.h | 5 -----
> 8 files changed, 25 deletions(-)
>
> diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
> index fc6167cf96..462619ff69 100644
> --- a/include/configs/SBx81LIFKW.h
> +++ b/include/configs/SBx81LIFKW.h
> @@ -59,11 +59,6 @@
> /* There is no PHY directly connected so don't ask it for link status */
> #undef CONFIG_SYS_FAULT_ECHO_LINK_DOWN
>
> -/*
> - * Other required minimal configurations
> - */
> -#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
> -
> /*
> * Ethernet Driver configuration
> */
> diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
> index 06be63e242..a271567f85 100644
> --- a/include/configs/SBx81LIFXCAT.h
> +++ b/include/configs/SBx81LIFXCAT.h
> @@ -64,11 +64,6 @@
> /* There is no PHY directly connected so don't ask it for link status */
> #undef CONFIG_SYS_FAULT_ECHO_LINK_DOWN
>
> -/*
> - * Other required minimal configurations
> - */
> -#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
> -
> /*
> * Ethernet Driver configuration
> */
> diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
> index fbe468010b..664d6d1f34 100644
> --- a/include/configs/edminiv2.h
> +++ b/include/configs/edminiv2.h
> @@ -151,12 +151,6 @@
> * Environment variables configurations
> */
>
> -/*
> - * Other required minimal configurations
> - */
> -
> -#define CONFIG_SYS_RESET_ADDRESS 0xffff0000
> -
> /* Enable command line editing */
>
> /* provide extensive help */
> diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
> index e460f69a08..cc3b597f28 100644
> --- a/include/configs/mv-common.h
> +++ b/include/configs/mv-common.h
> @@ -55,7 +55,6 @@
> /*
> * Other required minimal configurations
> */
> -#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
> #define CONFIG_SYS_MAXARGS 32 /* max number of command args */
>
> /* ====> Include platform Common Definitions */
> diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
> index 8c315eb563..e7f7e772fc 100644
> --- a/include/configs/mvebu_armada-37xx.h
> +++ b/include/configs/mvebu_armada-37xx.h
> @@ -30,7 +30,6 @@
> /*
> * Other required minimal configurations
> */
> -#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
> #define CONFIG_SYS_MAXARGS 32 /* max number of command args */
>
> /* End of 16M scrubbed by training in bootrom */
> diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
> index 2f8be2ee49..886f44c903 100644
> --- a/include/configs/mvebu_armada-8k.h
> +++ b/include/configs/mvebu_armada-8k.h
> @@ -24,7 +24,6 @@
> /*
> * Other required minimal configurations
> */
> -#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
> #define CONFIG_SYS_MAXARGS 32 /* max number of command args */
>
> /* End of 16M scrubbed by training in bootrom */
> diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
> index ab7931d35b..070abe38db 100644
> --- a/include/configs/turris_mox.h
> +++ b/include/configs/turris_mox.h
> @@ -28,7 +28,6 @@
> /*
> * Other required minimal configurations
> */
> -#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
> #define CONFIG_SYS_MAXARGS 32 /* max number of command args */
>
> /* End of 16M scrubbed by training in bootrom */
> diff --git a/include/configs/x530.h b/include/configs/x530.h
> index d6aec6d7f2..699deffbe0 100644
> --- a/include/configs/x530.h
> +++ b/include/configs/x530.h
> @@ -61,11 +61,6 @@
>
> #include <asm/arch/config.h>
>
> -/*
> - * Other required minimal configurations
> - */
> -#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
> -
> /* Keep device tree and initrd in low memory so the kernel can access them */
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "fdt_high=0x10000000\0" \
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 05/12] arm: mvebu: turris_mox: Cosmetic update for board config header
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
` (3 preceding siblings ...)
2021-10-09 17:33 ` [PATCH u-boot-marvell 04/12] arm: kirkwood, mvebu: Remove CONFIG_SYS_RESET_ADDRESS option Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:32 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 06/12] arm: mvebu: turris_mox: Use show_board_info() Marek Behún
` (7 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
Reorder the definitions in Turris MOX' board config header, drop the
comment relics from when this file was copied, fix indentation.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
include/configs/turris_mox.h | 61 +++++++++++++-----------------------
1 file changed, 22 insertions(+), 39 deletions(-)
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 070abe38db..3cfad7cca9 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -8,13 +8,11 @@
#ifndef _CONFIG_TURRIS_MOX_H
#define _CONFIG_TURRIS_MOX_H
-#define CONFIG_SYS_BOOTM_LEN (64 << 20)
-
-/* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE 0x00000000
-
-/* auto boot */
-
+#define CONFIG_SYS_BOOTM_LEN (64 << 20)
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
+#define CONFIG_SYS_CBSIZE 1024
+#define CONFIG_SYS_MAXARGS 32
#define CONFIG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \
9600, 19200, 38400, 57600, 115200, \
230400, 460800, 500000, 576000, \
@@ -23,25 +21,10 @@
4000000, 4500000, 5000000, 5500000, \
6000000 }
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-
-/*
- * Other required minimal configurations
- */
-#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
-
-/* End of 16M scrubbed by training in bootrom */
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
-
-/* Environment in SPI NOR flash */
-
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_ARP_TIMEOUT 200
-#define CONFIG_NET_RETRY_COUNT 50
+#define CONFIG_ARP_TIMEOUT 200
+#define CONFIG_NET_RETRY_COUNT 50
-#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 6
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
@@ -51,22 +34,22 @@
#include <config_distro_bootcmd.h>
-#define TURRIS_MOX_BOOTCMD_RESCUE \
- "setenv bootargs \"console=ttyMV0,115200 " \
- "earlycon=ar3700_uart,0xd0012000\" && " \
- "sf probe && " \
- "sf read 0x5000000 0x190000 && " \
- "lzmadec 0x5000000 0x5800000 && " \
+#define TURRIS_MOX_BOOTCMD_RESCUE \
+ "setenv bootargs \"console=ttyMV0,115200 " \
+ "earlycon=ar3700_uart,0xd0012000\" && " \
+ "sf probe && " \
+ "sf read 0x5000000 0x190000 && " \
+ "lzmadec 0x5000000 0x5800000 && " \
"bootm 0x5800000"
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "scriptaddr=0x4d00000\0" \
- "pxefile_addr_r=0x4e00000\0" \
- "fdt_addr_r=0x4f00000\0" \
- "kernel_addr_r=0x5000000\0" \
- "ramdisk_addr_r=0x8000000\0" \
- "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
- "bootcmd_rescue=" TURRIS_MOX_BOOTCMD_RESCUE "\0" \
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "scriptaddr=0x4d00000\0" \
+ "pxefile_addr_r=0x4e00000\0" \
+ "fdt_addr_r=0x4f00000\0" \
+ "kernel_addr_r=0x5000000\0" \
+ "ramdisk_addr_r=0x8000000\0" \
+ "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+ "bootcmd_rescue=" TURRIS_MOX_BOOTCMD_RESCUE "\0" \
BOOTENV
#endif /* _CONFIG_TURRIS_MOX_H */
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 05/12] arm: mvebu: turris_mox: Cosmetic update for board config header
2021-10-09 17:33 ` [PATCH u-boot-marvell 05/12] arm: mvebu: turris_mox: Cosmetic update for board config header Marek Behún
@ 2021-10-21 5:32 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:32 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Reorder the definitions in Turris MOX' board config header, drop the
> comment relics from when this file was copied, fix indentation.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> include/configs/turris_mox.h | 61 +++++++++++++-----------------------
> 1 file changed, 22 insertions(+), 39 deletions(-)
>
> diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
> index 070abe38db..3cfad7cca9 100644
> --- a/include/configs/turris_mox.h
> +++ b/include/configs/turris_mox.h
> @@ -8,13 +8,11 @@
> #ifndef _CONFIG_TURRIS_MOX_H
> #define _CONFIG_TURRIS_MOX_H
>
> -#define CONFIG_SYS_BOOTM_LEN (64 << 20)
> -
> -/* additions for new ARM relocation support */
> -#define CONFIG_SYS_SDRAM_BASE 0x00000000
> -
> -/* auto boot */
> -
> +#define CONFIG_SYS_BOOTM_LEN (64 << 20)
> +#define CONFIG_SYS_SDRAM_BASE 0x00000000
> +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
> +#define CONFIG_SYS_CBSIZE 1024
> +#define CONFIG_SYS_MAXARGS 32
> #define CONFIG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \
> 9600, 19200, 38400, 57600, 115200, \
> 230400, 460800, 500000, 576000, \
> @@ -23,25 +21,10 @@
> 4000000, 4500000, 5000000, 5500000, \
> 6000000 }
>
> -#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
> -
> -/*
> - * Other required minimal configurations
> - */
> -#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
> -
> -/* End of 16M scrubbed by training in bootrom */
> -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + 0xFF0000)
> -
> -/* Environment in SPI NOR flash */
> -
> -/*
> - * Ethernet Driver configuration
> - */
> -#define CONFIG_ARP_TIMEOUT 200
> -#define CONFIG_NET_RETRY_COUNT 50
> +#define CONFIG_ARP_TIMEOUT 200
> +#define CONFIG_NET_RETRY_COUNT 50
>
> -#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
> +#define CONFIG_USB_MAX_CONTROLLER_COUNT 6
>
> #define BOOT_TARGET_DEVICES(func) \
> func(MMC, mmc, 0) \
> @@ -51,22 +34,22 @@
>
> #include <config_distro_bootcmd.h>
>
> -#define TURRIS_MOX_BOOTCMD_RESCUE \
> - "setenv bootargs \"console=ttyMV0,115200 " \
> - "earlycon=ar3700_uart,0xd0012000\" && " \
> - "sf probe && " \
> - "sf read 0x5000000 0x190000 && " \
> - "lzmadec 0x5000000 0x5800000 && " \
> +#define TURRIS_MOX_BOOTCMD_RESCUE \
> + "setenv bootargs \"console=ttyMV0,115200 " \
> + "earlycon=ar3700_uart,0xd0012000\" && " \
> + "sf probe && " \
> + "sf read 0x5000000 0x190000 && " \
> + "lzmadec 0x5000000 0x5800000 && " \
> "bootm 0x5800000"
>
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> - "scriptaddr=0x4d00000\0" \
> - "pxefile_addr_r=0x4e00000\0" \
> - "fdt_addr_r=0x4f00000\0" \
> - "kernel_addr_r=0x5000000\0" \
> - "ramdisk_addr_r=0x8000000\0" \
> - "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
> - "bootcmd_rescue=" TURRIS_MOX_BOOTCMD_RESCUE "\0" \
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> + "scriptaddr=0x4d00000\0" \
> + "pxefile_addr_r=0x4e00000\0" \
> + "fdt_addr_r=0x4f00000\0" \
> + "kernel_addr_r=0x5000000\0" \
> + "ramdisk_addr_r=0x8000000\0" \
> + "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
> + "bootcmd_rescue=" TURRIS_MOX_BOOTCMD_RESCUE "\0" \
> BOOTENV
>
> #endif /* _CONFIG_TURRIS_MOX_H */
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 06/12] arm: mvebu: turris_mox: Use show_board_info()
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
` (4 preceding siblings ...)
2021-10-09 17:33 ` [PATCH u-boot-marvell 05/12] arm: mvebu: turris_mox: Cosmetic update for board config header Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:32 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 07/12] arm: mvebu: turris_mox: Always handle reset button Marek Behún
` (6 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
We are printing board information in last_stage_init(), but U-Boot has
dedicated function, show_board_info(), for this.
Move code which prints board information (board version, serial number,
module topology, ...) to show_board_info().
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
board/CZ.NIC/turris_mox/turris_mox.c | 67 ++++++++++++++--------------
1 file changed, 33 insertions(+), 34 deletions(-)
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 428cd23a19..ff0ed28045 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -485,44 +485,34 @@ static void handle_reset_button(void)
}
}
-static void mox_print_info(void)
+int show_board_info(void)
{
- int ret, board_version, ram_size;
- u64 serial_number;
+ int i, ret, board_version, ram_size, is_sd;
const char *pub_key;
+ const u8 *topology;
+ u64 serial_number;
+
+ printf("Model: CZ.NIC Turris Mox Board\n");
ret = mbox_sp_get_board_info(&serial_number, NULL, NULL, &board_version,
&ram_size);
- if (ret < 0)
- return;
-
- printf("Turris Mox:\n");
- printf(" Board version: %i\n", board_version);
- printf(" RAM size: %i MiB\n", ram_size);
- printf(" Serial Number: %016llX\n", serial_number);
+ if (ret < 0) {
+ printf(" Cannot read board info: %i\n", ret);
+ } else {
+ printf(" Board version: %i\n", board_version);
+ printf(" RAM size: %i MiB\n", ram_size);
+ printf(" Serial Number: %016llX\n", serial_number);
+ }
pub_key = mox_sp_get_ecdsa_public_key();
if (pub_key)
printf(" ECDSA Public Key: %s\n", pub_key);
else
- printf("Cannot read ECDSA Public Key\n");
-}
-
-int last_stage_init(void)
-{
- int ret, i;
- const u8 *topology;
- int is_sd;
- struct mii_dev *bus;
- struct gpio_desc reset_gpio = {};
-
- mox_print_info();
+ printf(" Cannot read ECDSA Public Key\n");
ret = mox_get_topology(&topology, &module_count, &is_sd);
- if (ret) {
+ if (ret)
printf("Cannot read module topology!\n");
- return 0;
- }
printf(" SD/eMMC version: %s\n", is_sd ? "SD" : "eMMC");
@@ -554,8 +544,7 @@ int last_stage_init(void)
}
}
- /* now check if modules are connected in supported mode */
-
+ /* check if modules are connected in supported mode */
for (i = 0; i < module_count; ++i) {
switch (topology[i]) {
case MOX_MODULE_SFP:
@@ -616,8 +605,17 @@ int last_stage_init(void)
}
}
- /* now configure modules */
+ if (module_count)
+ printf("\n");
+
+ return 0;
+}
+
+int last_stage_init(void)
+{
+ struct gpio_desc reset_gpio = {};
+ /* configure modules */
if (get_reset_gpio(&reset_gpio) < 0)
return 0;
@@ -633,16 +631,19 @@ int last_stage_init(void)
mdelay(50);
}
+ /*
+ * check if the addresses are set by reading Scratch & Misc register
+ * 0x70 of Peridot (and potentially Topaz) modules
+ */
if (peridot || topaz) {
- /*
- * now check if the addresses are set by reading Scratch & Misc
- * register 0x70 of Peridot (and potentially Topaz) modules
- */
+ struct mii_dev *bus;
bus = miiphy_get_dev_by_name("neta@30000");
if (!bus) {
printf("Cannot get MDIO bus device!\n");
} else {
+ int i;
+
for (i = 0; i < peridot; ++i)
check_switch_address(bus, 0x10 + i);
@@ -653,8 +654,6 @@ int last_stage_init(void)
}
}
- printf("\n");
-
handle_reset_button();
return 0;
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 06/12] arm: mvebu: turris_mox: Use show_board_info()
2021-10-09 17:33 ` [PATCH u-boot-marvell 06/12] arm: mvebu: turris_mox: Use show_board_info() Marek Behún
@ 2021-10-21 5:32 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:32 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> We are printing board information in last_stage_init(), but U-Boot has
> dedicated function, show_board_info(), for this.
>
> Move code which prints board information (board version, serial number,
> module topology, ...) to show_board_info().
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> board/CZ.NIC/turris_mox/turris_mox.c | 67 ++++++++++++++--------------
> 1 file changed, 33 insertions(+), 34 deletions(-)
>
> diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
> index 428cd23a19..ff0ed28045 100644
> --- a/board/CZ.NIC/turris_mox/turris_mox.c
> +++ b/board/CZ.NIC/turris_mox/turris_mox.c
> @@ -485,44 +485,34 @@ static void handle_reset_button(void)
> }
> }
>
> -static void mox_print_info(void)
> +int show_board_info(void)
> {
> - int ret, board_version, ram_size;
> - u64 serial_number;
> + int i, ret, board_version, ram_size, is_sd;
> const char *pub_key;
> + const u8 *topology;
> + u64 serial_number;
> +
> + printf("Model: CZ.NIC Turris Mox Board\n");
>
> ret = mbox_sp_get_board_info(&serial_number, NULL, NULL, &board_version,
> &ram_size);
> - if (ret < 0)
> - return;
> -
> - printf("Turris Mox:\n");
> - printf(" Board version: %i\n", board_version);
> - printf(" RAM size: %i MiB\n", ram_size);
> - printf(" Serial Number: %016llX\n", serial_number);
> + if (ret < 0) {
> + printf(" Cannot read board info: %i\n", ret);
> + } else {
> + printf(" Board version: %i\n", board_version);
> + printf(" RAM size: %i MiB\n", ram_size);
> + printf(" Serial Number: %016llX\n", serial_number);
> + }
>
> pub_key = mox_sp_get_ecdsa_public_key();
> if (pub_key)
> printf(" ECDSA Public Key: %s\n", pub_key);
> else
> - printf("Cannot read ECDSA Public Key\n");
> -}
> -
> -int last_stage_init(void)
> -{
> - int ret, i;
> - const u8 *topology;
> - int is_sd;
> - struct mii_dev *bus;
> - struct gpio_desc reset_gpio = {};
> -
> - mox_print_info();
> + printf(" Cannot read ECDSA Public Key\n");
>
> ret = mox_get_topology(&topology, &module_count, &is_sd);
> - if (ret) {
> + if (ret)
> printf("Cannot read module topology!\n");
> - return 0;
> - }
>
> printf(" SD/eMMC version: %s\n", is_sd ? "SD" : "eMMC");
>
> @@ -554,8 +544,7 @@ int last_stage_init(void)
> }
> }
>
> - /* now check if modules are connected in supported mode */
> -
> + /* check if modules are connected in supported mode */
> for (i = 0; i < module_count; ++i) {
> switch (topology[i]) {
> case MOX_MODULE_SFP:
> @@ -616,8 +605,17 @@ int last_stage_init(void)
> }
> }
>
> - /* now configure modules */
> + if (module_count)
> + printf("\n");
> +
> + return 0;
> +}
> +
> +int last_stage_init(void)
> +{
> + struct gpio_desc reset_gpio = {};
>
> + /* configure modules */
> if (get_reset_gpio(&reset_gpio) < 0)
> return 0;
>
> @@ -633,16 +631,19 @@ int last_stage_init(void)
> mdelay(50);
> }
>
> + /*
> + * check if the addresses are set by reading Scratch & Misc register
> + * 0x70 of Peridot (and potentially Topaz) modules
> + */
> if (peridot || topaz) {
> - /*
> - * now check if the addresses are set by reading Scratch & Misc
> - * register 0x70 of Peridot (and potentially Topaz) modules
> - */
> + struct mii_dev *bus;
>
> bus = miiphy_get_dev_by_name("neta@30000");
> if (!bus) {
> printf("Cannot get MDIO bus device!\n");
> } else {
> + int i;
> +
> for (i = 0; i < peridot; ++i)
> check_switch_address(bus, 0x10 + i);
>
> @@ -653,8 +654,6 @@ int last_stage_init(void)
> }
> }
>
> - printf("\n");
> -
> handle_reset_button();
>
> return 0;
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 07/12] arm: mvebu: turris_mox: Always handle reset button
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
` (5 preceding siblings ...)
2021-10-09 17:33 ` [PATCH u-boot-marvell 06/12] arm: mvebu: turris_mox: Use show_board_info() Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:32 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 08/12] arm: mvebu: turris_mox: Better check for valid ethernet addresses in env Marek Behún
` (5 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
Handle reset button even if we can't configure modules.
This happens if we fail retrieving reset GPIO with which we can reset
the modules.
(Note that this GPIO is different from reset button GPIO.)
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
board/CZ.NIC/turris_mox/turris_mox.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index ff0ed28045..7c5acfd1d9 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -617,7 +617,7 @@ int last_stage_init(void)
/* configure modules */
if (get_reset_gpio(&reset_gpio) < 0)
- return 0;
+ goto handle_reset_btn;
if (peridot > 0) {
if (configure_peridots(&reset_gpio) < 0) {
@@ -654,6 +654,7 @@ int last_stage_init(void)
}
}
+handle_reset_btn:
handle_reset_button();
return 0;
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 07/12] arm: mvebu: turris_mox: Always handle reset button
2021-10-09 17:33 ` [PATCH u-boot-marvell 07/12] arm: mvebu: turris_mox: Always handle reset button Marek Behún
@ 2021-10-21 5:32 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:32 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Handle reset button even if we can't configure modules.
>
> This happens if we fail retrieving reset GPIO with which we can reset
> the modules.
>
> (Note that this GPIO is different from reset button GPIO.)
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> board/CZ.NIC/turris_mox/turris_mox.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
> index ff0ed28045..7c5acfd1d9 100644
> --- a/board/CZ.NIC/turris_mox/turris_mox.c
> +++ b/board/CZ.NIC/turris_mox/turris_mox.c
> @@ -617,7 +617,7 @@ int last_stage_init(void)
>
> /* configure modules */
> if (get_reset_gpio(&reset_gpio) < 0)
> - return 0;
> + goto handle_reset_btn;
>
> if (peridot > 0) {
> if (configure_peridots(&reset_gpio) < 0) {
> @@ -654,6 +654,7 @@ int last_stage_init(void)
> }
> }
>
> +handle_reset_btn:
> handle_reset_button();
>
> return 0;
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 08/12] arm: mvebu: turris_mox: Better check for valid ethernet addresses in env
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
` (6 preceding siblings ...)
2021-10-09 17:33 ` [PATCH u-boot-marvell 07/12] arm: mvebu: turris_mox: Always handle reset button Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:33 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 09/12] arm: mvebu: turris_omnia: Overwrite ethaddr only if invalid Marek Behún
` (4 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
Currently we overwrite ethaddr and eth1addr only if these variables
don't exist.
Better overwrite them even if the env variable exists, but is invalid -
eth_env_get_enetaddr_by_index() checks for validity.
Refactor the code to use a for cycle.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
board/CZ.NIC/turris_mox/turris_mox.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index 7c5acfd1d9..2202eb8cfb 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -359,20 +359,22 @@ static int get_reset_gpio(struct gpio_desc *reset_gpio)
int misc_init_r(void)
{
- int ret;
- u8 mac1[6], mac2[6];
+ u8 mac[2][6];
+ int i, ret;
- ret = mbox_sp_get_board_info(NULL, mac1, mac2, NULL, NULL);
+ ret = mbox_sp_get_board_info(NULL, mac[0], mac[1], NULL, NULL);
if (ret < 0) {
printf("Cannot read data from OTP!\n");
return 0;
}
- if (is_valid_ethaddr(mac1) && !env_get("ethaddr"))
- eth_env_set_enetaddr("ethaddr", mac1);
+ for (i = 0; i < 2; ++i) {
+ u8 oldmac[6];
- if (is_valid_ethaddr(mac2) && !env_get("eth1addr"))
- eth_env_set_enetaddr("eth1addr", mac2);
+ if (is_valid_ethaddr(mac[i]) &&
+ !eth_env_get_enetaddr_by_index("eth", i, oldmac))
+ eth_env_set_enetaddr_by_index("eth", i, mac[i]);
+ }
return 0;
}
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 08/12] arm: mvebu: turris_mox: Better check for valid ethernet addresses in env
2021-10-09 17:33 ` [PATCH u-boot-marvell 08/12] arm: mvebu: turris_mox: Better check for valid ethernet addresses in env Marek Behún
@ 2021-10-21 5:33 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:33 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Currently we overwrite ethaddr and eth1addr only if these variables
> don't exist.
>
> Better overwrite them even if the env variable exists, but is invalid -
> eth_env_get_enetaddr_by_index() checks for validity.
>
> Refactor the code to use a for cycle.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> board/CZ.NIC/turris_mox/turris_mox.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
> index 7c5acfd1d9..2202eb8cfb 100644
> --- a/board/CZ.NIC/turris_mox/turris_mox.c
> +++ b/board/CZ.NIC/turris_mox/turris_mox.c
> @@ -359,20 +359,22 @@ static int get_reset_gpio(struct gpio_desc *reset_gpio)
>
> int misc_init_r(void)
> {
> - int ret;
> - u8 mac1[6], mac2[6];
> + u8 mac[2][6];
> + int i, ret;
>
> - ret = mbox_sp_get_board_info(NULL, mac1, mac2, NULL, NULL);
> + ret = mbox_sp_get_board_info(NULL, mac[0], mac[1], NULL, NULL);
> if (ret < 0) {
> printf("Cannot read data from OTP!\n");
> return 0;
> }
>
> - if (is_valid_ethaddr(mac1) && !env_get("ethaddr"))
> - eth_env_set_enetaddr("ethaddr", mac1);
> + for (i = 0; i < 2; ++i) {
> + u8 oldmac[6];
>
> - if (is_valid_ethaddr(mac2) && !env_get("eth1addr"))
> - eth_env_set_enetaddr("eth1addr", mac2);
> + if (is_valid_ethaddr(mac[i]) &&
> + !eth_env_get_enetaddr_by_index("eth", i, oldmac))
> + eth_env_set_enetaddr_by_index("eth", i, mac[i]);
> + }
>
> return 0;
> }
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 09/12] arm: mvebu: turris_omnia: Overwrite ethaddr only if invalid
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
` (7 preceding siblings ...)
2021-10-09 17:33 ` [PATCH u-boot-marvell 08/12] arm: mvebu: turris_mox: Better check for valid ethernet addresses in env Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:33 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 10/12] arm: mvebu: turris_omnia: Use show_board_info() Marek Behún
` (3 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
Currently we always overwrite ethaddrs with those from EEPROM.
In order to allow user to use a cloned MAC address in U-Boot, change the
code so that it sets ethaddr variables only if they aren't set or are
invalid.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
board/CZ.NIC/turris_omnia/turris_omnia.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index a48e1f5c30..7a86111890 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -518,6 +518,15 @@ static void increment_mac(u8 *mac)
}
}
+static void set_mac_if_invalid(int i, u8 *mac)
+{
+ u8 oldmac[6];
+
+ if (is_valid_ethaddr(mac) &&
+ !eth_env_get_enetaddr_by_index("eth", i, oldmac))
+ eth_env_set_enetaddr_by_index("eth", i, mac);
+}
+
int misc_init_r(void)
{
int err;
@@ -550,18 +559,11 @@ int misc_init_r(void)
mac[4] = mac1[2];
mac[5] = mac1[3];
- if (is_valid_ethaddr(mac))
- eth_env_set_enetaddr("eth1addr", mac);
-
+ set_mac_if_invalid(1, mac);
increment_mac(mac);
-
- if (is_valid_ethaddr(mac))
- eth_env_set_enetaddr("eth2addr", mac);
-
+ set_mac_if_invalid(2, mac);
increment_mac(mac);
-
- if (is_valid_ethaddr(mac))
- eth_env_set_enetaddr("ethaddr", mac);
+ set_mac_if_invalid(0, mac);
out:
return 0;
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 09/12] arm: mvebu: turris_omnia: Overwrite ethaddr only if invalid
2021-10-09 17:33 ` [PATCH u-boot-marvell 09/12] arm: mvebu: turris_omnia: Overwrite ethaddr only if invalid Marek Behún
@ 2021-10-21 5:33 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:33 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Currently we always overwrite ethaddrs with those from EEPROM.
>
> In order to allow user to use a cloned MAC address in U-Boot, change the
> code so that it sets ethaddr variables only if they aren't set or are
> invalid.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> board/CZ.NIC/turris_omnia/turris_omnia.c | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
> index a48e1f5c30..7a86111890 100644
> --- a/board/CZ.NIC/turris_omnia/turris_omnia.c
> +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
> @@ -518,6 +518,15 @@ static void increment_mac(u8 *mac)
> }
> }
>
> +static void set_mac_if_invalid(int i, u8 *mac)
> +{
> + u8 oldmac[6];
> +
> + if (is_valid_ethaddr(mac) &&
> + !eth_env_get_enetaddr_by_index("eth", i, oldmac))
> + eth_env_set_enetaddr_by_index("eth", i, mac);
> +}
> +
> int misc_init_r(void)
> {
> int err;
> @@ -550,18 +559,11 @@ int misc_init_r(void)
> mac[4] = mac1[2];
> mac[5] = mac1[3];
>
> - if (is_valid_ethaddr(mac))
> - eth_env_set_enetaddr("eth1addr", mac);
> -
> + set_mac_if_invalid(1, mac);
> increment_mac(mac);
> -
> - if (is_valid_ethaddr(mac))
> - eth_env_set_enetaddr("eth2addr", mac);
> -
> + set_mac_if_invalid(2, mac);
> increment_mac(mac);
> -
> - if (is_valid_ethaddr(mac))
> - eth_env_set_enetaddr("ethaddr", mac);
> + set_mac_if_invalid(0, mac);
>
> out:
> return 0;
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 10/12] arm: mvebu: turris_omnia: Use show_board_info()
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
` (8 preceding siblings ...)
2021-10-09 17:33 ` [PATCH u-boot-marvell 09/12] arm: mvebu: turris_omnia: Overwrite ethaddr only if invalid Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:34 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 11/12] arm: mvebu: turris_omnia: Move SPL's SYS_MALLOC_SIMPLE to Kconfig Marek Behún
` (2 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
We are printing board information in checkboard() function, which is
called from the default weak implementation of show_board_info().
Rename checkboard() to show_board_info(). This throws away the weak
implementation of show_board_info().
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
board/CZ.NIC/turris_omnia/turris_omnia.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 7a86111890..39051a803a 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -468,7 +468,7 @@ static struct udevice *get_atsha204a_dev(void)
return dev;
}
-int checkboard(void)
+int show_board_info(void)
{
u32 version_num, serial_num;
int err = 1;
@@ -496,7 +496,7 @@ int checkboard(void)
}
out:
- printf("Turris Omnia:\n");
+ printf("Model: Turris Omnia\n");
printf(" RAM size: %i MiB\n", omnia_get_ram_size_gb() * 1024);
if (err)
printf(" Serial Number: unknown\n");
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 10/12] arm: mvebu: turris_omnia: Use show_board_info()
2021-10-09 17:33 ` [PATCH u-boot-marvell 10/12] arm: mvebu: turris_omnia: Use show_board_info() Marek Behún
@ 2021-10-21 5:34 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:34 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> We are printing board information in checkboard() function, which is
> called from the default weak implementation of show_board_info().
>
> Rename checkboard() to show_board_info(). This throws away the weak
> implementation of show_board_info().
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> board/CZ.NIC/turris_omnia/turris_omnia.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
> index 7a86111890..39051a803a 100644
> --- a/board/CZ.NIC/turris_omnia/turris_omnia.c
> +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
> @@ -468,7 +468,7 @@ static struct udevice *get_atsha204a_dev(void)
> return dev;
> }
>
> -int checkboard(void)
> +int show_board_info(void)
> {
> u32 version_num, serial_num;
> int err = 1;
> @@ -496,7 +496,7 @@ int checkboard(void)
> }
>
> out:
> - printf("Turris Omnia:\n");
> + printf("Model: Turris Omnia\n");
> printf(" RAM size: %i MiB\n", omnia_get_ram_size_gb() * 1024);
> if (err)
> printf(" Serial Number: unknown\n");
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 11/12] arm: mvebu: turris_omnia: Move SPL's SYS_MALLOC_SIMPLE to Kconfig
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
` (9 preceding siblings ...)
2021-10-09 17:33 ` [PATCH u-boot-marvell 10/12] arm: mvebu: turris_omnia: Use show_board_info() Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:34 ` Stefan Roese
2021-10-09 17:33 ` [PATCH u-boot-marvell 12/12] arm: mvebu: turris_omnia: Move CONFIG_SPL_DRIVERS_MISC " Marek Behún
2021-10-21 7:47 ` [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Stefan Roese
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
Instead of declaring CONFIG_SYS_MALLOC_SIMPLE dependant on
CONFIG_SPL_BUILD in board config header, select
CONFIG_SPL_SYS_MALLOC_SIMPLE in Kconfig.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
arch/arm/mach-mvebu/Kconfig | 1 +
include/configs/turris_omnia.h | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 54dff9986b..8365305733 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -128,6 +128,7 @@ config TARGET_TURRIS_OMNIA
select I2C_MUX
select I2C_MUX_PCA954x
select SPL_I2C_MUX
+ select SPL_SYS_MALLOC_SIMPLE
select SYS_I2C_MVTWSI
select ATSHA204A
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 8646633ea4..562b49327f 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -36,10 +36,6 @@
#define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
#define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_MALLOC_SIMPLE
-#endif
-
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
#define CONFIG_SPL_DRIVERS_MISC
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 11/12] arm: mvebu: turris_omnia: Move SPL's SYS_MALLOC_SIMPLE to Kconfig
2021-10-09 17:33 ` [PATCH u-boot-marvell 11/12] arm: mvebu: turris_omnia: Move SPL's SYS_MALLOC_SIMPLE to Kconfig Marek Behún
@ 2021-10-21 5:34 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:34 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Instead of declaring CONFIG_SYS_MALLOC_SIMPLE dependant on
> CONFIG_SPL_BUILD in board config header, select
> CONFIG_SPL_SYS_MALLOC_SIMPLE in Kconfig.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> arch/arm/mach-mvebu/Kconfig | 1 +
> include/configs/turris_omnia.h | 4 ----
> 2 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 54dff9986b..8365305733 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -128,6 +128,7 @@ config TARGET_TURRIS_OMNIA
> select I2C_MUX
> select I2C_MUX_PCA954x
> select SPL_I2C_MUX
> + select SPL_SYS_MALLOC_SIMPLE
> select SYS_I2C_MVTWSI
> select ATSHA204A
>
> diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
> index 8646633ea4..562b49327f 100644
> --- a/include/configs/turris_omnia.h
> +++ b/include/configs/turris_omnia.h
> @@ -36,10 +36,6 @@
> #define CONFIG_SPL_BSS_START_ADDR (0x40000000 + CONFIG_SPL_SIZE)
> #define CONFIG_SPL_BSS_MAX_SIZE (16 << 10)
>
> -#ifdef CONFIG_SPL_BUILD
> -#define CONFIG_SYS_MALLOC_SIMPLE
> -#endif
> -
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
> #define CONFIG_SPL_DRIVERS_MISC
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH u-boot-marvell 12/12] arm: mvebu: turris_omnia: Move CONFIG_SPL_DRIVERS_MISC to Kconfig
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
` (10 preceding siblings ...)
2021-10-09 17:33 ` [PATCH u-boot-marvell 11/12] arm: mvebu: turris_omnia: Move SPL's SYS_MALLOC_SIMPLE to Kconfig Marek Behún
@ 2021-10-09 17:33 ` Marek Behún
2021-10-21 5:34 ` Stefan Roese
2021-10-21 7:47 ` [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Stefan Roese
12 siblings, 1 reply; 26+ messages in thread
From: Marek Behún @ 2021-10-09 17:33 UTC (permalink / raw)
To: Stefan Roese; +Cc: u-boot, pali, Marek Behún
From: Marek Behún <marek.behun@nic.cz>
Instead of declaring CONFIG_SPL_DRIVERS_MISC in board config header,
select it in Kconfig.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
arch/arm/mach-mvebu/Kconfig | 1 +
include/configs/turris_omnia.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 8365305733..c66dab6012 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -127,6 +127,7 @@ config TARGET_TURRIS_OMNIA
select DM_I2C
select I2C_MUX
select I2C_MUX_PCA954x
+ select SPL_DRIVERS_MISC
select SPL_I2C_MUX
select SPL_SYS_MALLOC_SIMPLE
select SYS_I2C_MVTWSI
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 562b49327f..3af62ef48c 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -38,7 +38,6 @@
#define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
#define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
-#define CONFIG_SPL_DRIVERS_MISC
#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
/* SPL related MMC defines */
--
2.32.0
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH u-boot-marvell 12/12] arm: mvebu: turris_omnia: Move CONFIG_SPL_DRIVERS_MISC to Kconfig
2021-10-09 17:33 ` [PATCH u-boot-marvell 12/12] arm: mvebu: turris_omnia: Move CONFIG_SPL_DRIVERS_MISC " Marek Behún
@ 2021-10-21 5:34 ` Stefan Roese
0 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 5:34 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Instead of declaring CONFIG_SPL_DRIVERS_MISC in board config header,
> select it in Kconfig.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> ---
> arch/arm/mach-mvebu/Kconfig | 1 +
> include/configs/turris_omnia.h | 1 -
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 8365305733..c66dab6012 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -127,6 +127,7 @@ config TARGET_TURRIS_OMNIA
> select DM_I2C
> select I2C_MUX
> select I2C_MUX_PCA954x
> + select SPL_DRIVERS_MISC
> select SPL_I2C_MUX
> select SPL_SYS_MALLOC_SIMPLE
> select SYS_I2C_MVTWSI
> diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
> index 562b49327f..3af62ef48c 100644
> --- a/include/configs/turris_omnia.h
> +++ b/include/configs/turris_omnia.h
> @@ -38,7 +38,6 @@
>
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
> -#define CONFIG_SPL_DRIVERS_MISC
>
> #ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
> /* SPL related MMC defines */
>
Viele Grüße,
Stefan
--
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@denx.de
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes
2021-10-09 17:33 [PATCH u-boot-marvell 00/12] Small Turris MOX and Omnia changes Marek Behún
` (11 preceding siblings ...)
2021-10-09 17:33 ` [PATCH u-boot-marvell 12/12] arm: mvebu: turris_omnia: Move CONFIG_SPL_DRIVERS_MISC " Marek Behún
@ 2021-10-21 7:47 ` Stefan Roese
12 siblings, 0 replies; 26+ messages in thread
From: Stefan Roese @ 2021-10-21 7:47 UTC (permalink / raw)
To: Marek Behún; +Cc: u-boot, pali, Marek Behún
On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
>
> Hi Stefan,
>
> these are some small changes for Turris Omnia and MOX, mainly moving
> options from board config header to Kconfig, but also some other.
>
> Two patchs are touching other mvebu boards.
>
> Marek
>
> Marek Behún (12):
> arm: mvebu: turris_mox: Drop SF_DEFAULT_MODE from defconfig
> arm: mvebu: turris_mox: Move options to defconfig
> arm: mvebu: a3720: Create Kconfig option for I2C_MV
> arm: kirkwood, mvebu: Remove CONFIG_SYS_RESET_ADDRESS option
> arm: mvebu: turris_mox: Cosmetic update for board config header
> arm: mvebu: turris_mox: Use show_board_info()
> arm: mvebu: turris_mox: Always handle reset button
> arm: mvebu: turris_mox: Better check for valid ethernet addresses in
> env
> arm: mvebu: turris_omnia: Overwrite ethaddr only if invalid
> arm: mvebu: turris_omnia: Use show_board_info()
> arm: mvebu: turris_omnia: Move SPL's SYS_MALLOC_SIMPLE to Kconfig
> arm: mvebu: turris_omnia: Move CONFIG_SPL_DRIVERS_MISC to Kconfig
>
> arch/arm/mach-mvebu/Kconfig | 2 +
> board/CZ.NIC/turris_mox/turris_mox.c | 86 +++++++++++----------
> board/CZ.NIC/turris_omnia/turris_omnia.c | 26 ++++---
> configs/mvebu_db-88f3720_defconfig | 1 +
> configs/mvebu_espressobin-88f3720_defconfig | 1 +
> configs/turris_mox_defconfig | 4 +-
> configs/uDPU_defconfig | 1 +
> drivers/i2c/Kconfig | 6 ++
> drivers/i2c/Makefile | 2 +-
> include/configs/SBx81LIFKW.h | 5 --
> include/configs/SBx81LIFXCAT.h | 5 --
> include/configs/edminiv2.h | 6 --
> include/configs/mv-common.h | 1 -
> include/configs/mvebu_armada-37xx.h | 6 --
> include/configs/mvebu_armada-8k.h | 1 -
> include/configs/turris_mox.h | 74 ++++++------------
> include/configs/turris_omnia.h | 5 --
> include/configs/x530.h | 5 --
> scripts/config_whitelist.txt | 1 -
> 19 files changed, 95 insertions(+), 143 deletions(-)
>
Applied to u-boot-marvell/master
Thanks,
Stefan
^ permalink raw reply [flat|nested] 26+ messages in thread