From 4d1e6442b14b0c1c2ab83fb3f70b3fb21e57c994 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 8 Nov 2024 09:41:05 +0100 Subject: [PATCH] Fix Banana PI r* kernel 6.6 compilation --- 6.6/target/linux/mediatek/image/filogic.mk | 18 +++++++++--------- config-bpi-r3 | 10 +--------- config-bpi-r4 | 10 +--------- config-bpi-r4-poe | 10 +--------- 4 files changed, 12 insertions(+), 36 deletions(-) diff --git a/6.6/target/linux/mediatek/image/filogic.mk b/6.6/target/linux/mediatek/image/filogic.mk index bf5cd972..ee1afcdf 100644 --- a/6.6/target/linux/mediatek/image/filogic.mk +++ b/6.6/target/linux/mediatek/image/filogic.mk @@ -334,12 +334,12 @@ define Device/bananapi_bpi-r3 pad-to 52M | mt7986-bl31-uboot bananapi_bpi-r3-emmc |\ pad-to 56M | mt798x-gpt emmc |\ $(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),\ - pad-to 64M | append-image squashfs-sysupgrade.itb | check-size |\ + pad-to 64M | append-image squashfs-sysupgrade.itb |\ ) \ gzip -ifeq ($(DUMP),) - IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m -endif +#ifeq ($(DUMP),) +# IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m +#endif KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k @@ -369,9 +369,9 @@ define Device/bananapi_bpi-r3-mini KERNEL_IN_UBI := 1 UBOOTENV_IN_UBI := 1 IMAGES := snand-factory.bin sysupgrade.itb -ifeq ($(DUMP),) - IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m -endif +#ifeq ($(DUMP),) +# IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m +#endif IMAGE/sysupgrade.itb := append-kernel | \ fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ pad-rootfs | append-metadata @@ -426,10 +426,10 @@ define Device/bananapi_bpi-r4-common pad-to 52M | mt7988-bl31-uboot $$(DEVICE_NAME)-emmc |\ pad-to 56M | mt798x-gpt emmc |\ $(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),\ - pad-to 64M | append-image squashfs-sysupgrade.itb | check-size |\ + pad-to 64M | append-image squashfs-sysupgrade.itb |\ ) \ gzip - IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m +# IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m KERNEL := kernel-bin | gzip KERNEL_INITRAMFS := kernel-bin | lzma | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k diff --git a/config-bpi-r3 b/config-bpi-r3 index 609e0f09..2aa08444 100644 --- a/config-bpi-r3 +++ b/config-bpi-r3 @@ -4,14 +4,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_bananapi_bpi-r3=y CONFIG_KERNEL_ARM64_MODULE_PLTS=y CONFIG_KERNEL_TCP_CONG_BBR2=y CONFIG_PACKAGE_kmod-mt76=y -CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE=y -# CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2 is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4 is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD is not set CONFIG_PACKAGE_kmod-thermal=y CONFIG_PACKAGE_kmod-hwmon-core=y -CONFIG_TARGET_ROOTFS_PARTSIZE=128 +# CONFIG_TARGET_ROOTFS_INITRAMFS is not set diff --git a/config-bpi-r4 b/config-bpi-r4 index 04db8261..660fbd3d 100644 --- a/config-bpi-r4 +++ b/config-bpi-r4 @@ -4,14 +4,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_bananapi_bpi-r4=y CONFIG_KERNEL_ARM64_MODULE_PLTS=y CONFIG_KERNEL_TCP_CONG_BBR2=y CONFIG_PACKAGE_kmod-mt76=y -CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE=y -# CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2 is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4 is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD is not set CONFIG_PACKAGE_kmod-thermal=y CONFIG_PACKAGE_kmod-hwmon-core=y -CONFIG_TARGET_ROOTFS_PARTSIZE=128 +# CONFIG_TARGET_ROOTFS_INITRAMFS is not set \ No newline at end of file diff --git a/config-bpi-r4-poe b/config-bpi-r4-poe index b2035b04..2cac740b 100644 --- a/config-bpi-r4-poe +++ b/config-bpi-r4-poe @@ -4,14 +4,6 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_bananapi_bpi-r4-poe=y CONFIG_KERNEL_ARM64_MODULE_PLTS=y CONFIG_KERNEL_TCP_CONG_BBR2=y CONFIG_PACKAGE_kmod-mt76=y -CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE=y -# CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2 is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4 is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ is not set -# CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD is not set CONFIG_PACKAGE_kmod-thermal=y CONFIG_PACKAGE_kmod-hwmon-core=y -CONFIG_TARGET_ROOTFS_PARTSIZE=128 +# CONFIG_TARGET_ROOTFS_INITRAMFS is not set \ No newline at end of file