2e2f6e893b
* Fix Tinker Board S (eMMC) boot (#650) Use Tinker Board S U-Boot configuration which is capable to boot from eMMC as well as from SD card. Note that this makes U-Boot always claiming to run on Tinker Board S: .. Model: Rockchip RK3288 Asus Tinker Board S .. It seems that there is no generic Tinker Board configuration. However, Tinker Board S configuration really seems to work well with Tinker Board as well, so just use it. Also today the U-Boot Makefile seems to generate a working idbloader.img already. Drop our special handling. * Use Tinker Board S device tree if booting from eMMC for Linux Instead of patching the Tinker Board device tree, select the device tree based on what device we are booting from. Note: This boots the non-S device tree when booting a Tinker Board S from SD card! But there is no reliable detection otherwise, so let's just live with that fact. * Document how to use our U-Boot to flash eMMC
56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
From 683783c7253981c0d4c3b772aeb1f9bda833e2be Mon Sep 17 00:00:00 2001
|
|
Message-Id: <683783c7253981c0d4c3b772aeb1f9bda833e2be.1599227174.git.stefan@agner.ch>
|
|
In-Reply-To: <74e929bc4713b76f58a8df82019d74078b4b8d0c.1599227174.git.stefan@agner.ch>
|
|
References: <74e929bc4713b76f58a8df82019d74078b4b8d0c.1599227174.git.stefan@agner.ch>
|
|
From: Stefan Agner <stefan@agner.ch>
|
|
Date: Fri, 4 Sep 2020 15:40:55 +0200
|
|
Subject: [PATCH 2/3] rockchip: dts: tinker: move i2c node to shared device
|
|
tree
|
|
|
|
The I2C EEPROM is present on Tinker Board S as well. Move the i2c node
|
|
to the shared, U-Boot specific rk3288-tinker-u-boot.dtsi device tree.
|
|
|
|
Cc: Jonas Karlman <jonas@kwiboo.se>
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
arch/arm/dts/rk3288-tinker-u-boot.dtsi | 7 +++++++
|
|
arch/arm/dts/rk3288-tinker.dts | 7 -------
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
|
|
index 732aa4f91f..3d169906fd 100644
|
|
--- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
|
|
@@ -17,6 +17,13 @@
|
|
rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>;
|
|
};
|
|
|
|
+&i2c2 {
|
|
+ m24c08@50 {
|
|
+ compatible = "at,24c08", "i2c-eeprom";
|
|
+ reg = <0x50>;
|
|
+ };
|
|
+};
|
|
+
|
|
&pinctrl {
|
|
u-boot,dm-pre-reloc;
|
|
};
|
|
diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
|
|
index 4b8405fd82..338670123b 100644
|
|
--- a/arch/arm/dts/rk3288-tinker.dts
|
|
+++ b/arch/arm/dts/rk3288-tinker.dts
|
|
@@ -35,10 +35,3 @@
|
|
vbus-supply = <&vcc5v0_host>;
|
|
status = "okay";
|
|
};
|
|
-
|
|
-&i2c2 {
|
|
- m24c08@50 {
|
|
- compatible = "at,24c08", "i2c-eeprom";
|
|
- reg = <0x50>;
|
|
- };
|
|
-};
|
|
--
|
|
2.28.0
|
|
|