From b3070c7eefadbd851bcbbc8035fce8e044e8ad61 Mon Sep 17 00:00:00 2001 From: Oleg Date: Thu, 10 Feb 2022 17:04:16 +0300 Subject: [PATCH] fix use auto dtb for extlinux (#3466) --- config/boards/station-p1.conf | 2 +- .../u-boot-rk3399-roc-pc-plus.patch | 216 ++++++++++++++++++ 2 files changed, 217 insertions(+), 1 deletion(-) create mode 100644 patch/u-boot/u-boot-rockchip64/board_station-p1/u-boot-rk3399-roc-pc-plus.patch diff --git a/config/boards/station-p1.conf b/config/boards/station-p1.conf index 708eaa5307..3c666ba25c 100644 --- a/config/boards/station-p1.conf +++ b/config/boards/station-p1.conf @@ -1,7 +1,7 @@ # Rockchip RK3399 hexa core 4GB LPDDR4 SoC eMMC GBE USB3 BOARD_NAME="Station P1" BOARDFAMILY="media" -BOOTCONFIG="roc-pc-mezzanine-rk3399_defconfig" +BOOTCONFIG="roc-pc-plus-rk3399_defconfig" KERNEL_TARGET="legacy,current,edge" FULL_DESKTOP="yes" BOOT_LOGO="desktop" diff --git a/patch/u-boot/u-boot-rockchip64/board_station-p1/u-boot-rk3399-roc-pc-plus.patch b/patch/u-boot/u-boot-rockchip64/board_station-p1/u-boot-rk3399-roc-pc-plus.patch new file mode 100644 index 0000000000..fa56ac5945 --- /dev/null +++ b/patch/u-boot/u-boot-rockchip64/board_station-p1/u-boot-rk3399-roc-pc-plus.patch @@ -0,0 +1,216 @@ +new file mode 100644 +index 00000000..cf3462ea +--- /dev/null ++++ b/configs/roc-pc-plus-rk3399_defconfig +@@ -0,0 +1,86 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_ROCKCHIP=y ++CONFIG_SYS_TEXT_BASE=0x00200000 ++CONFIG_SPL_GPIO_SUPPORT=y ++CONFIG_NR_DRAM_BANKS=1 ++CONFIG_ENV_SIZE=0x8000 ++CONFIG_ENV_OFFSET=0x3F8000 ++CONFIG_ENV_SECT_SIZE=0x1000 ++CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc-plus" ++CONFIG_ROCKCHIP_RK3399=y ++CONFIG_TARGET_ROC_PC_RK3399=y ++CONFIG_DEBUG_UART_BASE=0xFF1A0000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_SPL_SPI_FLASH_SUPPORT=y ++CONFIG_SPL_SPI_SUPPORT=y ++CONFIG_DEBUG_UART=y ++# CONFIG_ANDROID_BOOT_IMAGE is not set ++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-plus.dtb" ++CONFIG_DISPLAY_BOARDINFO_LATE=y ++# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set ++CONFIG_SPL_STACK_R=y ++CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x20000 ++CONFIG_SPL_ENV_SUPPORT=y ++CONFIG_SPL_SPI_LOAD=y ++CONFIG_TPL=y ++CONFIG_CMD_BOOTZ=y ++CONFIG_CMD_GPT=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_PCI=y ++CONFIG_CMD_USB=y ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_TIME=y ++CONFIG_SPL_OF_CONTROL=y ++CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" ++CONFIG_ENV_IS_IN_SPI_FLASH=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_SPL_DM_SEQ_ALIAS=y ++CONFIG_ROCKCHIP_GPIO=y ++CONFIG_SYS_I2C_ROCKCHIP=y ++CONFIG_MISC=y ++CONFIG_MMC_DW=y ++CONFIG_MMC_DW_ROCKCHIP=y ++CONFIG_MMC_SDHCI=y ++CONFIG_MMC_SDHCI_ROCKCHIP=y ++CONFIG_SF_DEFAULT_BUS=1 ++CONFIG_SPI_FLASH_WINBOND=y ++CONFIG_DM_ETH=y ++CONFIG_ETH_DESIGNWARE=y ++CONFIG_GMAC_ROCKCHIP=y ++CONFIG_NVME=y ++CONFIG_PCI=y ++CONFIG_PHY_ROCKCHIP_INNO_USB2=y ++CONFIG_PHY_ROCKCHIP_TYPEC=y ++CONFIG_PMIC_RK8XX=y ++CONFIG_REGULATOR_PWM=y ++CONFIG_REGULATOR_RK8XX=y ++CONFIG_PWM_ROCKCHIP=y ++# CONFIG_RAM_ROCKCHIP_DEBUG is not set ++CONFIG_RAM_RK3399_LPDDR4=y ++CONFIG_DM_RESET=y ++CONFIG_BAUDRATE=1500000 ++CONFIG_DEBUG_UART_SHIFT=2 ++CONFIG_ROCKCHIP_SPI=y ++CONFIG_SYSRESET=y ++CONFIG_USB=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_DWC3=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_USB_EHCI_GENERIC=y ++CONFIG_USB_DWC3=y ++CONFIG_USB_DWC3_GENERIC=y ++CONFIG_ROCKCHIP_USB2_PHY=y ++CONFIG_USB_KEYBOARD=y ++CONFIG_USB_GADGET=y ++CONFIG_USB_HOST_ETHER=y ++CONFIG_USB_ETHER_ASIX=y ++CONFIG_USB_ETHER_ASIX88179=y ++CONFIG_USB_ETHER_MCS7830=y ++CONFIG_USB_ETHER_RTL8152=y ++CONFIG_USB_ETHER_SMSC95XX=y ++CONFIG_DM_VIDEO=y ++CONFIG_DISPLAY=y ++CONFIG_VIDEO_ROCKCHIP=y ++CONFIG_DISPLAY_ROCKCHIP_HDMI=y ++CONFIG_SPL_TINY_MEMSET=y ++CONFIG_ERRNO_STR=y + + + +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -144,6 +144,7 @@ + rk3399-puma-haikou.dtb \ + rk3399-roc-pc.dtb \ + rk3399-roc-pc-mezzanine.dtb \ ++ rk3399-roc-pc-plus.dtb \ + rk3399-rock-pi-4a.dtb \ + rk3399-rock-pi-4b.dtb \ + rk3399-rock-pi-4c.dtb \ + +new file mode 100644 +index 00000000..02a8f9f5 +--- /dev/null ++++ b/arch/arm/dts/rk3399-roc-pc-plus.dts +@@ -0,0 +1,92 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd ++ */ ++ ++/dts-v1/; ++#include "rk3399-roc-pc.dtsi" ++ ++/ { ++ model = "Firefly ROC-RK3399-PC-PLUS Board"; ++ compatible = "firefly,roc-rk3399-pc-plus", "rockchip,rk3399"; ++ ++ vcc3v3_ngff: vcc3v3-ngff { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc3v3_ngff"; ++ enable-active-high; ++ gpio = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&vcc3v3_ngff_en>; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_12v>; ++ }; ++ ++ vcc3v3_pcie: vcc3v3-pcie { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc3v3_pcie"; ++ enable-active-high; ++ gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&vcc3v3_pcie_en>; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_12v>; ++ }; ++}; ++ ++&pcie_phy { ++ status = "okay"; ++}; ++ ++&pcie0 { ++ ep-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; ++ num-lanes = <4>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pcie_perst>; ++ vpcie3v3-supply = <&vcc3v3_pcie>; ++ vpcie1v8-supply = <&vcc1v8_pmu>; ++ vpcie0v9-supply = <&vcca_0v9>; ++ status = "okay"; ++}; ++ ++&pinctrl { ++ ngff { ++ vcc3v3_ngff_en: vcc3v3-ngff-en { ++ rockchip,pins = <4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ ++ pcie { ++ vcc3v3_pcie_en: vcc3v3-pcie-en { ++ rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ pcie_perst: pcie-perst { ++ rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++}; ++ ++&sdio0 { ++ bus-width = <4>; ++ cap-sd-highspeed; ++ cap-sdio-irq; ++ keep-power-in-suspend; ++ mmc-pwrseq = <&sdio_pwrseq>; ++ non-removable; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; ++ sd-uhs-sdr104; ++ vmmc-supply = <&vcc3v3_ngff>; ++ vqmmc-supply = <&vcc_1v8>; ++ status = "okay"; ++}; ++ ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; ++ status = "okay"; ++}; + + +new file mode 100644 +index 00000000..02a8f9f5 +--- /dev/null ++++ b/arch/arm/dts/rk3399-roc-pc-plus-u-boot.dtsi +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (c) 2020 Amarula Solutions(India) ++ */ ++ ++#include "rk3399-roc-pc-u-boot.dtsi" +