Skip to contentSkip to conversation

rockchip: Add support for rv1126 based Sonoff iHost Gateway

PATCH Superseded Tim Lunn 2 participants 8 messages Jan 22, 2024 – Jan 23, 2024

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Tim Lunn

author
#0 lore raw

cover rockchip: Add support for rv1126 based Sonoff iHost Gateway

Sonoff iHost is gateway device designed to provide a Smart Home Hub, it is based on Rockchip RV1126. It features Wifi, BT and Zigbee radios as required by many smart home devices.

Features:
- Rockchip RV1126
- 4GB DDR4
- 8GB eMMC
- microSD slot
- RMII Ethernet PHY
- 1x USB 2.0 Host
- 1x USB 2.0 OTG
- Realtek RTL8723DS WiFi/BT
- EFR32MG21 Silabs Zigbee radio
- Speaker/Microphone

Sync rv1126 dts from linux v6.8-rc1, add support for ddr4 ram and add board support for the Sonoff ihost.

Tim Lunn (5):
arm: dts: rockchip: Sync rv1126 dts from linux 6.8-rc1
ram: rockchip: Add rv1126 ddr4 support
board: rockchip: Add Sonoff iHost board
rockchip: rv1126: select SPL_OPTEE_IMAGE
rockchip: rv1126: Move RAM disk address

 arch/arm/dts/rv1126-edgeble-neu2-io.dts       |  70 +++
 arch/arm/dts/rv1126-edgeble-neu2.dtsi         |  27 +-
 arch/arm/dts/rv1126-pinctrl.dtsi              | 130 ++++++
 arch/arm/dts/rv1126-sonoff-ihost-u-boot.dtsi  |  13 +
 arch/arm/dts/rv1126-sonoff-ihost.dts          |  29 ++
 arch/arm/dts/rv1126-sonoff-ihost.dtsi         | 404 ++++++++++++++++++
 arch/arm/dts/rv1126.dtsi                      | 185 ++++++++
 arch/arm/mach-rockchip/Kconfig                |   1 +
 arch/arm/mach-rockchip/rv1126/Kconfig         |   8 +
 board/itead/sonoff-ihost/Kconfig              |  16 +
 board/itead/sonoff-ihost/MAINTAINERS          |   6 +
 configs/sonoff-ihost-rv1126_defconfig         |  60 +++
 .../sdram-rv1126-ddr4-detect-1056.inc         |  75 ++++
 .../rockchip/sdram-rv1126-ddr4-detect-328.inc |  75 ++++
 .../rockchip/sdram-rv1126-ddr4-detect-396.inc |  75 ++++
 .../rockchip/sdram-rv1126-ddr4-detect-528.inc |  75 ++++
 .../rockchip/sdram-rv1126-ddr4-detect-664.inc |  75 ++++
 .../rockchip/sdram-rv1126-ddr4-detect-784.inc |  75 ++++
 .../rockchip/sdram-rv1126-ddr4-detect-924.inc |  75 ++++
 drivers/ram/rockchip/sdram_rv1126.c           |   8 +
 include/configs/rv1126_common.h               |   2 +-
 include/configs/sonoff-ihost.h                |  18 +
 22 files changed, 1491 insertions(+), 11 deletions(-)
 create mode 100644 arch/arm/dts/rv1126-sonoff-ihost-u-boot.dtsi
 create mode 100644 arch/arm/dts/rv1126-sonoff-ihost.dts
 create mode 100644 arch/arm/dts/rv1126-sonoff-ihost.dtsi
 create mode 100644 board/itead/sonoff-ihost/Kconfig
 create mode 100644 board/itead/sonoff-ihost/MAINTAINERS
 create mode 100644 configs/sonoff-ihost-rv1126_defconfig
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-1056.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-328.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-396.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-528.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-664.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-784.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-924.inc
 create mode 100644 include/configs/sonoff-ihost.h
Signature · 1 line
2.40.1
author
#1 lore raw

PATCH 1/5 arm: dts: rockchip: Sync rv1126 dts from linux 6.8-rc1

Sync linux dts files for rv1126 boards from linux v6.8-rc1 tag. Includes the newly added dts for Sonoff iHost.

---

 arch/arm/dts/rv1126-edgeble-neu2-io.dts |  70 ++++
 arch/arm/dts/rv1126-edgeble-neu2.dtsi   |  27 +-
 arch/arm/dts/rv1126-pinctrl.dtsi        | 130 ++++++++
 arch/arm/dts/rv1126-sonoff-ihost.dts    |  29 ++
 arch/arm/dts/rv1126-sonoff-ihost.dtsi   | 404 ++++++++++++++++++++++++
 arch/arm/dts/rv1126.dtsi                | 185 +++++++++++
 6 files changed, 835 insertions(+), 10 deletions(-)
 create mode 100644 arch/arm/dts/rv1126-sonoff-ihost.dts
 create mode 100644 arch/arm/dts/rv1126-sonoff-ihost.dtsi
arch/arm/dts/rv1126-edgeble-neu2-io.dts +70 -0
index dded0a12f0..0c2396b8f8 100644
@@ -20,6 +20,76 @@
 	chosen {
 		stdout-path = "serial2:1500000n8";
 	};
+
+	vcc12v_dcin: vcc12v-dcin-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc12v_dcin";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
+	vcc5v0_sys: vcc5v0-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	v3v3_sys: v3v3-sys-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "v3v3_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc5v0_sys>;
+	};
+};
+
+&gmac {
+	assigned-clocks = <&cru CLK_GMAC_SRC>, <&cru CLK_GMAC_TX_RX>,
+			  <&cru CLK_GMAC_ETHERNET_OUT>;
+	assigned-clock-parents = <&cru CLK_GMAC_SRC_M1>, <&cru RGMII_MODE_CLK>;
+	assigned-clock-rates = <125000000>, <0>, <25000000>;
+	clock_in_out = "input";
+	phy-handle = <&phy>;
+	phy-mode = "rgmii";
+	phy-supply = <&vcc_3v3>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&rgmiim1_miim &rgmiim1_bus2 &rgmiim1_bus4 &clk_out_ethernetm1_pins>;
+	tx_delay = <0x2a>;
+	rx_delay = <0x1a>;
+	status = "okay";
+};
+
+&mdio {
+	phy: ethernet-phy@0 {
+		compatible = "ethernet-phy-id001c.c916",
+			     "ethernet-phy-ieee802.3-c22";
+		reg = <0x0>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&eth_phy_rst>;
+		reset-assert-us = <20000>;
+		reset-deassert-us = <100000>;
+		reset-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;
+	};
+};
+
+&pinctrl {
+	ethernet {
+		eth_phy_rst: eth-phy-rst {
+			rockchip,pins = <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+};
+
+&pwm11 {
+	status = "okay";
 };
 
 &sdmmc {
arch/arm/dts/rv1126-edgeble-neu2.dtsi +17 -10
index cc64ba4be3..7ea8d7d16f 100644
@@ -11,15 +11,6 @@
 		mmc0 = &emmc;
 	};
 
-	vcc5v0_sys: vcc5v0-sys-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_sys";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-	};
-
 	vccio_flash: vccio-flash-regulator {
 		compatible = "regulator-fixed";
 		enable-active-high;
@@ -52,7 +43,7 @@
 	bus-width = <8>;
 	non-removable;
 	pinctrl-names = "default";
-	pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk &emmc_rstnout>;
+	pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk>;
 	rockchip,default-sample-phase = <90>;
 	vmmc-supply = <&vcc_3v3>;
 	vqmmc-supply = <&vccio_flash>;
@@ -301,6 +292,22 @@
 	status = "okay";
 };
 
+&sfc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&fspi_pins>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <50000000>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <1>;
+	};
+};
+
 &sdio {
 	bus-width = <4>;
 	cap-sd-highspeed;
arch/arm/dts/rv1126-pinctrl.dtsi +130 -0

165 lines not on this page · raw message

arch/arm/dts/rv1126-sonoff-ihost.dts new file +29 -0
new file mode 100644
index 0000000000..77386a48d8
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 Rockchip Electronics Co., Ltd.
+ */
+
+/dts-v1/;
+#include "rv1126.dtsi"
+#include "rv1126-sonoff-ihost.dtsi"
+
+/ {
+	model = "Sonoff iHost 4G";
+	compatible = "itead,sonoff-ihost", "rockchip,rv1126";
+};
+
+&cpu0 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu1 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu2 {
+	cpu-supply = <&vdd_arm>;
+};
+
+&cpu3 {
+	cpu-supply = <&vdd_arm>;
+};
arch/arm/dts/rv1126-sonoff-ihost.dtsi new file +404 -0

404 lines not on this page · raw message

arch/arm/dts/rv1126.dtsi +185 -0

239 lines not on this page · raw message

Signature · 1 line
2.40.1
author
#2 lore raw

PATCH 2/5 ram: rockchip: Add rv1126 ddr4 support

In reply to Tim Lunn

Add support for ddr4 on rv1126. Timing detection files are imported from downstream Rockchip BSP u-boot. Allow selecting ddr4 ram with define CONFIG_RAM_ROCKCHIP_DDR4.

---

 .../sdram-rv1126-ddr4-detect-1056.inc         | 75 +++++++++++++++++++
 .../rockchip/sdram-rv1126-ddr4-detect-328.inc | 75 +++++++++++++++++++
 .../rockchip/sdram-rv1126-ddr4-detect-396.inc | 75 +++++++++++++++++++
 .../rockchip/sdram-rv1126-ddr4-detect-528.inc | 75 +++++++++++++++++++
 .../rockchip/sdram-rv1126-ddr4-detect-664.inc | 75 +++++++++++++++++++
 .../rockchip/sdram-rv1126-ddr4-detect-784.inc | 75 +++++++++++++++++++
 .../rockchip/sdram-rv1126-ddr4-detect-924.inc | 75 +++++++++++++++++++
 drivers/ram/rockchip/sdram_rv1126.c           |  8 ++
 8 files changed, 533 insertions(+)
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-1056.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-328.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-396.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-528.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-664.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-784.inc
 create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr4-detect-924.inc
drivers/ram/rockchip/sdram-rv1126-ddr4-detect-1056.inc new file +75 -0
new file mode 100644
index 0000000000..295b0871e0
@@ -0,0 +1,75 @@
+{
+	{
+		{
+			.rank = 0x1,
+			.col = 0xA,
+			.bk = 0x2,
+			.bw = 0x1,
+			.dbw = 0x0,
+			.row_3_4 = 0x0,
+			.cs0_row = 0x11,
+			.cs1_row = 0x0,
+			.cs0_high16bit_row = 0x11,
+			.cs1_high16bit_row = 0x0,
+			.ddrconfig = 0
+		},
+		{
+			{0x561d1219},
+			{0x10030703},
+			{0x00000002},
+			{0x00001111},
+			{0x0000000c},
+			{0x0000034b},
+			0x000000ff
+		}
+	},
+	{
+		.ddr_freq = 1056,	/* clock rate(MHz) */
+		.dramtype = DDR4,
+		.num_channels = 1,
+		.stride = 0,
+		.odt = 1
+	},
+	{
+		{
+			{0x00000000, 0x43041010},	/* MSTR */
+			{0x00000064, 0x008000b9},	/* RFSHTMG */
+			{0x000000d0, 0x00020103},	/* INIT0 */
+			{0x000000d4, 0x00690000},	/* INIT1 */
+			{0x000000d8, 0x00000100},	/* INIT2 */
+			{0x000000dc, 0x07340401},	/* INIT3 */
+			{0x000000e0, 0x00100000},	/* INIT4 */
+			{0x000000e4, 0x00110000},	/* INIT5 */
+			{0x000000e8, 0x00000420},	/* INIT6 */
+			{0x000000ec, 0x00000800},	/* INIT7 */
+			{0x000000f4, 0x000f011f},	/* RANKCTL */
+			{0x00000100, 0x0f102411},	/* DRAMTMG0 */
+			{0x00000104, 0x0004041a},	/* DRAMTMG1 */
+			{0x00000108, 0x0608060d},	/* DRAMTMG2 */
+			{0x0000010c, 0x0040400c},	/* DRAMTMG3 */
+			{0x00000110, 0x08030409},	/* DRAMTMG4 */
+			{0x00000114, 0x06060403},	/* DRAMTMG5 */
+			{0x00000120, 0x07070d07},	/* DRAMTMG8 */
+			{0x00000124, 0x00020309},	/* DRAMTMG9 */
+			{0x00000180, 0x01000040},	/* ZQCTL0 */
+			{0x00000184, 0x00000000},	/* ZQCTL1 */
+			{0x00000190, 0x07060004},	/* DFITMG0 */
+			{0x00000198, 0x07000101},	/* DFILPCFG0 */
+			{0x000001a0, 0xc0400003},	/* DFIUPD0 */
+			{0x00000240, 0x06000614},	/* ODTCFG */
+			{0x00000244, 0x00000201},	/* ODTMAP */
+			{0x00000250, 0x00001f00},	/* SCHED */
+			{0x00000490, 0x00000001},	/* PCTRL_0 */
+			{0xffffffff, 0xffffffff}
+		}
+	},
+	{
+		{
+			{0x00000004, 0x0000008c},	/* PHYREG01 */
+			{0x00000014, 0x00000010},	/* PHYREG05 */
+			{0x00000018, 0x00000000},	/* PHYREG06 */
+			{0x0000001c, 0x0000000b},	/* PHYREG07 */
+			{0xffffffff, 0xffffffff}
+		}
+	}
+},
drivers/ram/rockchip/sdram-rv1126-ddr4-detect-328.inc new file +75 -0

75 lines not on this page · raw message

drivers/ram/rockchip/sdram-rv1126-ddr4-detect-396.inc new file +75 -0

75 lines not on this page · raw message

drivers/ram/rockchip/sdram-rv1126-ddr4-detect-528.inc new file +75 -0

75 lines not on this page · raw message

drivers/ram/rockchip/sdram-rv1126-ddr4-detect-664.inc new file +75 -0

75 lines not on this page · raw message

drivers/ram/rockchip/sdram-rv1126-ddr4-detect-784.inc new file +75 -0

75 lines not on this page · raw message

drivers/ram/rockchip/sdram-rv1126-ddr4-detect-924.inc new file +75 -0

75 lines not on this page · raw message

drivers/ram/rockchip/sdram_rv1126.c +8 -0
index 9e1376a940..0a78e18c73 100644
@@ -76,6 +76,14 @@ struct rv1126_sdram_params sdram_configs[] = {
 # include	"sdram-rv1126-lpddr4-detect-784.inc"
 # include	"sdram-rv1126-lpddr4-detect-924.inc"
 # include	"sdram-rv1126-lpddr4-detect-1056.inc"
+#elif defined(CONFIG_RAM_ROCKCHIP_DDR4)
+# include	"sdram-rv1126-ddr4-detect-328.inc"
+# include	"sdram-rv1126-ddr4-detect-396.inc"
+# include	"sdram-rv1126-ddr4-detect-528.inc"
+# include	"sdram-rv1126-ddr4-detect-664.inc"
+# include	"sdram-rv1126-ddr4-detect-784.inc"
+# include	"sdram-rv1126-ddr4-detect-924.inc"
+# include	"sdram-rv1126-ddr4-detect-1056.inc"
 #else
 # include	"sdram-rv1126-ddr3-detect-328.inc"
 # include	"sdram-rv1126-ddr3-detect-396.inc"
Signature · 1 line
2.40.1
author
#3 lore raw

PATCH 3/5 board: rockchip: Add Sonoff iHost board

In reply to Tim Lunn

Sonoff iHost is gateway device designed to provide a Smart Home Hub, it is based on Rockchip RV1126. There is also a version with 2GB RAM based off the RV1109 dual core SoC however this works with the same config as the RV1126 for uboot purposes.

Features:
- Rockchip RV1126
- 4GB DDR4
- 8GB eMMC
- microSD slot
- RMII Ethernet PHY
- 1x USB 2.0 Host
- 1x USB 2.0 OTG
- Realtek RTL8723DS WiFi/BT
- EFR32MG21 Silabs Zigbee radio
- Speaker/Microphone

---

 arch/arm/dts/rv1126-sonoff-ihost-u-boot.dtsi | 13 +++++
 arch/arm/mach-rockchip/rv1126/Kconfig        |  8 +++
 board/itead/sonoff-ihost/Kconfig             | 16 ++++++
 board/itead/sonoff-ihost/MAINTAINERS         |  6 ++
 configs/sonoff-ihost-rv1126_defconfig        | 60 ++++++++++++++++++++
 include/configs/sonoff-ihost.h               | 18 ++++++
 6 files changed, 121 insertions(+)
 create mode 100644 arch/arm/dts/rv1126-sonoff-ihost-u-boot.dtsi
 create mode 100644 board/itead/sonoff-ihost/Kconfig
 create mode 100644 board/itead/sonoff-ihost/MAINTAINERS
 create mode 100644 configs/sonoff-ihost-rv1126_defconfig
 create mode 100644 include/configs/sonoff-ihost.h
arch/arm/dts/rv1126-sonoff-ihost-u-boot.dtsi new file +13 -0
new file mode 100644
index 0000000000..a625660d58
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+#include "rv1126-u-boot.dtsi"
+
+/ {
+	chosen {
+		u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
+	};
+};
+
+&sdio {
+	status = "disabled";
+};
arch/arm/mach-rockchip/rv1126/Kconfig +8 -0
index a6e2b5903c..55b1112120 100644
@@ -14,6 +14,13 @@ config TARGET_RV1126_NEU2
 	  IO board and Neu2 needs to mount on top of this IO board in order to
 	  create complete Edgeble Neural Compute Module 2(Neu2) IO platform.
 
+config TARGET_RV1126_SONOFF_IHOST
+	bool "Sonoff iHost smart home hub"
+	help
+	  Sonoff iHost is a smart home gateway based on Rockchip RV1126 SoC.
+	  It features Wifi, Bluetooth and Zigbee radios that are used by many
+	  smart home devices.
+
 config SOC_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select HAS_CUSTOM_SYS_INIT_SP_ADDR
@@ -58,5 +65,6 @@ config TEXT_BASE
 	default 0x600000
 
 source board/edgeble/neural-compute-module-2/Kconfig
+source board/itead/sonoff-ihost/Kconfig
 
 endif
board/itead/sonoff-ihost/Kconfig new file +16 -0
new file mode 100644
index 0000000000..30d9a6b3e6
@@ -0,0 +1,16 @@
+if TARGET_RV1126_SONOFF_IHOST
+
+config SYS_BOARD
+	default "sonoff-ihost"
+
+config SYS_VENDOR
+	default "itead"
+
+config SYS_CONFIG_NAME
+	default "sonoff-ihost"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+	select RAM_ROCKCHIP_DDR4
+
+endif
board/itead/sonoff-ihost/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000000..eff9274bea
@@ -0,0 +1,6 @@
+RV1126-SONOFF-IHOST
+M:	Tim Lunn <[email protected]>
+S:	Maintained
+F:	board/itead/sonoff-ihost
+F:	include/configs/sonoff-ihost.h
+F:	configs/sonoff-ihost-rv1126_defconfig
configs/sonoff-ihost-rv1126_defconfig new file +60 -0

60 lines not on this page · raw message

include/configs/sonoff-ihost.h new file +18 -0
new file mode 100644
index 0000000000..8ed5d78687
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __SONOFF_IHOST_H
+#define __SONOFF_IHOST_H
+
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdout=serial\0" \
+		"stderr=serial\0"
+
+#include <configs/rv1126_common.h>
+
+#undef BOOT_TARGET_DEVICES
+
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(MMC, mmc, 1)
+
+#endif /*  __SONOFF_IHOST_H */
Signature · 1 line
2.40.1
#4 lore raw

Re: [PATCH 3/5] board: rockchip: Add Sonoff iHost board

Quoted 4 lines · Tim Lunn

Sonoff iHost is gateway device designed to provide a Smart Home Hub, it is based on Rockchip RV1126. There is also a version with 2GB RAM based off the RV1109 dual core SoC however this works with the same config as the RV1126 for uboot purposes.

[snip]

Quoted 14 lines
include/configs/sonoff-ihost.h new file +8 -0
new file mode 100644
index 0000000000..8ed5d78687
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __SONOFF_IHOST_H
+#define __SONOFF_IHOST_H
+
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdout=serial\0" \
+		"stderr=serial\0"

include/configs/sonoff-ihost.h line 18

Quoted 10 lines
include/configs/sonoff-ihost.h new file +10 -0
+
+#include <configs/rv1126_common.h>
+
+#undef BOOT_TARGET_DEVICES
+
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(MMC, mmc, 1)
+
+#endif /*  __SONOFF_IHOST_H */

We should be using standard boot, which removes most of this, thanks.

Signature · 1 line
Tom
author
#5 lore raw

Re: [PATCH 3/5] board: rockchip: Add Sonoff iHost board

Hi Tom,

Quoted 24 lines · Tom Rini
Quoted 4 lines · Tim Lunn

Sonoff iHost is gateway device designed to provide a Smart Home Hub, it is based on Rockchip RV1126. There is also a version with 2GB RAM based off the RV1109 dual core SoC however this works with the same config as the RV1126 for uboot purposes.

[snip]

Quoted 17 lines
include/configs/sonoff-ihost.h new file +11 -0
new file mode 100644
index 0000000000..8ed5d78687
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef __SONOFF_IHOST_H
+#define __SONOFF_IHOST_H
+
+#define ROCKCHIP_DEVICE_SETTINGS \
+		"stdout=serial\0" \
+		"stderr=serial\0"
+
+#include <configs/rv1126_common.h>
+
Quoted 8 lines

include/configs/sonoff-ihost.h line 18

Quoted 7 lines
include/configs/sonoff-ihost.h new file +7 -0
+#undef BOOT_TARGET_DEVICES
+
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(MMC, mmc, 1)
+
+#endif /*  __SONOFF_IHOST_H */

We should be using standard boot, which removes most of this, thanks.

Thanks for the tip, I will check this out and fix for v2.

Regards
   Tim

Quoted 1 line
author
#6 lore raw

PATCH 4/5 rockchip: rv1126: select SPL_OPTEE_IMAGE

In reply to Tim Lunn

rv1126 requires OPTEE as it provides pcsi support. Mainline Linux kernel will fail to boot without this.

Select SPL_OPTEE_IMAGE when building FIT image. TEE must be provided when building.

---

 arch/arm/mach-rockchip/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-rockchip/Kconfig +1 -0
index 6ff0aa6911..cce118a004 100644
@@ -359,6 +359,7 @@ config ROCKCHIP_RV1126
 	select PMIC_RK8XX
 	select BOARD_LATE_INIT
 	imply ROCKCHIP_COMMON_BOARD
+	select SPL_OPTEE_IMAGE if SPL_FIT
 	imply OF_LIBFDT_OVERLAY
 	imply ROCKCHIP_OTP
 	imply MISC_INIT_R
Signature · 1 line
2.40.1
author
#7 lore raw

PATCH 5/5 rockchip: rv1126: Move RAM disk address

In reply to Tim Lunn

OPTEE gets loaded into a memory region overlapping with the ram disk.

Fix the ramdisk address so it doesn't overlap with the OPTEE memory region.

---

 include/configs/rv1126_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/rv1126_common.h +1 -1
index a64c0c6364..6961dbe20b 100644
@@ -26,7 +26,7 @@
 	"fdt_addr_r=0x08300000\0" \
 	"fdtoverlay_addr_r=0x02000000\0" \
 	"kernel_addr_r=0x02008000\0" \
-	"ramdisk_addr_r=0x0a200000\0"
+	"ramdisk_addr_r=0x0a400000\0"
 
 #include <config_distro_bootcmd.h>
 #define CFG_EXTRA_ENV_SETTINGS \
Signature · 1 line
2.40.1