[PATCH 6/5] arm: mvebu: Fix DEBUG_UART_BASE for all 32-bit boards
Stefan Roese
sr at denx.de
Mon May 16 08:39:07 CEST 2022
On 09.05.22 20:17, Pali Rohár wrote:
> UART base address is located in internal registers.
>
> Internal registers for 32-bit mvebu boards in SPL are at address 0xd0000000
> and in proper U-Boot at address 0xf1000000.
>
> Fix DEBUG_UART_BASE option for all 32-bit mvebu boards.
>
> Signed-off-by: Pali Rohár <pali at kernel.org>
Reviewed-by: Stefan Roese <sr at denx.de>
Thanks,
Stefan
> ---
> configs/clearfog_defconfig | 3 ++-
> configs/controlcenterdc_defconfig | 3 ++-
> configs/db-88f6820-amc_defconfig | 3 ++-
> configs/db-88f6820-gp_defconfig | 3 ++-
> configs/db-mv784mp-gp_defconfig | 3 ++-
> configs/ds414_defconfig | 3 ++-
> configs/helios4_defconfig | 3 ++-
> configs/maxbcm_defconfig | 3 ++-
> configs/theadorable_debug_defconfig | 3 ++-
> configs/x530_defconfig | 3 ++-
> 10 files changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
> index a7b6508a5c6d..9f744d0caf96 100644
> --- a/configs/clearfog_defconfig
> +++ b/configs/clearfog_defconfig
> @@ -13,7 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
> CONFIG_SPL_TEXT_BASE=0x40000030
> CONFIG_SPL_SERIAL=y
> CONFIG_SPL=y
> -CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_DEBUG_UART_BASE=0xf1012000
> CONFIG_DEBUG_UART_CLOCK=250000000
> CONFIG_SYS_LOAD_ADDR=0x800000
> CONFIG_DEBUG_UART=y
> @@ -66,6 +66,7 @@ CONFIG_MVMDIO=y
> CONFIG_PCI=y
> CONFIG_PCI_MVEBU=y
> CONFIG_SCSI=y
> +CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYS_NS16550=y
> CONFIG_KIRKWOOD_SPI=y
> diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
> index df38b2c54f08..c366db40e6fa 100644
> --- a/configs/controlcenterdc_defconfig
> +++ b/configs/controlcenterdc_defconfig
> @@ -16,7 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-38x-controlcenterdc"
> CONFIG_SPL_TEXT_BASE=0x40000030
> CONFIG_SPL_SERIAL=y
> CONFIG_SPL=y
> -CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_DEBUG_UART_BASE=0xf1012000
> CONFIG_DEBUG_UART_CLOCK=250000000
> CONFIG_SYS_LOAD_ADDR=0x800000
> CONFIG_DEBUG_UART=y
> @@ -84,6 +84,7 @@ CONFIG_PCI_MVEBU=y
> CONFIG_SCSI=y
> CONFIG_SCSI_AHCI_PLAT=y
> CONFIG_SYS_SCSI_MAX_SCSI_ID=2
> +CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYS_NS16550=y
> CONFIG_KIRKWOOD_SPI=y
> diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig
> index 9b77b4a5f057..be4ee7913513 100644
> --- a/configs/db-88f6820-amc_defconfig
> +++ b/configs/db-88f6820-amc_defconfig
> @@ -13,7 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-385-db-88f6820-amc"
> CONFIG_SPL_TEXT_BASE=0x40000030
> CONFIG_SPL_SERIAL=y
> CONFIG_SPL=y
> -CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_DEBUG_UART_BASE=0xf1012000
> CONFIG_DEBUG_UART_CLOCK=200000000
> CONFIG_SYS_LOAD_ADDR=0x800000
> CONFIG_DEBUG_UART=y
> @@ -70,6 +70,7 @@ CONFIG_MII=y
> CONFIG_MVMDIO=y
> CONFIG_PCI=y
> CONFIG_PCI_MVEBU=y
> +CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYS_NS16550=y
> CONFIG_KIRKWOOD_SPI=y
> diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
> index f56d1fbf2530..55ebb57c692e 100644
> --- a/configs/db-88f6820-gp_defconfig
> +++ b/configs/db-88f6820-gp_defconfig
> @@ -13,7 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-388-gp"
> CONFIG_SPL_TEXT_BASE=0x40000030
> CONFIG_SPL_SERIAL=y
> CONFIG_SPL=y
> -CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_DEBUG_UART_BASE=0xf1012000
> CONFIG_DEBUG_UART_CLOCK=250000000
> CONFIG_SYS_LOAD_ADDR=0x800000
> CONFIG_DEBUG_UART=y
> @@ -66,6 +66,7 @@ CONFIG_MVMDIO=y
> CONFIG_PCI=y
> CONFIG_PCI_MVEBU=y
> CONFIG_SCSI=y
> +CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYS_NS16550=y
> CONFIG_KIRKWOOD_SPI=y
> diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
> index 5683f118365f..2c1d3b464d85 100644
> --- a/configs/db-mv784mp-gp_defconfig
> +++ b/configs/db-mv784mp-gp_defconfig
> @@ -13,7 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
> CONFIG_SPL_TEXT_BASE=0x40004030
> CONFIG_SPL_SERIAL=y
> CONFIG_SPL=y
> -CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_DEBUG_UART_BASE=0xf1012000
> CONFIG_DEBUG_UART_CLOCK=250000000
> CONFIG_SYS_LOAD_ADDR=0x800000
> CONFIG_DEBUG_UART=y
> @@ -68,6 +68,7 @@ CONFIG_MII=y
> CONFIG_MVMDIO=y
> CONFIG_PCI=y
> CONFIG_PCI_MVEBU=y
> +CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYS_NS16550=y
> CONFIG_KIRKWOOD_SPI=y
> diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
> index a83fe079b3a1..81a767cc0ea8 100644
> --- a/configs/ds414_defconfig
> +++ b/configs/ds414_defconfig
> @@ -19,7 +19,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-synology-ds414"
> CONFIG_SPL_TEXT_BASE=0x40004030
> CONFIG_SPL_SERIAL=y
> CONFIG_SPL=y
> -CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_DEBUG_UART_BASE=0xf1012000
> CONFIG_DEBUG_UART_CLOCK=250000000
> CONFIG_SYS_LOAD_ADDR=0x800000
> CONFIG_DEBUG_UART=y
> @@ -68,6 +68,7 @@ CONFIG_MII=y
> CONFIG_MVMDIO=y
> CONFIG_PCI=y
> CONFIG_PCI_MVEBU=y
> +CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYS_NS16550=y
> CONFIG_KIRKWOOD_SPI=y
> diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig
> index c2130bacb4b4..4dc9e3bc58dd 100644
> --- a/configs/helios4_defconfig
> +++ b/configs/helios4_defconfig
> @@ -13,7 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-388-helios4"
> CONFIG_SPL_TEXT_BASE=0x40000030
> CONFIG_SPL_SERIAL=y
> CONFIG_SPL=y
> -CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_DEBUG_UART_BASE=0xf1012000
> CONFIG_DEBUG_UART_CLOCK=250000000
> CONFIG_SYS_LOAD_ADDR=0x800000
> CONFIG_DEBUG_UART=y
> @@ -67,6 +67,7 @@ CONFIG_MVMDIO=y
> CONFIG_PCI=y
> CONFIG_PCI_MVEBU=y
> CONFIG_SCSI=y
> +CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYS_NS16550=y
> CONFIG_KIRKWOOD_SPI=y
> diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
> index 40f79d47ea98..c325dd7cb272 100644
> --- a/configs/maxbcm_defconfig
> +++ b/configs/maxbcm_defconfig
> @@ -13,7 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-maxbcm"
> CONFIG_SPL_TEXT_BASE=0x40004030
> CONFIG_SPL_SERIAL=y
> CONFIG_SPL=y
> -CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_DEBUG_UART_BASE=0xf1012000
> CONFIG_DEBUG_UART_CLOCK=250000000
> CONFIG_SYS_LOAD_ADDR=0x800000
> CONFIG_DEBUG_UART=y
> @@ -48,6 +48,7 @@ CONFIG_PHY_GIGE=y
> CONFIG_MVNETA=y
> CONFIG_MII=y
> CONFIG_MVMDIO=y
> +CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYS_NS16550=y
> CONFIG_KIRKWOOD_SPI=y
> diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
> index 111392d9a941..9e8523d94145 100644
> --- a/configs/theadorable_debug_defconfig
> +++ b/configs/theadorable_debug_defconfig
> @@ -14,7 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"
> CONFIG_SPL_TEXT_BASE=0x40004030
> CONFIG_SPL_SERIAL=y
> CONFIG_SPL=y
> -CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_DEBUG_UART_BASE=0xf1012000
> CONFIG_DEBUG_UART_CLOCK=250000000
> CONFIG_SYS_MEM_TOP_HIDE=0x80000
> CONFIG_SYS_LOAD_ADDR=0x800000
> @@ -74,6 +74,7 @@ CONFIG_MVMDIO=y
> CONFIG_PCI=y
> CONFIG_DM_PCI_COMPAT=y
> CONFIG_PCI_MVEBU=y
> +CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYS_NS16550=y
> CONFIG_KIRKWOOD_SPI=y
> diff --git a/configs/x530_defconfig b/configs/x530_defconfig
> index 77d224942764..860cb2207139 100644
> --- a/configs/x530_defconfig
> +++ b/configs/x530_defconfig
> @@ -14,7 +14,7 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-385-atl-x530"
> CONFIG_SPL_TEXT_BASE=0x40000030
> CONFIG_SPL_SERIAL=y
> CONFIG_SPL=y
> -CONFIG_DEBUG_UART_BASE=0xd0012000
> +CONFIG_DEBUG_UART_BASE=0xf1012000
> CONFIG_DEBUG_UART_CLOCK=250000000
> CONFIG_SYS_LOAD_ADDR=0x1000000
> CONFIG_ENV_ADDR=0x100000
> @@ -72,6 +72,7 @@ CONFIG_PCI_MVEBU=y
> CONFIG_DM_RTC=y
> CONFIG_RTC_DS1307=y
> CONFIG_SPECIFY_CONSOLE_INDEX=y
> +CONFIG_SPL_DEBUG_UART_BASE=0xd0012000
> CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYS_NS16550=y
> CONFIG_KIRKWOOD_SPI=y
Viele Grüße,
Stefan Roese
--
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
More information about the U-Boot
mailing list