Skip to contentSkip to conversation

revive Theobroma-Systems puma board

PATCH Superseded Heiko Stuebner 3 participants 14 messages Jun 3, 2020 – Jun 4, 2020 Arm (32-bit)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover revive Theobroma-Systems puma board

From: Heiko Stuebner <[email protected]>

This revives the puma boards and makes them boot again with mainline uboot.

Main points may be going back to the general fit script and cleaning up the devicetree situation that got completely broken by the recent sync from mainline linux.

Heiko Stuebner (6):
arm64: dts: rk3399-puma: fix gpio levels for gmac reset pin
board: puma: fix indentation for -u-boot.dtsi
board: puma: reorganize devicetrees to actually work and match
upstream
board: puma: fix indentation of misc_init_r
board: puma: allow building with TPL as well
board: puma: remove separate fit generator

 arch/arm/dts/Makefile                         |   4 +-
 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi  |   4 -
 arch/arm/dts/rk3399-puma-ddr1333.dts          |   8 -
 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi  |   4 -
 arch/arm/dts/rk3399-puma-ddr1600.dts          |   9 -
 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi  |   4 -
 arch/arm/dts/rk3399-puma-ddr1866.dts          |   8 -
 arch/arm/dts/rk3399-puma-haikou.dts           | 272 ++++++++++++++++++
 arch/arm/dts/rk3399-puma-u-boot.dtsi          |  43 +--
 arch/arm/dts/rk3399-puma.dtsi                 |   2 +-
 board/theobroma-systems/puma_rk3399/Kconfig   |  15 +
 .../puma_rk3399/fit_spl_atf.sh                |  94 ------
 .../puma_rk3399/puma-rk3399.c                 |  30 +-
 configs/puma-rk3399_defconfig                 |   3 +-
 14 files changed, 334 insertions(+), 166 deletions(-)
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333.dts
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600.dts
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866.dts
 create mode 100644 arch/arm/dts/rk3399-puma-haikou.dts
 delete mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/6 arm64: dts: rk3399-puma: fix gpio levels for gmac reset pin

From: Heiko Stuebner <[email protected]>

The gmac reset has opposite values for the gpio declaration and the separate reset-active, bring this in line to make u-boot also find the ethernet-phy.

This mimics the upstream Linus commit found on
https://lore.kernel.org/r/20200603132836.362519-1-heiko at sntech.de

---
 arch/arm/dts/rk3399-puma.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/rk3399-puma.dtsi +1 -1
index 07694b196f..531520e771 100644
@@ -157,7 +157,7 @@
 	phy-mode = "rgmii";
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii_pins>;
-	snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
+	snps,reset-gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_LOW>;
 	snps,reset-active-low;
 	snps,reset-delays-us = <0 10000 50000>;
 	tx_delay = <0x10>;
Signature · 1 line
2.25.1
#2 lore raw

PATCH 1/6 arm64: dts: rk3399-puma: fix gpio levels for gmac reset pin

Quoted 14 lines · Heiko Stuebner

From: Heiko Stuebner <[email protected]>

The gmac reset has opposite values for the gpio declaration and the separate reset-active, bring this in line to make u-boot also find the ethernet-phy.

This mimics the upstream Linus commit found on
https://lore.kernel.org/r/20200603132836.362519-1-heiko at sntech.de

#3 lore raw

PATCH 2/6 board: puma: fix indentation for -u-boot.dtsi

In reply to Heiko Stuebner

From: Heiko Stuebner <[email protected]>

Tabs not spaces, so transform it to the common styling.

---
 arch/arm/dts/rk3399-puma-u-boot.dtsi | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)
arch/arm/dts/rk3399-puma-u-boot.dtsi +15 -15
index 3ad1139833..ddb5fa6e76 100644
@@ -2,24 +2,24 @@
 
 #include "rk3399-u-boot.dtsi"
 / {
-       config {
-               u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */
-               u-boot,mmc-env-offset = <0x4000>;      /* @  16KB */
-               u-boot,efi-partition-entries-offset = <0x200000>; /* 2MB */
-               u-boot,boot-led = "module_led";
-               sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>;
-       };
+	config {
+		u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */
+		u-boot,mmc-env-offset = <0x4000>;      /* @  16KB */
+		u-boot,efi-partition-entries-offset = <0x200000>; /* 2MB */
+		u-boot,boot-led = "module_led";
+		sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>;
+	};
 
-       chosen {
-               stdout-path = "serial0:115200n8";
-               u-boot,spl-boot-order = \
+	chosen {
+		stdout-path = "serial0:115200n8";
+		u-boot,spl-boot-order = \
 			"same-as-spl", &norflash, &sdhci, &sdmmc;
-       };
+	};
 
-       aliases {
-               spi0 = &spi1;
-               spi1 = &spi5;
-       };
+	aliases {
+		spi0 = &spi1;
+		spi1 = &spi5;
+	};
 
 	/*
 	 * The Qseven BIOS_DISABLE signal on the RK3399-Q7 keeps the on-module
Signature · 1 line
2.25.1
#5 lore raw

PATCH 3/6 board: puma: reorganize devicetrees to actually work and match upstream

In reply to Heiko Stuebner

From: Heiko Stuebner <[email protected]>

So far the puma dts files only just included the main puma dtsi without handling the actual baseboard and rk3399-puma.dtsi was very much detached from the variant in the mainline Linux kernel.

Recent changes resulted in a strange situation with nonworking puma boards.

Commit ab800e5a6f28 ("arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi") moved the sdram include from rk3399-puma-ddrX.dts to new files rk3399-puma-ddrx-u-boot.dtsi which were never included anywhere though.

Commit 167efc2c7a46 ("arm64: dts: rk3399: Sync v5.7-rc1 from Linux") replaced the rk3399-puma.dtsi nearly completely, but in the kernel it definitly depends on a baseboard dts to actually enable peripherals like sd-slot, uarts, etc.

So to untagle this and bring the whole thing more in line with mainline Linux, bring the rk3399-puma-haikou.dts over as well, drop the separate DDR-option devicetrees and instead replace them with a puma Kconfig option to select and include the needed DDR variant.

---
 arch/arm/dts/Makefile                        |   4 +-
 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi |   4 -
 arch/arm/dts/rk3399-puma-ddr1333.dts         |   8 -
 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi |   4 -
 arch/arm/dts/rk3399-puma-ddr1600.dts         |   9 -
 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi |   4 -
 arch/arm/dts/rk3399-puma-ddr1866.dts         |   8 -
 arch/arm/dts/rk3399-puma-haikou.dts          | 272 +++++++++++++++++++
 arch/arm/dts/rk3399-puma-u-boot.dtsi         |  11 +
 board/theobroma-systems/puma_rk3399/Kconfig  |  15 +
 configs/puma-rk3399_defconfig                |   2 +-
 11 files changed, 300 insertions(+), 41 deletions(-)
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333.dts
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600.dts
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi
 delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866.dts
 create mode 100644 arch/arm/dts/rk3399-puma-haikou.dts
arch/arm/dts/Makefile +1 -3
index c6af87cf5e..a66bdb439d 100644
@@ -130,9 +130,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
 	rk3399-nanopi-neo4.dtb \
 	rk3399-orangepi.dtb \
 	rk3399-pinebook-pro.dtb \
-	rk3399-puma-ddr1333.dtb \
-	rk3399-puma-ddr1600.dtb \
-	rk3399-puma-ddr1866.dtb \
+	rk3399-puma-haikou.dtb \
 	rk3399-roc-pc.dtb \
 	rk3399-roc-pc-mezzanine.dtb \
 	rk3399-rock-pi-4.dtb \
arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi deleted +0 -4
deleted file mode 100644
index 39d3927f49..0000000000
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include "rk3399-puma-u-boot.dtsi"
-#include "rk3399-sdram-ddr3-1333.dtsi"
arch/arm/dts/rk3399-puma-ddr1333.dts deleted +0 -8
deleted file mode 100644
index 80f27699f4..0000000000
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- */
-
-/dts-v1/;
-
-#include "rk3399-puma.dtsi"
arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi deleted +0 -4
deleted file mode 100644
index be58311dc4..0000000000
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include "rk3399-puma-u-boot.dtsi"
-#include "rk3399-sdram-ddr3-1600.dtsi"
arch/arm/dts/rk3399-puma-ddr1600.dts deleted +0 -9
deleted file mode 100644
index cb76b0165c..0000000000
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- */
-
-/dts-v1/;
-
-#include "rk3399-puma.dtsi"
-#include "rk3399-u-boot.dtsi"
arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi deleted +0 -4
deleted file mode 100644
index 48da076329..0000000000
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include "rk3399-puma-u-boot.dtsi"
-#include "rk3399-sdram-ddr3-1866.dtsi"
arch/arm/dts/rk3399-puma-ddr1866.dts deleted +0 -8
deleted file mode 100644
index 80f27699f4..0000000000
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR X11
-/*
- * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- */
-
-/dts-v1/;
-
-#include "rk3399-puma.dtsi"
arch/arm/dts/rk3399-puma-haikou.dts new file +272 -0

272 lines not on this page · raw message

arch/arm/dts/rk3399-puma-u-boot.dtsi +11 -0
index ddb5fa6e76..29846c4b00 100644
@@ -1,6 +1,17 @@
 // SPDX-License-Identifier: GPL-2.0+
 
 #include "rk3399-u-boot.dtsi"
+
+#ifdef CONFIG_TARGET_PUMA_RK3399_RAM_DDR3_1333
+#include "rk3399-sdram-ddr3-1333.dtsi"
+#endif
+#ifdef CONFIG_TARGET_PUMA_RK3399_RAM_DDR3_1600
+#include "rk3399-sdram-ddr3-1600.dtsi"
+#endif
+#ifdef CONFIG_TARGET_PUMA_RK3399_RAM_DDR3_1866
+#include "rk3399-sdram-ddr3-1866.dtsi"
+#endif
+
 / {
 	config {
 		u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */
board/theobroma-systems/puma_rk3399/Kconfig +15 -0
index 9e23252754..e82623a170 100644
@@ -18,4 +18,19 @@ config ENV_SIZE
 config ENV_OFFSET
 	default 0x3fc000 if ENV_IS_IN_SPI_FLASH
 
+choice
+	prompt "Theobroma Systems RK3399-Q7 DDR Option"
+	default TARGET_PUMA_RK3399_RAM_DDR3_1333
+
+config TARGET_PUMA_RK3399_RAM_DDR3_1333
+	bool "DDR3-1333MHz"
+
+config TARGET_PUMA_RK3399_RAM_DDR3_1600
+	bool "DDR3-1600MHz"
+
+config TARGET_PUMA_RK3399_RAM_DDR3_1866
+	bool "DDR3-1866MHz"
+
+endchoice
+
 endif
configs/puma-rk3399_defconfig +1 -1
index a148832b83..47a60930b6 100644
@@ -39,7 +39,7 @@ CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_LIVE=y
-CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-ddr1600"
+CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-haikou"
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Signature · 1 line
2.25.1
#6 lore raw

PATCH 3/6 board: puma: reorganize devicetrees to actually work and match upstream

Quoted 20 lines · Heiko Stuebner

From: Heiko Stuebner <[email protected]>

So far the puma dts files only just included the main puma dtsi without handling the actual baseboard and rk3399-puma.dtsi was very much detached from the variant in the mainline Linux kernel.

Recent changes resulted in a strange situation with nonworking puma boards.

Commit ab800e5a6f28 ("arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi") moved the sdram include from rk3399-puma-ddrX.dts to new files rk3399-puma-ddrx-u-boot.dtsi which were never included anywhere though.

Commit 167efc2c7a46 ("arm64: dts: rk3399: Sync v5.7-rc1 from Linux") replaced the rk3399-puma.dtsi nearly completely, but in the kernel it definitly depends on a baseboard dts to actually enable peripherals like sd-slot, uarts, etc.

Quoted 6 lines

So to untagle this and bring the whole thing more in line with mainline Linux, bring the rk3399-puma-haikou.dts over as well, drop the separate DDR-option devicetrees and instead replace them with a puma Kconfig option to select and include the needed DDR variant.

#7 lore raw

PATCH 4/6 board: puma: fix indentation of misc_init_r

In reply to Heiko Stuebner

From: Heiko Stuebner <[email protected]>

The commit moving puma to the generic cpuid/macaddr helpers used 7 spaces as indentation, so correct that by moving to the required tabs.

Fixes fa177ff0208b ("board: puma: Use rockchip_* helpers to setup cpuid and macaddr")
---
 .../puma_rk3399/puma-rk3399.c                 | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)
board/theobroma-systems/puma_rk3399/puma-rk3399.c +16 -16
index f7f08ae617..65bb2ad6f2 100644
@@ -114,22 +114,22 @@ static int setup_boottargets(void)
 
 int misc_init_r(void)
 {
-       const u32 cpuid_offset = 0x7;
-       const u32 cpuid_length = 0x10;
-       u8 cpuid[cpuid_length];
-       int ret;
-
-       ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid);
-       if (ret)
-               return ret;
-
-       ret = rockchip_cpuid_set(cpuid, cpuid_length);
-       if (ret)
-               return ret;
-
-       ret = rockchip_setup_macaddr();
-       if (ret)
-               return ret;
+	const u32 cpuid_offset = 0x7;
+	const u32 cpuid_length = 0x10;
+	u8 cpuid[cpuid_length];
+	int ret;
+
+	ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid);
+	if (ret)
+		return ret;
+
+	ret = rockchip_cpuid_set(cpuid, cpuid_length);
+	if (ret)
+		return ret;
+
+	ret = rockchip_setup_macaddr();
+	if (ret)
+		return ret;
 
 	setup_iodomain();
 	setup_boottargets();
Signature · 1 line
2.25.1
#9 lore raw

PATCH 5/6 board: puma: allow building with TPL as well

In reply to Heiko Stuebner

From: Heiko Stuebner <[email protected]>

Right now puma-u-boot can fit everything into SPL but that may overflow easily for example with more extensive debug options.

By adding CONFIG_TPL and removing the CONFIG_SPL_TEXT_BASE it is easy to enable a TPL build as well. Only obstacle is the usb-specific handling for the puma regulator, so make this conditional on actual usb options being enabled in SPL and U-Boot proper.

---
 board/theobroma-systems/puma_rk3399/puma-rk3399.c | 4 ++++
 1 file changed, 4 insertions(+)
board/theobroma-systems/puma_rk3399/puma-rk3399.c +4 -0
index 65bb2ad6f2..31ac27c6f5 100644
@@ -153,6 +153,9 @@ void get_board_serial(struct tag_serialnr *serialnr)
 }
 #endif
 
+#if !defined(CONFIG_TPL_BUILD) && \
+    (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_HOST_SUPPORT)) || \
+    (!defined(CONFIG_SPL_BUILD) && defined(CONFIG_USB))
 /**
  * Switch power at an external regulator (for our root hub).
  *
@@ -219,3 +222,4 @@ void usb_hub_reset_devices(struct usb_hub_device *hub, int port)
 	 */
 	board_usb_port_power_set(ctrl, port, true);
 }
+#endif
Signature · 1 line
2.25.1
#10 lore raw

PATCH 5/6 board: puma: allow building with TPL as well

Quoted 9 lines · Heiko Stuebner

From: Heiko Stuebner <[email protected]>

Right now puma-u-boot can fit everything into SPL but that may overflow easily for example with more extensive debug options.

Quoted 6 lines

By adding CONFIG_TPL and removing the CONFIG_SPL_TEXT_BASE it is easy to enable a TPL build as well. Only obstacle is the usb-specific handling for the puma regulator, so make this conditional on actual usb options being enabled in SPL and U-Boot proper.

#11 lore raw

PATCH 6/6 board: puma: remove separate fit generator

In reply to Heiko Stuebner

From: Heiko Stuebner <[email protected]>

The introduction of the puma-specific generator was mainly a way to split the pmu firmware from the ATF binary and not having to distribute that 4GB (sparse) image that was created before moving to the bl31.elf as base.

Looking at the publically available repository for that separate pmu firmware

    https://git.theobroma-systems.com/rk3399-cortex-m0.git/

there is also no activity for 3 years and apart from some build customizations no other changes were done.

And even then, if changes need to be made, this can very well also happen in the atf context itself, so there is no real need to diverge from the established build procedure and we can just go back to using the main make_fit_atf.py script.

---
 .../puma_rk3399/fit_spl_atf.sh                | 94 -------------------
 configs/puma-rk3399_defconfig                 |  1 -
 2 files changed, 95 deletions(-)
 delete mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh
board/theobroma-systems/puma_rk3399/fit_spl_atf.sh deleted +0 -94
deleted file mode 100755
index c9396577a9..0000000000
@@ -1,94 +0,0 @@
-#!/bin/sh
-#
-# SPDX-License-Identifier:      GPL-2.0+
-#
-# Copyright (C) 2019 Jagan Teki <[email protected]>
-#
-# Based on the board/sunxi/mksunxi_fit_atf.sh
-#
-# Script to generate FIT image source for 64-bit puma boards with
-# U-Boot proper, ATF, PMU firmware and devicetree.
-#
-# usage: $0 <dt_name> [<dt_name> [<dt_name] ...]
-
-[ -z "$BL31" ] && BL31="bl31.bin"
-
-if [ ! -f $BL31 ]; then
-	echo "WARNING: BL31 file $BL31 NOT found, resulting binary is non-functional" >&2
-	echo "Please read Building section in doc/README.rockchip" >&2
-	BL31=/dev/null
-fi
-
-[ -z "$PMUM0" ] && PMUM0="rk3399m0.bin"
-
-if [ ! -f $PMUM0 ]; then
-	echo "WARNING: PMUM0 file $PMUM0 NOT found, resulting binary is non-functional" >&2
-	echo "Please read Building section in doc/README.rockchip" >&2
-	PMUM0=/dev/null
-fi
-
-cat << __HEADER_EOF
-/* SPDX-License-Identifier: GPL-2.0+ OR X11 */
-/*
- * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH
- *
- * Minimal dts for a SPL FIT image payload.
- */
-
-/dts-v1/;
-
-/ {
-	description = "FIT image with U-Boot proper, ATF bl31, M0 Firmware, DTB";
-	#address-cells = <1>;
-
-	images {
-		uboot {
-			description = "U-Boot (64-bit)";
-			data = /incbin/("u-boot-nodtb.bin");
-			type = "standalone";
-			arch = "arm64";
-			compression = "none";
-			load = <0x4a000000>;
-		};
-		atf {
-			description = "ARM Trusted Firmware";
-			data = /incbin/("$BL31");
-			type = "firmware";
-			arch = "arm64";
-			os = "arm-trusted-firmware";
-			compression = "none";
-			load = <0x1000>;
-			entry = <0x1000>;
-		};
-		pmu {
-		        description = "Cortex-M0 firmware";
-			data = /incbin/("$PMUM0");
-			type = "pmu-firmware";
-			compression = "none";
-			load = <0x180000>;
-                };
-		fdt {
-			description = "RK3399-Q7 (Puma) flat device-tree";
-			data = /incbin/("$1");
-			type = "flat_dt";
-			compression = "none";
-		};
-__HEADER_EOF
-
-cat << __CONF_HEADER_EOF
-	};
-
-	configurations {
-		default = "conf";
-		conf {
-			description = "Theobroma Systems RK3399-Q7 (Puma) SoM";
-			firmware = "atf";
-			loadables = "uboot", "pmu";
-			fdt = "fdt";
-		};
-__CONF_HEADER_EOF
-
-cat << __ITS_EOF
-	};
-};
-__ITS_EOF
configs/puma-rk3399_defconfig +0 -1
index 47a60930b6..31d4eb3471 100644
@@ -14,7 +14,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_TEXT_BASE=0xff8c2000
 CONFIG_DEBUG_UART=y
-CONFIG_SPL_FIT_GENERATOR="board/theobroma-systems/puma_rk3399/fit_spl_atf.sh"
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb"
 CONFIG_MISC_INIT_R=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
Signature · 1 line
2.25.1
#12 lore raw

PATCH 6/6 board: puma: remove separate fit generator

Quoted 17 lines · Heiko Stuebner

From: Heiko Stuebner <[email protected]>

The introduction of the puma-specific generator was mainly a way to split the pmu firmware from the ATF binary and not having to distribute that 4GB (sparse) image that was created before moving to the bl31.elf as base.

Looking at the publically available repository for that separate pmu firmware
https://git.theobroma-systems.com/rk3399-cortex-m0.git/
there is also no activity for 3 years and apart from some build customizations no other changes were done.

Quoted 6 lines

And even then, if changes need to be made, this can very well also happen in the atf context itself, so there is no real need to diverge from the established build procedure and we can just go back to using the main make_fit_atf.py script.

#13 lore raw

cover revive Theobroma-Systems puma board

In reply to Heiko Stuebner

Hi Heiko,

??? Could you use 'rockchip' instead of 'board' as prefix in the subject?

Thanks,

- Kever

Quoted 43 lines · Heiko Stuebner

From: Heiko Stuebner <[email protected]>

This revives the puma boards and makes them boot again with mainline uboot.

Main points may be going back to the general fit script and cleaning up the devicetree situation that got completely broken by the recent sync from mainline linux.

Heiko Stuebner (6):
arm64: dts: rk3399-puma: fix gpio levels for gmac reset pin
board: puma: fix indentation for -u-boot.dtsi
board: puma: reorganize devicetrees to actually work and match
upstream
board: puma: fix indentation of misc_init_r
board: puma: allow building with TPL as well
board: puma: remove separate fit generator

  arch/arm/dts/Makefile                         |   4 +-
  arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi  |   4 -
  arch/arm/dts/rk3399-puma-ddr1333.dts          |   8 -
  arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi  |   4 -
  arch/arm/dts/rk3399-puma-ddr1600.dts          |   9 -
  arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi  |   4 -
  arch/arm/dts/rk3399-puma-ddr1866.dts          |   8 -
  arch/arm/dts/rk3399-puma-haikou.dts           | 272 ++++++++++++++++++
  arch/arm/dts/rk3399-puma-u-boot.dtsi          |  43 +--
  arch/arm/dts/rk3399-puma.dtsi                 |   2 +-
  board/theobroma-systems/puma_rk3399/Kconfig   |  15 +
  .../puma_rk3399/fit_spl_atf.sh                |  94 ------
  .../puma_rk3399/puma-rk3399.c                 |  30 +-
  configs/puma-rk3399_defconfig                 |   3 +-
  14 files changed, 334 insertions(+), 166 deletions(-)

delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3399-puma-ddr1333.dts delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3399-puma-ddr1600.dts delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3399-puma-ddr1866.dts create mode 100644 arch/arm/dts/rk3399-puma-haikou.dts delete mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh