mirror of
https://github.com/armbian/build.git
synced 2025-08-09 12:46:58 +02:00
rockchip: fix emmc busy loop on Tinkerboard
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>
This commit is contained in:
parent
f2e9da1af5
commit
3f30b482cc
@ -253,6 +253,31 @@ compile_uboot()
|
|||||||
done
|
done
|
||||||
done <<< "$UBOOT_TARGET_MAP"
|
done <<< "$UBOOT_TARGET_MAP"
|
||||||
|
|
||||||
|
# set up postinstall script
|
||||||
|
if [[ $BOARD == tinkerboard ]]; then
|
||||||
|
cat <<-EOF > "$uboottempdir/${uboot_name}/DEBIAN/postinst"
|
||||||
|
#!/bin/bash
|
||||||
|
source /usr/lib/u-boot/platform_install.sh
|
||||||
|
[[ \$DEVICE == /dev/null ]] && exit 0
|
||||||
|
if [[ -z \$DEVICE ]]; then
|
||||||
|
DEVICE="/dev/mmcblk0"
|
||||||
|
# proceed to other options.
|
||||||
|
[ ! -b \$DEVICE ] && DEVICE="/dev/mmcblk1"
|
||||||
|
[ ! -b \$DEVICE ] && DEVICE="/dev/mmcblk2"
|
||||||
|
fi
|
||||||
|
[[ \$(type -t setup_write_uboot_platform) == function ]] && setup_write_uboot_platform
|
||||||
|
if [[ -b \$DEVICE ]]; then
|
||||||
|
echo "Updating u-boot on \$DEVICE" >&2
|
||||||
|
write_uboot_platform \$DIR \$DEVICE
|
||||||
|
sync
|
||||||
|
else
|
||||||
|
echo "Device \$DEVICE does not exist, skipping" >&2
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
EOF
|
||||||
|
chmod 755 "$uboottempdir/${uboot_name}/DEBIAN/postinst"
|
||||||
|
fi
|
||||||
|
|
||||||
# declare -f on non-defined function does not do anything
|
# declare -f on non-defined function does not do anything
|
||||||
cat <<-EOF > "$uboottempdir/${uboot_name}/usr/lib/u-boot/platform_install.sh"
|
cat <<-EOF > "$uboottempdir/${uboot_name}/usr/lib/u-boot/platform_install.sh"
|
||||||
DIR=/usr/lib/$uboot_name
|
DIR=/usr/lib/$uboot_name
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
|
||||||
index f88c913ff..7f04ccbdf 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
|
||||||
@@ -547,3 +547,20 @@
|
|
||||||
&gpiomem {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+&emmc {
|
|
||||||
+ bus-width = <8>;
|
|
||||||
+ cap-mmc-highspeed;
|
|
||||||
+ non-removable;
|
|
||||||
+ 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";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hdmi {
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&hdmi_cec_c0>;
|
|
||||||
+};
|
|
@ -1,25 +0,0 @@
|
|||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
|
||||||
index f88c913ff..7f04ccbdf 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
|
||||||
@@ -547,3 +547,20 @@
|
|
||||||
&gpiomem {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+&emmc {
|
|
||||||
+ bus-width = <8>;
|
|
||||||
+ cap-mmc-highspeed;
|
|
||||||
+ non-removable;
|
|
||||||
+ 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";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hdmi {
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&hdmi_cec_c0>;
|
|
||||||
+};
|
|
@ -1,3 +1,15 @@
|
|||||||
|
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
|
diff --git a/arch/arm/dts/rk3288-tinker.dtsi b/arch/arm/dts/rk3288-tinker.dtsi
|
||||||
index a752458..14cca73 100644
|
index a752458..14cca73 100644
|
||||||
--- a/arch/arm/dts/rk3288-tinker.dtsi
|
--- a/arch/arm/dts/rk3288-tinker.dtsi
|
||||||
|
Loading…
Reference in New Issue
Block a user