Skip to contentSkip to conversation

Add Rikomagic MK808 board

PATCH Superseded Johan Jonker 2 participants 22 messages Apr 11, 2022 – Apr 16, 2022

Subsystems (6)

v10 of 11 Superseded Latest is v11 →

lore
Share & tools
lore
#0 lore raw

v10 cover Add Rikomagic MK808 board

MK808 is a RK3066-based board with 1 USB host and 1 USB OTG port, HDMI and a micro-SD card slot. It also includes on-board NAND and 1GB of SDRAM.

Changed V10:
add u-boot,spl-fifo-mode property
combine patches core support
restyle doc rockchip.rst
add more px30 doc info
add more rk3066 doc info

Changed V9:
fix TABs and spaces
add led config
enable led gpio
change pinctrl regmap source
disable STIMER
move include

Changed V8:
update clock driver
update grf header file

Changed V7:
add board files
enable boot from SD card
restyle pinctrl driver
restyle sdram driver

===

Boot procedure flow for a Rockchip rk3066 SoC:

1.Read 2K SDRAM initialization image code to internal SRAM 2.Run image code to do SDRAM initialization 3.Transfer boot image code to SDRAM
4.Run boot image code

Supported system boot from the following devices:
Nand Flash
SPI nor Flash
eMMC device
UART interface

If all boot options fail then enter into BootROM mode on the USB OTG port. Unlike later SoC models the rk3066 BootROM doesn't have SDMMC support.

The size of a full U-boot binary is too large for the internal SDRAM memory. Of that 64k size only 32kb sram - 2kb bootrom is available for the first stage.

Similar to the already supported rk3188, the BootROM will attempt to load up the first stage image in two steps: first 1KB to offset 0x800 in the SRAM and
then the remainder to offset 0xc00 in the SRAM.
It always enters at offset 0x804 after a 4 ASCII character "RK30" header.

With CONFIG_TPL_ROCKCHIP_EARLYRETURN_TO_BROM=y this first stage is combined with the U-boot TPL binary (u-boot-tpl.bin).

For rk3066 with NAND flash and U-boot this gives the following stages:

- TPL: init external SDRAM
- SPL: init SDMMC and read U-boot from SD CARD.
- U-boot: read Linux kernel from SD CARD.
- Kernel

Additionally the rk3066 requires everything the BootROM loads to be RC4-encrypted.

===

Boot solution with full U-boot stored on SD CARD:

Compile commands(U-boot):

ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- make mk808_defconfig ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- make menuconfig ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- make all

===

Size of SPL and TPL must be aligned to 2kb.
If bricked and no BootROM mode shows up then connect pin 8 and 9 of the NAND flash with a needle while reconnecting to the USB OTG port to a PC.

===

Show connected devices with:

lsusb

Bus 001 Device 004: ID 2207:300a Fuzhou Rockchip Electronics Company RK3066 in Mask ROM mode

===

Program commands with ./flash.sh:

#!/bin/sh

printf "RK30" > tplspl.bin
dd if=u-boot-tpl.bin >> tplspl.bin
truncate -s %2048 tplspl.bin
truncate -s %2048 u-boot-spl.bin
../tools/boot_merger --verbose config-flash.ini
../tools/upgrade_tool ul ./RK30xxLoader_uboot.bin

===

config-flash.ini:

[CHIP_NAME]
NAME=RK30
[VERSION]
MAJOR=2
MINOR=21
[CODE471_OPTION]
NUM=1
Path1=30_LPDDR2_300MHz_DD.bin
[CODE472_OPTION]
NUM=1
Path1=rk30usbplug.bin
[LOADER_OPTION]
NUM=2
LOADER1=FlashData
LOADER2=FlashBoot
FlashData=tplspl.bin
FlashBoot=u-boot-spl.bin
[OUTPUT]
PATH=RK30xxLoader_uboot.bin

===

Partition Map for MMC device 0 -- Partition Type: EFI

Part Start LBA End LBA Name
Attributes
Type GUID
Partition GUID
1 0x00000040 0x00001f7f "loader1"
2 0x00004000 0x00005fff "loader2"
3 0x00006000 0x00007fff "trust"
4 0x00008000 0x0003ffff "boot"
5 0x00040000 0x00ed7fde "rootfs"

Make sure boot and esp flag are set for boot partition. Loader1 partition is not used by RK3066.

===

Boot partition:

extlinux -- extlinux.conf
zImage
rk3066a-mk808.dtb

===

extlinux.conf:

label kernel
kernel /zImage
fdt /rk3066a-mk808.dtb
append root=LABEL=linuxroot init=/sbin/init rootfstype=ext4 rootwait

===

Program commands (SD CARD with GPT partition):

sudo dd if=u-boot-dtb.img of=/dev/sda seek=16384

===

TODO:
Better program flow/tools
USB
NAND
etc etc

===

Johan Jonker (12):
rockchip: rk3066-power: sync power domain dt-binding header from Linux
arm: dts: rockchip: fix rk3xxx-u-boot.dtsi
arm: dts: rockchip: fix include rk3xxx-u-boot.dtsi
arm: dts: rockchip: add rk3066a.dtsi
arm: dts: rockchip: add rk3066a-mk808.dts
rockchip: tools: add rk3066 support to rkcommon.c
rockchip: rk3066: add core support
rockchip: rk3066: add Rikomagic MK808 board
rockchip: rk3066: add mk808_defconfig
doc: rockchip: restyle rockchip.rst
doc: rockchip: add px30/rk3326 boards and examples
doc: rockchip: add rk3066 Rikomagic MK808

Paweł Jarosz (4):
rockchip: rk3066: add grf header file
rockchip: rk3066: add clock driver for rk3066 soc
rockchip: rk3066: add rk3066 pinctrl driver
rockchip: rk3066: add sdram driver

 arch/arm/dts/Makefile                         |   3 +
 arch/arm/dts/rk3066a-mk808-u-boot.dtsi        |  49 +
 arch/arm/dts/rk3066a-mk808.dts                | 216 +++++
 arch/arm/dts/rk3066a-u-boot.dtsi              |   4 +
 arch/arm/dts/rk3066a.dtsi                     | 879 +++++++++++++++++
 arch/arm/dts/rk3188-u-boot.dtsi               |   1 +
 arch/arm/dts/rk3188.dtsi                      |   1 -
 arch/arm/dts/rk3xxx-u-boot.dtsi               |   8 +-
 arch/arm/include/asm/arch-rk3066/boot0.h      |   8 +
 arch/arm/include/asm/arch-rk3066/gpio.h       |   8 +
 arch/arm/include/asm/arch-rk3066/timer.h      |   6 +
 .../include/asm/arch-rockchip/cru_rk3066.h    | 157 +++
 .../include/asm/arch-rockchip/grf_rk3066.h    | 210 +++++
 arch/arm/mach-rockchip/Kconfig                |  23 +
 arch/arm/mach-rockchip/Makefile               |   1 +
 arch/arm/mach-rockchip/rk3066/Kconfig         |  39 +
 arch/arm/mach-rockchip/rk3066/Makefile        |   5 +
 arch/arm/mach-rockchip/rk3066/clk_rk3066.c    |  33 +
 arch/arm/mach-rockchip/rk3066/rk3066.c        |  49 +
 arch/arm/mach-rockchip/rk3066/syscon_rk3066.c |  55 ++
 board/rikomagic/mk808/Kconfig                 |  15 +
 board/rikomagic/mk808/MAINTAINERS             |   6 +
 board/rikomagic/mk808/Makefile                |   3 +
 board/rikomagic/mk808/mk808.c                 |   3 +
 configs/mk808_defconfig                       | 100 ++
 doc/board/rockchip/rockchip.rst               | 263 +++++-
 drivers/clk/rockchip/Makefile                 |   1 +
 drivers/clk/rockchip/clk_rk3066.c             | 717 ++++++++++++++
 drivers/pinctrl/rockchip/Makefile             |   1 +
 drivers/pinctrl/rockchip/pinctrl-rk3066.c     | 112 +++
 drivers/ram/rockchip/Makefile                 |   1 +
 drivers/ram/rockchip/sdram_rk3066.c           | 892 ++++++++++++++++++
 include/configs/mk808.h                       |   9 +
 include/configs/rk3066_common.h               |  56 ++
 include/dt-bindings/power/rk3066-power.h      |  22 +
 tools/rkcommon.c                              |   1 +
 36 files changed, 3903 insertions(+), 54 deletions(-)
 create mode 100644 arch/arm/dts/rk3066a-mk808-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3066a-mk808.dts
 create mode 100644 arch/arm/dts/rk3066a-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3066a.dtsi
 create mode 100644 arch/arm/include/asm/arch-rk3066/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3066/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rk3066/timer.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3066.h
 create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3066.h
 create mode 100644 arch/arm/mach-rockchip/rk3066/Kconfig
 create mode 100644 arch/arm/mach-rockchip/rk3066/Makefile
 create mode 100644 arch/arm/mach-rockchip/rk3066/clk_rk3066.c
 create mode 100644 arch/arm/mach-rockchip/rk3066/rk3066.c
 create mode 100644 arch/arm/mach-rockchip/rk3066/syscon_rk3066.c
 create mode 100644 board/rikomagic/mk808/Kconfig
 create mode 100644 board/rikomagic/mk808/MAINTAINERS
 create mode 100644 board/rikomagic/mk808/Makefile
 create mode 100644 board/rikomagic/mk808/mk808.c
 create mode 100644 configs/mk808_defconfig
 create mode 100644 drivers/clk/rockchip/clk_rk3066.c
 create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3066.c
 create mode 100644 drivers/ram/rockchip/sdram_rk3066.c
 create mode 100644 include/configs/mk808.h
 create mode 100644 include/configs/rk3066_common.h
 create mode 100644 include/dt-bindings/power/rk3066-power.h
Signature · 1 line
2.20.1
#1 lore raw

PATCH v10 1/16 rockchip: rk3066-power: sync power domain dt-binding header from Linux

In order to update the DT for rk3066
sync the power domain dt-binding header.
This is the state as of v5.12 in Linux.

---
 include/dt-bindings/power/rk3066-power.h | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 include/dt-bindings/power/rk3066-power.h
include/dt-bindings/power/rk3066-power.h new file +22 -0
new file mode 100644
index 0000000000..acf9f310ac
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __DT_BINDINGS_POWER_RK3066_POWER_H__
+#define __DT_BINDINGS_POWER_RK3066_POWER_H__
+
+/* VD_CORE */
+#define RK3066_PD_A9_0		0
+#define RK3066_PD_A9_1		1
+#define RK3066_PD_DBG		4
+#define RK3066_PD_SCU		5
+
+/* VD_LOGIC */
+#define RK3066_PD_VIDEO		6
+#define RK3066_PD_VIO		7
+#define RK3066_PD_GPU		8
+#define RK3066_PD_PERI		9
+#define RK3066_PD_CPU		10
+#define RK3066_PD_ALIVE		11
+
+/* VD_PMU */
+#define RK3066_PD_RTC		12
+
+#endif
Signature · 1 line
2.20.1
#2 lore raw

PATCH v10 2/16 rockchip: rk3066: add grf header file

In reply to Johan Jonker

From: Paweł Jarosz <[email protected]>

grf is needed by various drivers for rk3066 soc.

---

Changed V9:
fix TAB

Changed V8:
add GRF_GPIO3B_IOMUX for SDMMC0
use GENMASK, __bf_shf and REG defines
add includes

---
 .../include/asm/arch-rockchip/grf_rk3066.h    | 210 ++++++++++++++++++
 1 file changed, 210 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3066.h
arch/arm/include/asm/arch-rockchip/grf_rk3066.h new file +210 -0
new file mode 100644
index 0000000000..d8e0812cee
@@ -0,0 +1,210 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) 2021 Paweł Jarosz <[email protected]>
+ */
+
+#ifndef _ASM_ARCH_GRF_RK3066_H
+#define _ASM_ARCH_GRF_RK3066_H
+
+#include <linux/bitops.h>
+#include <linux/bitfield.h>
+
+#define REG(name, h, l) \
+	name##_MASK = GENMASK(h, l), \
+	name##_SHIFT = __bf_shf(name##_MASK)
+
+struct rk3066_grf_gpio_lh {
+	u32 l;
+	u32 h;
+};
+
+struct rk3066_grf {
+	struct rk3066_grf_gpio_lh gpio_dir[7];
+	struct rk3066_grf_gpio_lh gpio_do[7];
+	struct rk3066_grf_gpio_lh gpio_en[7];
+
+	u32 gpio0a_iomux;
+	u32 gpio0b_iomux;
+	u32 gpio0c_iomux;
+	u32 gpio0d_iomux;
+
+	u32 gpio1a_iomux;
+	u32 gpio1b_iomux;
+	u32 gpio1c_iomux;
+	u32 gpio1d_iomux;
+
+	u32 gpio2a_iomux;
+	u32 gpio2b_iomux;
+	u32 gpio2c_iomux;
+	u32 gpio2d_iomux;
+
+	u32 gpio3a_iomux;
+	u32 gpio3b_iomux;
+	u32 gpio3c_iomux;
+	u32 gpio3d_iomux;
+
+	u32 gpio4a_iomux;
+	u32 gpio4b_iomux;
+	u32 gpio4c_iomux;
+	u32 gpio4d_iomux;
+
+	u32 reserved0[5];
+
+	u32 gpio6b_iomux;
+
+	u32 reserved1[2];
+
+	struct rk3066_grf_gpio_lh gpio_pull[7];
+
+	u32 soc_con0;
+	u32 soc_con1;
+	u32 soc_con2;
+
+	u32 soc_status0;
+
+	u32 dmac1_con[3];
+	u32 dmac2_con[4];
+
+	u32 uoc0_con[3];
+	u32 uoc1_con[4];
+	u32 ddrc_con;
+	u32 ddrc_stat;
+
+	u32 reserved2[10];
+
+	u32 os_reg[4];
+};
+
+check_member(rk3066_grf, os_reg[3], 0x01d4);
+
+/* GRF_GPIO1B_IOMUX */
+enum {
+	REG(GPIO1B1, 2, 2),
+	GPIO1B1_GPIO		= 0,
+	GPIO1B1_UART2_SOUT,
+
+	REG(GPIO1B0, 0, 0),
+	GPIO1B0_GPIO		= 0,
+	GPIO1B0_UART2_SIN
+};
+
+/* GRF_GPIO3B_IOMUX */
+enum {
+	REG(GPIO3B6, 12, 12),
+	GPIO3B6_GPIO		= 0,
+	GPIO3B6_SDMMC0_DECTN,
+
+	REG(GPIO3B5, 10, 10),
+	GPIO3B5_GPIO		= 0,
+	GPIO3B5_SDMMC0_DATA3,
+
+	REG(GPIO3B4, 8, 8),
+	GPIO3B4_GPIO		= 0,
+	GPIO3B4_SDMMC0_DATA2,
+
+	REG(GPIO3B3, 6, 6),
+	GPIO3B3_GPIO		= 0,
+	GPIO3B3_SDMMC0_DATA1,
+
+	REG(GPIO3B2, 4, 4),
+	GPIO3B2_GPIO		= 0,
+	GPIO3B2_SDMMC0_DATA0,
+
+	REG(GPIO3B1, 2, 2),
+	GPIO3B1_GPIO		= 0,
+	GPIO3B1_SDMMC0_CMD,
+
+	REG(GPIO3B0, 0, 0),
+	GPIO3B0_GPIO		= 0,
+	GPIO3B0_SDMMC0_CLKOUT,
+};
+
+/* GRF_SOC_CON0 */
+enum {
+	REG(SMC_MUX_CON, 13, 13),
+
+	REG(NOC_REMAP, 12, 12),
+
+	REG(EMMC_FLASH_SEL, 11, 11),
+
+	REG(TZPC_REVISION, 10, 7),
+
+	REG(L2CACHE_ACC, 6, 5),
+
+	REG(L2RD_WAIT, 4, 3),
+
+	REG(IMEMRD_WAIT, 2, 1),
+
+	REG(SOC_REMAP, 0, 0),
+};
+
+/* GRF_SOC_CON1 */
+enum {
+	REG(RKI2C4_SEL, 15, 15),
+
+	REG(RKI2C3_SEL, 14, 14),
+
+	REG(RKI2C2_SEL, 13, 13),
+
+	REG(RKI2C1_SEL, 12, 12),
+
+	REG(RKI2C0_SEL, 11, 11),
+
+	REG(VCODEC_SEL, 10, 10),
+
+	REG(PERI_EMEM_PAUSE, 9, 9),
+
+	REG(PERI_USB_PAUSE, 8, 8),
+
+	REG(SMC_MUX_MODE_0, 6, 6),
+
+	REG(SMC_SRAM_MW_0, 5, 4),
+
+	REG(SMC_REMAP_0, 3, 3),
+
+	REG(SMC_A_GT_M0_SYNC, 2, 2),
+
+	REG(EMAC_SPEED, 1, 1),
+
+	REG(EMAC_MODE, 0, 0),
+};
+
+/* GRF_SOC_CON2 */
+enum {
+	REG(MSCH4_MAINDDR3, 7, 7),
+	MSCH4_MAINDDR3_DDR3	= 1,
+
+	REG(EMAC_NEWRCV_EN, 6, 6),
+
+	REG(SW_ADDR15_EN, 5, 5),
+
+	REG(SW_ADDR16_EN, 4, 4),
+
+	REG(SW_ADDR17_EN, 3, 3),
+
+	REG(BANK2_TO_RANK_EN, 2, 2),
+
+	REG(RANK_TO_ROW15_EN, 1, 1),
+
+	REG(UPCTL_C_ACTIVE_IN, 0, 0),
+	UPCTL_C_ACTIVE_IN_MAY	= 0,
+	UPCTL_C_ACTIVE_IN_WILL,
+};
+
+/* GRF_DDRC_CON0 */
+enum {
+	REG(DTO_LB, 12, 11),
+
+	REG(DTO_TE, 10, 9),
+
+	REG(DTO_PDR, 8, 7),
+
+	REG(DTO_PDD, 6, 5),
+
+	REG(DTO_IOM, 4, 3),
+
+	REG(DTO_OE, 2, 1),
+
+	REG(ATO_AE, 0, 0),
+};
+#endif
Signature · 1 line
2.20.1
#3 lore raw

PATCH v10 3/16 rockchip: rk3066: add clock driver for rk3066 soc

In reply to Johan Jonker

From: Paweł Jarosz <[email protected]>

Add the clock driver for the rk3066 platform.

Derived from the rk3288 and rk3188 driver it supports only a bare minimum to bring up the system to reduce the TPL size for:
SDRAM clock configuration.
The boot devices NAND, EMMC, SDMMC, SPI.
A UART for the debug messages (fixed) at 115200n8. A SARADC for the recovery button.
A TIMER for the delays (fixed).

There's support for two possible frequencies,
the safe 600MHz which will work with default pmic settings and will be set to get away from the 24MHz default and the maximum of 1.416Ghz, which boards can set if they were able to get pmic support for it.

After the clock tree is set during the TPL probe
there's no parent update support.

In OF_REAL mode the drivers ns16550.c and dw-apb-timer.c obtain the (fixed) clk_get_rate from the clock driver instead of platdata.

The rk3066 cru node has a number of assigned-clocks properties that call the .set_rate() function. Add them to the list so that they return a 0 instead of -ENOENT.

---

Changed V9:
fix TAB
fix space

Changed V8:
add SCLK_TIMER[0..2]
add SCLK_UART[0..3]
fix assigned-clocks
use GENMASK, __bf_shf and REG defines
fix clk defines
add includes
fix bit position CRU_CLKSEL0_CON rk3066 vs rk3188 fix comments
rename PLL_MODE defines
use dev_bind
use dev_dbg
use a different variable name

Changed V7:
changed function prefix
changed #if where possible
restyle U_BOOT_DRIVER structure

---
 .../include/asm/arch-rockchip/cru_rk3066.h    | 157 ++++
 drivers/clk/rockchip/Makefile                 |   1 +
 drivers/clk/rockchip/clk_rk3066.c             | 717 ++++++++++++++++++
 3 files changed, 875 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3066.h
 create mode 100644 drivers/clk/rockchip/clk_rk3066.c
arch/arm/include/asm/arch-rockchip/cru_rk3066.h new file +157 -0
new file mode 100644
index 0000000000..76a715a8e6
@@ -0,0 +1,157 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2021 Paweł Jarosz <[email protected]>
+ */
+
+#ifndef _ASM_ARCH_CRU_RK3066_H
+#define _ASM_ARCH_CRU_RK3066_H
+
+#include <linux/bitops.h>
+#include <linux/bitfield.h>
+
+#define REG(name, h, l) \
+	name##_MASK = GENMASK(h, l), \
+	name##_SHIFT = __bf_shf(name##_MASK)
+
+#define OSC_HZ		(24 * 1000 * 1000)
+
+#define APLL_HZ		(1416 * 1000000)
+#define APLL_SAFE_HZ	(600 * 1000000)
+#define GPLL_HZ		(594 * 1000000)
+#define CPLL_HZ		(384 * 1000000)
+
+/* The SRAM is clocked off aclk_cpu, so we want to max it out for boot speed */
+#define CPU_ACLK_HZ	297000000
+#define CPU_HCLK_HZ	148500000
+#define CPU_PCLK_HZ	74250000
+#define CPU_H2P_HZ	74250000
+
+#define PERI_ACLK_HZ	148500000
+#define PERI_HCLK_HZ	148500000
+#define PERI_PCLK_HZ	74250000
+
+/* Private data for the clock driver - used by rockchip_get_cru() */
+struct rk3066_clk_priv {
+	struct rk3066_grf *grf;
+	struct rk3066_cru *cru;
+	ulong rate;
+	bool has_bwadj;
+};
+
+struct rk3066_cru {
+	struct rk3066_pll {
+		u32 con0;
+		u32 con1;
+		u32 con2;
+		u32 con3;
+	} pll[4];
+	u32 cru_mode_con;
+	u32 cru_clksel_con[35];
+	u32 cru_clkgate_con[10];
+	u32 reserved1[2];
+	u32 cru_glb_srst_fst_value;
+	u32 cru_glb_srst_snd_value;
+	u32 reserved2[2];
+	u32 cru_softrst_con[9];
+	u32 cru_misc_con;
+	u32 reserved3[2];
+	u32 cru_glb_cnt_th;
+};
+
+check_member(rk3066_cru, cru_glb_cnt_th, 0x0140);
+
+/* CRU_CLKSEL0_CON */
+enum {
+	REG(CPU_ACLK_PLL, 8, 8),
+	CPU_ACLK_PLL_SELECT_APLL	= 0,
+	CPU_ACLK_PLL_SELECT_GPLL,
+
+	REG(CORE_PERI_DIV, 7, 6),
+
+	REG(A9_CORE_DIV, 4, 0),
+};
+
+/* CRU_CLKSEL1_CON */
+enum {
+	REG(AHB2APB_DIV, 15, 14),
+
+	REG(CPU_PCLK_DIV, 13, 12),
+
+	REG(CPU_HCLK_DIV, 9, 8),
+
+	REG(CPU_ACLK_DIV, 2, 0),
+};
+
+/* CRU_CLKSEL10_CON */
+enum {
+	REG(PERI_SEL_PLL, 15, 15),
+	PERI_SEL_CPLL		= 0,
+	PERI_SEL_GPLL,
+
+	REG(PERI_PCLK_DIV, 13, 12),
+
+	REG(PERI_HCLK_DIV, 9, 8),
+
+	REG(PERI_ACLK_DIV, 4, 0),
+};
+
+/* CRU_CLKSEL11_CON */
+enum {
+	REG(MMC0_DIV, 5, 0),
+};
+
+/* CRU_CLKSEL12_CON */
+enum {
+	REG(UART_PLL, 15, 15),
+	UART_PLL_SELECT_GENERAL	= 0,
+	UART_PLL_SELECT_CODEC,
+
+	REG(EMMC_DIV, 13, 8),
+
+	REG(SDIO_DIV, 5, 0),
+};
+
+/* CRU_CLKSEL24_CON */
+enum {
+	REG(SARADC_DIV, 15, 8),
+};
+
+/* CRU_CLKSEL25_CON */
+enum {
+	REG(SPI1_DIV, 14, 8),
+
+	REG(SPI0_DIV, 6, 0),
+};
+
+/* CRU_CLKSEL34_CON */
+enum {
+	REG(TSADC_DIV, 15, 0),
+};
+
+/* CRU_MODE_CON */
+enum {
+	REG(GPLL_MODE, 13, 12),
+
+	REG(CPLL_MODE, 9, 8),
+
+	REG(DPLL_MODE, 5, 4),
+
+	REG(APLL_MODE, 1, 0),
+	PLL_MODE_SLOW		= 0,
+	PLL_MODE_NORMAL,
+	PLL_MODE_DEEP,
+};
+
+/* CRU_APLL_CON0 */
+enum {
+	REG(CLKR, 13, 8),
+
+	REG(CLKOD, 3, 0),
+};
+
+/* CRU_APLL_CON1 */
+enum {
+	REG(CLKF, 12, 0),
+};
+
+#endif
drivers/clk/rockchip/Makefile +1 -0
index 913f611a0f..a72d8fe58a 100644
@@ -6,6 +6,7 @@
 obj-y += clk_pll.o
 obj-$(CONFIG_ROCKCHIP_PX30) += clk_px30.o
 obj-$(CONFIG_ROCKCHIP_RK3036) += clk_rk3036.o
+obj-$(CONFIG_ROCKCHIP_RK3066) += clk_rk3066.o
 obj-$(CONFIG_ROCKCHIP_RK3128) += clk_rk3128.o
 obj-$(CONFIG_ROCKCHIP_RK3188) += clk_rk3188.o
 obj-$(CONFIG_ROCKCHIP_RK322X) += clk_rk322x.o
drivers/clk/rockchip/clk_rk3066.c new file +717 -0

717 lines not on this page · raw message

Signature · 1 line
2.20.1
#4 lore raw

PATCH v10 4/16 rockchip: rk3066: add rk3066 pinctrl driver

In reply to Johan Jonker

From: Paweł Jarosz <[email protected]>

Add driver supporting pin multiplexing on rk3066 platform.

---

Changed V9:
change regmap source

Changed V7:
restyle
changed function prefix.
restyle U_BOOT_DRIVER structure
use OF_REAL
use EOPNOTSUPP

---
 drivers/pinctrl/rockchip/Makefile         |   1 +
 drivers/pinctrl/rockchip/pinctrl-rk3066.c | 112 ++++++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 drivers/pinctrl/rockchip/pinctrl-rk3066.c
drivers/pinctrl/rockchip/Makefile +1 -0
index fcf19f877a..7d03f8101d 100644
@@ -5,6 +5,7 @@
 obj-y += pinctrl-rockchip-core.o
 obj-$(CONFIG_ROCKCHIP_PX30) += pinctrl-px30.o
 obj-$(CONFIG_ROCKCHIP_RK3036) += pinctrl-rk3036.o
+obj-$(CONFIG_ROCKCHIP_RK3066) += pinctrl-rk3066.o
 obj-$(CONFIG_ROCKCHIP_RK3128) += pinctrl-rk3128.o
 obj-$(CONFIG_ROCKCHIP_RK3188) += pinctrl-rk3188.o
 obj-$(CONFIG_ROCKCHIP_RK322X) += pinctrl-rk322x.o
drivers/pinctrl/rockchip/pinctrl-rk3066.c new file +112 -0

112 lines not on this page · raw message

Signature · 1 line
2.20.1
#5 lore raw

PATCH v10 5/16 rockchip: rk3066: add sdram driver

In reply to Johan Jonker

From: Paweł Jarosz <[email protected]>

Add rockchip rk3066 sdram driver

---

Changed V7:
restyle
rename TEST_PATTERN
changed function prefix
changed #if where possible
restyle U_BOOT_DRIVER structure
remove rk3066_dmc_of_to_plat because dmc DT data only used in TPL in combination with OF_PLATDATA

---
 drivers/ram/rockchip/Makefile       |   1 +
 drivers/ram/rockchip/sdram_rk3066.c | 892 ++++++++++++++++++++++++++++
 2 files changed, 893 insertions(+)
 create mode 100644 drivers/ram/rockchip/sdram_rk3066.c
drivers/ram/rockchip/Makefile +1 -0
index ca1c289b88..6d530c29af 100644
@@ -5,6 +5,7 @@
 
 obj-$(CONFIG_ROCKCHIP_PX30) += sdram_px30.o sdram_pctl_px30.o sdram_phy_px30.o
 obj-$(CONFIG_ROCKCHIP_RK3368) = dmc-rk3368.o
+obj-$(CONFIG_ROCKCHIP_RK3066) = sdram_rk3066.o
 obj-$(CONFIG_ROCKCHIP_RK3128) = sdram_rk3128.o
 obj-$(CONFIG_ROCKCHIP_RK3188) = sdram_rk3188.o
 obj-$(CONFIG_ROCKCHIP_RK322X) = sdram_rk322x.o
drivers/ram/rockchip/sdram_rk3066.c new file +892 -0

892 lines not on this page · raw message

Signature · 1 line
2.20.1
#6 lore raw

PATCH v10 6/16 arm: dts: rockchip: fix rk3xxx-u-boot.dtsi

In reply to Johan Jonker

The file rk3xxx-u-boot.dtsi was original only for rk3188 and SPL. With rk3066 added some nodes are also needed in TPL,
so change them to u-boot,dm-pre-reloc

---
 arch/arm/dts/rk3xxx-u-boot.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/dts/rk3xxx-u-boot.dtsi +4 -4
index 581594c35d..e67432fb39 100644
@@ -4,7 +4,7 @@
 	noc: syscon@10128000 {
 		compatible = "rockchip,rk3188-noc", "syscon";
 		reg = <0x10128000 0x2000>;
-		u-boot,dm-spl;
+		u-boot,dm-pre-reloc;
 	};
 
 	dmc: dmc@20020000 {
@@ -18,16 +18,16 @@
 		rockchip,grf = <&grf>;
 		rockchip,pmu = <&pmu>;
 		rockchip,noc = <&noc>;
-		u-boot,dm-spl;
+		u-boot,dm-pre-reloc;
 	};
 };
 
 &grf {
-	u-boot,dm-spl;
+	u-boot,dm-pre-reloc;
 };
 
 &pmu {
-	u-boot,dm-spl;
+	u-boot,dm-pre-reloc;
 };
 
 &uart2 {
Signature · 1 line
2.20.1
#7 lore raw

PATCH v10 7/16 arm: dts: rockchip: fix include rk3xxx-u-boot.dtsi

In reply to Johan Jonker

Move the include for rk3xxx-u-boot.dtsi to rk3188-u-boot.dtsi to stay in line with U-boot dtsi files.

---
 arch/arm/dts/rk3188-u-boot.dtsi | 1 +
 arch/arm/dts/rk3188.dtsi        | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/rk3188-u-boot.dtsi +1 -0
index 43f05b9876..735776c16b 100644
@@ -4,6 +4,7 @@
  */
 
 #include "rockchip-u-boot.dtsi"
+#include "rk3xxx-u-boot.dtsi"
 
 &global_timer {
 	status = "okay";
arch/arm/dts/rk3188.dtsi +0 -1
index 6c1c2ff533..6764776cce 100644
@@ -9,7 +9,6 @@
 #include <dt-bindings/clock/rk3188-cru.h>
 #include <dt-bindings/power/rk3188-power.h>
 #include "rk3xxx.dtsi"
-#include "rk3xxx-u-boot.dtsi"
 
 / {
 	compatible = "rockchip,rk3188";
Signature · 1 line
2.20.1
#8 lore raw

PATCH v10 8/16 arm: dts: rockchip: add rk3066a.dtsi

In reply to Johan Jonker

In the Linux DT the file rk3xxx.dtsi is shared between rk3066 and rk3188. Add rk3066a.dtsi. Move U-boot specific things in a rk3066a-u-boot.dtsi file.

---

Changed V9:
fix include rk3066a-u-boot.dtsi

Changed V8:
update dtsi

---
 arch/arm/dts/rk3066a-u-boot.dtsi |   4 +
 arch/arm/dts/rk3066a.dtsi        | 879 +++++++++++++++++++++++++++++++
 2 files changed, 883 insertions(+)
 create mode 100644 arch/arm/dts/rk3066a-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3066a.dtsi
arch/arm/dts/rk3066a-u-boot.dtsi new file +4 -0
new file mode 100644
index 0000000000..bc6e609d02
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rockchip-u-boot.dtsi"
+#include "rk3xxx-u-boot.dtsi"
arch/arm/dts/rk3066a.dtsi new file +879 -0

879 lines not on this page · raw message

Signature · 1 line
2.20.1
#9 lore raw

PATCH v10 9/16 arm: dts: rockchip: add rk3066a-mk808.dts

In reply to Johan Jonker

MK808 is a RK3066-based board with 1 USB host and 1 USB OTG port, HDMI and a micro-SD card slot. It also includes on-board NAND and 1GB of SDRAM. Add rk3066a-mk808.dts. Move U-boot specific things in a rk3066a-mk808-u-boot.dtsi file.

---

Changed V10:
add u-boot,spl-fifo-mode property

Changed V9:
add led config
move dtb-$() in Makefile

Changed V8:
update dts

---
 arch/arm/dts/Makefile                  |   3 +
 arch/arm/dts/rk3066a-mk808-u-boot.dtsi |  49 ++++++
 arch/arm/dts/rk3066a-mk808.dts         | 216 +++++++++++++++++++++++++
 3 files changed, 268 insertions(+)
 create mode 100644 arch/arm/dts/rk3066a-mk808-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3066a-mk808.dts
arch/arm/dts/Makefile +3 -0
index 99dc7bc777..e8657bed09 100644
@@ -90,6 +90,9 @@ dtb-$(CONFIG_ROCKCHIP_PX30) += \
 dtb-$(CONFIG_ROCKCHIP_RK3036) += \
 	rk3036-sdk.dtb
 
+dtb-$(CONFIG_ROCKCHIP_RK3066) += \
+	rk3066a-mk808.dtb
+
 dtb-$(CONFIG_ROCKCHIP_RK3128) += \
 	rk3128-evb.dtb
 
arch/arm/dts/rk3066a-mk808-u-boot.dtsi new file +49 -0

49 lines not on this page · raw message

arch/arm/dts/rk3066a-mk808.dts new file +216 -0

216 lines not on this page · raw message

Signature · 1 line
2.20.1
#10 lore raw

PATCH v10 10/16 rockchip: tools: add rk3066 support to rkcommon.c

In reply to Johan Jonker

Add rk3066 support to rkcommon.c

---
 tools/rkcommon.c | 1 +
 1 file changed, 1 insertion(+)
tools/rkcommon.c +1 -0
index 29f2676c19..860785f839 100644
@@ -123,6 +123,7 @@ struct spl_info {
 static struct spl_info spl_infos[] = {
 	{ "px30", "RK33", 0x2800, false, RK_HEADER_V1 },
 	{ "rk3036", "RK30", 0x1000, false, RK_HEADER_V1 },
+	{ "rk3066", "RK30", 0x8000 - 0x800, true, RK_HEADER_V1 },
 	{ "rk3128", "RK31", 0x1800, false, RK_HEADER_V1 },
 	{ "rk3188", "RK31", 0x8000 - 0x800, true, RK_HEADER_V1 },
 	{ "rk322x", "RK32", 0x8000 - 0x1000, false, RK_HEADER_V1 },
Signature · 1 line
2.20.1
#11 lore raw

PATCH v10 11/16 rockchip: rk3066: add core support

In reply to Johan Jonker

Add the core architecture code for the rk3066.

---
 arch/arm/include/asm/arch-rk3066/boot0.h      |  8 +++
 arch/arm/include/asm/arch-rk3066/gpio.h       |  8 +++
 arch/arm/include/asm/arch-rk3066/timer.h      |  6 ++
 arch/arm/mach-rockchip/Kconfig                | 23 ++++++++
 arch/arm/mach-rockchip/Makefile               |  1 +
 arch/arm/mach-rockchip/rk3066/Kconfig         | 30 ++++++++++
 arch/arm/mach-rockchip/rk3066/Makefile        |  5 ++
 arch/arm/mach-rockchip/rk3066/clk_rk3066.c    | 33 +++++++++++
 arch/arm/mach-rockchip/rk3066/rk3066.c        | 49 ++++++++++++++++
 arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 55 ++++++++++++++++++
 include/configs/mk808.h                       |  9 +++
 include/configs/rk3066_common.h               | 56 +++++++++++++++++++
 12 files changed, 283 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rk3066/boot0.h
 create mode 100644 arch/arm/include/asm/arch-rk3066/gpio.h
 create mode 100644 arch/arm/include/asm/arch-rk3066/timer.h
 create mode 100644 arch/arm/mach-rockchip/rk3066/Kconfig
 create mode 100644 arch/arm/mach-rockchip/rk3066/Makefile
 create mode 100644 arch/arm/mach-rockchip/rk3066/clk_rk3066.c
 create mode 100644 arch/arm/mach-rockchip/rk3066/rk3066.c
 create mode 100644 arch/arm/mach-rockchip/rk3066/syscon_rk3066.c
 create mode 100644 include/configs/mk808.h
 create mode 100644 include/configs/rk3066_common.h
arch/arm/include/asm/arch-rk3066/boot0.h new file +8 -0
new file mode 100644
index 0000000000..28c0fb9a4c
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk3066/gpio.h new file +8 -0
new file mode 100644
index 0000000000..a4a3b3289c
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rk3066/timer.h new file +6 -0
new file mode 100644
index 0000000000..3bb39428cd
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __ASM_ARCH_TIMER_H__
+#define __ASM_ARCH_TIMER_H__
+
+#endif
arch/arm/mach-rockchip/Kconfig +23 -0
index 811964973a..18aff5480b 100644
@@ -35,6 +35,28 @@ config ROCKCHIP_RK3036
 	  and video codec support. Peripherals include Gigabit Ethernet,
 	  USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
 
+config ROCKCHIP_RK3066
+	bool "Support Rockchip RK3066"
+	select CPU_V7A
+	select SPL_BOARD_INIT if SPL
+	select SUPPORT_SPL
+	select SUPPORT_TPL
+	select SPL
+	select TPL
+	select TPL_ROCKCHIP_BACK_TO_BROM
+	select TPL_ROCKCHIP_EARLYRETURN_TO_BROM
+	imply ROCKCHIP_COMMON_BOARD
+	imply SPL_ROCKCHIP_COMMON_BOARD
+	imply SPL_SERIAL
+	imply TPL_ROCKCHIP_COMMON_BOARD
+	imply TPL_SERIAL
+	help
+	  The Rockchip RK3066 is a ARM-based SoC with a dual-core Cortex-A9
+	  including NEON and GPU, 512KB L2 cache, Mali-400 graphics, two
+	  video interfaces, several memory options and video codec support.
+	  Peripherals include Fast Ethernet, USB2 host and OTG, SDIO, I2S,
+	  UART, SPI, I2C and PWMs.
+
 config ROCKCHIP_RK3128
 	bool "Support Rockchip RK3128"
 	select CPU_V7A
@@ -405,6 +427,7 @@ config LNX_KRNL_IMG_TEXT_OFFSET_BASE
 
 source "arch/arm/mach-rockchip/px30/Kconfig"
 source "arch/arm/mach-rockchip/rk3036/Kconfig"
+source "arch/arm/mach-rockchip/rk3066/Kconfig"
 source "arch/arm/mach-rockchip/rk3128/Kconfig"
 source "arch/arm/mach-rockchip/rk3188/Kconfig"
 source "arch/arm/mach-rockchip/rk322x/Kconfig"
arch/arm/mach-rockchip/Makefile +1 -0
index 00aef0ecee..6c1c7b8a10 100644
@@ -34,6 +34,7 @@ obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram.o
 
 obj-$(CONFIG_ROCKCHIP_PX30) += px30/
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/
+obj-$(CONFIG_ROCKCHIP_RK3066) += rk3066/
 obj-$(CONFIG_ROCKCHIP_RK3128) += rk3128/
 obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188/
 obj-$(CONFIG_ROCKCHIP_RK322X) += rk322x/
arch/arm/mach-rockchip/rk3066/Kconfig new file +30 -0
new file mode 100644
index 0000000000..335f49bc55
@@ -0,0 +1,30 @@
+if ROCKCHIP_RK3066
+
+config ROCKCHIP_BOOT_MODE_REG
+	default 0x20004040
+
+config SYS_SOC
+	default "rk3066"
+
+config SYS_MALLOC_F_LEN
+	default 0x0800
+
+config SPL_LIBCOMMON_SUPPORT
+	default y
+
+config SPL_LIBGENERIC_SUPPORT
+	default y
+
+config SPL_SERIAL
+	default y
+
+config TPL_LIBCOMMON_SUPPORT
+	default y
+
+config TPL_LIBGENERIC_SUPPORT
+	default y
+
+config TPL_SERIAL
+	default y
+
+endif
arch/arm/mach-rockchip/rk3066/Makefile new file +5 -0
new file mode 100644
index 0000000000..9e2a9d4b0a
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+obj-y += clk_rk3066.o
+obj-y += rk3066.o
+obj-y += syscon_rk3066.o
arch/arm/mach-rockchip/rk3066/clk_rk3066.c new file +33 -0
new file mode 100644
index 0000000000..c47526dca5
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2015 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <syscon.h>
+#include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/cru_rk3066.h>
+#include <linux/err.h>
+
+int rockchip_get_clk(struct udevice **devp)
+{
+	return uclass_get_device_by_driver(UCLASS_CLK,
+			DM_DRIVER_GET(rockchip_rk3066a_cru), devp);
+}
+
+void *rockchip_get_cru(void)
+{
+	struct rk3066_clk_priv *priv;
+	struct udevice *dev;
+	int ret;
+
+	ret = rockchip_get_clk(&dev);
+	if (ret)
+		return ERR_PTR(ret);
+
+	priv = dev_get_priv(dev);
+
+	return priv->cru;
+}
arch/arm/mach-rockchip/rk3066/rk3066.c new file +49 -0

49 lines not on this page · raw message

arch/arm/mach-rockchip/rk3066/syscon_rk3066.c new file +55 -0

55 lines not on this page · raw message

include/configs/mk808.h new file +9 -0
new file mode 100644
index 0000000000..e2ab2b512c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define ROCKCHIP_DEVICE_SETTINGS
+#include <configs/rk3066_common.h>
+
+#endif
include/configs/rk3066_common.h new file +56 -0

56 lines not on this page · raw message

Signature · 1 line
2.20.1
Reviewed-by on v10 11/16
#12 lore raw

Re: [PATCH v10 11/16] rockchip: rk3066: add core support

Quoted 3 lines · Johan Jonker

Add the core architecture code for the rk3066.

Thanks,
- Kever

Quoted 397 lines
---
  arch/arm/include/asm/arch-rk3066/boot0.h      |  8 +++
  arch/arm/include/asm/arch-rk3066/gpio.h       |  8 +++
  arch/arm/include/asm/arch-rk3066/timer.h      |  6 ++
  arch/arm/mach-rockchip/Kconfig                | 23 ++++++++
  arch/arm/mach-rockchip/Makefile               |  1 +
  arch/arm/mach-rockchip/rk3066/Kconfig         | 30 ++++++++++
  arch/arm/mach-rockchip/rk3066/Makefile        |  5 ++
  arch/arm/mach-rockchip/rk3066/clk_rk3066.c    | 33 +++++++++++
  arch/arm/mach-rockchip/rk3066/rk3066.c        | 49 ++++++++++++++++
  arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 55 ++++++++++++++++++
  include/configs/mk808.h                       |  9 +++
  include/configs/rk3066_common.h               | 56 +++++++++++++++++++
  12 files changed, 283 insertions(+)

create mode 100644 arch/arm/include/asm/arch-rk3066/boot0.h create mode 100644 arch/arm/include/asm/arch-rk3066/gpio.h create mode 100644 arch/arm/include/asm/arch-rk3066/timer.h create mode 100644 arch/arm/mach-rockchip/rk3066/Kconfig create mode 100644 arch/arm/mach-rockchip/rk3066/Makefile create mode 100644 arch/arm/mach-rockchip/rk3066/clk_rk3066.c create mode 100644 arch/arm/mach-rockchip/rk3066/rk3066.c create mode 100644 arch/arm/mach-rockchip/rk3066/syscon_rk3066.c create mode 100644 include/configs/mk808.h
create mode 100644 include/configs/rk3066_common.h

arch/arm/include/asm/arch-rk3066/boot0.h new file +8 -0
new file mode 100644
index 0000000000..28c0fb9a4c
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk3066/gpio.h new file +8 -0
new file mode 100644
index 0000000000..a4a3b3289c
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rk3066/timer.h new file +6 -0
new file mode 100644
index 0000000000..3bb39428cd
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __ASM_ARCH_TIMER_H__
+#define __ASM_ARCH_TIMER_H__
+
+#endif
arch/arm/mach-rockchip/Kconfig +23 -0
index 811964973a..18aff5480b 100644
@@ -35,6 +35,28 @@ config ROCKCHIP_RK3036
  	  and video codec support. Peripherals include Gigabit Ethernet,
  	  USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
 
+config ROCKCHIP_RK3066
+	bool "Support Rockchip RK3066"
+	select CPU_V7A
+	select SPL_BOARD_INIT if SPL
+	select SUPPORT_SPL
+	select SUPPORT_TPL
+	select SPL
+	select TPL
+	select TPL_ROCKCHIP_BACK_TO_BROM
+	select TPL_ROCKCHIP_EARLYRETURN_TO_BROM
+	imply ROCKCHIP_COMMON_BOARD
+	imply SPL_ROCKCHIP_COMMON_BOARD
+	imply SPL_SERIAL
+	imply TPL_ROCKCHIP_COMMON_BOARD
+	imply TPL_SERIAL
+	help
+	  The Rockchip RK3066 is a ARM-based SoC with a dual-core Cortex-A9
+	  including NEON and GPU, 512KB L2 cache, Mali-400 graphics, two
+	  video interfaces, several memory options and video codec support.
+	  Peripherals include Fast Ethernet, USB2 host and OTG, SDIO, I2S,
+	  UART, SPI, I2C and PWMs.
+
  config ROCKCHIP_RK3128
  	bool "Support Rockchip RK3128"
  	select CPU_V7A
@@ -405,6 +427,7 @@ config LNX_KRNL_IMG_TEXT_OFFSET_BASE
 
  source "arch/arm/mach-rockchip/px30/Kconfig"
  source "arch/arm/mach-rockchip/rk3036/Kconfig"
+source "arch/arm/mach-rockchip/rk3066/Kconfig"
  source "arch/arm/mach-rockchip/rk3128/Kconfig"
  source "arch/arm/mach-rockchip/rk3188/Kconfig"
  source "arch/arm/mach-rockchip/rk322x/Kconfig"
arch/arm/mach-rockchip/Makefile +1 -0
index 00aef0ecee..6c1c7b8a10 100644
@@ -34,6 +34,7 @@ obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram.o
 
  obj-$(CONFIG_ROCKCHIP_PX30) += px30/
  obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/
+obj-$(CONFIG_ROCKCHIP_RK3066) += rk3066/
  obj-$(CONFIG_ROCKCHIP_RK3128) += rk3128/
  obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188/
  obj-$(CONFIG_ROCKCHIP_RK322X) += rk322x/
arch/arm/mach-rockchip/rk3066/Kconfig new file +30 -0
new file mode 100644
index 0000000000..335f49bc55
@@ -0,0 +1,30 @@
+if ROCKCHIP_RK3066
+
+config ROCKCHIP_BOOT_MODE_REG
+	default 0x20004040
+
+config SYS_SOC
+	default "rk3066"
+
+config SYS_MALLOC_F_LEN
+	default 0x0800
+
+config SPL_LIBCOMMON_SUPPORT
+	default y
+
+config SPL_LIBGENERIC_SUPPORT
+	default y
+
+config SPL_SERIAL
+	default y
+
+config TPL_LIBCOMMON_SUPPORT
+	default y
+
+config TPL_LIBGENERIC_SUPPORT
+	default y
+
+config TPL_SERIAL
+	default y
+
+endif
arch/arm/mach-rockchip/rk3066/Makefile new file +5 -0
new file mode 100644
index 0000000000..9e2a9d4b0a
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+obj-y += clk_rk3066.o
+obj-y += rk3066.o
+obj-y += syscon_rk3066.o
arch/arm/mach-rockchip/rk3066/clk_rk3066.c new file +33 -0
new file mode 100644
index 0000000000..c47526dca5
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2015 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <syscon.h>
+#include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/cru_rk3066.h>
+#include <linux/err.h>
+
+int rockchip_get_clk(struct udevice **devp)
+{
+	return uclass_get_device_by_driver(UCLASS_CLK,
+			DM_DRIVER_GET(rockchip_rk3066a_cru), devp);
+}
+
+void *rockchip_get_cru(void)
+{
+	struct rk3066_clk_priv *priv;
+	struct udevice *dev;
+	int ret;
+
+	ret = rockchip_get_clk(&dev);
+	if (ret)
+		return ERR_PTR(ret);
+
+	priv = dev_get_priv(dev);
+
+	return priv->cru;
+}
arch/arm/mach-rockchip/rk3066/rk3066.c new file +49 -0
new file mode 100644
index 0000000000..78c7d894f9
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2016 Rockchip Electronics Co., Ltd
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch-rockchip/bootrom.h>
+#include <asm/arch-rockchip/grf_rk3066.h>
+
+#define GRF_BASE	0x20008000
+
+const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
+	[BROM_BOOTSOURCE_EMMC] = "/mmc@1021c000",
+	[BROM_BOOTSOURCE_SD] = "/mmc@10214000",
+};
+
+void board_debug_uart_init(void)
+{
+	struct rk3066_grf * const grf = (void *)GRF_BASE;
+
+	/* Enable early UART on the RK3066 */
+	rk_clrsetreg(&grf->gpio1b_iomux,
+		     GPIO1B1_MASK | GPIO1B0_MASK,
+		     GPIO1B1_UART2_SOUT << GPIO1B1_SHIFT |
+		     GPIO1B0_UART2_SIN << GPIO1B0_SHIFT);
+}
+
+void spl_board_init(void)
+{
+	if (!IS_ENABLED(CONFIG_SPL_BUILD))
+		return;
+
+	if (IS_ENABLED(CONFIG_SPL_DM_MMC)) {
+		struct rk3066_grf * const grf = (void *)GRF_BASE;
+
+		rk_clrsetreg(&grf->gpio3b_iomux,
+			     GPIO3B0_MASK | GPIO3B1_MASK | GPIO3B2_MASK |
+			     GPIO3B3_MASK | GPIO3B4_MASK | GPIO3B5_MASK |
+			     GPIO3B6_MASK,
+			     GPIO3B0_SDMMC0_CLKOUT << GPIO3B0_SHIFT |
+			     GPIO3B1_SDMMC0_CMD    << GPIO3B1_SHIFT |
+			     GPIO3B2_SDMMC0_DATA0  << GPIO3B2_SHIFT |
+			     GPIO3B3_SDMMC0_DATA1  << GPIO3B3_SHIFT |
+			     GPIO3B4_SDMMC0_DATA2  << GPIO3B4_SHIFT |
+			     GPIO3B5_SDMMC0_DATA3  << GPIO3B5_SHIFT |
+			     GPIO3B6_SDMMC0_DECTN  << GPIO3B6_SHIFT);
+	}
+}
arch/arm/mach-rockchip/rk3066/syscon_rk3066.c new file +55 -0
new file mode 100644
index 0000000000..a598f6400d
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2015 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <log.h>
+#include <syscon.h>
+#include <asm/arch-rockchip/clock.h>
+
+static const struct udevice_id rk3066_syscon_ids[] = {
+	{ .compatible = "rockchip,rk3066-noc", .data = ROCKCHIP_SYSCON_NOC },
+	{ .compatible = "rockchip,rk3066-grf", .data = ROCKCHIP_SYSCON_GRF },
+	{ .compatible = "rockchip,rk3066-pmu", .data = ROCKCHIP_SYSCON_PMU },
+	{ }
+};
+
+U_BOOT_DRIVER(syscon_rk3066) = {
+	.name = "rk3066_syscon",
+	.id = UCLASS_SYSCON,
+	.of_match = rk3066_syscon_ids,
+};
+
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+static int rk3066_syscon_bind_of_plat(struct udevice *dev)
+{
+	dev->driver_data = dev->driver->of_match->data;
+	debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data);
+
+	return 0;
+}
+
+U_BOOT_DRIVER(rockchip_rk3066_noc) = {
+	.name = "rockchip_rk3066_noc",
+	.id = UCLASS_SYSCON,
+	.of_match = rk3066_syscon_ids,
+	.bind = rk3066_syscon_bind_of_plat,
+};
+
+U_BOOT_DRIVER(rockchip_rk3066_grf) = {
+	.name = "rockchip_rk3066_grf",
+	.id = UCLASS_SYSCON,
+	.of_match = rk3066_syscon_ids + 1,
+	.bind = rk3066_syscon_bind_of_plat,
+};
+
+U_BOOT_DRIVER(rockchip_rk3066_pmu) = {
+	.name = "rockchip_rk3066_pmu",
+	.id = UCLASS_SYSCON,
+	.of_match = rk3066_syscon_ids + 2,
+	.bind = rk3066_syscon_bind_of_plat,
+};
+#endif
include/configs/mk808.h new file +9 -0
new file mode 100644
index 0000000000..e2ab2b512c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define ROCKCHIP_DEVICE_SETTINGS
+#include <configs/rk3066_common.h>
+
+#endif
include/configs/rk3066_common.h new file +56 -0
new file mode 100644
index 0000000000..b8dc024286
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2015 Google, Inc
+ */
+
+#ifndef __CONFIG_RK3066_COMMON_H
+#define __CONFIG_RK3066_COMMON_H
+
+#define CONFIG_SYS_CACHELINE_SIZE	64
+
+#include <asm/arch-rockchip/hardware.h>
+#include "rockchip-common.h"
+
+#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
+#define CONFIG_SYS_CBSIZE		256
+
+#define CONFIG_SYS_INIT_SP_ADDR		0x78000000
+
+#define CONFIG_ROCKCHIP_MAX_INIT_SIZE	(0x10000 - 0xC00)
+
+#define CONFIG_IRAM_BASE		0x10080000
+
+/* spl size max 200k */
+#define CONFIG_SPL_MAX_SIZE		0x32000
+
+#define CONFIG_SPL_STACK		0x1008FFFF
+
+#define CONFIG_SYS_SDRAM_BASE		0x60000000
+#define CONFIG_NR_DRAM_BANKS		1
+#define SDRAM_BANK_SIZE			(1024UL << 20UL)
+#define SDRAM_MAX_SIZE			CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE
+
+#ifndef CONFIG_SPL_BUILD
+/* usb otg */
+
+/* usb host support */
+#define ENV_MEM_LAYOUT_SETTINGS \
+	"scriptaddr=0x60000000\0" \
+	"pxefile_addr_r=0x60100000\0" \
+	"fdt_addr_r=0x61f00000\0" \
+	"kernel_addr_r=0x62000000\0" \
+	"ramdisk_addr_r=0x64000000\0"
+
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"fdt_high=0x6fffffff\0" \
+	"initrd_high=0x6fffffff\0" \
+	"partitions=" PARTS_DEFAULT \
+	ENV_MEM_LAYOUT_SETTINGS \
+	ROCKCHIP_DEVICE_SETTINGS \
+	BOOTENV
+
+#endif /* CONFIG_SPL_BUILD */
+
+#endif
#13 lore raw

Re: [PATCH v10 11/16] rockchip: rk3066: add core support

In reply to Johan Jonker

Hi Johan,

https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/jobs/424188

$ KSYMLST=`mktemp`; KUSEDLST=`mktemp`; cat `find . -name "Kconfig*"` | sed -n -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' | sort -u > $KSYMLST; for CFG in `find include/configs -name "*.h"`; do (grep '#define[[:blank:]]CONFIG_' $CFG | sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ; grep '#undef[[:blank:]]CONFIG_' $CFG | sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') | sort -u > ${KUSEDLST} || true; NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | cut -d , -f 3`; if [[ $NUM -ne 0 ]]; then echo "Unmigrated symbols found in $CFG"; exit 1; fi; done
26 <https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/jobs/424188#L26>Unmigrated symbols found in include/configs/rk3066_common.h

Thanks,
- Kever

Quoted 383 lines · Johan Jonker

Add the core architecture code for the rk3066.

---
  arch/arm/include/asm/arch-rk3066/boot0.h      |  8 +++
  arch/arm/include/asm/arch-rk3066/gpio.h       |  8 +++
  arch/arm/include/asm/arch-rk3066/timer.h      |  6 ++
  arch/arm/mach-rockchip/Kconfig                | 23 ++++++++
  arch/arm/mach-rockchip/Makefile               |  1 +
  arch/arm/mach-rockchip/rk3066/Kconfig         | 30 ++++++++++
  arch/arm/mach-rockchip/rk3066/Makefile        |  5 ++
  arch/arm/mach-rockchip/rk3066/clk_rk3066.c    | 33 +++++++++++
  arch/arm/mach-rockchip/rk3066/rk3066.c        | 49 ++++++++++++++++
  arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 55 ++++++++++++++++++
  include/configs/mk808.h                       |  9 +++
  include/configs/rk3066_common.h               | 56 +++++++++++++++++++
  12 files changed, 283 insertions(+)

create mode 100644 arch/arm/include/asm/arch-rk3066/boot0.h create mode 100644 arch/arm/include/asm/arch-rk3066/gpio.h create mode 100644 arch/arm/include/asm/arch-rk3066/timer.h create mode 100644 arch/arm/mach-rockchip/rk3066/Kconfig create mode 100644 arch/arm/mach-rockchip/rk3066/Makefile create mode 100644 arch/arm/mach-rockchip/rk3066/clk_rk3066.c create mode 100644 arch/arm/mach-rockchip/rk3066/rk3066.c create mode 100644 arch/arm/mach-rockchip/rk3066/syscon_rk3066.c create mode 100644 include/configs/mk808.h
create mode 100644 include/configs/rk3066_common.h

arch/arm/include/asm/arch-rk3066/boot0.h new file +8 -0
new file mode 100644
index 0000000000..28c0fb9a4c
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __ASM_ARCH_BOOT0_H__
+#define __ASM_ARCH_BOOT0_H__
+
+#include <asm/arch-rockchip/boot0.h>
+
+#endif
arch/arm/include/asm/arch-rk3066/gpio.h new file +8 -0
new file mode 100644
index 0000000000..a4a3b3289c
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __ASM_ARCH_GPIO_H__
+#define __ASM_ARCH_GPIO_H__
+
+#include <asm/arch-rockchip/gpio.h>
+
+#endif
arch/arm/include/asm/arch-rk3066/timer.h new file +6 -0
new file mode 100644
index 0000000000..3bb39428cd
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __ASM_ARCH_TIMER_H__
+#define __ASM_ARCH_TIMER_H__
+
+#endif
arch/arm/mach-rockchip/Kconfig +23 -0
index 811964973a..18aff5480b 100644
@@ -35,6 +35,28 @@ config ROCKCHIP_RK3036
  	  and video codec support. Peripherals include Gigabit Ethernet,
  	  USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs.
 
+config ROCKCHIP_RK3066
+	bool "Support Rockchip RK3066"
+	select CPU_V7A
+	select SPL_BOARD_INIT if SPL
+	select SUPPORT_SPL
+	select SUPPORT_TPL
+	select SPL
+	select TPL
+	select TPL_ROCKCHIP_BACK_TO_BROM
+	select TPL_ROCKCHIP_EARLYRETURN_TO_BROM
+	imply ROCKCHIP_COMMON_BOARD
+	imply SPL_ROCKCHIP_COMMON_BOARD
+	imply SPL_SERIAL
+	imply TPL_ROCKCHIP_COMMON_BOARD
+	imply TPL_SERIAL
+	help
+	  The Rockchip RK3066 is a ARM-based SoC with a dual-core Cortex-A9
+	  including NEON and GPU, 512KB L2 cache, Mali-400 graphics, two
+	  video interfaces, several memory options and video codec support.
+	  Peripherals include Fast Ethernet, USB2 host and OTG, SDIO, I2S,
+	  UART, SPI, I2C and PWMs.
+
  config ROCKCHIP_RK3128
  	bool "Support Rockchip RK3128"
  	select CPU_V7A
@@ -405,6 +427,7 @@ config LNX_KRNL_IMG_TEXT_OFFSET_BASE
 
  source "arch/arm/mach-rockchip/px30/Kconfig"
  source "arch/arm/mach-rockchip/rk3036/Kconfig"
+source "arch/arm/mach-rockchip/rk3066/Kconfig"
  source "arch/arm/mach-rockchip/rk3128/Kconfig"
  source "arch/arm/mach-rockchip/rk3188/Kconfig"
  source "arch/arm/mach-rockchip/rk322x/Kconfig" diff --git a/arch/arm/mach-rockchip/Makefile 

b/arch/arm/mach-rockchip/Makefile index 00aef0ecee..6c1c7b8a10 100644
--- a/arch/arm/mach-rockchip/Makefile +++
b/arch/arm/mach-rockchip/Makefile @@ -34,6 +34,7 @@ obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram.o obj-$(CONFIG_ROCKCHIP_PX30) += px30/ obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/
+obj-$(CONFIG_ROCKCHIP_RK3066) += rk3066/
obj-$(CONFIG_ROCKCHIP_RK3128) += rk3128/ obj-$(CONFIG_ROCKCHIP_RK3188)
+= rk3188/ obj-$(CONFIG_ROCKCHIP_RK322X) += rk322x/ diff --git
a/arch/arm/mach-rockchip/rk3066/Kconfig b/arch/arm/mach-rockchip/rk3066/Kconfig new file mode 100644 index 0000000000..335f49bc55 --- /dev/null +++ b/arch/arm/mach-rockchip/rk3066/Kconfig @@ -0,0 +1,30 @@ +if ROCKCHIP_RK3066 + +config ROCKCHIP_BOOT_MODE_REG + default 0x20004040
+ +config SYS_SOC + default "rk3066"

arch/arm/mach-rockchip/Kconfig +23 -0
+
+config SYS_MALLOC_F_LEN
+	default 0x0800
+
+config SPL_LIBCOMMON_SUPPORT
+	default y
+
+config SPL_LIBGENERIC_SUPPORT
+	default y
+
+config SPL_SERIAL
+	default y
+
+config TPL_LIBCOMMON_SUPPORT
+	default y
+
+config TPL_LIBGENERIC_SUPPORT
+	default y
+
+config TPL_SERIAL
+	default y
+
+endif
arch/arm/mach-rockchip/rk3066/Makefile new file +5 -0
new file mode 100644
index 0000000000..9e2a9d4b0a
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+obj-y += clk_rk3066.o
+obj-y += rk3066.o
+obj-y += syscon_rk3066.o
arch/arm/mach-rockchip/rk3066/clk_rk3066.c new file +33 -0
new file mode 100644
index 0000000000..c47526dca5
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2015 Google, Inc
+ * Written by Simon Glass<[email protected]>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <syscon.h>
+#include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/cru_rk3066.h>
+#include <linux/err.h>
+
+int rockchip_get_clk(struct udevice **devp)
+{
+	return uclass_get_device_by_driver(UCLASS_CLK,
+			DM_DRIVER_GET(rockchip_rk3066a_cru), devp);
+}
+
+void *rockchip_get_cru(void)
+{
+	struct rk3066_clk_priv *priv;
+	struct udevice *dev;
+	int ret;
+
+	ret = rockchip_get_clk(&dev);
+	if (ret)
+		return ERR_PTR(ret);
+
+	priv = dev_get_priv(dev);
+
+	return priv->cru;
+}
arch/arm/mach-rockchip/rk3066/rk3066.c new file +49 -0
new file mode 100644
index 0000000000..78c7d894f9
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2016 Rockchip Electronics Co., Ltd
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch-rockchip/bootrom.h>
+#include <asm/arch-rockchip/grf_rk3066.h>
+
+#define GRF_BASE	0x20008000
+
+const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
+	[BROM_BOOTSOURCE_EMMC] = "/mmc@1021c000",
+	[BROM_BOOTSOURCE_SD] = "/mmc@10214000",
+};
+
+void board_debug_uart_init(void)
+{
+	struct rk3066_grf * const grf = (void *)GRF_BASE;
+
+	/* Enable early UART on the RK3066 */
+	rk_clrsetreg(&grf->gpio1b_iomux,
+		     GPIO1B1_MASK | GPIO1B0_MASK,
+		     GPIO1B1_UART2_SOUT << GPIO1B1_SHIFT |
+		     GPIO1B0_UART2_SIN << GPIO1B0_SHIFT);
+}
+
+void spl_board_init(void)
+{
+	if (!IS_ENABLED(CONFIG_SPL_BUILD))
+		return;
+
+	if (IS_ENABLED(CONFIG_SPL_DM_MMC)) {
+		struct rk3066_grf * const grf = (void *)GRF_BASE;
+
+		rk_clrsetreg(&grf->gpio3b_iomux,
+			     GPIO3B0_MASK | GPIO3B1_MASK | GPIO3B2_MASK |
+			     GPIO3B3_MASK | GPIO3B4_MASK | GPIO3B5_MASK |
+			     GPIO3B6_MASK,
+			     GPIO3B0_SDMMC0_CLKOUT << GPIO3B0_SHIFT |
+			     GPIO3B1_SDMMC0_CMD    << GPIO3B1_SHIFT |
+			     GPIO3B2_SDMMC0_DATA0  << GPIO3B2_SHIFT |
+			     GPIO3B3_SDMMC0_DATA1  << GPIO3B3_SHIFT |
+			     GPIO3B4_SDMMC0_DATA2  << GPIO3B4_SHIFT |
+			     GPIO3B5_SDMMC0_DATA3  << GPIO3B5_SHIFT |
+			     GPIO3B6_SDMMC0_DECTN  << GPIO3B6_SHIFT);
+	}
+}
arch/arm/mach-rockchip/rk3066/syscon_rk3066.c new file +55 -0
new file mode 100644
index 0000000000..a598f6400d
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2015 Google, Inc
+ * Written by Simon Glass<[email protected]>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <log.h>
+#include <syscon.h>
+#include <asm/arch-rockchip/clock.h>
+
+static const struct udevice_id rk3066_syscon_ids[] = {
+	{ .compatible = "rockchip,rk3066-noc", .data = ROCKCHIP_SYSCON_NOC },
+	{ .compatible = "rockchip,rk3066-grf", .data = ROCKCHIP_SYSCON_GRF },
+	{ .compatible = "rockchip,rk3066-pmu", .data = ROCKCHIP_SYSCON_PMU },
+	{ }
+};
+
+U_BOOT_DRIVER(syscon_rk3066) = {
+	.name = "rk3066_syscon",
+	.id = UCLASS_SYSCON,
+	.of_match = rk3066_syscon_ids,
+};
+
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+static int rk3066_syscon_bind_of_plat(struct udevice *dev)
+{
+	dev->driver_data = dev->driver->of_match->data;
+	debug("syscon: %s %d\n", dev->name, (uint)dev->driver_data);
+
+	return 0;
+}
+
+U_BOOT_DRIVER(rockchip_rk3066_noc) = {
+	.name = "rockchip_rk3066_noc",
+	.id = UCLASS_SYSCON,
+	.of_match = rk3066_syscon_ids,
+	.bind = rk3066_syscon_bind_of_plat,
+};
+
+U_BOOT_DRIVER(rockchip_rk3066_grf) = {
+	.name = "rockchip_rk3066_grf",
+	.id = UCLASS_SYSCON,
+	.of_match = rk3066_syscon_ids + 1,
+	.bind = rk3066_syscon_bind_of_plat,
+};
+
+U_BOOT_DRIVER(rockchip_rk3066_pmu) = {
+	.name = "rockchip_rk3066_pmu",
+	.id = UCLASS_SYSCON,
+	.of_match = rk3066_syscon_ids + 2,
+	.bind = rk3066_syscon_bind_of_plat,
+};
+#endif
include/configs/mk808.h new file +9 -0
new file mode 100644
index 0000000000..e2ab2b512c
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define ROCKCHIP_DEVICE_SETTINGS
+#include <configs/rk3066_common.h>
+
+#endif
include/configs/rk3066_common.h new file +56 -0
new file mode 100644
index 0000000000..b8dc024286
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2015 Google, Inc
+ */
+
+#ifndef __CONFIG_RK3066_COMMON_H
+#define __CONFIG_RK3066_COMMON_H
+
+#define CONFIG_SYS_CACHELINE_SIZE	64
+
+#include <asm/arch-rockchip/hardware.h>
+#include "rockchip-common.h"
+
+#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
+#define CONFIG_SYS_CBSIZE		256
+
+#define CONFIG_SYS_INIT_SP_ADDR		0x78000000
+
+#define CONFIG_ROCKCHIP_MAX_INIT_SIZE	(0x10000 - 0xC00)
+
+#define CONFIG_IRAM_BASE		0x10080000
+
+/* spl size max 200k */
+#define CONFIG_SPL_MAX_SIZE		0x32000
+
+#define CONFIG_SPL_STACK		0x1008FFFF
+
+#define CONFIG_SYS_SDRAM_BASE		0x60000000
+#define CONFIG_NR_DRAM_BANKS		1
+#define SDRAM_BANK_SIZE			(1024UL << 20UL)
+#define SDRAM_MAX_SIZE			CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE
+
+#ifndef CONFIG_SPL_BUILD
+/* usb otg */
+
+/* usb host support */
+#define ENV_MEM_LAYOUT_SETTINGS \
+	"scriptaddr=0x60000000\0" \
+	"pxefile_addr_r=0x60100000\0" \
+	"fdt_addr_r=0x61f00000\0" \
+	"kernel_addr_r=0x62000000\0" \
+	"ramdisk_addr_r=0x64000000\0"
+
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"fdt_high=0x6fffffff\0" \
+	"initrd_high=0x6fffffff\0" \
+	"partitions=" PARTS_DEFAULT \
+	ENV_MEM_LAYOUT_SETTINGS \
+	ROCKCHIP_DEVICE_SETTINGS \
+	BOOTENV
+
+#endif /* CONFIG_SPL_BUILD */
+
+#endif
#14 lore raw

PATCH v10 12/16 rockchip: rk3066: add Rikomagic MK808 board

In reply to Johan Jonker

MK808 is a RK3066-based board with 1 USB host and 1 USB OTG port, HDMI and a micro-SD card slot. It also includes on-board NAND and 1GB of SDRAM.

---
 arch/arm/mach-rockchip/rk3066/Kconfig |  9 +++++++++
 board/rikomagic/mk808/Kconfig         | 15 +++++++++++++++
 board/rikomagic/mk808/MAINTAINERS     |  6 ++++++
 board/rikomagic/mk808/Makefile        |  3 +++
 board/rikomagic/mk808/mk808.c         |  3 +++
 5 files changed, 36 insertions(+)
 create mode 100644 board/rikomagic/mk808/Kconfig
 create mode 100644 board/rikomagic/mk808/MAINTAINERS
 create mode 100644 board/rikomagic/mk808/Makefile
 create mode 100644 board/rikomagic/mk808/mk808.c
arch/arm/mach-rockchip/rk3066/Kconfig +9 -0
index 335f49bc55..95d7fc8a29 100644
@@ -1,5 +1,12 @@
 if ROCKCHIP_RK3066
 
+config TARGET_MK808
+	bool "MK808"
+	help
+	  MK808 is a RK3066-based board with 1 USB host and 1 USB OTG port,
+	  HDMI and a micro-SD card slot. It also includes on-board NAND
+	  and 1GB of SDRAM.
+
 config ROCKCHIP_BOOT_MODE_REG
 	default 0x20004040
 
@@ -27,4 +34,6 @@ config TPL_LIBGENERIC_SUPPORT
 config TPL_SERIAL
 	default y
 
+source "board/rikomagic/mk808/Kconfig"
+
 endif
board/rikomagic/mk808/Kconfig new file +15 -0
new file mode 100644
index 0000000000..4abad7e750
@@ -0,0 +1,15 @@
+if TARGET_MK808
+
+config SYS_BOARD
+	default "mk808"
+
+config SYS_VENDOR
+	default "rikomagic"
+
+config SYS_CONFIG_NAME
+	default "mk808"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+
+endif
board/rikomagic/mk808/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000000..b3ef6adb91
@@ -0,0 +1,6 @@
+MK808
+M:	Johan Jonker <[email protected]>
+S:	Maintained
+F:	board/rikomagic/mk808
+F:	configs/mk808_defconfig
+F:	include/configs/mk808.h
board/rikomagic/mk808/Makefile new file +3 -0
new file mode 100644
index 0000000000..a4d16884df
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+obj-y	+= mk808.o
board/rikomagic/mk808/mk808.c new file +3 -0
new file mode 100644
index 0000000000..e0bfc6f331
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <common.h>
Signature · 1 line
2.20.1
#15 lore raw

PATCH v10 13/16 rockchip: rk3066: add mk808_defconfig

In reply to Johan Jonker

This commit adds the default configuration file and relevant description for a MK808 board.

---

changed V9:
enable led gpio
disable STIMER

Changed V8:
use default log level
ENV_IS_NOWHERE

---
 configs/mk808_defconfig | 100 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 configs/mk808_defconfig
configs/mk808_defconfig new file +100 -0
new file mode 100644
index 0000000000..b475e73540
@@ -0,0 +1,100 @@
+CONFIG_ARM=y
+# CONFIG_SPL_SYS_THUMB_BUILD is not set
+# CONFIG_TPL_SYS_THUMB_BUILD is not set
+# CONFIG_SPL_USE_ARCH_MEMCPY is not set
+# CONFIG_SPL_USE_ARCH_MEMSET is not set
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x60408000
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x8000
+CONFIG_DEFAULT_DEVICE_TREE="rk3066a-mk808"
+CONFIG_SPL_TEXT_BASE=0x60000000
+CONFIG_ROCKCHIP_RK3066=y
+# CONFIG_ROCKCHIP_STIMER is not set
+CONFIG_TPL_TEXT_BASE=0x10080C04
+CONFIG_TPL_MAX_SIZE=32764
+CONFIG_TPL_STACK=0x1008FFFF
+CONFIG_TARGET_MK808=y
+CONFIG_SPL_STACK_R_ADDR=0x70000000
+CONFIG_DEBUG_UART_BASE=0x20064000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SPL_FS_FAT=y
+CONFIG_SYS_LOAD_ADDR=0x70800800
+CONFIG_SPL_PAYLOAD="u-boot.bin"
+CONFIG_DEBUG_UART=y
+CONFIG_SD_BOOT=y
+CONFIG_USE_PREBOOT=y
+CONFIG_DEFAULT_FDT_FILE="rk3066a-mk808.dtb"
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SPL_FS_EXT4=y
+CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=2
+CONFIG_TPL_NEEDS_SEPARATE_STACK=y
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
+# CONFIG_BOOTM_VXWORKS is not set
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_TPL_OF_CONTROL=y
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_DTB_PROPS_REMOVE=y
+CONFIG_SPL_OF_PLATDATA=y
+CONFIG_TPL_OF_PLATDATA=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+# CONFIG_NET is not set
+CONFIG_TPL_DM=y
+# CONFIG_DM_WARN is not set
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_TPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_SYSCON=y
+CONFIG_TPL_SYSCON=y
+# CONFIG_SIMPLE_BUS is not set
+# CONFIG_SPL_SIMPLE_BUS is not set
+# CONFIG_TPL_BLK is not set
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_TPL_CLK=y
+CONFIG_ROCKCHIP_GPIO=y
+# CONFIG_SPL_DM_I2C is not set
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_SPL_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_SPL_MMC_UHS_SUPPORT=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_PINCTRL=y
+CONFIG_DM_PMIC=y
+# CONFIG_SPL_PMIC_CHILDREN is not set
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_TPL_RAM=y
+CONFIG_DM_RESET=y
+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_ROCKCHIP_SERIAL=y
+CONFIG_SYSRESET=y
+CONFIG_TIMER=y
+CONFIG_SPL_TIMER=y
+CONFIG_TPL_TIMER=y
+CONFIG_DESIGNWARE_APB_TIMER=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
+# CONFIG_TPL_OF_LIBFDT is not set
Signature · 1 line
2.20.1
#16 lore raw

PATCH v10 14/16 doc: rockchip: restyle rockchip.rst

In reply to Johan Jonker

With more text coming to the rockchip.rst document, give it a restyle first.

Changed:
sort build examples alphabetically
add git clone example
fix bash examples
fix phrases (grammer)
fix typos

---
 doc/board/rockchip/rockchip.rst | 138 ++++++++++++++++++++------------
 1 file changed, 88 insertions(+), 50 deletions(-)
doc/board/rockchip/rockchip.rst +88 -50
index a75e60b9fa..7953203c75 100644
@@ -13,7 +13,7 @@ and it's usage steps.
 Rockchip boards
 ---------------
 
-Rockchip is SoC solutions provider for tablets & PCs, streaming media
+Rockchip is a SoC solutions provider for tablets & PCs, streaming media
 TV boxes, AI audio & vision, IoT hardware.
 
 A wide range of Rockchip SoCs with associated boards are supported in
@@ -85,42 +85,58 @@ Building
 TF-A
 ^^^^
 
-TF-A would require to build for ARM64 Rockchip SoCs platforms.
+TF-A is required when building ARM64 Rockchip SoCs images.
 
-To build TF-A::
+To build TF-A:
 
-        git clone https://github.com/ARM-software/arm-trusted-firmware.git
+.. code-block:: bash
+
+        git clone --depth 1 https://github.com/ARM-software/arm-trusted-firmware.git
         cd arm-trusted-firmware
         make realclean
         make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3399
+        cd ..
 
 Specify the PLAT= with desired Rockchip platform to build TF-A for.
 
 U-Boot
 ^^^^^^
 
-To build rk3328 boards::
+.. code-block:: bash
 
-        export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
-        make evb-rk3328_defconfig
-        make
+        git clone --depth 1 https://source.denx.de/u-boot/u-boot.git
+        cd u-boot
+
+To build rk3288 boards:
 
-To build rk3288 boards::
+.. code-block:: bash
 
         make evb-rk3288_defconfig
-        make
+        make CROSS_COMPILE=arm-linux-gnueabihf-
+
+To build rk3328 boards:
+
+.. code-block:: bash
+
+        export BL31=../arm-trusted-firmware/build/rk3328/release/bl31/bl31.elf
+        make evb-rk3328_defconfig
+        make CROSS_COMPILE=aarch64-linux-gnu-
+
+To build rk3368 boards:
 
-To build rk3368 boards::
+.. code-block:: bash
 
-        export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
+        export BL31=../arm-trusted-firmware/build/rk3368/release/bl31/bl31.elf
         make evb-px5_defconfig
-        make
+        make CROSS_COMPILE=aarch64-linux-gnu-
+
+To build rk3399 boards:
 
-To build rk3399 boards::
+.. code-block:: bash
 
-        export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
+        export BL31=../arm-trusted-firmware/build/rk3399/release/bl31/bl31.elf
         make evb-rk3399_defconfig
-        make
+        make CROSS_COMPILE=aarch64-linux-gnu-
 
 Flashing
 --------
@@ -131,10 +147,12 @@ Flashing
 SD Card
 ^^^^^^^
 
-All Rockchip platforms, except rk3128 (which doesn't use SPL) are now
-supporting single boot image using binman and pad_cat.
+All Rockchip platforms (except rk3128 which doesn't use SPL) are now
+supporting a single boot image using binman and pad_cat.
 
-To write an image that boots from an SD card (assumed to be /dev/sda)::
+To write an image that boots from a SD card (assumed to be /dev/sda):
+
+.. code-block:: bash
 
         sudo dd if=u-boot-rockchip.bin of=/dev/sda seek=64
         sync
@@ -144,45 +162,60 @@ eMMC
 
 eMMC flash would probe on mmc0 in most of the Rockchip platforms.
 
-Create GPT partition layout as defined in configurations::
+Create GPT partition layout as defined in $partitions:
+
+.. code-block:: bash
 
         mmc dev 0
         gpt write mmc 0 $partitions
 
-Connect the USB-OTG cable between host and target device.
+Connect the USB-OTG cable between the host and a target device.
+
+Launch fastboot on the target with:
 
-Launch fastboot at target::
+.. code-block:: bash
 
         fastboot 0
 
-Upon successful gadget connection,host show the USB device like::
+Upon a successful gadget connection the host shows the USB device with:
+
+.. code-block:: bash
 
         lsusb
         Bus 001 Device 020: ID 2207:330c Fuzhou Rockchip Electronics Company RK3399 in Mask ROM mode
 
-Program the flash::
+Program the flash with:
+
+.. code-block:: bash
 
         sudo fastboot -i 0x2207 flash loader1 idbloader.img
         sudo fastboot -i 0x2207 flash loader2 u-boot.itb
 
-Note: for Rockchip 32-bit platforms the U-Boot proper image
+Note:
+
+For Rockchip 32-bit platforms the U-Boot proper image
 is u-boot-dtb.img
 
 SPI
 ^^^
 
-Generating idbloader for SPI boot would require to input a multi image
-image format to mkimage tool instead of concerting (like for MMC boot).
+The SPI boot method requires the generation of idbloader.img with help of the mkimage tool.
+
+SPL-alone SPI boot image:
 
-SPL-alone SPI boot image::
+.. code-block:: bash
 
         ./tools/mkimage -n rk3399 -T rkspi -d spl/u-boot-spl.bin idbloader.img
 
-TPL+SPL SPI boot image::
+TPL+SPL SPI boot image:
+
+.. code-block:: bash
 
         ./tools/mkimage -n rk3399 -T rkspi -d tpl/u-boot-tpl.bin:spl/u-boot-spl.bin idbloader.img
 
-Copy SPI boot images into SD card and boot from SD::
+Copy SPI boot images into SD card and boot from SD:
+
+.. code-block:: bash
 
         sf probe
         load mmc 1:1 $kernel_addr_r idbloader.img
@@ -195,35 +228,42 @@ Copy SPI boot images into SD card and boot from SD::
 2. Package the image with Rockchip miniloader
 ---------------------------------------------
 
-Image package with Rockchip miniloader requires robin [1].
+Image package with Rockchip miniloader requires rkbin [1].
+
+.. code-block:: bash
+
+        cd ..
+        git clone --depth 1 https://github.com/rockchip-linux/rkbin
 
-Create idbloader.img
+Create idbloader.img:
 
-.. code-block:: none
+.. code-block:: bash
 
-  cd u-boot
-  ./tools/mkimage -n px30 -T rksd -d rkbin/bin/rk33/px30_ddr_333MHz_v1.15.bin idbloader.img
-  cat rkbin/bin/rk33/px30_miniloader_v1.22.bin >> idbloader.img
-  sudo dd if=idbloader.img of=/dev/sda seek=64
+        cd u-boot
+        ./tools/mkimage -n px30 -T rksd -d ../rkbin/bin/rk33/px30_ddr_333MHz_v1.16.bin idbloader.img
+        cat ../rkbin/bin/rk33/px30_miniloader_v1.31.bin >> idbloader.img
+        sudo dd if=idbloader.img of=/dev/sda seek=64
 
-Create trust.img
+Create trust.img:
 
-.. code-block:: none
+.. code-block:: bash
 
-  cd rkbin
-  ./tools/trust_merger RKTRUST/PX30TRUST.ini
-  sudo dd if=trust.img of=/dev/sda seek=24576
+        cd ../rkbin
+        ./tools/trust_merger RKTRUST/PX30TRUST.ini
+        sudo dd if=trust.img of=/dev/sda seek=24576
 
-Create uboot.img
+Create uboot.img [2]:
 
-.. code-block:: none
+.. code-block:: bash
 
-  rbink/tools/loaderimage --pack --uboot u-boot-dtb.bin uboot.img 0x200000
-  sudo dd if=uboot.img of=/dev/sda seek=16384
+        cd ../u-boot
+        ../rkbin/tools/loaderimage --pack --uboot u-boot-dtb.bin uboot.img 0x200000
+        sudo dd if=uboot.img of=/dev/sda seek=16384
 
 Note:
-1. 0x200000 is load address and it's an optional in some platforms.
-2. rkbin binaries are kept on updating, so would recommend to use the latest versions.
+
+1. rkbin binaries are regularly updated, so it would be recommended to use the latest version.
+2. 0x200000 is a load address and is an option for some platforms.
 
 TODO
 ----
@@ -233,7 +273,5 @@ TODO
 - Document SPI flash boot
 - Add missing SoC's with it boards list
 
-[1] https://github.com/rockchip-linux/rkbin
-
 .. Jagan Teki <[email protected]>
 .. Wednesday 28 October 2020 06:47:26 PM IST
Signature · 1 line
2.20.1
Reviewed-by on v10 14/16
#17 lore raw

Re: [PATCH v10 14/16] doc: rockchip: restyle rockchip.rst

Quoted 11 lines · Johan Jonker

With more text coming to the rockchip.rst document, give it a restyle first.

Changed:
sort build examples alphabetically
add git clone example
fix bash examples
fix phrases (grammer)
fix typos

Thanks,
- Kever

Quoted 248 lines
---
  doc/board/rockchip/rockchip.rst | 138 ++++++++++++++++++++------------
  1 file changed, 88 insertions(+), 50 deletions(-)
doc/board/rockchip/rockchip.rst +88 -50
index a75e60b9fa..7953203c75 100644
@@ -13,7 +13,7 @@ and it's usage steps.
  Rockchip boards
  ---------------
 
-Rockchip is SoC solutions provider for tablets & PCs, streaming media
+Rockchip is a SoC solutions provider for tablets & PCs, streaming media
  TV boxes, AI audio & vision, IoT hardware.
 
  A wide range of Rockchip SoCs with associated boards are supported in
@@ -85,42 +85,58 @@ Building
  TF-A
  ^^^^
 
-TF-A would require to build for ARM64 Rockchip SoCs platforms.
+TF-A is required when building ARM64 Rockchip SoCs images.
 
-To build TF-A::
+To build TF-A:
 
-        git clone https://github.com/ARM-software/arm-trusted-firmware.git
+.. code-block:: bash
+
+        git clone --depth 1 https://github.com/ARM-software/arm-trusted-firmware.git
          cd arm-trusted-firmware
          make realclean
          make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3399
+        cd ..
 
  Specify the PLAT= with desired Rockchip platform to build TF-A for.
 
  U-Boot
  ^^^^^^
 
-To build rk3328 boards::
+.. code-block:: bash
 
-        export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
-        make evb-rk3328_defconfig
-        make
+        git clone --depth 1 https://source.denx.de/u-boot/u-boot.git
+        cd u-boot
+
+To build rk3288 boards:
 
-To build rk3288 boards::
+.. code-block:: bash
 
          make evb-rk3288_defconfig
-        make
+        make CROSS_COMPILE=arm-linux-gnueabihf-
+
+To build rk3328 boards:
+
+.. code-block:: bash
+
+        export BL31=../arm-trusted-firmware/build/rk3328/release/bl31/bl31.elf
+        make evb-rk3328_defconfig
+        make CROSS_COMPILE=aarch64-linux-gnu-
+
+To build rk3368 boards:
 
-To build rk3368 boards::
+.. code-block:: bash
 
-        export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
+        export BL31=../arm-trusted-firmware/build/rk3368/release/bl31/bl31.elf
          make evb-px5_defconfig
-        make
+        make CROSS_COMPILE=aarch64-linux-gnu-
+
+To build rk3399 boards:
 
-To build rk3399 boards::
+.. code-block:: bash
 
-        export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
+        export BL31=../arm-trusted-firmware/build/rk3399/release/bl31/bl31.elf
          make evb-rk3399_defconfig
-        make
+        make CROSS_COMPILE=aarch64-linux-gnu-
 
  Flashing
  --------
@@ -131,10 +147,12 @@ Flashing
  SD Card
  ^^^^^^^
 
-All Rockchip platforms, except rk3128 (which doesn't use SPL) are now
-supporting single boot image using binman and pad_cat.
+All Rockchip platforms (except rk3128 which doesn't use SPL) are now
+supporting a single boot image using binman and pad_cat.
 
-To write an image that boots from an SD card (assumed to be /dev/sda)::
+To write an image that boots from a SD card (assumed to be /dev/sda):
+
+.. code-block:: bash
 
          sudo dd if=u-boot-rockchip.bin of=/dev/sda seek=64
          sync
@@ -144,45 +162,60 @@ eMMC
 
  eMMC flash would probe on mmc0 in most of the Rockchip platforms.
 
-Create GPT partition layout as defined in configurations::
+Create GPT partition layout as defined in $partitions:
+
+.. code-block:: bash
 
          mmc dev 0
          gpt write mmc 0 $partitions
 
-Connect the USB-OTG cable between host and target device.
+Connect the USB-OTG cable between the host and a target device.
+
+Launch fastboot on the target with:
 
-Launch fastboot at target::
+.. code-block:: bash
 
          fastboot 0
 
-Upon successful gadget connection,host show the USB device like::
+Upon a successful gadget connection the host shows the USB device with:
+
+.. code-block:: bash
 
          lsusb
          Bus 001 Device 020: ID 2207:330c Fuzhou Rockchip Electronics Company RK3399 in Mask ROM mode
 
-Program the flash::
+Program the flash with:
+
+.. code-block:: bash
 
          sudo fastboot -i 0x2207 flash loader1 idbloader.img
          sudo fastboot -i 0x2207 flash loader2 u-boot.itb
 
-Note: for Rockchip 32-bit platforms the U-Boot proper image
+Note:
+
+For Rockchip 32-bit platforms the U-Boot proper image
  is u-boot-dtb.img
 
  SPI
  ^^^
 
-Generating idbloader for SPI boot would require to input a multi image
-image format to mkimage tool instead of concerting (like for MMC boot).
+The SPI boot method requires the generation of idbloader.img with help of the mkimage tool.
+
+SPL-alone SPI boot image:
 
-SPL-alone SPI boot image::
+.. code-block:: bash
 
          ./tools/mkimage -n rk3399 -T rkspi -d spl/u-boot-spl.bin idbloader.img
 
-TPL+SPL SPI boot image::
+TPL+SPL SPI boot image:
+
+.. code-block:: bash
 
          ./tools/mkimage -n rk3399 -T rkspi -d tpl/u-boot-tpl.bin:spl/u-boot-spl.bin idbloader.img
 
-Copy SPI boot images into SD card and boot from SD::
+Copy SPI boot images into SD card and boot from SD:
+
+.. code-block:: bash
 
          sf probe
          load mmc 1:1 $kernel_addr_r idbloader.img
@@ -195,35 +228,42 @@ Copy SPI boot images into SD card and boot from SD::
  2. Package the image with Rockchip miniloader
  ---------------------------------------------
 
-Image package with Rockchip miniloader requires robin [1].
+Image package with Rockchip miniloader requires rkbin [1].
+
+.. code-block:: bash
+
+        cd ..
+        git clone --depth 1 https://github.com/rockchip-linux/rkbin
 
-Create idbloader.img
+Create idbloader.img:
 
-.. code-block:: none
+.. code-block:: bash
 
-  cd u-boot
-  ./tools/mkimage -n px30 -T rksd -d rkbin/bin/rk33/px30_ddr_333MHz_v1.15.bin idbloader.img
-  cat rkbin/bin/rk33/px30_miniloader_v1.22.bin >> idbloader.img
-  sudo dd if=idbloader.img of=/dev/sda seek=64
+        cd u-boot
+        ./tools/mkimage -n px30 -T rksd -d ../rkbin/bin/rk33/px30_ddr_333MHz_v1.16.bin idbloader.img
+        cat ../rkbin/bin/rk33/px30_miniloader_v1.31.bin >> idbloader.img
+        sudo dd if=idbloader.img of=/dev/sda seek=64
 
-Create trust.img
+Create trust.img:
 
-.. code-block:: none
+.. code-block:: bash
 
-  cd rkbin
-  ./tools/trust_merger RKTRUST/PX30TRUST.ini
-  sudo dd if=trust.img of=/dev/sda seek=24576
+        cd ../rkbin
+        ./tools/trust_merger RKTRUST/PX30TRUST.ini
+        sudo dd if=trust.img of=/dev/sda seek=24576
 
-Create uboot.img
+Create uboot.img [2]:
 
-.. code-block:: none
+.. code-block:: bash
 
-  rbink/tools/loaderimage --pack --uboot u-boot-dtb.bin uboot.img 0x200000
-  sudo dd if=uboot.img of=/dev/sda seek=16384
+        cd ../u-boot
+        ../rkbin/tools/loaderimage --pack --uboot u-boot-dtb.bin uboot.img 0x200000
+        sudo dd if=uboot.img of=/dev/sda seek=16384
 
  Note:
-1. 0x200000 is load address and it's an optional in some platforms.
-2. rkbin binaries are kept on updating, so would recommend to use the latest versions.
+
+1. rkbin binaries are regularly updated, so it would be recommended to use the latest version.
+2. 0x200000 is a load address and is an option for some platforms.
 
  TODO
  ----
@@ -233,7 +273,5 @@ TODO
  - Document SPI flash boot
  - Add missing SoC's with it boards list
 
-[1] https://github.com/rockchip-linux/rkbin
-
  .. Jagan Teki <[email protected]>
  .. Wednesday 28 October 2020 06:47:26 PM IST
#18 lore raw

PATCH v10 15/16 doc: rockchip: add px30/rk3326 boards and examples

In reply to Johan Jonker

There are several PX30/RK3326 boards in use without mentioning in rockchip.rst. Add boards and examples.

---
 doc/board/rockchip/rockchip.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
doc/board/rockchip/rockchip.rst +16 -0
index 7953203c75..b8737dedda 100644
@@ -21,6 +21,12 @@ mainline U-Boot.
 
 List of mainline supported Rockchip boards:
 
+* px30
+     - Rockchip Evb-PX30 (evb-px30)
+     - Engicam PX30.Core C.TOUCH 2.0 (px30-core-ctouch2-px30)
+     - Engicam PX30.Core C.TOUCH 2.0 10.1 (px30-core-ctouch2-of10-px30)
+     - Engicam PX30.Core EDIMM2.2 Starter Kit (px30-core-edimm2.2-px30)
+     - Firefly Core-PX30-JD4 (firefly-px30)
 * rk3036
      - Rockchip Evb-RK3036 (evb-rk3036)
      - Kylin (kylin_rk3036)
@@ -46,6 +52,8 @@ List of mainline supported Rockchip boards:
 * rk3308
      - Rockchip Evb-RK3308 (evb-rk3308)
      - Roc-cc-RK3308 (roc-cc-rk3308)
+* rk3326
+     - ODROID-GO Advance (odroid-go2)
 * rk3328
      - Rockchip Evb-RK3328 (evb-rk3328)
      - Pine64 Rock64 (rock64-rk3328)
@@ -107,6 +115,14 @@ U-Boot
         git clone --depth 1 https://source.denx.de/u-boot/u-boot.git
         cd u-boot
 
+To build px30 boards:
+
+.. code-block:: bash
+
+        export BL31=../arm-trusted-firmware/build/px30/release/bl31/bl31.elf
+        make evb-px30_defconfig
+        make CROSS_COMPILE=aarch64-linux-gnu-
+
 To build rk3288 boards:
 
 .. code-block:: bash
Signature · 1 line
2.20.1
Reviewed-by on v10 15/16
#19 lore raw

Re: [PATCH v10 15/16] doc: rockchip: add px30/rk3326 boards and examples

Quoted 6 lines · Johan Jonker

There are several PX30/RK3326 boards in use without mentioning in rockchip.rst. Add boards and examples.

---
  doc/board/rockchip/rockchip.rst | 16 ++++++++++++++++

Thanks,
- Kever

Quoted 43 lines
  1 file changed, 16 insertions(+)
doc/board/rockchip/rockchip.rst +16 -0
index 7953203c75..b8737dedda 100644
@@ -21,6 +21,12 @@ mainline U-Boot.
 
  List of mainline supported Rockchip boards:
 
+* px30
+     - Rockchip Evb-PX30 (evb-px30)
+     - Engicam PX30.Core C.TOUCH 2.0 (px30-core-ctouch2-px30)
+     - Engicam PX30.Core C.TOUCH 2.0 10.1 (px30-core-ctouch2-of10-px30)
+     - Engicam PX30.Core EDIMM2.2 Starter Kit (px30-core-edimm2.2-px30)
+     - Firefly Core-PX30-JD4 (firefly-px30)
  * rk3036
       - Rockchip Evb-RK3036 (evb-rk3036)
       - Kylin (kylin_rk3036)
@@ -46,6 +52,8 @@ List of mainline supported Rockchip boards:
  * rk3308
       - Rockchip Evb-RK3308 (evb-rk3308)
       - Roc-cc-RK3308 (roc-cc-rk3308)
+* rk3326
+     - ODROID-GO Advance (odroid-go2)
  * rk3328
       - Rockchip Evb-RK3328 (evb-rk3328)
       - Pine64 Rock64 (rock64-rk3328)
@@ -107,6 +115,14 @@ U-Boot
          git clone --depth 1 https://source.denx.de/u-boot/u-boot.git
          cd u-boot
 
+To build px30 boards:
+
+.. code-block:: bash
+
+        export BL31=../arm-trusted-firmware/build/px30/release/bl31/bl31.elf
+        make evb-px30_defconfig
+        make CROSS_COMPILE=aarch64-linux-gnu-
+
  To build rk3288 boards:
 
  .. code-block:: bash
#20 lore raw

PATCH v10 16/16 doc: rockchip: add rk3066 Rikomagic MK808

In reply to Johan Jonker

Add rk3066 Rikomagic MK808 to the list of mainline supported Rockchip boards. Include instructions for creating and programming images to NAND and SD card.

---

Changed V10:
add more info

---
 doc/board/rockchip/rockchip.rst | 111 ++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)
doc/board/rockchip/rockchip.rst +111 -0
index b8737dedda..7b428563a6 100644
@@ -30,6 +30,8 @@ List of mainline supported Rockchip boards:
 * rk3036
      - Rockchip Evb-RK3036 (evb-rk3036)
      - Kylin (kylin_rk3036)
+* rk3066
+     - Rikomagic MK808 (mk808)
 * rk3128
      - Rockchip Evb-RK3128 (evb-rk3128)
 * rk3188
@@ -123,6 +125,13 @@ To build px30 boards:
         make evb-px30_defconfig
         make CROSS_COMPILE=aarch64-linux-gnu-
 
+To build rk3066 boards:
+
+.. code-block:: bash
+
+        make mk808_defconfig
+        make CROSS_COMPILE=arm-linux-gnueabihf-
+
 To build rk3288 boards:
 
 .. code-block:: bash
@@ -281,6 +290,108 @@ Note:
 1. rkbin binaries are regularly updated, so it would be recommended to use the latest version.
 2. 0x200000 is a load address and is an option for some platforms.
 
+3. Package the RK3066 image with U-Boot TPL/SPL on NAND
+-------------------------------------------------------
+
+Unlike later SoC models the rk3066 BootROM doesn't have SDMMC support.
+If all other boot options fail then it enters into a BootROM mode on the USB OTG port.
+This method loads TPL/SPL on NAND with U-boot and kernel on SD card.
+
+SD Card
+^^^^^^^
+
+U-boot expects a GPT partition map and a boot directory structure with files on the SD card.
+
+.. code-block:: none
+
+        Partition Map for MMC device 0  --   Partition Type: EFI
+        Part     Start LBA         End LBA           Name
+                 Attributes
+                 Type GUID
+                 Partition GUID
+        1        0x00000040        0x00001f7f        "loader1"
+        2        0x00004000        0x00005fff        "loader2"
+        3        0x00006000        0x00007fff        "trust"
+        4        0x00008000        0x0003ffff        "boot"
+        5        0x00040000        0x00ed7fde        "rootfs"
+
+Make sure boot and esp flag are set for the boot partition.
+Loader1 partition is not used by RK3066.
+
+Boot partition:
+
+.. code-block:: none
+
+        extlinux
+          extlinux.conf
+
+        zImage
+        rk3066a-mk808.dtb
+
+To write a U-boot image to the SD card (assumed to be /dev/sda):
+
+.. code-block:: bash
+
+        sudo dd if=u-boot-dtb.img of=/dev/sda seek=16384
+        sync
+
+NAND
+^^^^
+
+Bring device in BootROM mode:
+
+If bricked and no BootROM mode shows up then connect pin 8 and 9 of the NAND flash
+with a needle while reconnecting to the USB OTG port to a PC.
+
+Show connected devices with:
+
+.. code-block:: bash
+
+        lsusb
+        Bus 001 Device 004: ID 2207:300a Fuzhou Rockchip Electronics Company RK3066 in Mask ROM mode
+
+
+Create NAND image:
+
+Size of SPL and TPL must be aligned to 2kb.
+
+Program with commands in a bash script ./flash.sh:
+
+.. code-block:: bash
+
+      #!/bin/sh
+
+      printf "RK30" > tplspl.bin
+      dd if=u-boot-tpl.bin >> tplspl.bin
+      truncate -s %2048 tplspl.bin
+      truncate -s %2048 u-boot-spl.bin
+      ../tools/boot_merger --verbose config-flash.ini
+      ../tools/upgrade_tool ul ./RK30xxLoader_uboot.bin
+
+config-flash.ini:
+
+.. code-block:: none
+
+      [CHIP_NAME]
+      NAME=RK30
+      [VERSION]
+      MAJOR=2
+      MINOR=21
+      [CODE471_OPTION]
+      NUM=1
+      Path1=30_LPDDR2_300MHz_DD.bin
+      [CODE472_OPTION]
+      NUM=1
+      Path1=rk30usbplug.bin
+      [LOADER_OPTION]
+      NUM=2
+      LOADER1=FlashData
+      LOADER2=FlashBoot
+      FlashData=tplspl.bin
+      FlashBoot=u-boot-spl.bin
+      [OUTPUT]
+      PATH=RK30xxLoader_uboot.bin
+
 TODO
 ----
 
Signature · 1 line
2.20.1
Reviewed-by on v10 16/16
#21 lore raw

Re: [PATCH v10 16/16] doc: rockchip: add rk3066 Rikomagic MK808

Quoted 6 lines · Johan Jonker

Add rk3066 Rikomagic MK808 to the list of mainline supported Rockchip boards. Include instructions for creating and programming images to NAND and SD card.

Thanks,
- Kever

Quoted 144 lines

---

Changed V10:
add more info

---
  doc/board/rockchip/rockchip.rst | 111 ++++++++++++++++++++++++++++++++
  1 file changed, 111 insertions(+)
doc/board/rockchip/rockchip.rst +111 -0
index b8737dedda..7b428563a6 100644
@@ -30,6 +30,8 @@ List of mainline supported Rockchip boards:
  * rk3036
       - Rockchip Evb-RK3036 (evb-rk3036)
       - Kylin (kylin_rk3036)
+* rk3066
+     - Rikomagic MK808 (mk808)
  * rk3128
       - Rockchip Evb-RK3128 (evb-rk3128)
  * rk3188
@@ -123,6 +125,13 @@ To build px30 boards:
          make evb-px30_defconfig
          make CROSS_COMPILE=aarch64-linux-gnu-
 
+To build rk3066 boards:
+
+.. code-block:: bash
+
+        make mk808_defconfig
+        make CROSS_COMPILE=arm-linux-gnueabihf-
+
  To build rk3288 boards:
 
  .. code-block:: bash
@@ -281,6 +290,108 @@ Note:
  1. rkbin binaries are regularly updated, so it would be recommended to use the latest version.
  2. 0x200000 is a load address and is an option for some platforms.
 
+3. Package the RK3066 image with U-Boot TPL/SPL on NAND
+-------------------------------------------------------
+
+Unlike later SoC models the rk3066 BootROM doesn't have SDMMC support.
+If all other boot options fail then it enters into a BootROM mode on the USB OTG port.
+This method loads TPL/SPL on NAND with U-boot and kernel on SD card.
+
+SD Card
+^^^^^^^
+
+U-boot expects a GPT partition map and a boot directory structure with files on the SD card.
+
+.. code-block:: none
+
+        Partition Map for MMC device 0  --   Partition Type: EFI
+        Part     Start LBA         End LBA           Name
+                 Attributes
+                 Type GUID
+                 Partition GUID
+        1        0x00000040        0x00001f7f        "loader1"
+        2        0x00004000        0x00005fff        "loader2"
+        3        0x00006000        0x00007fff        "trust"
+        4        0x00008000        0x0003ffff        "boot"
+        5        0x00040000        0x00ed7fde        "rootfs"
+
+Make sure boot and esp flag are set for the boot partition.
+Loader1 partition is not used by RK3066.
+
+Boot partition:
+
+.. code-block:: none
+
+        extlinux
+          extlinux.conf
+
+        zImage
+        rk3066a-mk808.dtb
+
+To write a U-boot image to the SD card (assumed to be /dev/sda):
+
+.. code-block:: bash
+
+        sudo dd if=u-boot-dtb.img of=/dev/sda seek=16384
+        sync
+
+NAND
+^^^^
+
+Bring device in BootROM mode:
+
+If bricked and no BootROM mode shows up then connect pin 8 and 9 of the NAND flash
+with a needle while reconnecting to the USB OTG port to a PC.
+
+Show connected devices with:
+
+.. code-block:: bash
+
+        lsusb
+        Bus 001 Device 004: ID 2207:300a Fuzhou Rockchip Electronics Company RK3066 in Mask ROM mode
+
+
+Create NAND image:
+
+Size of SPL and TPL must be aligned to 2kb.
+
+Program with commands in a bash script ./flash.sh:
+
+.. code-block:: bash
+
+      #!/bin/sh
+
+      printf "RK30" > tplspl.bin
+      dd if=u-boot-tpl.bin >> tplspl.bin
+      truncate -s %2048 tplspl.bin
+      truncate -s %2048 u-boot-spl.bin
+      ../tools/boot_merger --verbose config-flash.ini
+      ../tools/upgrade_tool ul ./RK30xxLoader_uboot.bin
+
+config-flash.ini:
+
+.. code-block:: none
+
+      [CHIP_NAME]
+      NAME=RK30
+      [VERSION]
+      MAJOR=2
+      MINOR=21
+      [CODE471_OPTION]
+      NUM=1
+      Path1=30_LPDDR2_300MHz_DD.bin
+      [CODE472_OPTION]
+      NUM=1
+      Path1=rk30usbplug.bin
+      [LOADER_OPTION]
+      NUM=2
+      LOADER1=FlashData
+      LOADER2=FlashBoot
+      FlashData=tplspl.bin
+      FlashBoot=u-boot-spl.bin
+      [OUTPUT]
+      PATH=RK30xxLoader_uboot.bin
+
  TODO
  ----