update

kiddin9 · Apr 11, 2024 · bbe1d3f · bbe1d3f
1 parent 47f8eca
commit bbe1d3f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/devices/common/kernel_6.1.sh b/devices/common/kernel_6.1.sh
@@ -6,7 +6,7 @@ mkdir new; cp -rf .git new/.git
 cd new
 git reset --hard origin/master
 
-cp -rf --parents target/linux package/kernel package/boot package/firmware include/kernel* package/network/config/wifi-scripts config/Config-images.in include/image*.mk scripts/ubinize-image.sh package/utils/bcm27xx-utils ../
+cp -rf --parents target/linux package/kernel package/boot package/firmware include/kernel* package/network/config/wifi-scripts config/Config-images.in include/image*.mk scripts/ubinize-image.sh package/utils/bcm27xx-utils package/devel/perf ../
 cd -
 
 sed -i "s/^.*vermagic$/\techo '1' > \$(LINUX_DIR)\/.vermagic/" include/kernel-defaults.mk

diff --git a/devices/rockchip_armv8/diy.sh b/devices/rockchip_armv8/diy.sh
@@ -24,11 +24,13 @@ sed -i "/KernelPackage,ptp/d" package/kernel/linux/modules/other.mk
 
 mv -f tmp/r8125 feeds/kiddin9/
 
-rm -rf target/linux/rockchip/armv8/base-files/etc/uci-defaults/13_opkg_update
+rm -rf target/linux/rockchip/armv8/base-files/etc/uci-defaults/13_opkg_update package/devel/kselftests-bpf package/feeds/packages/libpfring package/feeds/packages/mdio-netlink package/devel/perf package/feeds/packages/ovpn-dco package/feeds/packages/dmx_usb_module package/feeds/packages/jool
 
 sed -i -e 's,kmod-r8168,kmod-r8169,g' target/linux/rockchip/image/armv8.mk
 sed -i -e 's,wpad-openssl,wpad-basic-mbedtls,g' target/linux/rockchip/image/armv8.mk
 
+curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
+
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-drm-rockchip/' target/linux/rockchip/Makefile
 
 cp -Rf $SHELL_FOLDER/diy/* ./

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
@@ -1,13 +1,3 @@
---- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -173,6 +173,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
- dtb-$(CONFIG_ROCKCHIP_RK3568) += \
- 	rk3568-bpi-r2-pro.dtb \
- 	rk3568-evb.dtb \
-+	rk3568-xgp.dtb \
- 	rk3568-r66s.dtb \
- 	rk3568-opc-h68k.dtb \
- 	rk3568-mrkaio-m68s.dtb \
 --- /dev/null
 +++ b/arch/arm/dts/rk3568-xgp-u-boot.dtsi
 @@ -0,0 +1,21 @@

diff --git a/devices/rockchip_armv8/patches/33-rk3568.patch b/devices/rockchip_armv8/patches/33-rk3568.patch
@@ -191,7 +191,7 @@ index 231bca2b544..0c4b2c55d9a 100644
   	rk3399-pinebook-pro.dtb \
   	rk3399-pinephone-pro.dtb \
 -@@ -182,12 +184,20 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \
-+@@ -182,12 +184,21 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \
++@@ -182,12 +184,22 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \
   	rk3566-soquartz-model-a.dtb \
   	rk3568-bpi-r2-pro.dtb \
   	rk3568-evb.dtb \
@@ -200,6 +200,7 @@ index 231bca2b544..0c4b2c55d9a 100644
   	rk3568-generic.dtb \
   	rk3568-lubancat-2.dtb \
 ++	rk3568-lyt-t68m.dtb \
+++	rk3568-xgp.dtb \
  +	rk3568-mrkaio-m68s.dtb \
   	rk3568-nanopi-r5c.dtb \
   	rk3568-nanopi-r5s.dtb \