Re: [U-Boot] [PATCH v2 8/9] arm64: rk3399: add SPL support

2017-02-22 Thread Kever Yang 

Hi Simon,

On 02/23/2017 12:16 PM, Simon Glass wrote:

Hi Kever,

On 13 February 2017 at 02:39, Kever Yang  wrote:

Add SPL support for rk3399, default with of-platdata enabled.

Signed-off-by: Kever Yang 
---

Changes in v2:
- split SPL patch into 4 patches

Changes in v1: None

  arch/arm/Kconfig  |   1 +
  arch/arm/mach-rockchip/Kconfig|   2 +
  arch/arm/mach-rockchip/Makefile   |   1 +
  arch/arm/mach-rockchip/rk3399-board-spl.c | 158 ++
  include/configs/rk3399_common.h   |   6 ++
  5 files changed, 168 insertions(+)
  create mode 100644 arch/arm/mach-rockchip/rk3399-board-spl.c

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d871a45..9a0efe4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -882,6 +882,7 @@ config ARCH_ROCKCHIP
 select DM
 select SPL_DM if SPL
 select SYS_MALLOC_F
+   select SPL_SEPARATE_BSS if SPL

Unfortunately this line seems to break firefly-rk3288, for example.

Can you perhaps move it to RK3399 only?


Yes, I can move it to RK3399, can I send v4 patch only for this one, because
the patch is too big.

Thanks,
- Kever


Regards,
Simon






___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v2 8/9] arm64: rk3399: add SPL support

2017-02-22 Thread Simon Glass 
Hi Kever,

On 13 February 2017 at 02:39, Kever Yang  wrote:
> Add SPL support for rk3399, default with of-platdata enabled.
>
> Signed-off-by: Kever Yang 
> ---
>
> Changes in v2:
> - split SPL patch into 4 patches
>
> Changes in v1: None
>
>  arch/arm/Kconfig  |   1 +
>  arch/arm/mach-rockchip/Kconfig|   2 +
>  arch/arm/mach-rockchip/Makefile   |   1 +
>  arch/arm/mach-rockchip/rk3399-board-spl.c | 158 
> ++
>  include/configs/rk3399_common.h   |   6 ++
>  5 files changed, 168 insertions(+)
>  create mode 100644 arch/arm/mach-rockchip/rk3399-board-spl.c
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index d871a45..9a0efe4 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -882,6 +882,7 @@ config ARCH_ROCKCHIP
> select DM
> select SPL_DM if SPL
> select SYS_MALLOC_F
> +   select SPL_SEPARATE_BSS if SPL

Unfortunately this line seems to break firefly-rk3288, for example.

Can you perhaps move it to RK3399 only?

Regards,
Simon
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v2 8/9] arm64: rk3399: add SPL support

2017-02-16 Thread Simon Glass 
On 13 February 2017 at 02:39, Kever Yang  wrote:
> Add SPL support for rk3399, default with of-platdata enabled.
>
> Signed-off-by: Kever Yang 
> ---
>
> Changes in v2:
> - split SPL patch into 4 patches
>
> Changes in v1: None
>
>  arch/arm/Kconfig  |   1 +
>  arch/arm/mach-rockchip/Kconfig|   2 +
>  arch/arm/mach-rockchip/Makefile   |   1 +
>  arch/arm/mach-rockchip/rk3399-board-spl.c | 158 
> ++
>  include/configs/rk3399_common.h   |   6 ++
>  5 files changed, 168 insertions(+)
>  create mode 100644 arch/arm/mach-rockchip/rk3399-board-spl.c

Reviewed-by: Simon Glass 
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v2 8/9] arm64: rk3399: add SPL support

2017-02-13 Thread Kever Yang 
Add SPL support for rk3399, default with of-platdata enabled.

Signed-off-by: Kever Yang 
---

Changes in v2:
- split SPL patch into 4 patches

Changes in v1: None

 arch/arm/Kconfig  |   1 +
 arch/arm/mach-rockchip/Kconfig|   2 +
 arch/arm/mach-rockchip/Makefile   |   1 +
 arch/arm/mach-rockchip/rk3399-board-spl.c | 158 ++
 include/configs/rk3399_common.h   |   6 ++
 5 files changed, 168 insertions(+)
 create mode 100644 arch/arm/mach-rockchip/rk3399-board-spl.c

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d871a45..9a0efe4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -882,6 +882,7 @@ config ARCH_ROCKCHIP
select DM
select SPL_DM if SPL
select SYS_MALLOC_F
+   select SPL_SEPARATE_BSS if SPL
select SPL_SYS_MALLOC_SIMPLE if SPL
select DM_GPIO
select DM_I2C
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 5c4a4c2..cd8fef8 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -26,6 +26,8 @@ config ROCKCHIP_RK3288
 config ROCKCHIP_RK3399
bool "Support Rockchip RK3399"
select ARM64
+   select SUPPORT_SPL
+   select SPL
help
  The Rockchip RK3399 is a ARM-based SoC with a dual-core Cortex-A72
  and quad-core Cortex-A53.
diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
index 6e79fed..b58c02d 100644
--- a/arch/arm/mach-rockchip/Makefile
+++ b/arch/arm/mach-rockchip/Makefile
@@ -7,6 +7,7 @@
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o
+obj-$(CONFIG_ROCKCHIP_RK3399) += rk3399-board-spl.o
 obj-$(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) += save_boot_param.o
 else
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board.o
diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c 
b/arch/arm/mach-rockchip/rk3399-board-spl.c
new file mode 100644
index 000..8ae3055
--- /dev/null
+++ b/arch/arm/mach-rockchip/rk3399-board-spl.c
@@ -0,0 +1,158 @@
+/*
+ * (C) Copyright 2016 Rockchip Electronics Co., Ltd
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+DECLARE_GLOBAL_DATA_PTR;
+
+u32 spl_boot_device(void)
+{
+   return BOOT_DEVICE_MMC1;
+}
+
+u32 spl_boot_mode(const u32 boot_device)
+{
+   return MMCSD_MODE_RAW;
+}
+
+#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);
+}
+
+#define GRF_EMMCCORE_CON11 0xff77f02c
+void board_init_f(ulong dummy)
+{
+   struct udevice *pinctrl;
+   struct udevice *dev;
+   int ret;
+
+   /* Example code showing how to enable the debug UART on RK3288 */
+#include 
+   /* Enable early UART2 channel C on the RK3399 */
+#define GRF_BASE   0xff77
+   struct rk3399_grf_regs * const grf = (void *)GRF_BASE;
+
+   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);
+#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
+   /*  Emmc clock generator: disable the clock multipilier */
+   rk_clrreg(GRF_EMMCCORE_CON11, 0x0ff);
+
+   ret = spl_init();
+   if (ret) {
+   debug("spl_init() failed: %d\n", ret);
+   hang();
+   }
+
+   secure_timer_init();
+
+   ret = uclass_get_device(UCLASS_PINCTRL, 0, );
+   if (ret) {
+   debug("Pinctrl init failed: %d\n", ret);
+