Hi Philipp:
2017-08-03 4:34 GMT+08:00 Philipp Tomsich < philipp.tomsich@theobroma-systems.com>:
This adds the TPL support for the RK3368, including the u-boot-tpl.lds.
Signed-off-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com Reviewed-by: Simon Glass sjg@chromium.org
Changes in v4: None Changes in v3:
- removes the '#define DEBUG'
- uses the syscon API to access GRF and SGRF to avoid using hard-coded addresses
Changes in v2:
- copies the enum for the IOMUX config of the debug UART into the TPL support code, as the various constants are otherwise private to the pinctrl code (and we can't include pinctrl in the TPL stage due to size constraints/dependencies)
arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/rk3368-board-tpl.c | 177 +++++++++++++++++++++++++++ arch/arm/mach-rockchip/rk3368/u-boot-tpl.lds | 13 ++ 3 files changed, 191 insertions(+) create mode 100644 arch/arm/mach-rockchip/rk3368-board-tpl.c create mode 100644 arch/arm/mach-rockchip/rk3368/u-boot-tpl.lds
diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/ Makefile index 633c91e..960f40f 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -12,6 +12,7 @@ obj-spl-$(CONFIG_ROCKCHIP_BROM_HELPER) += bootrom.o save_boot_param.o obj-tpl-$(CONFIG_ROCKCHIP_BROM_HELPER) += bootrom.o save_boot_param.o
obj-tpl-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-tpl.o +obj-tpl-$(CONFIG_ROCKCHIP_RK3368) += rk3368-board-tpl.o
obj-spl-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o obj-spl-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-spl.o diff --git a/arch/arm/mach-rockchip/rk3368-board-tpl.c b/arch/arm/mach-rockchip/rk3368-board-tpl.c new file mode 100644 index 0000000..2a91007 --- /dev/null +++ b/arch/arm/mach-rockchip/rk3368-board-tpl.c @@ -0,0 +1,177 @@ +/*
- (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- SPDX-License-Identifier: GPL-2.0+
- */
+#include <common.h> +#include <asm/arch/clock.h> +#include <debug_uart.h> +#include <dm.h> +#include <ram.h> +#include <spl.h> +#include <asm/io.h> +#include <asm/arch/bootrom.h> +#include <asm/arch/cru_rk3368.h> +#include <asm/arch/grf_rk3368.h> +#include <asm/arch/hardware.h> +#include <asm/arch/timer.h> +#include <syscon.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;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);+}
+/*
- The SPL (and also the full U-Boot stage on the RK3368) will run in
- secure mode (i.e. EL3) and an ATF will eventually be booted before
- starting up the operating system... so we can initialize the SGRF
- here and rely on the ATF installing the final (secure) policy
- later.
- */
+static inline uintptr_t sgrf_soc_con_addr(unsigned no) +{
const uintptr_t SGRF_BASE =(uintptr_t)syscon_get_first_range(ROCKCHIP_SYSCON_SGRF);return SGRF_BASE + sizeof(u32) * no;+}
+static inline uintptr_t sgrf_busdmac_addr(unsigned no) +{
const uintptr_t SGRF_BASE =(uintptr_t)syscon_get_first_range(ROCKCHIP_SYSCON_SGRF);const uintptr_t SGRF_BUSDMAC_OFFSET = 0x100;const uintptr_t SGRF_BUSDMAC_BASE = SGRF_BASE +SGRF_BUSDMAC_OFFSET;
return SGRF_BUSDMAC_BASE + sizeof(u32) * no;+}
+static void sgrf_init(void) +{
struct rk3368_cru * const cru =(struct rk3368_cru * const)rockchip_get_cru();const u16 SGRF_SOC_CON_SEC = GENMASK(15, 0);const u16 SGRF_BUSDMAC_CON0_SEC = BIT(2);const u16 SGRF_BUSDMAC_CON1_SEC = GENMASK(15, 12);/* Set all configurable IP to 'non secure'-mode */rk_setreg(sgrf_soc_con_addr(5), SGRF_SOC_CON_SEC);rk_setreg(sgrf_soc_con_addr(6), SGRF_SOC_CON_SEC);rk_setreg(sgrf_soc_con_addr(7), SGRF_SOC_CON_SEC);/** From rockchip-uboot/arch/arm/cpu/armv8/rk33xx/cpu.c* Original comment: "ddr space set no secure mode"*/rk_clrreg(sgrf_soc_con_addr(8), SGRF_SOC_CON_SEC);rk_clrreg(sgrf_soc_con_addr(9), SGRF_SOC_CON_SEC);rk_clrreg(sgrf_soc_con_addr(10), SGRF_SOC_CON_SEC);/* Set 'secure dma' to 'non secure'-mode */rk_setreg(sgrf_busdmac_addr(0), SGRF_BUSDMAC_CON0_SEC);rk_setreg(sgrf_busdmac_addr(1), SGRF_BUSDMAC_CON1_SEC);dsb(); /* barrier */rk_setreg(&cru->softrst_con[1], DMA1_SRST_REQ);rk_setreg(&cru->softrst_con[4], DMA2_SRST_REQ);dsb(); /* barrier */udelay(10);rk_clrreg(&cru->softrst_con[1], DMA1_SRST_REQ);rk_clrreg(&cru->softrst_con[4], DMA2_SRST_REQ);+}
+void board_debug_uart_init(void) +{
/** N.B.: This is called before the device-model has been* initialised. For this reason, we can not access* the GRF address range using the syscon API.*/struct rk3368_grf * const grf =(struct rk3368_grf * const)0xff770000;enum {GPIO2D1_MASK = GENMASK(3, 2),GPIO2D1_GPIO = 0,GPIO2D1_UART0_SOUT = (1 << 2),GPIO2D0_MASK = GENMASK(1, 0),GPIO2D0_GPIO = 0,GPIO2D0_UART0_SIN = (1 << 0),};+#if defined(CONFIG_DEBUG_UART_BASE) && (CONFIG_DEBUG_UART_BASE == 0xff180000)
/* Enable early UART0 on the RK3368 */rk_clrsetreg(&grf->gpio2d_iomux,GPIO2D0_MASK, GPIO2D0_UART0_SIN);rk_clrsetreg(&grf->gpio2d_iomux,GPIO2D1_MASK, GPIO2D1_UART0_SOUT);+#endif +}
+void board_init_f(ulong dummy) +{
struct udevice *dev;int ret;+#define EARLY_UART +#ifdef EARLY_UART
/** Debug UART can be used from here if required:** debug_uart_init();* printch('a');* printhex8(0x1234);* printascii("string");*/debug_uart_init();printascii("U-Boot TPL board init\n");+#endif
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();/* Reset security, so we can use DMA in the MMC drivers */sgrf_init();ret = uclass_get_device(UCLASS_RAM, 0, &dev);if (ret) {debug("DRAM init failed: %d\n", ret);return;}+}
+void board_return_to_bootrom(void) +{
back_to_bootrom();+}
+u32 spl_boot_device(void) +{
return BOOT_DEVICE_BOOTROM;+}
The last blank line is not needed.
diff --git a/arch/arm/mach-rockchip/rk3368/u-boot-tpl.lds b/arch/arm/mach-rockchip/rk3368/u-boot-tpl.lds new file mode 100644 index 0000000..cc59844 --- /dev/null +++ b/arch/arm/mach-rockchip/rk3368/u-boot-tpl.lds @@ -0,0 +1,13 @@ +/*
- (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- SPDX-License-Identifier: GPL-2.0+
- */
+#undef CONFIG_SPL_TEXT_BASE +#define CONFIG_SPL_TEXT_BASE CONFIG_TPL_TEXT_BASE
+#undef CONFIG_SPL_MAX_SIZE +#define CONFIG_SPL_MAX_SIZE CONFIG_TPL_MAX_SIZE
+#include "../../cpu/armv8/u-boot-spl.lds"
2.1.4
U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot