[U-Boot] [PATCH v2 51/56] rockchip: rk3368: spl: add SPL support

[Simon Glass]

On 26 July 2017 at 04:40, Philipp Tomsich
<philipp.tomsich at theobroma-systems.com> wrote:
> Adds SPL support for the RK3368 (assuming that our TPL stage has
> initialised DRAM and set up the memory firewall).
>
> Signed-off-by: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>
>
> ---
>
> Changes in v2:
> - reuses the support for configuring the boot order using the
>   u-boot,spl-boot-order property
> - drops the initialisation of the debug_uart
> - adds pinctrl-configuration for the preloader UART
>
>  arch/arm/mach-rockchip/Makefile           |  2 +-
>  arch/arm/mach-rockchip/rk3368-board-spl.c | 98 +++++++++++++++++++++++++++++++
>  2 files changed, 99 insertions(+), 1 deletion(-)
>  create mode 100644 arch/arm/mach-rockchip/rk3368-board-spl.c

Reviewed-by: Simon Glass <sjg at chromium.org>

Please see below?

>
> diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
> index c5d17f9..c3ed862 100644
> --- a/arch/arm/mach-rockchip/Makefile
> +++ b/arch/arm/mach-rockchip/Makefile
> @@ -18,7 +18,7 @@ obj-spl-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o
>  obj-spl-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-spl.o
>  obj-spl-$(CONFIG_ROCKCHIP_RK322X) += rk322x-board-spl.o
>  obj-spl-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o
> -obj-spl-$(CONFIG_ROCKCHIP_RK3368) += rk3368-board-spl.o
> +obj-spl-$(CONFIG_ROCKCHIP_RK3368) += rk3368-board-spl.o spl-boot-order.o
>  obj-spl-$(CONFIG_ROCKCHIP_RK3399) += rk3399-board-spl.o spl-boot-order.o
>
>  ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
> diff --git a/arch/arm/mach-rockchip/rk3368-board-spl.c b/arch/arm/mach-rockchip/rk3368-board-spl.c
> new file mode 100644
> index 0000000..691db41
> --- /dev/null
> +++ b/arch/arm/mach-rockchip/rk3368-board-spl.c
> @@ -0,0 +1,98 @@
> +/*
> + * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
> + *
> + * SPDX-License-Identifier:     GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <debug_uart.h>
> +#include <dm.h>
> +#include <dm/pinctrl.h>
> +#include <ram.h>
> +#include <spl.h>
> +#include <asm/io.h>
> +#include <asm/arch/cru_rk3368.h>
> +#include <asm/arch/grf_rk3368.h>
> +#include <asm/arch/hardware.h>
> +#include <asm/arch/periph.h>
> +#include <asm/arch/timer.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +/*
> + * The ARMv8 generic timer uses the STIMER1 as its clock-source.
> + * Set up the STIMER1 to free-running (i.e. auto-reload) to start
> + * the generic timer counting (if we don't do this, udelay will not
> + * work and block indefinitively).
> + */
> +static void secure_timer_init(void)
> +{
> +       struct rk_timer * const stimer1 =
> +               (struct rk_timer * const)0xff830020;

Can we use DT for this?

> +       const u32 TIMER_EN = BIT(0);
> +
> +       writel(~0u, &stimer1->timer_load_count0);
> +       writel(~0u, &stimer1->timer_load_count1);
> +       writel(TIMER_EN, &stimer1->timer_ctrl_reg);
> +}
> +
> +void board_debug_uart_init(void)
> +{
> +}
> +
> +void board_init_f(ulong dummy)
> +{
> +       struct udevice *pinctrl;
> +       struct udevice *dev;
> +       int ret;
> +
> +       ret = spl_early_init();
> +       if (ret) {
> +               debug("spl_early_init() failed: %d\n", ret);
> +               hang();
> +       }
> +
> +       /* Make sure the ARMv8 generic timer counts */
> +       secure_timer_init();
> +
> +       /* Set up our preloader console */
> +       ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
> +       if (ret) {
> +               error("%s: pinctrl init failed: %d\n", __func__, ret);
> +               hang();
> +       }
> +
> +       ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_UART0);
> +       if (ret) {
> +               error("%s: failed to set up console UART\n", __func__);
> +               hang();
> +       }
> +
> +       preloader_console_init();
> +
> +       ret = uclass_get_device(UCLASS_RAM, 0, &dev);
> +       if (ret) {
> +               debug("DRAM init failed: %d\n", ret);
> +               return;
> +       }
> +}
> +
> +u32 spl_boot_mode(const u32 boot_device)
> +{
> +       return MMCSD_MODE_RAW;
> +}
> +
> +u32 spl_boot_device(void)
> +{
> +       return BOOT_DEVICE_MMC1;
> +}
> +
> +#ifdef CONFIG_SPL_LOAD_FIT
> +int board_fit_config_name_match(const char *name)
> +{
> +       /* Just empty function now - can't decide what to choose */
> +       debug("%s: %s\n", __func__, name);
> +
> +       return 0;
> +}
> +#endif
> --
> 2.1.4
>

Regards,
Simon