From b19251b19f4000e44e4c823bcb46d5bc1118b669 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 1 Dec 2025 18:06:19 -0500 Subject: [PATCH] linux-pine64-pinenote: package efistub Part-of: --- device/testing/linux-pine64-pinenote/APKBUILD | 17 +++++--- .../config-pine64-pinenote.aarch64 | 11 +++-- .../pmos-kconfig-default.patch | 41 ++++++++++++------- 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/device/testing/linux-pine64-pinenote/APKBUILD b/device/testing/linux-pine64-pinenote/APKBUILD index a31ff2e05..4d5052cd0 100644 --- a/device/testing/linux-pine64-pinenote/APKBUILD +++ b/device/testing/linux-pine64-pinenote/APKBUILD @@ -4,7 +4,7 @@ pkgname=linux-pine64-pinenote pkgver=6.17.9 _kernver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="Pine64 PineNote close to mainline fork" arch="aarch64" _carch="arm64" @@ -53,8 +53,15 @@ build() { package() { mkdir -p "$pkgdir"/boot - install -Dm644 "$builddir/arch/$_carch/boot/Image" \ - "$pkgdir/boot/vmlinuz" + if [ -e "$builddir/arch/$_carch/boot/vmlinuz.efi" ]; then + # ZBOOT EFI decompressor for EFI booting + install -Dm644 "$builddir/arch/$_carch/boot/vmlinuz.efi" \ + "$pkgdir/boot/linux.efi" + else + echo "WARNING: CONFIG_EFI_ZBOOT not enabled!" + install -Dm644 "$builddir/arch/$_carch/boot/Image.gz" \ + "$pkgdir/boot/vmlinuz" + fi make modules_install dtbs_install \ ARCH="$_carch" \ @@ -73,6 +80,6 @@ sha512sums=" 063999d7b819970657f6b7713fdb4173da2065ffdeed7cae197026dbb1edfd7f1d50374f073a1e19ef9686539594824ff6ecb8a930d97c4f272cb12f1c6d8355 linux-6.17.tar.xz 35593bc973cc7f626aa7a41cf8b7dea1b46fe8922bd57194db363d26e8854af514d103e39d02c642c26748bd933d5e402ff89d2a20d2da5f8d901e4713eafc46 linux-pine64-pinenote-6.17.9.patch.xz e08bb4daa33fecf27a011fcf3389ef43162e3484d2e92450717049e5f6e88ed4d86f0126ef12a445603c42f3a009128a133806e1c7ce451f320aed9b5129786b linux-pine64-pinenote-6.17-6f680296674101ffb7db7bd81c8cbd9f6a73fff1.patch -5736658563c76b5477a93024792fb00cbbe9d5b9952370c6e91c841c5042e39c3d6e572bfc8d52b6a2bf34d72ff681bb03a32b7a65a688381ff35c6c0ac9cad7 pmos-kconfig-default.patch -e1f8db788d448bd7325ccd5b0bed92d7109f8ab5d68111d43cdb58b1cb697000209d0853189ea560ccf0d0847b4d8a0e93924c76312cf91429dbf3ee4fe09387 config-pine64-pinenote.aarch64 +bc5a8a90592df3a997246c660a27c87e6ad1da61d779f8c5787457747c80623a9fae2df5c6a0ebdc15239e5266d5855cdb34bcf6df0221b30d66d36ae8d994d7 pmos-kconfig-default.patch +ec1bcfbb07b5fa1722bce9b37cdeddfb100c07c0455bb607b7484ef5b58fda7bf13cfac0b0d759c40643e6dd1a35131be9d8faba612153809d24e21d775939fb config-pine64-pinenote.aarch64 " diff --git a/device/testing/linux-pine64-pinenote/config-pine64-pinenote.aarch64 b/device/testing/linux-pine64-pinenote/config-pine64-pinenote.aarch64 index 85c5b636e..8f36700d4 100644 --- a/device/testing/linux-pine64-pinenote/config-pine64-pinenote.aarch64 +++ b/device/testing/linux-pine64-pinenote/config-pine64-pinenote.aarch64 @@ -35,6 +35,10 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_BUILD_SALT="" +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_ZSTD=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_ZSTD is not set CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="pinenote" CONFIG_SYSVIPC=y @@ -1826,10 +1830,10 @@ CONFIG_EFI_ESRT=y CONFIG_EFI_PARAMS_FROM_FDT=y CONFIG_EFI_RUNTIME_WRAPPERS=y CONFIG_EFI_GENERIC_STUB=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y CONFIG_EFI_ARMSTUB_DTB_LOADER=y -CONFIG_EFI_BOOTLOADER_CONTROL=y -# CONFIG_EFI_CAPSULE_LOADER is not set +# CONFIG_EFI_BOOTLOADER_CONTROL is not set +CONFIG_EFI_CAPSULE_LOADER=y # CONFIG_EFI_TEST is not set # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_EFI_DISABLE_PCI_DMA is not set @@ -1837,6 +1841,7 @@ CONFIG_EFI_EARLYCON=y # CONFIG_EFI_DISABLE_RUNTIME is not set # CONFIG_EFI_COCO_SECRET is not set # CONFIG_OVMF_DEBUG_LOG is not set +CONFIG_EFI_SBAT_FILE="" # end of EFI (Extensible Firmware Interface) Support CONFIG_ARM_PSCI_FW=y diff --git a/device/testing/linux-pine64-pinenote/pmos-kconfig-default.patch b/device/testing/linux-pine64-pinenote/pmos-kconfig-default.patch index e07be4850..5ad61f2d2 100644 --- a/device/testing/linux-pine64-pinenote/pmos-kconfig-default.patch +++ b/device/testing/linux-pine64-pinenote/pmos-kconfig-default.patch @@ -1,5 +1,5 @@ diff --git a/arch/arm64/configs/pinenote_defconfig.orig b/arch/arm64/configs/pinenote_defconfig -index f27b482..5e7aa22 100644 +index f27b482..0443fc3 100644 --- a/arch/arm64/configs/pinenote_defconfig.orig +++ b/arch/arm64/configs/pinenote_defconfig @@ -1,5 +1,41 @@ @@ -162,7 +162,18 @@ index f27b482..5e7aa22 100644 ## ## file: drivers/ata/Kconfig -@@ -544,10 +582,135 @@ CONFIG_DRM_ROCKCHIP_EBC=m +@@ -495,7 +533,9 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=y + ## + ## file: drivers/firmware/efi/Kconfig + ## +-CONFIG_EFI_BOOTLOADER_CONTROL=y ++CONFIG_EFI_CAPSULE_LOADER=y ++CONFIG_EFI_ZBOOT=y ++CONFIG_EFI_SBAT_FILE="" + + ## + ## file: drivers/firmware/smccc/Kconfig +@@ -544,10 +584,135 @@ CONFIG_DRM_ROCKCHIP_EBC=m ## ## file: drivers/hid/Kconfig ## @@ -299,7 +310,7 @@ index f27b482..5e7aa22 100644 ## ## file: drivers/hid/i2c-hid/Kconfig -@@ -586,7 +749,7 @@ CONFIG_I2C_RK3X=y +@@ -586,7 +751,7 @@ CONFIG_I2C_RK3X=y ## ## file: drivers/iio/Kconfig ## @@ -308,7 +319,7 @@ index f27b482..5e7aa22 100644 CONFIG_IIO_SW_TRIGGER=m ## -@@ -609,7 +772,7 @@ CONFIG_IIO_SCMI=m +@@ -609,7 +774,7 @@ CONFIG_IIO_SCMI=m ## file: drivers/input/Kconfig ## CONFIG_INPUT_MOUSEDEV=m @@ -317,7 +328,7 @@ index f27b482..5e7aa22 100644 ## ## file: drivers/input/keyboard/Kconfig -@@ -617,14 +780,19 @@ CONFIG_INPUT_EVDEV=y +@@ -617,14 +782,19 @@ CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=m # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_GPIO=y @@ -338,7 +349,7 @@ index f27b482..5e7aa22 100644 ## ## file: drivers/input/mouse/Kconfig -@@ -654,13 +822,13 @@ CONFIG_ROCKCHIP_IOMMU=y +@@ -654,13 +824,13 @@ CONFIG_ROCKCHIP_IOMMU=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=y @@ -354,7 +365,7 @@ index f27b482..5e7aa22 100644 CONFIG_LEDS_TRIGGER_ONESHOT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y -@@ -672,7 +840,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y +@@ -672,7 +842,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_LEDS_TRIGGER_CAMERA=y CONFIG_LEDS_TRIGGER_PANIC=y CONFIG_LEDS_TRIGGER_NETDEV=y @@ -363,7 +374,7 @@ index f27b482..5e7aa22 100644 CONFIG_LEDS_TRIGGER_TTY=y ## -@@ -889,6 +1057,7 @@ CONFIG_VIDEO_HANTRO_ROCKCHIP=y +@@ -889,6 +1059,7 @@ CONFIG_VIDEO_HANTRO_ROCKCHIP=y ## CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y @@ -371,7 +382,7 @@ index f27b482..5e7aa22 100644 ## ## file: drivers/mfd/Kconfig -@@ -1221,12 +1390,13 @@ CONFIG_USB_CONFIGFS_F_UVC=y +@@ -1221,12 +1392,13 @@ CONFIG_USB_CONFIGFS_F_UVC=y ## file: drivers/usb/gadget/legacy/Kconfig ## CONFIG_USB_GADGETFS=y @@ -386,7 +397,7 @@ index f27b482..5e7aa22 100644 ## ## file: drivers/usb/host/Kconfig -@@ -1285,6 +1455,7 @@ CONFIG_DW_WATCHDOG=y +@@ -1285,6 +1457,7 @@ CONFIG_DW_WATCHDOG=y ## CONFIG_FILE_LOCKING=y CONFIG_NETWORK_FILESYSTEMS=y @@ -394,7 +405,7 @@ index f27b482..5e7aa22 100644 ## ## file: fs/cachefiles/Kconfig -@@ -1408,6 +1579,9 @@ CONFIG_IP_NF_NAT=m +@@ -1408,6 +1581,9 @@ CONFIG_IP_NF_NAT=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_MANGLE=m @@ -404,7 +415,7 @@ index f27b482..5e7aa22 100644 ## ## file: net/ipv6/Kconfig -@@ -1423,6 +1597,12 @@ CONFIG_IPV6_MULTIPLE_TABLES=y +@@ -1423,6 +1599,12 @@ CONFIG_IPV6_MULTIPLE_TABLES=y ## file: net/ipv6/netfilter/Kconfig ## CONFIG_IP6_NF_IPTABLES=m @@ -417,7 +428,7 @@ index f27b482..5e7aa22 100644 ## ## file: net/mac80211/Kconfig -@@ -1437,6 +1617,7 @@ CONFIG_MAC80211_DEBUGFS=y +@@ -1437,6 +1619,7 @@ CONFIG_MAC80211_DEBUGFS=y ## CONFIG_NF_CONNTRACK=m CONFIG_NF_TABLES=m @@ -425,7 +436,7 @@ index f27b482..5e7aa22 100644 CONFIG_NFT_CT=m CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_MASQ=m -@@ -1444,6 +1625,19 @@ CONFIG_NFT_REDIR=m +@@ -1444,6 +1627,19 @@ CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT=m CONFIG_NFT_COMPAT=m CONFIG_NFT_HASH=m @@ -445,7 +456,7 @@ index f27b482..5e7aa22 100644 CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_MARK=m -@@ -1451,6 +1645,14 @@ CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +@@ -1451,6 +1647,14 @@ CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_IPVS=m CONFIG_NETFILTER_XT_MATCH_POLICY=m