On 2019/10/24 上午3:56, Jagan Teki wrote:

Add U-Boot specific dtsi file for rk3036 SoC. This would help to add U-Boot specific dts nodes, properties which are common across rk3036.

Right now, the file is empty, will add required changes in future patches.

Signed-off-by: Jagan Teki jagan@amarulasolutions.com

Reviewed-by: Kever Yang kever.yang@rock-chips.com

Thanks, - Kever

---

arch/arm/dts/rk3036-sdk-u-boot.dtsi | 2 ++ arch/arm/dts/rk3036-u-boot.dtsi | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 arch/arm/dts/rk3036-u-boot.dtsi

diff --git a/arch/arm/dts/rk3036-sdk-u-boot.dtsi b/arch/arm/dts/rk3036-sdk-u-boot.dtsi index 6f15f4a8ec..754800c6e6 100644 --- a/arch/arm/dts/rk3036-sdk-u-boot.dtsi +++ b/arch/arm/dts/rk3036-sdk-u-boot.dtsi @@ -1,3 +1,5 @@ +#include "rk3036-u-boot.dtsi"

• &uart2 { u-boot,dm-pre-reloc; };

diff --git a/arch/arm/dts/rk3036-u-boot.dtsi b/arch/arm/dts/rk3036-u-boot.dtsi new file mode 100644 index 0000000000..1e7d079315 --- /dev/null +++ b/arch/arm/dts/rk3036-u-boot.dtsi @@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*

• • Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com
• */

On 2019/10/24 上午3:56, Jagan Teki wrote:

All rockchip platforms support TPL or SPL-based bootloader in mainline with U-Boot proper as final stage. For each stage we need to burn the image on to flash with respective offsets.

This patch creates a single boot image component using

• binman, for arm32 rockchip platforms
• pad_cat, for arm64 rockchip platforms.

This would help users to get rid of burning different boot stage images.

The new image called 'u-boot-rockchip.bin' which can burn into flash like:

₹ sudo dd if=u-boot-rockchip.bin of=/dev/sda seek=64

This would support all rockchip platforms, except rk3128 since it doesn't support for SPL yet.

Cc: Kever Yang kever.yang@rock-chips.com Cc: Matwey V. Kornilov matwey.kornilov@gmail.com Signed-off-by: Jagan Teki jagan@amarulasolutions.com

Reviewed-by: Kever Yang kever.yang@rock-chips.com

Thanks, - Kever

---

Makefile | 18 ++++++++++++++---- arch/arm/Kconfig | 1 + arch/arm/dts/rk3036-u-boot.dtsi | 2 ++ arch/arm/dts/rk3288-u-boot.dtsi | 2 ++ arch/arm/dts/rockchip-u-boot.dtsi | 21 +++++++++++++++++++++ include/configs/rockchip-common.h | 2 ++ 6 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/rockchip-u-boot.dtsi

diff --git a/Makefile b/Makefile index a4278170d4..6c70106c6e 100644 --- a/Makefile +++ b/Makefile @@ -887,7 +887,7 @@ ALL-y += u-boot-with-dtb.bin endif

ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy) -ALL-y += u-boot-spl-rockchip.bin +ALL-y += u-boot-rockchip.bin endif

LDFLAGS_u-boot += $(LDFLAGS_FINAL) @@ -1347,15 +1347,25 @@ ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy) MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE $(call if_changed,mkimage) -u-boot-spl-rockchip.bin: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE +spl/u-boot-spl-rockchip.bin: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE $(call if_changed,cat) else MKIMAGEFLAGS_u-boot-spl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) -u-boot-spl-rockchip.bin: spl/u-boot-spl.bin FORCE +spl/u-boot-spl-rockchip.bin: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) endif

-endif +ifeq ($(CONFIG_ARM64),) +u-boot-rockchip.bin: spl/u-boot-spl-rockchip.bin u-boot.img FORCE

• $(call if_changed,binman)

+else +OBJCOPYFLAGS_u-boot-rockchip.bin = -I binary -O binary \

• --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff

+u-boot-rockchip.bin: spl/u-boot-spl-rockchip.bin u-boot.itb FORCE

• $(call if_changed,pad_cat)

+endif # CONFIG_ARM64

+endif # CONFIG_ARCH_ROCKCHIP

ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy) MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1df2aba3c2..8107414626 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1594,6 +1594,7 @@ config ARCH_STM32MP config ARCH_ROCKCHIP bool "Support Rockchip SoCs" select BLK

• select BINMAN if !ARM64 select DM select DM_GPIO select DM_I2C

diff --git a/arch/arm/dts/rk3036-u-boot.dtsi b/arch/arm/dts/rk3036-u-boot.dtsi index 1e7d079315..41ac054b81 100644 --- a/arch/arm/dts/rk3036-u-boot.dtsi +++ b/arch/arm/dts/rk3036-u-boot.dtsi @@ -2,3 +2,5 @@ /*

• Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com

*/

+#include "rockchip-u-boot.dtsi" diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi index 3f00a3b6d3..6d31735362 100644 --- a/arch/arm/dts/rk3288-u-boot.dtsi +++ b/arch/arm/dts/rk3288-u-boot.dtsi @@ -3,6 +3,8 @@

• Copyright (C) 2019 Rockchip Electronics Co., Ltd

*/

+#include "rockchip-u-boot.dtsi"

• / { chosen { u-boot,spl-boot-order = \

diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi new file mode 100644 index 0000000000..bc0b1412a2 --- /dev/null +++ b/arch/arm/dts/rockchip-u-boot.dtsi @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*

• • Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com
• */

+#include <config.h>

+/ {

• binman {

• filename = "u-boot-rockchip.bin";
  

• pad-byte = <0xff>;
  

• blob {
  

• 	filename = "spl/u-boot-spl-rockchip.bin";
  

• };
  

• u-boot-img {
  

• 	offset = <CONFIG_SPL_PAD_TO>;
  

• };
  

• };

+}; diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 68e1105a4b..d7f5ca9fa4 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -9,6 +9,8 @@

#define CONFIG_SYS_NS16550_MEM32

+#define CONFIG_SPL_PAD_TO 8355840

• #ifndef CONFIG_SPL_BUILD

  /* First try to boot from SD (index 0), then eMMC (index 1) */

Jagan,

On 2019/10/24 上午3:56, Jagan Teki wrote:

Rockchip has documentation file, doc/README.rockchip but which is not so readable to add or understand the existing contents. Even the format that support is legacy readme in U-Boot.

Add rockchip specific documentation file using new rst format, which describes the information about Rockchip supported boards and it's usage steps.

Added minimal information about rk3288, rk3328, rk3368 and rk3399 boards and usage. This would indeed updated further based on the requirements and updates.

This patch move small part of content from doc/README.rockchip, I would prefer

to have a more complete version before it move to new document.

Thanks,

- Kever

Cc: Kever Yang kever.yang@rock-chips.com Cc: Matwey V. Kornilov matwey.kornilov@gmail.com Signed-off-by: Jagan Teki jagan@amarulasolutions.com

---

doc/board/rockchip/index.rst | 10 +++ doc/board/rockchip/rockchip.rst | 128 ++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100644 doc/board/rockchip/index.rst create mode 100644 doc/board/rockchip/rockchip.rst

diff --git a/doc/board/rockchip/index.rst b/doc/board/rockchip/index.rst new file mode 100644 index 0000000000..0c377e9bbb --- /dev/null +++ b/doc/board/rockchip/index.rst @@ -0,0 +1,10 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com

+Rockchip +========

+.. toctree::

• :maxdepth: 2
• rockchip

diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst new file mode 100644 index 0000000000..625155e432 --- /dev/null +++ b/doc/board/rockchip/rockchip.rst @@ -0,0 +1,128 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright (C) 2019 Jagan Teki jagan@amarulasolutions.com

+ROCKCHIP +========

+About this +----------

+This document describes the information about Rockchip supported boards +and it's usage steps.

+Rockchip boards +---------------

+Rockchip is SoC solutions provider for tablets & PCs, streaming media +TV boxes, AI audio & vision, IoT hardware.

+A wide range of Rockchip SoCs with associated boardsare supported in +mainline U-Boot.

+List of mainline supported rockchip boards:

+* rk3288

• - Evb-RK3288
  

• - Firefly-RK3288
  

• - mqmaker MiQi
  

• - Phytec RK3288 PCM-947
  

• - PopMetal-RK3288
  

• - Radxa Rock 2 Square
  

• - Tinker-RK3288
  

• - Google Jerry
  

• - Google Mickey
  

• - Google Minnie
  

• - Google Speedy
  

• - Amarula Vyasa-RK3288
  

+* rk3328

• - Rockchip RK3328 EVB
  

• - Pine64 Rock64
  

+* rk3368

• - GeekBox
  

• - PX5 EVB
  

• - Rockchip sheep board
  

• - Theobroma Systems RK3368-uQ7 SoM
  

+* rk3399

• - 96boards RK3399 Ficus
  

• - 96boards Rock960
  

• - Firefly-RK3399 Board
  

• - Firefly ROC-RK3399-PC Board
  

• - FriendlyElec NanoPC-T4
  

• - FriendlyElec NanoPi M4
  

• - FriendlyARM NanoPi NEO4
  

• - Google Bob
  

• - Khadas Edge
  

• - Khadas Edge-Captain
  

• - Khadas Edge-V
  

• - Orange Pi RK3399 Board
  

• - Pine64 RockPro64
  

• - Radxa ROCK Pi 4
  

• - Rockchip RK3399 Evaluation Board
  

• - Theobroma Systems RK3399-Q7 SoM
  

+Building +--------

+TF-A +^^^^

+TF-A would require to build for ARM64 Rockchip SoCs platforms.

+To build TF-A::

•    git clone https://github.com/ARM-software/arm-trusted-firmware.git
  

•    cd arm-trusted-firmware
  

•    make realclean
  

•    make CROSS_COMPILE=aarch64-linux-gnu- PLAT=rk3399
  

+Specify the PLAT= with desired rockchip platform to build TF-A for.

+U-Boot +^^^^^^

+To build rk3328 boards::

•    export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
  

•    make evb-rk3328_defconfig
  

•    make
  

+To build rk3288 boards::

•    make evb-rk3288_defconfig
  

•    make
  

+To build rk3368 boards::

•    export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
  

•    make evb-px5_defconfig
  

•    make
  

+To build rk3399 boards::

•    export BL31=/path/to/arm-trusted-firmware/to/bl31.elf
  

•    make evb-rk3399_defconfig
  

•    make
  

+Flashing +--------

+SD Card +^^^^^^^

+All rockchip platforms, except rk3128 (which doesn't use SPL) are now +supporting single boot image using binman and pad_cat.

+To write an image that boots from an SD card (assumed to be /dev/sda)::

•    sudo dd if=u-boot-rockchip.bin of=/dev/sda seek=64
  

•    sync
  

+TODO +----

+- Add rockchip idbloader image building +- Describe steps for eMMC flashing +- Add missing SoC's with it boards list

+.. Jagan Teki jagan@amarulasolutions.com +.. Thu Oct 17 22:36:14 IST 2019