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

Kever Yang kever.yang at rock-chips.com
Sat Apr 16 07:44:07 CEST 2022


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
On 2022/4/11 09:29, Johan Jonker wrote:
> Add the core architecture code for the rk3066.
>
> Signed-off-by: Johan Jonker<jbx6244 at gmail.com>
> ---
>   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
>
> diff --git a/arch/arm/include/asm/arch-rk3066/boot0.h b/arch/arm/include/asm/arch-rk3066/boot0.h
> new file mode 100644
> index 0000000000..28c0fb9a4c
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-rk3066/boot0.h
> @@ -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
> diff --git a/arch/arm/include/asm/arch-rk3066/gpio.h b/arch/arm/include/asm/arch-rk3066/gpio.h
> new file mode 100644
> index 0000000000..a4a3b3289c
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-rk3066/gpio.h
> @@ -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
> diff --git a/arch/arm/include/asm/arch-rk3066/timer.h b/arch/arm/include/asm/arch-rk3066/timer.h
> new file mode 100644
> index 0000000000..3bb39428cd
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-rk3066/timer.h
> @@ -0,0 +1,6 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +
> +#ifndef __ASM_ARCH_TIMER_H__
> +#define __ASM_ARCH_TIMER_H__
> +
> +#endif
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 811964973a..18aff5480b 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -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"
> +
> +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
> diff --git a/arch/arm/mach-rockchip/rk3066/Makefile b/arch/arm/mach-rockchip/rk3066/Makefile
> new file mode 100644
> index 0000000000..9e2a9d4b0a
> --- /dev/null
> +++ b/arch/arm/mach-rockchip/rk3066/Makefile
> @@ -0,0 +1,5 @@
> +# SPDX-License-Identifier: GPL-2.0+
> +
> +obj-y += clk_rk3066.o
> +obj-y += rk3066.o
> +obj-y += syscon_rk3066.o
> diff --git a/arch/arm/mach-rockchip/rk3066/clk_rk3066.c b/arch/arm/mach-rockchip/rk3066/clk_rk3066.c
> new file mode 100644
> index 0000000000..c47526dca5
> --- /dev/null
> +++ b/arch/arm/mach-rockchip/rk3066/clk_rk3066.c
> @@ -0,0 +1,33 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2015 Google, Inc
> + * Written by Simon Glass<sjg at chromium.org>
> + */
> +
> +#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;
> +}
> diff --git a/arch/arm/mach-rockchip/rk3066/rk3066.c b/arch/arm/mach-rockchip/rk3066/rk3066.c
> new file mode 100644
> index 0000000000..78c7d894f9
> --- /dev/null
> +++ b/arch/arm/mach-rockchip/rk3066/rk3066.c
> @@ -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 at 1021c000",
> +	[BROM_BOOTSOURCE_SD] = "/mmc at 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);
> +	}
> +}
> diff --git a/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c b/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c
> new file mode 100644
> index 0000000000..a598f6400d
> --- /dev/null
> +++ b/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c
> @@ -0,0 +1,55 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2015 Google, Inc
> + * Written by Simon Glass<sjg at chromium.org>
> + */
> +
> +#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
> diff --git a/include/configs/mk808.h b/include/configs/mk808.h
> new file mode 100644
> index 0000000000..e2ab2b512c
> --- /dev/null
> +++ b/include/configs/mk808.h
> @@ -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
> diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h
> new file mode 100644
> index 0000000000..b8dc024286
> --- /dev/null
> +++ b/include/configs/rk3066_common.h
> @@ -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


More information about the U-Boot mailing list