Skip to contentSkip to conversation

RK3399: Add support for Ficus board

PATCH New Ezequiel Garcia 1 participant 4 messages Aug 29, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover RK3399: Add support for Ficus board

Add support for a new RK3399-based board. The RK3399 Ficus board is an Enterprise Edition board manufactured by Vamrs Ltd., based on the Rockchip RK3399 SoC.

While here, we extend the evb_rk3399/README document with instructions for SD/MMC boot.

The devicetree file for this board has been already merged in Linux maintainer's tree:

https://kernel.googlesource.com/pub/scm/linux/kernel/git/mmind/linux-rockchip/+/v4.19-armsoc/dts64/arch/arm64/boot/dts/rockchip/rk3399-ficus.dts

Changes from v1:
* Drop CONFIG_ROCKCHIP_USB2_PHY which wasn't appropriate for this board, and also it was breaking the build.
* Tested on travis-ci.org.

Ezequiel Garcia (2):
rockchip: rk3399: add Ficus board
rockchip: rk3399: Add more instructions to the README

Randy Li (1):
arm: dts: rockchip: add some common pin-settings to rk3399

 arch/arm/dts/Makefile            |   1 +
 arch/arm/dts/rk3399-ficus.dts    | 564 +++++++++++++++++++++++++++++++
 arch/arm/dts/rk3399.dtsi         |  55 ++-
 board/rockchip/evb_rk3399/README |  57 +++-
 configs/ficus-rk3399_defconfig   |  70 ++++
 5 files changed, 739 insertions(+), 8 deletions(-)
 create mode 100644 arch/arm/dts/rk3399-ficus.dts
 create mode 100644 configs/ficus-rk3399_defconfig
Signature · 1 line
2.18.0
#1 lore raw

PATCH v2 1/3 arm: dts: rockchip: add some common pin-settings to rk3399

From: Randy Li <[email protected]>

Those pins would be used by many boards.

Commit grabbed from Linux:

commit b41023282d07b61a53e2c9b9508912b1e7ce7b4f

Author: Randy Li <[email protected]>
Date:   Thu Jun 21 21:32:10 2018 +0800

arm64: dts: rockchip: add some common pin-settings to rk3399

Those pins would be used by many boards.

---
 arch/arm/dts/rk3399.dtsi | 55 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 6 deletions(-)
arch/arm/dts/rk3399.dtsi +49 -6
index 83c257b1228b..8349451b03dc 100644
@@ -1602,19 +1602,49 @@
 			drive-strength = <12>;
 		};
 
+		pcfg_pull_none_13ma: pcfg-pull-none-13ma {
+			bias-disable;
+			drive-strength = <13>;
+		};
+
+		pcfg_pull_none_18ma: pcfg-pull-none-18ma {
+			bias-disable;
+			drive-strength = <18>;
+		};
+
+		pcfg_pull_none_20ma: pcfg-pull-none-20ma {
+			bias-disable;
+			drive-strength = <20>;
+		};
+
+		pcfg_pull_up_2ma: pcfg-pull-up-2ma {
+			bias-pull-up;
+			drive-strength = <2>;
+		};
+
 		pcfg_pull_up_8ma: pcfg-pull-up-8ma {
 			bias-pull-up;
 			drive-strength = <8>;
 		};
 
+		pcfg_pull_up_18ma: pcfg-pull-up-18ma {
+			bias-pull-up;
+			drive-strength = <18>;
+		};
+
+		pcfg_pull_up_20ma: pcfg-pull-up-20ma {
+			bias-pull-up;
+			drive-strength = <20>;
+		};
+
 		pcfg_pull_down_4ma: pcfg-pull-down-4ma {
 			bias-pull-down;
 			drive-strength = <4>;
 		};
 
-		pcfg_pull_up_2ma: pcfg-pull-up-2ma {
-			bias-pull-up;
-			drive-strength = <2>;
+		pcfg_pull_down_8ma: pcfg-pull-down-8ma {
+			bias-pull-down;
+			drive-strength = <8>;
 		};
 
 		pcfg_pull_down_12ma: pcfg-pull-down-12ma {
@@ -1622,9 +1652,22 @@
 			drive-strength = <12>;
 		};
 
-		pcfg_pull_none_13ma: pcfg-pull-none-13ma {
-			bias-disable;
-			drive-strength = <13>;
+		pcfg_pull_down_18ma: pcfg-pull-down-18ma {
+			bias-pull-down;
+			drive-strength = <18>;
+		};
+
+		pcfg_pull_down_20ma: pcfg-pull-down-20ma {
+			bias-pull-down;
+			drive-strength = <20>;
+		};
+
+		pcfg_output_high: pcfg-output-high {
+			output-high;
+		};
+
+		pcfg_output_low: pcfg-output-low {
+			output-low;
 		};
 
 		clock {
Signature · 1 line
2.18.0
#2 lore raw

PATCH v2 2/3 rockchip: rk3399: add Ficus board

In reply to Ezequiel Garcia

This commit adds support for RK3399 Ficus board,
aka ROCK960 Enterprise Edition.

Following peripherals are tested and known to work:
* Gigabit Ethernet
* USB 2.0
* MMC

---
 arch/arm/dts/Makefile            |   1 +
 arch/arm/dts/rk3399-ficus.dts    | 564 +++++++++++++++++++++++++++++++
 board/rockchip/evb_rk3399/README |   2 +
 configs/ficus-rk3399_defconfig   |  70 ++++
 4 files changed, 637 insertions(+)
 create mode 100644 arch/arm/dts/rk3399-ficus.dts
 create mode 100644 configs/ficus-rk3399_defconfig
arch/arm/dts/Makefile +1 -0
index ebfa2272627b..9aaee42c1521 100644
@@ -47,6 +47,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3368-geekbox.dtb \
 	rk3368-px5-evb.dtb \
 	rk3399-evb.dtb \
+	rk3399-ficus.dtb \
 	rk3399-firefly.dtb \
 	rk3399-puma-ddr1333.dtb \
 	rk3399-puma-ddr1600.dtb \
arch/arm/dts/rk3399-ficus.dts new file +564 -0

564 lines not on this page · raw message

board/rockchip/evb_rk3399/README +2 -0
index 832146704627..d08e2ea13147 100644
@@ -57,6 +57,8 @@ Compile the U-Boot
   > make evb-rk3399_defconfig
   for firefly-rk3399, use below instead:
   > make firefly-rk3399_defconfig
+  for ficus-rk3399, use below instead:
+  > make ficus-rk3399_defconfig
   > make
   > make u-boot.itb
 
configs/ficus-rk3399_defconfig new file +70 -0

70 lines not on this page · raw message

Signature · 1 line
2.18.0
#3 lore raw

PATCH v2 3/3 rockchip: rk3399: Add more instructions to the README

In reply to Ezequiel Garcia

This commit adds a content section and also instructions on how to create a bootable SD/MMC device for RK3399 boards.

---
 board/rockchip/evb_rk3399/README | 55 ++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)
board/rockchip/evb_rk3399/README +53 -2
index d08e2ea13147..4d283dc31d48 100644
@@ -1,3 +1,21 @@
+Contents
+========
+
+1. Introduction
+2. Get the Source and prebuild binary
+3. Compile the ATF
+4. Compile the U-Boot
+5. Compile the rkdeveloptool
+6. Package the image
+   6.1. Package the image for U-Boot SPL(option 1)
+   6.2. Package the image for Rockchip miniloader(option 2)
+7. Bootloader storage options
+8. Flash the image to eMMC
+   8.1. Flash the image with U-Boot SPL(option 1)
+   8.2. Flash the image with Rockchip miniloader(option 2)
+9. Create a bootable SD/MMC
+10. And that is it
+
 Introduction
 ============
 
@@ -97,6 +115,12 @@ Package the image for Rockchip miniloader(option 2)
 
   Get trust.img and uboot.img in this step.
 
+Bootloader storage options
+==========================
+
+There are a few different storage options for the bootloader.
+This document explores two of these: eMMC and removable SD/MMC.
+
 Flash the image to eMMC
 =======================
 
@@ -117,6 +141,33 @@ Power on(or reset with RESET KEY) with MASKROM KEY preesed, and then:
   > rkdeveloptool wl 0x6000 u-boot/trust.img
   > rkdeveloptool rd
 
+Create a bootable SD/MMC
+========================
+
+The idbspl.img contains the first stage, and the u-boot.img the second stage.
+As explained in the Rockchip partition table reference [2], the first stage
+(aka loader1) start sector is 64, and the second stage start sector is 16384.
+
+Each sector is 512 bytes, which means the first stage offset is 32 KiB,
+and the second stage offset is 8 MiB.
+
+Note: the second stage location is actually not as per the spec,
+but defined by the SPL. Mainline SPL defines an 8 MiB offset for the second
+stage.
+
+Assuming the SD card is exposed by device /dev/mmcblk0, the commands
+to write the two stages are:
+
+  > dd if=idbspl.img of=/dev/mmcblk0 bs=1k seek=32
+  > dd if=u-boot.itb of=/dev/mmcblk0 bs=1k seek=8192
+
+Setting up the kernel and rootfs is beyond the scope of this document.
+
+And that is it
+==============
+
 You should be able to get U-Boot log in console/UART2(baurdrate 1500000)
-For more detail, please reference to:
-http://opensource.rock-chips.com/wiki_Boot_option
+For more detail, please reference [2].
+
+[1] http://opensource.rock-chips.com/wiki_Partitions
+[2] http://opensource.rock-chips.com/wiki_Boot_option
Signature · 1 line
2.18.0