mirror of
https://github.com/armbian/build.git
synced 2025-08-14 15:16:58 +02:00
27175e3e55
There are already emmc nodes in rk3288-tinker-s.dts, adding these nodes to rk3288-tinker.dtsi will cause emmc busy loop on original Tinkerboard. Signed-off-by: Jack Chen <redchenjs@live.com>
67 lines
1.7 KiB
Diff
67 lines
1.7 KiB
Diff
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
|
|
--- a/configs/tinker-rk3288_defconfig
|
|
+++ b/configs/tinker-rk3288_defconfig
|
|
@@ -13,7 +13,7 @@
|
|
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
CONFIG_SILENT_CONSOLE=y
|
|
CONFIG_CONSOLE_MUX=y
|
|
-CONFIG_DEFAULT_FDT_FILE="rk3288-tinker.dtb"
|
|
+CONFIG_DEFAULT_FDT_FILE="rk3288-tinker-s.dtb"
|
|
# CONFIG_DISPLAY_CPUINFO is not set
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_SPL_STACK_R=y
|
|
diff --git a/arch/arm/dts/rk3288-tinker.dtsi b/arch/arm/dts/rk3288-tinker.dtsi
|
|
index a752458..14cca73 100644
|
|
--- a/arch/arm/dts/rk3288-tinker.dtsi
|
|
+++ b/arch/arm/dts/rk3288-tinker.dtsi
|
|
@@ -143,6 +143,21 @@
|
|
vqmmc-supply = <&vccio_sd>;
|
|
};
|
|
|
|
+&emmc {
|
|
+ bus-width = <8>;
|
|
+ cap-mmc-highspeed;
|
|
+ disable-wp;
|
|
+ non-removable;
|
|
+ num-slots = <1>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
|
|
+ max-frequency = <150000000>;
|
|
+ mmc-hs200-1_8v;
|
|
+ mmc-ddr-1_8v;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+
|
|
&gpu {
|
|
mali-supply = <&vdd_gpu>;
|
|
status = "okay";
|
|
diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h
|
|
index 58eea3c..cc585dc 100644
|
|
--- a/include/configs/tinker_rk3288.h
|
|
+++ b/include/configs/tinker_rk3288.h
|
|
@@ -7,17 +7,14 @@
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
-#define ROCKCHIP_DEVICE_SETTINGS
|
|
-#include <configs/rk3288_common.h>
|
|
+#define ROCKCHIP_DEVICE_SETTINGS \
|
|
+ "stdin=serial,cros-ec-keyb\0"\
|
|
+ "stdout=serial,vidconsole\0"\
|
|
+ "stderr=serial,vidconsole\0"
|
|
|
|
-#undef BOOT_TARGET_DEVICES
|
|
|
|
-#define BOOT_TARGET_DEVICES(func) \
|
|
- func(MMC, mmc, 1) \
|
|
- func(USB, usb, 0) \
|
|
- func(PXE, pxe, na) \
|
|
- func(DHCP, dchp, na)
|
|
+#include <configs/rk3288_common.h>
|
|
|
|
-#define CONFIG_SYS_MMC_ENV_DEV 1
|
|
+#define CONFIG_SYS_MMC_ENV_DEV 0
|
|
|
|
#endif
|