diff --git a/config/boards/station-m1.conf b/config/boards/station-m1.conf index f18f66b2d7..96b490a897 100644 --- a/config/boards/station-m1.conf +++ b/config/boards/station-m1.conf @@ -8,5 +8,5 @@ BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3328-roc-pc.dtb" SRC_EXTLINUX="yes" SERIALCON="ttyS0,tty0" -SRC_CMDLINE="console=ttyS0,1500000 console=tty0" +SRC_CMDLINE="console=ttyS2,1500000 console=tty0" ASOUND_STATE="asound.state.station-m1" diff --git a/patch/u-boot/u-boot-media/0270-u-boot-rk-rk3328-roc-pc-config.patch b/patch/u-boot/u-boot-media/0270-u-boot-rk-rk3328-roc-pc-config.patch index 5b444c837a..17eb4205f4 100644 --- a/patch/u-boot/u-boot-media/0270-u-boot-rk-rk3328-roc-pc-config.patch +++ b/patch/u-boot/u-boot-media/0270-u-boot-rk-rk3328-roc-pc-config.patch @@ -39,6 +39,7 @@ +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TIME=y +CONFIG_SPL_OF_CONTROL=y @@ -88,7 +89,6 @@ +CONFIG_DM_RESET=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_ROCKCHIP_SPI=y +CONFIG_SYSINFO=y +CONFIG_SYSINFO_SMBIOS=y +CONFIG_SYSRESET=y diff --git a/patch/u-boot/u-boot-media/0301-u-boot-rk-rk3328-roc-pc-u-boot-dtsi.patch b/patch/u-boot/u-boot-media/0301-u-boot-rk-rk3328-roc-pc-u-boot-dtsi.patch new file mode 100644 index 0000000000..be08610697 --- /dev/null +++ b/patch/u-boot/u-boot-media/0301-u-boot-rk-rk3328-roc-pc-u-boot-dtsi.patch @@ -0,0 +1,72 @@ +--- /dev/null ++++ b/arch/arm/dts/rk3328-roc-pc-u-boot.dtsi +@@ -0,0 +1,68 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd ++ */ ++ ++#include "rk3328-u-boot.dtsi" ++#include "rk3328-sdram-lpddr3-1600.dtsi" ++/ { ++ chosen { ++ u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc; ++ }; ++ ++ smbios { ++ compatible = "u-boot,sysinfo-smbios"; ++ ++ smbios { ++ system { ++ manufacturer = "firefly"; ++ product = "roc-rk3328-pc"; ++ }; ++ ++ baseboard { ++ manufacturer = "firefly"; ++ product = "roc-rk3328-pc"; ++ }; ++ ++ chassis { ++ manufacturer = "firefly"; ++ product = "roc-rk3328-pc"; ++ }; ++ }; ++ }; ++}; ++ ++&gpio0 { ++ u-boot,dm-spl; ++}; ++ ++&pinctrl { ++ u-boot,dm-spl; ++}; ++ ++&sdmmc0m1_pin { ++ u-boot,dm-spl; ++}; ++ ++&pcfg_pull_up_4ma { ++ u-boot,dm-spl; ++}; ++ ++&usb_host0_xhci { ++ vbus-supply = <&vcc_host1_5v>; ++ status = "okay"; ++}; ++ ++/* ++ * This makes XHCI responsible for toggling VBUS. This is needed to work ++ * around an issue where either XHCI only works with USB 2.0 or OTG doesn't ++ * work, depending on how VBUS is configured. Having USB 3.0 seems better. ++ */ ++&vcc_host1_5v { ++ /delete-property/ regulator-always-on; ++}; ++ ++/* Need this and all the pinctrl/gpio stuff above to set pinmux */ ++&vcc_sd { ++ u-boot,dm-spl; ++}; +