[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  rockchip: refresh Kconfig
  kernel: bump 5.15 to 5.15.54 (coolsnowwolf#9749)
  kernel: 5.18: refresh patches (coolsnowwolf#9748)
  igb-intel: fix typo error (coolsnowwolf#9751)
  igb-intel: using KERNEL_MAKE compile
  igb-intel: mark conflict with kmod-igb (coolsnowwolf#9750)
  Update README for uboot-rockchip
  uboot-rockchip: remove prebuilt of-platdata (coolsnowwolf#9747)

README.md

@@ -4,7 +4,6 @@
 
 ## 注意
 
-0. **免责声明：!! 这个源代码不欢迎 “Redmi ax6 机友会” 的群里任何一位成员 直接 或者 间接 使用，否则一旦发生全家富贵的事情一律均和本人无关！！**
 1. **不要用 root 用户进行编译**
 2. 国内用户编译前最好准备好梯子
 3. 默认登陆IP 192.168.1.1 密码 password
@@ -22,7 +21,7 @@
    bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib \
    git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libglib2.0-dev libgmp3-dev libltdl-dev \
    libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz \
-   mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python2.7 python3 python3-pip qemu-utils \
+   mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python2.7 python3 python3-pip libpython3-dev qemu-utils \
    rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev
    ```
 

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .53
-LINUX_KERNEL_HASH-5.15.53 = f3aa717243051f3fcca90ebfe26fe5c3a596c2f6047846e8d1724ea90df77b07
+LINUX_VERSION-5.15 = .54
+LINUX_KERNEL_HASH-5.15.54 = 594f548bb0a73e9c08deef838836c984666709687257a624c5ccaf9ae056ce4d

package/boot/uboot-rockchip/Makefile

@@ -32,7 +32,6 @@ define U-Boot/nanopi-r2c-rk3328
   DEPENDS:=+PACKAGE_u-boot-nanopi-r2c-rk3328:arm-trusted-firmware-rk3328
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk322xh_bl31_v1.46.elf
-  OF_PLATDATA:=$(1)
   USE_RKBIN:=1
 endef
 
@@ -45,7 +44,6 @@ define U-Boot/nanopi-r2s-rk3328
   DEPENDS:=+PACKAGE_u-boot-nanopi-r2s-rk3328:arm-trusted-firmware-rk3328
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk322xh_bl31_v1.46.elf
-  OF_PLATDATA:=$(1)
   USE_RKBIN:=1
 endef
 
@@ -57,7 +55,6 @@ define U-Boot/orangepi-r1-plus-rk3328
   DEPENDS:=+PACKAGE_u-boot-orangepi-r1-plus-rk3328:arm-trusted-firmware-rk3328
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk322xh_bl31_v1.46.elf
-  OF_PLATDATA:=$(1)
   USE_RKBIN:=1
 endef
 
@@ -69,7 +66,6 @@ define U-Boot/orangepi-r1-plus-lts-rk3328
   DEPENDS:=+PACKAGE_u-boot-orangepi-r1-plus-lts-rk3328:arm-trusted-firmware-rk3328
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk322xh_bl31_v1.46.elf
-  OF_PLATDATA:=$(1)
   USE_RKBIN:=1
 endef
 
@@ -81,7 +77,6 @@ define U-Boot/doornet1-rk3328
   DEPENDS:=+PACKAGE_u-boot-doornet1-rk3328:arm-trusted-firmware-rk3328
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk322xh_bl31_v1.46.elf
-  OF_PLATDATA:=$(1)
   USE_RKBIN:=1
 endef
 
@@ -171,15 +166,7 @@ UBOOT_MAKE_FLAGS += \
 define Build/Configure
 	$(call Build/Configure/U-Boot)
 
-ifneq ($(OF_PLATDATA),)
-	mkdir -p $(PKG_BUILD_DIR)/tpl/dts
-	mkdir -p $(PKG_BUILD_DIR)/include/generated
-
-	$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-plat.c $(PKG_BUILD_DIR)/tpl/dts/dt-plat.c
-	$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-structs-gen.h $(PKG_BUILD_DIR)/include/generated/dt-structs-gen.h
-	$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-decl.h $(PKG_BUILD_DIR)/include/generated/dt-decl.h
-endif
-
+	$(SED) 's/CONFIG_TOOLS_LIBCRYPTO=y/# CONFIG_TOOLS_LIBCRYPTO is not set/' $(PKG_BUILD_DIR)/.config
 	$(SED) 's#CONFIG_MKIMAGE_DTC_PATH=.*#CONFIG_MKIMAGE_DTC_PATH="$(PKG_BUILD_DIR)/scripts/dtc/dtc"#g' $(PKG_BUILD_DIR)/.config
 	echo 'CONFIG_IDENT_STRING=" OpenWrt"' >> $(PKG_BUILD_DIR)/.config
 endef