Re: [U-Boot] [U-Boot, 31/36] rockchip: rk3399: prepare to use common board file

[Kever Yang]

On 04/02/2018 05:59 AM, Philipp Tomsich wrote:
>>
>> DECLARE_GLOBAL_DATA_PTR;
>>
>> -int board_init(void)
>> -{
>> -    int ret;
>> -
>> -    /*
>> - * We need to call into regulators_enable_boot_on() again, as
>> the call
>> - * during SPL may have not included all regulators.
>> - */
>> -    ret = regulators_enable_boot_on(false);
>> -    if (ret)
>> -    debug("%s: Cannot enable boot on regulator\n", __func__);
>> -
>
> This is critical during SPL for us.
> I don't see this being moved anywhere else. 

This will be in common board.c in coming up patch.

Thanks,
- Kever
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [U-Boot, 31/36] rockchip: rk3399: prepare to use common board file

[Philipp Tomsich]

On Tue, 27 Mar 2018, Kever Yang wrote:


Use common board file and move SoC spec setting into rk3399.c

Signed-off-by: Kever Yang 


See below for a few comments.
I'll review again, once this series is somewhat more mature...


---

arch/arm/mach-rockchip/rk3399-board-spl.c | 179 --
arch/arm/mach-rockchip/rk3399-board.c |  14 --
arch/arm/mach-rockchip/rk3399/rk3399.c|  86 +--
board/rockchip/evb_rk3399/evb-rk3399.c|  56 ---
board/theobroma-systems/puma_rk3399/puma-rk3399.c |  17 +-
5 files changed, 103 insertions(+), 249 deletions(-)
delete mode 100644 arch/arm/mach-rockchip/rk3399-board-spl.c
delete mode 100644 arch/arm/mach-rockchip/rk3399-board.c

diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c 
b/arch/arm/mach-rockchip/rk3399-board-spl.c
deleted file mode 100644
index d35990e..000
--- a/arch/arm/mach-rockchip/rk3399-board-spl.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * (C) Copyright 2016 Rockchip Electronics Co., Ltd
- * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH


Please make sure when moving code we contributed, that our copyright shows 
up in the new location you are moving this to.



- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void board_return_to_bootrom(void)
-{
-   back_to_bootrom(BROM_BOOT_NEXTSTAGE);
-}
-
-static const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-   [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe33",
-   [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d",
-   [BROM_BOOTSOURCE_SD] = "/dwmmc@fe32",
-};
-
-const char *board_spl_was_booted_from(void)
-{
-   u32  bootdevice_brom_id = readl(RK3399_BROM_BOOTSOURCE_ID_ADDR);
-   const char *bootdevice_ofpath = NULL;
-
-   if (bootdevice_brom_id < ARRAY_SIZE(boot_devices))
-   bootdevice_ofpath = boot_devices[bootdevice_brom_id];
-
-   if (bootdevice_ofpath)
-   debug("%s: brom_bootdevice_id %x maps to '%s'\n",
- __func__, bootdevice_brom_id, bootdevice_ofpath);
-   else
-   debug("%s: failed to resolve brom_bootdevice_id %x\n",
- __func__, bootdevice_brom_id);
-
-   return bootdevice_ofpath;
-}
-
-u32 spl_boot_device(void)
-{
-   u32 boot_device = BOOT_DEVICE_MMC1;
-
-   if (CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM))
-   return BOOT_DEVICE_BOOTROM;
-
-   return boot_device;
-}
-
-#define TIMER_CHN10_BASE   0xff8680a0
-#define TIMER_END_COUNT_L  0x00
-#define TIMER_END_COUNT_H  0x04
-#define TIMER_INIT_COUNT_L 0x10
-#define TIMER_INIT_COUNT_H 0x14
-#define TIMER_CONTROL_REG  0x1c
-
-#define TIMER_EN   0x1
-#defineTIMER_FMODE (0 << 1)
-#defineTIMER_RMODE (1 << 1)
-
-void secure_timer_init(void)
-{
-   writel(0x, TIMER_CHN10_BASE + TIMER_END_COUNT_L);
-   writel(0x, TIMER_CHN10_BASE + TIMER_END_COUNT_H);
-   writel(0, TIMER_CHN10_BASE + TIMER_INIT_COUNT_L);
-   writel(0, TIMER_CHN10_BASE + TIMER_INIT_COUNT_H);
-   writel(TIMER_EN | TIMER_FMODE, TIMER_CHN10_BASE + TIMER_CONTROL_REG);
-}
-
-void board_debug_uart_init(void)
-{
-#define GRF_BASE   0xff77
-   struct rk3399_grf_regs * const grf = (void *)GRF_BASE;
-
-#if defined(CONFIG_DEBUG_UART_BASE) && (CONFIG_DEBUG_UART_BASE == 0xff18)
-   /* Enable early UART0 on the RK3399 */
-   rk_clrsetreg(>gpio2c_iomux,
-GRF_GPIO2C0_SEL_MASK,
-GRF_UART0BT_SIN << GRF_GPIO2C0_SEL_SHIFT);
-   rk_clrsetreg(>gpio2c_iomux,
-GRF_GPIO2C1_SEL_MASK,
-GRF_UART0BT_SOUT << GRF_GPIO2C1_SEL_SHIFT);
-#else
-   /* Enable early UART2 channel C on the RK3399 */
-   rk_clrsetreg(>gpio4c_iomux,
-GRF_GPIO4C3_SEL_MASK,
-GRF_UART2DGBC_SIN << GRF_GPIO4C3_SEL_SHIFT);
-   rk_clrsetreg(>gpio4c_iomux,
-GRF_GPIO4C4_SEL_MASK,
-GRF_UART2DBGC_SOUT << GRF_GPIO4C4_SEL_SHIFT);
-   /* Set channel C as UART2 input */
-   rk_clrsetreg(>soc_con7,
-GRF_UART_DBG_SEL_MASK,
-GRF_UART_DBG_SEL_C << GRF_UART_DBG_SEL_SHIFT);
-#endif
-}
-
-void board_init_f(ulong dummy)
-{
-   struct udevice *pinctrl;
-   struct udevice *dev;
-   struct rk3399_pmusgrf_regs *sgrf;
-   struct rk3399_grf_regs *grf;
-   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 SPL board init");
-#endif
-
-   ret = 

Re: [U-Boot] [U-Boot, 31/36] rockchip: rk3399: prepare to use common board file

[Philipp Tomsich]

> Use common board file and move SoC spec setting into rk3399.c
> 
> Signed-off-by: Kever Yang 
> ---
> 
>  arch/arm/mach-rockchip/rk3399-board-spl.c | 179 
> --
>  arch/arm/mach-rockchip/rk3399-board.c |  14 --
>  arch/arm/mach-rockchip/rk3399/rk3399.c|  86 +--
>  board/rockchip/evb_rk3399/evb-rk3399.c|  56 ---
>  board/theobroma-systems/puma_rk3399/puma-rk3399.c |  17 +-
>  5 files changed, 103 insertions(+), 249 deletions(-)
>  delete mode 100644 arch/arm/mach-rockchip/rk3399-board-spl.c
>  delete mode 100644 arch/arm/mach-rockchip/rk3399-board.c
> 

Acked-by: Philipp Tomsich 
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot