update

kiddin9 · Apr 11, 2024 · 96f43f8 · 96f43f8
1 parent e65b570
commit 96f43f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 33 deletions.
diff --git a/...y/package/boot/uboot-rockchip/patches/316-rockchip-rk3568-Add-support-for-nlnet-xgp.patch b/...y/package/boot/uboot-rockchip/patches/316-rockchip-rk3568-Add-support-for-nlnet-xgp.patch
@@ -24,7 +24,7 @@
 +};
 --- /dev/null
 +++ b/arch/arm/dts/rk3568-xgp.dts
-@@ -0,0 +1,357 @@
+@@ -0,0 +1,327 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +
 +#include "rk3568-evb.dts"
@@ -47,24 +47,6 @@
 + regulator-min-microvolt = <4000000>;
 + regulator-max-microvolt = <4000000>;
 + };
-+
-+ vcc_3v3: vcc_3v3 {
-+ compatible = "regulator-fixed";
-+ regulator-name = "vcc_3v3";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ vin-supply = <&vcc3v3_sys>;
-+ };
-+
-+ vcc_1v8: vcc_1v8 {
-+ compatible = "regulator-fixed";
-+ regulator-name = "vcc_1v8";
-+ regulator-always-on;
-+ regulator-boot-on;
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ vin-supply = <&vcc_sysin_b>;
-+ };
 +};
 +
 +&cpu0 {
@@ -187,18 +169,6 @@
 + };
 + };
 +
-+ vcca1v8_pmu: LDO_REG1 {
-+ regulator-always-on;
-+ regulator-boot-on;
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-name = "vcca1v8_pmu";
-+ regulator-state-mem {
-+ regulator-on-in-suspend;
-+ regulator-suspend-microvolt = <1800000>;
-+ };
-+ };
-+
 + vdda_0v9: LDO_REG2 {
 + regulator-always-on;
 + regulator-boot-on;

diff --git a/devices/rockchip_armv8/patches/33-rk3568.patch b/devices/rockchip_armv8/patches/33-rk3568.patch
@@ -58,7 +58,7 @@ index 231bca2b544..0c4b2c55d9a 100644
 + $(U-Boot/Default/rk3568)
 + NAME:=NLnet XGP Board
 + BUILD_DEVICES:= \
-+ nlnet-xgp
++ nlnet_xgp
 +endef
 +
 +define U-Boot/seewo-sv21-rk3568
@@ -85,7 +85,7 @@ index 231bca2b544..0c4b2c55d9a 100644
 
 --- a/target/linux/rockchip/image/armv8.mk
 +++ b/target/linux/rockchip/image/armv8.mk
-@@ -319,6 +320,48 @@
+@@ -319,6 +320,49 @@
  endef
  TARGET_DEVICES += friendlyarm_nanopi-neo3
 
@@ -103,6 +103,7 @@ index 231bca2b544..0c4b2c55d9a 100644
 + DEVICE_VENDOR := NLnet
 + DEVICE_MODEL := XiGuaPi
 + SOC := rk3568
++ KERNEL := kernel-bin
 + DEVICE_DTS := rockchip/rk3568-xgp rockchip/rk3568-xgp-v3
 + UBOOT_DEVICE_NAME := nlnet-xgp-rk3568
 + BOOT_FLOW := pine64-img