From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH 23/26 v7] mips: mtmips: add SPL support
Date: Tue, 21 Apr 2020 13:28:25 +0200 [thread overview]
Message-ID: <2866e278-e880-8c64-4fbf-c6cd6cc20f80@gmail.com> (raw)
In-Reply-To: <20200421072850.4970-24-sr@denx.de>
Am 21.04.20 um 09:28 schrieb Stefan Roese:
> From: Weijie Gao <weijie.gao@mediatek.com>
>
> This patch adds SPL support for mtmips platform. The lowlevel architecture
> is split into SPL and the rest parts are built into a memory loadable
> u-boot image. Optional SPL_DM and OF_CONTROL are also supported.
>
> The increment of size is very small (< 10 KiB) if SPL_DM and OF_CONTROL are
> not enabled and the memory bootable u-boot (u-boot.img) is generated
> automatically so there is not need to add a separate config for it.
>
> A lzma compressed payload (u-boot-lzma.img) is also generated and it will
> be combined with u-boot-spl.bin to form the unified ROM bootable binary
> u-boot-mtmips.bin.
>
> A spl loader is added to support uncompress the payload.
>
> Reviewed-by: Stefan Roese <sr@denx.de>
> Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
> ---
> Changes since v3: generate output file using u-boot-with-spl.bin
>
> Makefile | 6 +++
> arch/mips/Kconfig | 3 ++
> arch/mips/dts/mt7628-u-boot.dtsi | 56 +++++++++++++++++++++
> arch/mips/dts/mt7628a.dtsi | 2 +-
> arch/mips/mach-mtmips/Kconfig | 26 ++++++++++
> arch/mips/mach-mtmips/Makefile | 1 +
> arch/mips/mach-mtmips/include/mach/serial.h | 13 +++++
> arch/mips/mach-mtmips/mt7628/Makefile | 1 +
> arch/mips/mach-mtmips/mt7628/serial.c | 34 +++++++++++++
> arch/mips/mach-mtmips/spl.c | 44 ++++++++++++++++
> 10 files changed, 185 insertions(+), 1 deletion(-)
> create mode 100644 arch/mips/dts/mt7628-u-boot.dtsi
> create mode 100644 arch/mips/mach-mtmips/include/mach/serial.h
> create mode 100644 arch/mips/mach-mtmips/mt7628/serial.c
> create mode 100644 arch/mips/mach-mtmips/spl.c
>
> diff --git a/Makefile b/Makefile
> index ffc1e28bd0..1e619bfc8b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -938,6 +938,12 @@ endif
>
> ALL-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin
>
> +ifeq ($(CONFIG_SPL),y)
> +ALL-$(CONFIG_ARCH_MTMIPS) += u-boot-with-spl.bin
> +else
> +ALL-$(CONFIG_ARCH_MTMIPS) += u-boot.bin
> +endif
> +
> # Add optional build target if defined in board/cpu/soc headers
> ifneq ($(CONFIG_BUILD_TARGET),)
> ALL-y += $(CONFIG_BUILD_TARGET:"%"=%)
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index 7b9d0072eb..4c1eea1ccc 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -98,6 +98,9 @@ config ARCH_MTMIPS
> select SUPPORTS_CPU_MIPS32_R2
> select SUPPORTS_LITTLE_ENDIAN
> select SYSRESET
> + select SUPPORT_SPL
> + select SPL_LZMA
> + select BINMAN
>
> config ARCH_JZ47XX
> bool "Support Ingenic JZ47xx"
> diff --git a/arch/mips/dts/mt7628-u-boot.dtsi b/arch/mips/dts/mt7628-u-boot.dtsi
> new file mode 100644
> index 0000000000..9149187762
> --- /dev/null
> +++ b/arch/mips/dts/mt7628-u-boot.dtsi
> @@ -0,0 +1,56 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2020 MediaTek Inc.
> + *
> + * Author: Weijie Gao <weijie.gao@mediatek.com>
> + */
> +
> +/ {
> + binman {
> + filename = "u-boot-mips.bin";
> + pad-byte = <0xff>;
> +
> +#ifdef CONFIG_SPL
> + u-boot-spl {
> + };
> +
> + u-boot-lzma-img {
> + };
> +#else
> + u-boot {
> + };
> +#endif
> + };
> +};
> +
> +&palmbus {
> + u-boot,dm-pre-reloc;
> +};
> +
> +&reboot {
> + u-boot,dm-pre-reloc;
> +};
> +
> +&clkctrl {
> + u-boot,dm-pre-reloc;
> +};
> +
> +&rstctrl {
> + u-boot,dm-pre-reloc;
> +};
> +
> +&pinctrl {
> + u-boot,dm-pre-reloc;
> +};
> +
> +&uart0 {
> + u-boot,dm-pre-reloc;
> +};
> +
> +&uart1 {
> + u-boot,dm-pre-reloc;
> +};
> +
> +&uart2 {
> + u-boot,dm-pre-reloc;
> +};
> diff --git a/arch/mips/dts/mt7628a.dtsi b/arch/mips/dts/mt7628a.dtsi
> index 2200135a77..6baa63add3 100644
> --- a/arch/mips/dts/mt7628a.dtsi
> +++ b/arch/mips/dts/mt7628a.dtsi
> @@ -33,7 +33,7 @@
> #clock-cells = <0>;
> };
>
> - palmbus at 10000000 {
> + palmbus: palmbus at 10000000 {
> compatible = "palmbus", "simple-bus";
> reg = <0x10000000 0x200000>;
> ranges = <0x0 0x10000000 0x1FFFFF>;
> diff --git a/arch/mips/mach-mtmips/Kconfig b/arch/mips/mach-mtmips/Kconfig
> index 3f25de8b85..81cec53e72 100644
> --- a/arch/mips/mach-mtmips/Kconfig
> +++ b/arch/mips/mach-mtmips/Kconfig
> @@ -20,8 +20,18 @@ config SYS_ICACHE_LINE_SIZE
> default 32
>
> config SYS_TEXT_BASE
> + default 0x9c000000 if !SPL
> + default 0x80200000 if SPL
> +
> +config SPL_TEXT_BASE
> default 0x9c000000
>
> +config SPL_LOADER_SUPPORT
> + default y
on my request this was introduced as generic MIPS symbol with patch
13/26. So maybe it's a left-over and should be removed. Either "config
ARCH_MTMIPS" or "config SOC_MT7628" should select this symbol.
> +
> +config SPL_PAYLOAD
> + default "u-boot-lzma.img"
> +
> choice
> prompt "MediaTek MIPS SoC select"
>
> @@ -34,6 +44,14 @@ config SOC_MT7628
> select PINCTRL_MT7628
> select MTK_SERIAL
> select SYSRESET_RESETCTL
> + select SPL_SEPARATE_BSS if SPL
> + select SPL_INIT_STACK_WITHOUT_MALLOC_F if SPL
> + select SPL_OF_CONTROL if SPL_DM
> + select SPL_SIMPLE_BUS if SPL_DM
> + select SPL_DM_SERIAL if SPL_DM
> + select SPL_CLK if SPL_DM && SPL_SERIAL_SUPPORT
> + select SPL_SYSRESET if SPL_DM
> + select SPL_OF_LIBFDT if SPL_OF_CONTROL
> help
> This supports MediaTek MT7628/MT7688.
>
> @@ -88,6 +106,14 @@ endchoice
> config SUPPORTS_BOOT_RAM
> bool
>
> +config SPL_UART2_SPIS_PINMUX
> + bool "Use alternative pinmux for UART2 in SPL stage"
> + depends on SPL_SERIAL_SUPPORT
> + default n
> + help
> + Select this if the UART2 of your board is connected to GPIO 16/17
> + (shared with SPIS) rather than the usual GPIO 20/21.
> +
> source "board/gardena/smart-gateway-mt7688/Kconfig"
> source "board/seeed/linkit-smart-7688/Kconfig"
>
> diff --git a/arch/mips/mach-mtmips/Makefile b/arch/mips/mach-mtmips/Makefile
> index 72f0369030..a7e6a66304 100644
> --- a/arch/mips/mach-mtmips/Makefile
> +++ b/arch/mips/mach-mtmips/Makefile
> @@ -3,5 +3,6 @@
> obj-y += cpu.o
> obj-y += ddr_init.o
> obj-y += ddr_cal.o
> +obj-$(CONFIG_SPL_BUILD) += spl.o
>
> obj-$(CONFIG_SOC_MT7628) += mt7628/
> diff --git a/arch/mips/mach-mtmips/include/mach/serial.h b/arch/mips/mach-mtmips/include/mach/serial.h
> new file mode 100644
> index 0000000000..bfa246b428
> --- /dev/null
> +++ b/arch/mips/mach-mtmips/include/mach/serial.h
> @@ -0,0 +1,13 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (C) 2020 MediaTek Inc.
> + *
> + * Author: Weijie Gao <weijie.gao@mediatek.com>
> + */
> +
> +#ifndef _MTMIPS_SERIAL_H_
> +#define _MTMIPS_SERIAL_H_
> +
> +void mtmips_spl_serial_init(void);
> +
> +#endif /* _MTMIPS_SERIAL_H_ */
> diff --git a/arch/mips/mach-mtmips/mt7628/Makefile b/arch/mips/mach-mtmips/mt7628/Makefile
> index db62e90d77..7e139d5adf 100644
> --- a/arch/mips/mach-mtmips/mt7628/Makefile
> +++ b/arch/mips/mach-mtmips/mt7628/Makefile
> @@ -3,3 +3,4 @@
> obj-y += lowlevel_init.o
> obj-y += init.o
> obj-y += ddr.o
> +obj-$(CONFIG_SPL_BUILD) += serial.o
> diff --git a/arch/mips/mach-mtmips/mt7628/serial.c b/arch/mips/mach-mtmips/mt7628/serial.c
> new file mode 100644
> index 0000000000..a7d324792d
> --- /dev/null
> +++ b/arch/mips/mach-mtmips/mt7628/serial.c
> @@ -0,0 +1,34 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2020 MediaTek Inc.
> + *
> + * Author: Weijie Gao <weijie.gao@mediatek.com>
> + */
> +
> +#include <common.h>
> +#include <asm/io.h>
> +#include "mt7628.h"
> +
> +void mtmips_spl_serial_init(void)
> +{
> +#ifdef CONFIG_SPL_SERIAL_SUPPORT
> + void __iomem *base = ioremap_nocache(SYSCTL_BASE, SYSCTL_SIZE);
> +
> +#if CONFIG_CONS_INDEX == 1
> + clrbits_32(base + SYSCTL_GPIO_MODE1_REG, UART0_MODE_M);
> +#elif CONFIG_CONS_INDEX == 2
> + clrbits_32(base + SYSCTL_GPIO_MODE1_REG, UART1_MODE_M);
> +#elif CONFIG_CONS_INDEX == 3
> + setbits_32(base + SYSCTL_AGPIO_CFG_REG, EPHY_GPIO_AIO_EN_M);
> +#ifdef CONFIG_SPL_UART2_SPIS_PINMUX
> + setbits_32(base + SYSCTL_GPIO_MODE1_REG, SPIS_MODE_M);
> + clrsetbits_32(base + SYSCTL_GPIO_MODE1_REG, UART2_MODE_M,
> + 1 << UART2_MODE_S);
> +#else
> + clrbits_32(base + SYSCTL_GPIO_MODE1_REG, UART2_MODE_M);
> + clrsetbits_32(base + SYSCTL_GPIO_MODE1_REG, SPIS_MODE_M,
> + 1 << SPIS_MODE_S);
> +#endif /* CONFIG_SPL_UART2_SPIS_PINMUX */
> +#endif /* CONFIG_CONS_INDEX */
> +#endif /* CONFIG_SPL_SERIAL_SUPPORT */
> +}
> diff --git a/arch/mips/mach-mtmips/spl.c b/arch/mips/mach-mtmips/spl.c
> new file mode 100644
> index 0000000000..2a24af70c3
> --- /dev/null
> +++ b/arch/mips/mach-mtmips/spl.c
> @@ -0,0 +1,44 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2020 MediaTek Inc. All Rights Reserved.
> + *
> + * Author: Weijie Gao <weijie.gao@mediatek.com>
> + */
> +
> +#include <common.h>
> +#include <fdt.h>
> +#include <spl.h>
> +#include <asm/sections.h>
> +#include <linux/sizes.h>
> +#include <mach/serial.h>
> +
> +void __noreturn board_init_f(ulong dummy)
> +{
> + spl_init();
> +
> +#ifdef CONFIG_SPL_SERIAL_SUPPORT
> + /*
> + * mtmips_spl_serial_init() is useful if debug uart is enabled,
> + * or DM based serial is not enabled.
> + */
> + mtmips_spl_serial_init();
> + preloader_console_init();
> +#endif
> +
> + board_init_r(NULL, 0);
> +}
> +
> +void board_boot_order(u32 *spl_boot_list)
> +{
> + spl_boot_list[0] = BOOT_DEVICE_NOR;
> +}
> +
> +unsigned long spl_nor_get_uboot_base(void)
> +{
> + void *uboot_base = __image_copy_end;
> +
> + if (fdt_magic(uboot_base) == FDT_MAGIC)
> + return (unsigned long)uboot_base + fdt_totalsize(uboot_base);
> +
> + return (unsigned long)uboot_base;
> +}
>
--
- Daniel
next prev parent reply other threads:[~2020-04-21 11:28 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 7:28 [PATCH 00/26 v7] Refactor the architecture parts of mt7628 Stefan Roese
2020-04-21 7:28 ` [PATCH 01/26 v7] mips: add support to restore exception vector base before booting linux Stefan Roese
2020-04-21 7:28 ` [PATCH 02/26 v7] mips: mtmips: add predefined i-cache/d-cache size and linesize Stefan Roese
2020-04-21 7:28 ` [PATCH 03/26 v7] mips: add an option to support initialize SRAM for initial stack Stefan Roese
2020-04-21 7:28 ` [PATCH 04/26 v7] mips: start.S: avoid overwriting outside gd when clearing global data in stack Stefan Roese
2020-04-21 7:28 ` [PATCH 05/26 v7] sysreset: add reset controller based reboot driver Stefan Roese
2020-04-21 7:28 ` [PATCH 06/26 v7] mips: mtmips: make use of sysreset-resetctrl for mt7628 soc Stefan Roese
2020-04-21 7:28 ` [PATCH 07/26 v7] configs: enable CONFIG_RESTORE_EXCEPTION_VECTOR_BASE for all mtmips boards Stefan Roese
2020-04-21 7:28 ` [PATCH 08/26 v7] mips: add a mtmips-specific field to architecture-specific global data Stefan Roese
2020-04-21 7:28 ` [PATCH 09/26 v7] mips: add a option to support not reserving malloc space on initial stack Stefan Roese
2020-04-21 7:28 ` [PATCH 10/26 v7] mips: mtmips: rewrite lowlevel codes of mt7628 Stefan Roese
2020-04-21 7:28 ` [PATCH 11/26 v7] dts: mtmips: add alternative pinmux node for uart2 Stefan Roese
2020-04-21 7:28 ` [PATCH 12/26 v7] mips: enable support for appending dtb to spl binary Stefan Roese
2020-04-21 7:28 ` [PATCH 13/26 v7] mips: add an option to enable u_boot_list section for SPL loaders in u-boot-spl.lds Stefan Roese
2020-04-21 7:28 ` [PATCH 14/26 v7] lib: enable lzma decompression support for SPL build Stefan Roese
2020-04-21 7:28 ` [PATCH 15/26 v7] Makefile: add support to generate LZMA compressed u-boot image Stefan Roese
2020-04-21 7:28 ` [PATCH 16/26 v7] tools: binman: add etype file for u-boot-lzma-img Stefan Roese
2020-04-21 7:28 ` [PATCH 17/26 v7] spl: Extract legacy image handling into separate file Stefan Roese
2020-04-23 19:28 ` Daniel Schwierzeck
2020-04-21 7:28 ` [PATCH 18/26 v7] spl: spl_legacy: Use IS_ENABLED() to remove #ifdef Stefan Roese
2020-04-23 19:28 ` Daniel Schwierzeck
2020-04-21 7:28 ` [PATCH 19/26 v7] spl: spl_nor: Move legacy image loading into spl_legacy.c Stefan Roese
2020-04-23 19:29 ` Daniel Schwierzeck
2020-04-21 7:28 ` [PATCH 20/26 v7] spl: spl_nor: Remove unused variable 'ret' warning Stefan Roese
2020-04-23 19:30 ` Daniel Schwierzeck
2020-04-21 7:28 ` [PATCH 21/26 v7] spl: spl_legacy: Add lzma decompression support for legacy image Stefan Roese
2020-04-21 7:28 ` [PATCH 22/26 v7] mips: spl: Flush cache before jumping to U-Boot proper Stefan Roese
2020-04-23 19:26 ` Daniel Schwierzeck
2020-04-21 7:28 ` [PATCH 23/26 v7] mips: mtmips: add SPL support Stefan Roese
2020-04-21 11:28 ` Daniel Schwierzeck [this message]
2020-04-21 11:34 ` Stefan Roese
2020-04-21 11:57 ` Daniel Schwierzeck
2020-04-21 12:04 ` Stefan Roese
2020-04-21 7:28 ` [PATCH 24/26 v7] mips: mtmips: enable SPL for all boards Stefan Roese
2020-04-21 7:28 ` [PATCH 25/26 v7] mips: mtmips: add support for mt7628-rfb Stefan Roese
2020-04-21 7:28 ` [PATCH 26/26 v7] mips: mtmips: Increase CONFIG_SPL_SYS_MALLOC_F_LEN Stefan Roese
2020-04-27 13:35 ` [PATCH 00/26 v7] Refactor the architecture parts of mt7628 Daniel Schwierzeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2866e278-e880-8c64-4fbf-c6cd6cc20f80@gmail.com \
--to=daniel.schwierzeck@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox