diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index 3cca761c4c..46dfee1eba 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -10,6 +10,7 @@ SERIALCON=${SERIALCON:=$([ $BRANCH == "legacy" ] && echo "ttyFIQ0:1500000" || ec GOVERNOR="ondemand" CPUMAX="2016000" CPUMIN="408000" +BOOTBRANCH="tag:v2020.07" RKBIN_DIR="$SRC/cache/sources/rkbin-tools" diff --git a/patch/u-boot/u-boot-rockchip64-mainline/add-board-nanopi-m4v2.patch b/patch/u-boot/u-boot-rockchip64-mainline/add-board-nanopi-m4v2.patch index 3dff32d2d9..f77d5bd6cb 100644 --- a/patch/u-boot/u-boot-rockchip64-mainline/add-board-nanopi-m4v2.patch +++ b/patch/u-boot/u-boot-rockchip64-mainline/add-board-nanopi-m4v2.patch @@ -2,14 +2,14 @@ diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 62da168e..efba2231 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -113,6 +113,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ - rk3399-khadas-edge-v.dtb \ +@@ -129,6 +129,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-nanopc-t4.dtb \ rk3399-nanopi-m4.dtb \ + rk3399-nanopi-m4-2gb.dtb \ + rk3399-nanopi-m4v2.dtb \ rk3399-nanopi-neo4.dtb \ rk3399-orangepi.dtb \ - rk3399-puma-ddr1333.dtb \ + rk3399-puma-haiku.dtb \ diff --git a/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4v2-u-boot.dtsi new file mode 100644 index 00000000..5bd86966 @@ -110,7 +110,7 @@ new file mode 100644 index 00000000..ff4d32e2 --- /dev/null +++ b/configs/nanopi-m4v2-rk3399_defconfig -@@ -0,0 +1,72 @@ +@@ -0,0 +1,75 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x00200000 @@ -133,6 +133,7 @@ index 00000000..ff4d32e2 +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y ++CONFIG_CMD_PCI=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TIME=y +CONFIG_SPL_OF_CONTROL=y @@ -149,11 +150,14 @@ index 00000000..ff4d32e2 +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_GMAC_ROCKCHIP=y ++CONFIG_NVME=y ++CONFIG_PCI=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_PWM=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM_RK3399_LPDDR4=y ++CONFIG_DM_RESET=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYSRESET=y diff --git a/patch/u-boot/u-boot-rockchip64-mainline/add-board-nanopi-r2s.patch b/patch/u-boot/u-boot-rockchip64-mainline/add-board-nanopi-r2s.patch index 473340905e..ffef282f88 100644 --- a/patch/u-boot/u-boot-rockchip64-mainline/add-board-nanopi-r2s.patch +++ b/patch/u-boot/u-boot-rockchip64-mainline/add-board-nanopi-r2s.patch @@ -2,14 +2,14 @@ diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0127a91a..c5beaa85 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -104,6 +104,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \ +@@ -106,6 +106,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \ dtb-$(CONFIG_ROCKCHIP_RK3328) += \ rk3328-evb.dtb \ + rk3328-nanopi-r2-rev00.dtb \ - rk3328-rock64.dtb - - dtb-$(CONFIG_ROCKCHIP_RK3368) += \ + rk3328-roc-cc.dtb \ + rk3328-rock64.dtb \ + rk3328-rock-pi-e.dtb diff --git a/arch/arm/dts/rk3328-nanopi-r2-common.dtsi b/arch/arm/dts/rk3328-nanopi-r2-common.dtsi new file mode 100644 index 00000000..bc924346 @@ -1136,16 +1136,3 @@ index 00000000..720b5e04 +CONFIG_TPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y +CONFIG_SMBIOS_MANUFACTURER="pine64" -diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi -index 060c84e6..eac257b0 100644 ---- a/arch/arm/dts/rk3328.dtsi -+++ b/arch/arm/dts/rk3328.dtsi -@@ -1386,7 +1386,7 @@ - }; - }; - -- gmac2phy { -+ gmac2phy: gmac2phy { - fephyled_speed100: fephyled-speed100 { - rockchip,pins = - <0 31 RK_FUNC_1 &pcfg_pull_none>; diff --git a/patch/u-boot/u-boot-rockchip64-mainline/add-board-orangepi-4.patch b/patch/u-boot/u-boot-rockchip64-mainline/add-board-orangepi-4.patch index 2566cac624..7687096c6e 100644 --- a/patch/u-boot/u-boot-rockchip64-mainline/add-board-orangepi-4.patch +++ b/patch/u-boot/u-boot-rockchip64-mainline/add-board-orangepi-4.patch @@ -2,14 +2,14 @@ diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 59a5aa3e..37a8157b 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -126,6 +126,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ +@@ -131,6 +131,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-nanopi-m4v2.dtb \ rk3399-nanopi-neo4.dtb \ rk3399-orangepi.dtb \ + rk3399-orangepi-4.dtb \ - rk3399-puma-ddr1333.dtb \ - rk3399-puma-ddr1600.dtb \ - rk3399-puma-ddr1866.dtb \ + rk3399-pinebook-pro.dtb \ + rk3399-puma-haikou.dtb \ + rk3399-roc-pc.dtb \ diff --git a/arch/arm/dts/rk3399-orangepi-4-u-boot.dtsi b/arch/arm/dts/rk3399-orangepi-4-u-boot.dtsi new file mode 100644 index 00000000..5bd86966 @@ -162,7 +162,7 @@ index 0000000..4c50b3d + status = "okay"; +}; + -+&dwc3_typec0 { ++&usbdrd3_0 { + vbus-supply = <&vcc5v0_typec0>; + status = "okay"; +}; @@ -175,7 +175,7 @@ index 0000000..4c50b3d + status = "okay"; +}; + -+&dwc3_typec1 { ++&usbdrd3_1 { + vbus-supply = <&vcc5v0_typec1>; + status = "okay"; +}; diff --git a/patch/u-boot/u-boot-rockchip64-mainline/add-board-rockpi-e.patch b/patch/u-boot/u-boot-rockchip64-mainline/add-board-rockpi-e.patch deleted file mode 100644 index 5046d3c398..0000000000 --- a/patch/u-boot/u-boot-rockchip64-mainline/add-board-rockpi-e.patch +++ /dev/null @@ -1,384 +0,0 @@ -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 820ee973..adabb692 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -105,6 +105,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \ - dtb-$(CONFIG_ROCKCHIP_RK3328) += \ - rk3328-evb.dtb \ - rk3328-nanopi-r2-rev00.dtb \ -+ rk3328-rock-pi-e.dtb \ - rk3328-rock64.dtb - - dtb-$(CONFIG_ROCKCHIP_RK3368) += \ -diff --git a/arch/arm/dts/rk3328-rock-pi-e.dts b/arch/arm/dts/rk3328-rock-pi-e.dts -new file mode 100644 -index 0000000..49e16ca ---- /dev/null -+++ b/arch/arm/dts/rk3328-rock-pi-e.dts -@@ -0,0 +1,265 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * (C) Copyright 2016 Rockchip Electronics Co., Ltd -+ */ -+ -+/dts-v1/; -+#include "rk3328.dtsi" -+ -+/ { -+ model = "Radxa ROCK Pi E"; -+ compatible = "radxa,rockpie", "rockchip,rk3328"; -+ -+ chosen { -+ stdout-path = &uart2; -+ }; -+ -+ gmac_clkin: external-gmac-clock { -+ compatible = "fixed-clock"; -+ clock-frequency = <125000000>; -+ clock-output-names = "gmac_clkin"; -+ #clock-cells = <0>; -+ }; -+ -+ vcc_sd: sdmmc-regulator { -+ compatible = "regulator-fixed"; -+ gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdmmc0m1_gpio>; -+ regulator-name = "vcc_sd"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&vcc_io>; -+ }; -+ -+ vcc5v0_host_xhci: vcc5v0-host-xhci-drv { -+ compatible = "regulator-fixed"; -+ enable-active-high; -+ regulator-name = "vcc5v0_host_xhci"; -+ gpio = <&gpio3 7 GPIO_ACTIVE_HIGH>; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ status = "okay"; -+ -+ blue-led { -+ gpios = <&gpio3 RK_PA5 GPIO_ACTIVE_LOW>; -+ label = "blue_blue"; -+ default-state = "on"; -+ }; -+ }; -+}; -+ -+&cpu0 { -+ cpu-supply = <&vdd_arm>; -+}; -+ -+&cpu1 { -+ cpu-supply = <&vdd_arm>; -+}; -+ -+&cpu2 { -+ cpu-supply = <&vdd_arm>; -+}; -+ -+&cpu3 { -+ cpu-supply = <&vdd_arm>; -+}; -+ -+&saradc { -+ status = "okay"; -+}; -+ -+&uart2 { -+ status = "okay"; -+}; -+ -+&sdmmc { -+ bus-width = <4>; -+ cap-mmc-highspeed; -+ cap-sd-highspeed; -+ disable-wp; -+ max-frequency = <150000000>; -+ num-slots = <1>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>; -+ supports-sd; -+ vmmc-supply = <&vcc_sd>; -+ status = "okay"; -+}; -+ -+&emmc { -+ bus-width = <8>; -+ cap-mmc-highspeed; -+ mmc-hs200-1_8v; -+ supports-emmc; -+ disable-wp; -+ non-removable; -+ num-slots = <1>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; -+ vmmc-supply = <&vcc_io>; -+ vqmmc-supply = <&vcc_18emmc>; -+ status = "okay"; -+}; -+ -+&gmac2io { -+ phy-supply = <&vcc_io>; -+ phy-mode = "rgmii"; -+ clock_in_out = "input"; -+ snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; -+ snps,reset-active-low; -+ snps,reset-delays-us = <0 10000 50000>; -+ assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; -+ assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&rgmiim1_pins>; -+ tx_delay = <0x26>; -+ rx_delay = <0x11>; -+ status = "okay"; -+}; -+ -+&usb_host0_ehci { -+ status = "okay"; -+}; -+ -+&usb_host0_ohci { -+ status = "okay"; -+}; -+ -+&usb20_otg { -+ status = "okay"; -+}; -+ -+&i2c1 { -+ clock-frequency = <400000>; -+ i2c-scl-rising-time-ns = <168>; -+ i2c-scl-falling-time-ns = <4>; -+ status = "okay"; -+ -+ rk805: pmic@18 { -+ compatible = "rockchip,rk805"; -+ status = "okay"; -+ reg = <0x18>; -+ interrupt-parent = <&gpio2>; -+ interrupts = <6 IRQ_TYPE_LEVEL_LOW>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pmic_int_l>; -+ rockchip,system-power-controller; -+ wakeup-source; -+ gpio-controller; -+ #gpio-cells = <2>; -+ #clock-cells = <1>; -+ clock-output-names = "xin32k", "rk805-clkout2"; -+ -+ regulators { -+ vdd_logic: DCDC_REG1 { -+ regulator-name = "vdd_logic"; -+ regulator-min-microvolt = <712500>; -+ regulator-max-microvolt = <1450000>; -+ regulator-ramp-delay = <6001>; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <1000000>; -+ }; -+ }; -+ -+ vdd_arm: DCDC_REG2 { -+ regulator-name = "vdd_arm"; -+ regulator-min-microvolt = <712500>; -+ regulator-max-microvolt = <1450000>; -+ regulator-ramp-delay = <6001>; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <1000000>; -+ }; -+ }; -+ -+ vcc_ddr: DCDC_REG3 { -+ regulator-name = "vcc_ddr"; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ }; -+ }; -+ -+ vcc_io: DCDC_REG4 { -+ regulator-name = "vcc_io"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <3300000>; -+ }; -+ }; -+ -+ vdd_18: LDO_REG1 { -+ regulator-name = "vdd_18"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <1800000>; -+ }; -+ }; -+ -+ vcc_18emmc: LDO_REG2 { -+ regulator-name = "vcc_18emmc"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <1800000>; -+ }; -+ }; -+ -+ vdd_10: LDO_REG3 { -+ regulator-name = "vdd_10"; -+ regulator-min-microvolt = <1000000>; -+ regulator-max-microvolt = <1000000>; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <1000000>; -+ }; -+ }; -+ }; -+ }; -+}; -+ -+&io_domains { -+ status = "okay"; -+ -+ vccio1-supply = <&vcc_io>; -+ vccio2-supply = <&vcc_18emmc>; -+ vccio3-supply = <&vcc_io>; -+ vccio4-supply = <&vcc_io>; -+ vccio5-supply = <&vcc_io>; -+ vccio6-supply = <&vcc_io>; -+ pmuio-supply = <&vcc_io>; -+}; -+ -+&pinctrl { -+ pmic { -+ pmic_int_l: pmic-int-l { -+ rockchip,pins = -+ <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; /* gpio2_a6 */ -+ }; -+ }; -+}; -+ -diff --git a/configs/rock-pi-e-rk3328_defconfig b/configs/rock-pi-e-rk3328_defconfig -new file mode 100644 -index 0000000..9e8798d ---- /dev/null -+++ b/configs/rock-pi-e-rk3328_defconfig -@@ -0,0 +1,95 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_ROCKCHIP=y -+CONFIG_SYS_TEXT_BASE=0x00200000 -+CONFIG_ROCKCHIP_RK3328=y -+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y -+CONFIG_TPL_LIBCOMMON_SUPPORT=y -+CONFIG_TPL_LIBGENERIC_SUPPORT=y -+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y -+CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_SPL_STACK_R_ADDR=0x600000 -+CONFIG_NR_DRAM_BANKS=1 -+CONFIG_DEBUG_UART_BASE=0xFF130000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SMBIOS_PRODUCT_NAME="rock64_rk3328" -+CONFIG_DEBUG_UART=y -+CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 -+# CONFIG_ANDROID_BOOT_IMAGE is not set -+CONFIG_FIT=y -+CONFIG_FIT_VERBOSE=y -+CONFIG_SPL_LOAD_FIT=y -+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-rock-pi-e.dtb" -+CONFIG_MISC_INIT_R=y -+# CONFIG_DISPLAY_CPUINFO is not set -+CONFIG_DISPLAY_BOARDINFO_LATE=y -+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -+CONFIG_TPL_SYS_MALLOC_SIMPLE=y -+CONFIG_SPL_STACK_R=y -+CONFIG_SPL_ATF=y -+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y -+CONFIG_CMD_BOOTZ=y -+CONFIG_CMD_GPT=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_USB=y -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_TIME=y -+CONFIG_SPL_OF_CONTROL=y -+CONFIG_TPL_OF_CONTROL=y -+CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock-pi-e" -+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -+CONFIG_TPL_OF_PLATDATA=y -+CONFIG_ENV_IS_IN_MMC=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_TPL_DM=y -+CONFIG_REGMAP=y -+CONFIG_SPL_REGMAP=y -+CONFIG_TPL_REGMAP=y -+CONFIG_SYSCON=y -+CONFIG_SPL_SYSCON=y -+CONFIG_TPL_SYSCON=y -+CONFIG_CLK=y -+CONFIG_SPL_CLK=y -+CONFIG_FASTBOOT_BUF_ADDR=0x800800 -+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y -+CONFIG_ROCKCHIP_GPIO=y -+CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MMC_DW=y -+CONFIG_MMC_DW_ROCKCHIP=y -+CONFIG_SF_DEFAULT_SPEED=20000000 -+CONFIG_DM_ETH=y -+CONFIG_ETH_DESIGNWARE=y -+CONFIG_GMAC_ROCKCHIP=y -+CONFIG_PHY=y -+CONFIG_PINCTRL=y -+CONFIG_SPL_PINCTRL=y -+CONFIG_DM_PMIC=y -+CONFIG_PMIC_RK8XX=y -+CONFIG_REGULATOR_PWM=y -+CONFIG_DM_REGULATOR_FIXED=y -+CONFIG_REGULATOR_RK8XX=y -+CONFIG_PWM_ROCKCHIP=y -+CONFIG_RAM=y -+CONFIG_SPL_RAM=y -+CONFIG_TPL_RAM=y -+CONFIG_DM_RESET=y -+CONFIG_BAUDRATE=1500000 -+CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_SYSRESET=y -+# CONFIG_TPL_SYSRESET is not set -+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_OHCI_HCD=y -+CONFIG_USB_OHCI_GENERIC=y -+CONFIG_USB_DWC2=y -+CONFIG_USB_DWC3=y -+# CONFIG_USB_DWC3_GADGET is not set -+CONFIG_USB_GADGET=y -+CONFIG_USB_GADGET_DWC2_OTG=y -+CONFIG_SPL_TINY_MEMSET=y -+CONFIG_TPL_TINY_MEMSET=y -+CONFIG_ERRNO_STR=y -+CONFIG_SMBIOS_MANUFACTURER="pine64" diff --git a/patch/u-boot/u-boot-rockchip64-mainline/rk3328-efuse-driver.patch b/patch/u-boot/u-boot-rockchip64-mainline/rk3328-efuse-driver.patch index bd44bed3bc..10edb28f26 100644 --- a/patch/u-boot/u-boot-rockchip64-mainline/rk3328-efuse-driver.patch +++ b/patch/u-boot/u-boot-rockchip64-mainline/rk3328-efuse-driver.patch @@ -146,39 +146,3 @@ index 407e5d29..0552e476 100644 #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ /* FAT sd card locations. */ -diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi -index eac257b0..3e04a823 100644 ---- a/arch/arm/dts/rk3328.dtsi -+++ b/arch/arm/dts/rk3328.dtsi -@@ -337,6 +337,31 @@ - }; - }; - -+ efuse: efuse@ff260000 { -+ compatible = "rockchip,rk3328-efuse"; -+ reg = <0x0 0xff260000 0x0 0x50>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ clocks = <&cru SCLK_EFUSE>; -+ clock-names = "pclk_efuse"; -+ rockchip,efuse-size = <0x20>; -+ -+ /* Data cells */ -+ efuse_id: id@7 { -+ reg = <0x07 0x10>; -+ }; -+ cpu_leakage: cpu-leakage@17 { -+ reg = <0x17 0x1>; -+ }; -+ logic_leakage: logic-leakage@19 { -+ reg = <0x19 0x1>; -+ }; -+ efuse_cpu_version: cpu-version@1a { -+ reg = <0x1a 0x1>; -+ bits = <3 3>; -+ }; -+ }; -+ - saradc: saradc@ff280000 { - compatible = "rockchip,rk3328-saradc", "rockchip,saradc"; - reg = <0x0 0xff280000 0x0 0x100>; diff --git a/patch/u-boot/u-boot-rockchip64-mainline/rk3399-disable-hdmi.patch b/patch/u-boot/u-boot-rockchip64-mainline/rk3399-disable-hdmi.patch deleted file mode 100644 index c71e61a371..0000000000 --- a/patch/u-boot/u-boot-rockchip64-mainline/rk3399-disable-hdmi.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig -index 607a00db..9ea9b115 100644 ---- a/configs/nanopc-t4-rk3399_defconfig -+++ b/configs/nanopc-t4-rk3399_defconfig -@@ -52,12 +52,5 @@ CONFIG_USB_ETHER_ASIX88179=y - CONFIG_USB_ETHER_MCS7830=y - CONFIG_USB_ETHER_RTL8152=y - CONFIG_USB_ETHER_SMSC95XX=y --CONFIG_USB_KEYBOARD=y - CONFIG_SPL_TINY_MEMSET=y - CONFIG_ERRNO_STR=y --CONFIG_DM_VIDEO=y --CONFIG_VIDEO_BPP16=y --CONFIG_VIDEO_BPP32=y --CONFIG_DISPLAY=y --CONFIG_VIDEO_ROCKCHIP=y --CONFIG_DISPLAY_ROCKCHIP_HDMI=y -diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig -index 3fcb7ac2..ad0e808b 100644 ---- a/configs/nanopi-m4-rk3399_defconfig -+++ b/configs/nanopi-m4-rk3399_defconfig -@@ -52,12 +52,5 @@ CONFIG_USB_ETHER_ASIX88179=y - CONFIG_USB_ETHER_MCS7830=y - CONFIG_USB_ETHER_RTL8152=y - CONFIG_USB_ETHER_SMSC95XX=y --CONFIG_USB_KEYBOARD=y - CONFIG_SPL_TINY_MEMSET=y - CONFIG_ERRNO_STR=y --CONFIG_DM_VIDEO=y --CONFIG_VIDEO_BPP16=y --CONFIG_VIDEO_BPP32=y --CONFIG_DISPLAY=y --CONFIG_VIDEO_ROCKCHIP=y --CONFIG_DISPLAY_ROCKCHIP_HDMI=y -diff --git a/configs/nanopi-m4v2-rk3399_defconfig b/configs/nanopi-m4v2-rk3399_defconfig -index 0b7077ca..45d05078 100644 ---- a/configs/nanopi-m4v2-rk3399_defconfig -+++ b/configs/nanopi-m4v2-rk3399_defconfig -@@ -55,15 +55,8 @@ CONFIG_USB_ETHER_ASIX88179=y - CONFIG_USB_ETHER_MCS7830=y - CONFIG_USB_ETHER_RTL8152=y - CONFIG_USB_ETHER_SMSC95XX=y --CONFIG_USB_KEYBOARD=y - CONFIG_SPL_TINY_MEMSET=y - CONFIG_ERRNO_STR=y --CONFIG_DM_VIDEO=y --CONFIG_VIDEO_BPP16=y --CONFIG_VIDEO_BPP32=y --CONFIG_DISPLAY=y --CONFIG_VIDEO_ROCKCHIP=y --CONFIG_DISPLAY_ROCKCHIP_HDMI=y - CONFIG_LOG=y - CONFIG_LOG_CONSOLE=y - CONFIG_SPL_LOG=y -diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig -index b9ea535e..d038a8ca 100644 ---- a/configs/nanopi-neo4-rk3399_defconfig -+++ b/configs/nanopi-neo4-rk3399_defconfig -@@ -52,12 +52,5 @@ CONFIG_USB_ETHER_ASIX88179=y - CONFIG_USB_ETHER_MCS7830=y - CONFIG_USB_ETHER_RTL8152=y - CONFIG_USB_ETHER_SMSC95XX=y --CONFIG_USB_KEYBOARD=y - CONFIG_SPL_TINY_MEMSET=y - CONFIG_ERRNO_STR=y --CONFIG_DM_VIDEO=y --CONFIG_VIDEO_BPP16=y --CONFIG_VIDEO_BPP32=y --CONFIG_DISPLAY=y --CONFIG_VIDEO_ROCKCHIP=y --CONFIG_DISPLAY_ROCKCHIP_HDMI=y -diff --git a/configs/orangepi-4-rk3399_defconfig b/configs/orangepi-4-rk3399_defconfig -index 18ec369f..a0cb7628 100644 ---- a/configs/orangepi-4-rk3399_defconfig -+++ b/configs/orangepi-4-rk3399_defconfig -@@ -55,15 +55,8 @@ CONFIG_USB_ETHER_ASIX88179=y - CONFIG_USB_ETHER_MCS7830=y - CONFIG_USB_ETHER_RTL8152=y - CONFIG_USB_ETHER_SMSC95XX=y --CONFIG_USB_KEYBOARD=y - CONFIG_SPL_TINY_MEMSET=y - CONFIG_ERRNO_STR=y --CONFIG_DM_VIDEO=y --CONFIG_VIDEO_BPP16=y --CONFIG_VIDEO_BPP32=y --CONFIG_DISPLAY=y --CONFIG_VIDEO_ROCKCHIP=y --CONFIG_DISPLAY_ROCKCHIP_HDMI=y - CONFIG_LOG=y - CONFIG_LOG_CONSOLE=y - CONFIG_SPL_LOG=y -diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig -index be76524c..659c67a0 100644 ---- a/configs/roc-pc-rk3399_defconfig -+++ b/configs/roc-pc-rk3399_defconfig -@@ -56,12 +56,5 @@ CONFIG_USB_ETHER_ASIX88179=y - CONFIG_USB_ETHER_MCS7830=y - CONFIG_USB_ETHER_RTL8152=y - CONFIG_USB_ETHER_SMSC95XX=y --CONFIG_USB_KEYBOARD=y - CONFIG_SPL_TINY_MEMSET=y - CONFIG_ERRNO_STR=y --CONFIG_DM_VIDEO=y --CONFIG_VIDEO_BPP16=y --CONFIG_VIDEO_BPP32=y --CONFIG_DISPLAY=y --CONFIG_VIDEO_ROCKCHIP=y --CONFIG_DISPLAY_ROCKCHIP_HDMI=y -diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h -index 2d3db228..c0b03588 100644 ---- a/include/configs/evb_rk3399.h -+++ b/include/configs/evb_rk3399.h -@@ -6,11 +6,6 @@ - #ifndef __EVB_RK3399_H - #define __EVB_RK3399_H - --#define ROCKCHIP_DEVICE_SETTINGS \ -- "stdin=serial,usbkbd\0" \ -- "stdout=serial,vidconsole\0" \ -- "stderr=serial,vidconsole\0" -- - #include - - #if defined(CONFIG_ENV_IS_IN_MMC)