From eeb59f87a18843c541277a6236b4f2b6e41889e9 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Tue, 22 Oct 2024 16:10:05 +0200 Subject: [PATCH 01/16] ppp: install pkg-config file on InstallDev It seems some package (sstp-client) makes use of pppd.pc file to detect the ppp version as 2.5.0 changed some API. Also install the .pc file to permit the version detection of pppd. Signed-off-by: Christian Marangi --- package/network/services/ppp/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index 5f1ebd4e7d..760a31dc0d 100644 --- a/package/network/services/ppp/Makefile +++ b/package/network/services/ppp/Makefile @@ -192,6 +192,8 @@ endif define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/pppd $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig endef define Package/ppp/script_install From 7e542f6a77aabfd02c82bef5240ce0a09ebf5070 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 22 Oct 2024 16:56:19 +0200 Subject: [PATCH 02/16] hostapd: fix build error with SAE disabled Fixes: b2a2c286170d ("hostapd: add support for authenticating with multiple PSKs via ubus helper") Signed-off-by: Felix Fietkau --- .../services/hostapd/patches/601-ucode_support.patch | 12 ++++++++---- ...0-Implement-APuP-Access-Point-Micro-Peering.patch | 6 +++--- .../patches/803-hostapd-fix-80211be-build.patch | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/package/network/services/hostapd/patches/601-ucode_support.patch b/package/network/services/hostapd/patches/601-ucode_support.patch index a3c03bf359..5a88687cf2 100644 --- a/package/network/services/hostapd/patches/601-ucode_support.patch +++ b/package/network/services/hostapd/patches/601-ucode_support.patch @@ -725,7 +725,7 @@ as adding/removing interfaces. for (pw = hapd->conf->sae_passwords; pw; pw = pw->next) { if (!is_broadcast_ether_addr(pw->peer_addr) && (!sta || -@@ -582,12 +587,28 @@ const char * sae_get_password(struct hos +@@ -582,12 +587,30 @@ const char * sae_get_password(struct hos pt = hapd->conf->ssid.pt; } @@ -741,6 +741,7 @@ as adding/removing interfaces. + if (!sta->use_sta_psk) + break; + ++#ifdef CONFIG_SAE + if (sta->sae_pt) { + pt = sta->sae_pt; break; @@ -753,10 +754,11 @@ as adding/removing interfaces. + NULL); + sta->sae_pt = pt; + break; ++#endif } } -@@ -3229,6 +3250,12 @@ static void handle_auth(struct hostapd_d +@@ -3229,6 +3252,12 @@ static void handle_auth(struct hostapd_d goto fail; } @@ -771,17 +773,19 @@ as adding/removing interfaces. --- a/src/ap/sta_info.c +++ b/src/ap/sta_info.c -@@ -474,6 +474,9 @@ void ap_free_sta(struct hostapd_data *ha +@@ -474,6 +474,11 @@ void ap_free_sta(struct hostapd_data *ha forced_memzero(sta->last_tk, WPA_TK_MAX_LEN); #endif /* CONFIG_TESTING_OPTIONS */ ++#ifdef CONFIG_SAE + if (sta->sae_pt) + sae_deinit_pt(sta->sae_pt); ++#endif + os_free(sta); } -@@ -1507,6 +1510,8 @@ void ap_sta_set_authorized_event(struct +@@ -1507,6 +1512,8 @@ void ap_sta_set_authorized_event(struct #endif /* CONFIG_P2P */ const u8 *ip_ptr = NULL; diff --git a/package/network/services/hostapd/patches/780-Implement-APuP-Access-Point-Micro-Peering.patch b/package/network/services/hostapd/patches/780-Implement-APuP-Access-Point-Micro-Peering.patch index 157b7dbb82..dae7ad180c 100644 --- a/package/network/services/hostapd/patches/780-Implement-APuP-Access-Point-Micro-Peering.patch +++ b/package/network/services/hostapd/patches/780-Implement-APuP-Access-Point-Micro-Peering.patch @@ -372,7 +372,7 @@ Hotfix-by: Sebastian Gottschall https://github.com/mirror/dd-wrt/commit/0c3001a6 #ifdef CONFIG_FILS static struct wpabuf * -@@ -3615,8 +3618,8 @@ static u16 check_multi_ap(struct hostapd +@@ -3617,8 +3620,8 @@ static u16 check_multi_ap(struct hostapd } @@ -383,7 +383,7 @@ Hotfix-by: Sebastian Gottschall https://github.com/mirror/dd-wrt/commit/0c3001a6 { /* Supported rates not used in IEEE 802.11ad/DMG */ if (hapd->iface->current_mode && -@@ -4003,7 +4006,7 @@ static int __check_assoc_ies(struct host +@@ -4005,7 +4008,7 @@ static int __check_assoc_ies(struct host elems->ext_capab_len); if (resp != WLAN_STATUS_SUCCESS) return resp; @@ -392,7 +392,7 @@ Hotfix-by: Sebastian Gottschall https://github.com/mirror/dd-wrt/commit/0c3001a6 if (resp != WLAN_STATUS_SUCCESS) return resp; -@@ -6058,6 +6061,11 @@ static void handle_beacon(struct hostapd +@@ -6060,6 +6063,11 @@ static void handle_beacon(struct hostapd 0); ap_list_process_beacon(hapd->iface, mgmt, &elems, fi); diff --git a/package/network/services/hostapd/patches/803-hostapd-fix-80211be-build.patch b/package/network/services/hostapd/patches/803-hostapd-fix-80211be-build.patch index 55c6e63581..cbd6298d9d 100644 --- a/package/network/services/hostapd/patches/803-hostapd-fix-80211be-build.patch +++ b/package/network/services/hostapd/patches/803-hostapd-fix-80211be-build.patch @@ -1,6 +1,6 @@ --- a/src/ap/sta_info.c +++ b/src/ap/sta_info.c -@@ -1836,3 +1836,22 @@ void ap_sta_free_sta_profile(struct mld_ +@@ -1914,3 +1914,22 @@ void ap_sta_free_sta_profile(struct mld_ } } #endif /* CONFIG_IEEE80211BE */ @@ -25,7 +25,7 @@ + --- a/src/ap/sta_info.h +++ b/src/ap/sta_info.h -@@ -417,23 +417,8 @@ int ap_sta_re_add(struct hostapd_data *h +@@ -408,23 +408,8 @@ int ap_sta_re_add(struct hostapd_data *h void ap_free_sta_pasn(struct hostapd_data *hapd, struct sta_info *sta); From b8816343fbf7f6c14573de43fd86a0ae544abfec Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 22 Oct 2024 00:02:28 +0200 Subject: [PATCH 03/16] scripts: Add script to reorder kernel config-* files This script will reorder the content of all config-* files in the target folder. It will also remove duplicates. It will not remove options already defined in the generic configuration. Link: https://github.com/openwrt/openwrt/pull/16743 Signed-off-by: Hauke Mehrtens --- scripts/kconfig-reorder.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 scripts/kconfig-reorder.sh diff --git a/scripts/kconfig-reorder.sh b/scripts/kconfig-reorder.sh new file mode 100755 index 0000000000..9ab7858d49 --- /dev/null +++ b/scripts/kconfig-reorder.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# This script reorders all config-* files in the target directory. + +find_files=$(find target -type f -name 'config-*' -print) + +if [ -n "$find_files" ]; then + for file in $find_files; do + echo "Reordering options in $file" + LANG=C ./scripts/kconfig.pl '+' "$file" /dev/null > "$file"-new + mv "$file"-new "$file" + done +else + echo "No files named config-* found." +fi + From d0abb26f402e6193f6bfe253d42088b09dccbce5 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 20 Oct 2024 15:38:57 +0200 Subject: [PATCH 04/16] mediatek: Remove double CONFIG_HARDEN_BRANCH_PREDICTOR CONFIG_HARDEN_BRANCH_PREDICTOR option is included two times in this configuration file. Remove one definition. On arm32 SoC it should not be needed. Fixes: 54f9744c820a ("treewide: disable spectre mitigation on unaffected Arm32 targets") Link: https://github.com/openwrt/openwrt/pull/16743 Signed-off-by: Hauke Mehrtens --- target/linux/mediatek/mt7623/config-6.6 | 1 - target/linux/mediatek/mt7629/config-6.6 | 1 - 2 files changed, 2 deletions(-) diff --git a/target/linux/mediatek/mt7623/config-6.6 b/target/linux/mediatek/mt7623/config-6.6 index e34822d992..baa31b465d 100644 --- a/target/linux/mediatek/mt7623/config-6.6 +++ b/target/linux/mediatek/mt7623/config-6.6 @@ -273,7 +273,6 @@ CONFIG_GPIO_CDEV=y CONFIG_GRO_CELLS=y # CONFIG_HARDEN_BRANCH_HISTORY is not set # CONFIG_HARDEN_BRANCH_PREDICTOR is not set -CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y diff --git a/target/linux/mediatek/mt7629/config-6.6 b/target/linux/mediatek/mt7629/config-6.6 index 81c07a5492..5169acb99f 100644 --- a/target/linux/mediatek/mt7629/config-6.6 +++ b/target/linux/mediatek/mt7629/config-6.6 @@ -147,7 +147,6 @@ CONFIG_GPIO_CDEV=y CONFIG_GRO_CELLS=y # CONFIG_HARDEN_BRANCH_HISTORY is not set # CONFIG_HARDEN_BRANCH_PREDICTOR is not set -CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y From 1306885968e31113595383225b148bacb6731e25 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 20 Oct 2024 15:31:23 +0200 Subject: [PATCH 05/16] kernel: Reorder config files Reorder the kernel configuration files. This was done uisng: ./scripts/kconfig-reorder.sh Link: https://github.com/openwrt/openwrt/pull/16743 Signed-off-by: Hauke Mehrtens --- target/linux/apm821xx/sata/config-default | 39 ++++++++++---------- target/linux/bcm53xx/config-6.6 | 2 +- target/linux/d1/config-6.6 | 2 +- target/linux/generic/config-6.6 | 4 +- target/linux/generic/config-filter | 6 +-- target/linux/imx/config-6.6 | 22 +++++------ target/linux/imx/cortexa53/config-default | 2 +- target/linux/ipq40xx/config-6.6 | 12 +++--- target/linux/ipq40xx/mikrotik/config-default | 2 +- target/linux/ipq806x/config-6.6 | 8 ++-- target/linux/mpc85xx/p1020/config-default | 6 +-- target/linux/mvebu/cortexa72/config-6.6 | 4 +- target/linux/realtek/rtl839x/config-6.6 | 2 +- target/linux/sifiveu/config-6.6 | 8 ++-- target/linux/starfive/config-6.6 | 6 +-- target/linux/sunxi/cortexa53/config-6.6 | 22 +++++------ target/linux/x86/64/config-6.6 | 12 +++--- target/linux/x86/generic/config-6.6 | 2 +- target/linux/x86/geode/config-6.6 | 2 +- target/linux/x86/legacy/config-6.6 | 4 +- 20 files changed, 83 insertions(+), 84 deletions(-) diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default index 7efb914885..c12f01f87d 100644 --- a/target/linux/apm821xx/sata/config-default +++ b/target/linux/apm821xx/sata/config-default @@ -1,31 +1,25 @@ CONFIG_APOLLO3G=y -CONFIG_BROADCOM_PHY=y -CONFIG_EXT4_FS=y -# CONFIG_SATA_DWC_OLD_DMA is not set CONFIG_ATA=y -CONFIG_ATA_SFF=y CONFIG_ATA_BMDMA=y -CONFIG_SATA_PMP=y -CONFIG_GENERIC_PHY=y -CONFIG_SATA_DWC=y -# CONFIG_SATA_DWC_DEBUG is not set +CONFIG_ATA_SFF=y +CONFIG_BLK_DEV_DM=y +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_MD=y +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_PM=y +CONFIG_BROADCOM_PHY=y CONFIG_CRYPTO_MD5_PPC=y CONFIG_CRYPTO_SHA1_PPC=y CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y CONFIG_FREEZER=y CONFIG_FW_CACHE=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_PM=y +CONFIG_GENERIC_PHY=y +CONFIG_GPIO_74XX_MMIO=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_GPIO_74XX_MMIO=y CONFIG_LEDS_TRIGGER_DISK=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_DM=y -CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_MD=y CONFIG_MD=y CONFIG_MD_AUTODETECT=y # CONFIG_MD_LINEAR is not set @@ -34,8 +28,8 @@ CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y # CONFIG_MD_RAID10 is not set # CONFIG_MD_RAID456 is not set -CONFIG_MTD_PHYSMAP=y CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_PHYSMAP=y CONFIG_PM=y CONFIG_PM_AUTOSLEEP=y CONFIG_PM_CLK=y @@ -44,14 +38,19 @@ CONFIG_PM_SLEEP=y CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_GC=y CONFIG_PM_WAKELOCKS_LIMIT=100 +CONFIG_PPC4xx_CPM=y CONFIG_PPC_EARLY_DEBUG=y -CONFIG_PPC_EARLY_DEBUG_44x=y -# CONFIG_PPC_EARLY_DEBUG_MEMCONS is not set # CONFIG_PPC_EARLY_DEBUG_16550 is not set +CONFIG_PPC_EARLY_DEBUG_44x=y CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x4 CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300 -CONFIG_PPC4xx_CPM=y +# CONFIG_PPC_EARLY_DEBUG_MEMCONS is not set CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_SATA_DWC=y +# CONFIG_SATA_DWC_DEBUG is not set +# CONFIG_SATA_DWC_OLD_DMA is not set +CONFIG_SATA_PMP=y +CONFIG_SCSI=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_USB=y diff --git a/target/linux/bcm53xx/config-6.6 b/target/linux/bcm53xx/config-6.6 index ace9e7d615..34dcf86e7b 100644 --- a/target/linux/bcm53xx/config-6.6 +++ b/target/linux/bcm53xx/config-6.6 @@ -245,8 +245,8 @@ CONFIG_NET_DSA_TAG_BRCM=y CONFIG_NET_DSA_TAG_BRCM_COMMON=y CONFIG_NET_DSA_TAG_BRCM_LEGACY=y CONFIG_NET_DSA_TAG_BRCM_PREPEND=y -CONFIG_NET_DSA_TAG_QCA=y CONFIG_NET_DSA_TAG_NONE=y +CONFIG_NET_DSA_TAG_QCA=y CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_INGRESS=y diff --git a/target/linux/d1/config-6.6 b/target/linux/d1/config-6.6 index 957c3fba4d..5a5b4c3d36 100644 --- a/target/linux/d1/config-6.6 +++ b/target/linux/d1/config-6.6 @@ -143,13 +143,13 @@ CONFIG_I2C_MV64XXX=y CONFIG_I2C_OCORES=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INPUT=y +# CONFIG_IOMMUFD is not set CONFIG_IOMMU_API=y # CONFIG_IOMMU_DEBUGFS is not set # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set CONFIG_IOMMU_DEFAULT_DMA_STRICT=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_IOMMU_SUPPORT=y -# CONFIG_IOMMUFD is not set CONFIG_IO_URING=y CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6 index 3fe4c3d668..efe8d11279 100644 --- a/target/linux/generic/config-6.6 +++ b/target/linux/generic/config-6.6 @@ -880,7 +880,6 @@ CONFIG_CFG80211_HEADERS=y # CONFIG_CHELSIO_T4 is not set # CONFIG_CHELSIO_T4VF is not set # CONFIG_CHROME_PLATFORMS is not set -# CONFIG_CZNIC_PLATFORMS is not set # CONFIG_CHR_DEV_SCH is not set # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_ST is not set @@ -1247,6 +1246,7 @@ CONFIG_CRYPTO_SKCIPHER2=y # CONFIG_CXL_BASE is not set # CONFIG_CXL_BUS is not set # CONFIG_CYPRESS_FIRMWARE is not set +# CONFIG_CZNIC_PLATFORMS is not set # CONFIG_DA280 is not set # CONFIG_DA311 is not set # CONFIG_DAMON is not set @@ -5153,8 +5153,8 @@ CONFIG_RTC_SYSTOHC_DEVICE="rtc0" # CONFIG_RTL_CARDS is not set # CONFIG_RTS5208 is not set CONFIG_RT_MUTEXES=y -# CONFIG_RUST is not set CONFIG_RUNTIME_TESTING_MENU=y +# CONFIG_RUST is not set # CONFIG_RV is not set CONFIG_RXKAD=y # CONFIG_RXPERF is not set diff --git a/target/linux/generic/config-filter b/target/linux/generic/config-filter index e7eda471d0..e72c334ee7 100644 --- a/target/linux/generic/config-filter +++ b/target/linux/generic/config-filter @@ -1,17 +1,17 @@ +# CONFIG_ARCH_(ENABLE|HAS|HAVE|INLINE|SUPPORTS|USE|WANT|STACKWALK)_.* is not set # CONFIG_ARM64_AS_.* is not set # CONFIG_ARM64_CONT_.*_SHIFT is not set -# CONFIG_ARCH_(ENABLE|HAS|HAVE|INLINE|SUPPORTS|USE|WANT|STACKWALK)_.* is not set # CONFIG_AS_.* is not set # CONFIG_CC_(CAN|HAS|IS|VERSION)_.* is not set CONFIG_CLANG_VERSION=.* -# CONFIG_GCC_VERSION is not set CONFIG_FRAME_WARN=.* +# CONFIG_GCC_VERSION is not set # CONFIG_HAVE_(?!(ARCH_TIMER|TCM|SMP)).* is not set # CONFIG_INLINE_.* is not set # CONFIG_LD_.* is not set CONFIG_LLD_VERSION=.* -CONFIG_PAHOLE_VERSION=.* CONFIG_PAHOLE_HAS_SPLIT_BTF=.* +CONFIG_PAHOLE_VERSION=.* CONFIG_PLUGIN_HOSTCC=".*" # CONFIG_SET_FS is not set # CONFIG_TASKS_.* is not set diff --git a/target/linux/imx/config-6.6 b/target/linux/imx/config-6.6 index 6cb1d8a8f6..f70e7e1501 100644 --- a/target/linux/imx/config-6.6 +++ b/target/linux/imx/config-6.6 @@ -116,12 +116,12 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=y # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set # CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set -# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y +# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y @@ -167,19 +167,13 @@ CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_DMA_OPS=y CONFIG_DMA_VIRTUAL_CHANNELS=y +# CONFIG_DRM_DW_HDMI_GP_AUDIO is not set # CONFIG_DRM_FSL_LDB is not set # CONFIG_DRM_IMX8QM_LDB is not set # CONFIG_DRM_IMX8QXP_LDB is not set # CONFIG_DRM_IMX8QXP_PIXEL_COMBINER is not set # CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI is not set # CONFIG_DRM_IMX_LCDC is not set -# CONFIG_DRM_DW_HDMI_GP_AUDIO is not set -# CONFIG_VIDEO_IMX_MIPI_CSIS is not set -# CONFIG_VIDEO_IMX8_ISI is not set -# CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 is not set -# CONFIG_VIDEO_DW100 is not set -# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set -# CONFIG_VIDEO_HANTRO is not set CONFIG_DTC=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y @@ -351,6 +345,7 @@ CONFIG_PAGE_OFFSET=0x80000000 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y +CONFIG_PCI_IMX6_HOST=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y @@ -360,7 +355,6 @@ CONFIG_PINCTRL=y # CONFIG_PINCTRL_IMX93 is not set # CONFIG_PINCTRL_IMXRT1050 is not set # CONFIG_PINCTRL_IMXRT1170 is not set -CONFIG_PCI_IMX6_HOST=y CONFIG_PL310_ERRATA_769419=y CONFIG_PM=y CONFIG_PM_CLK=y @@ -392,8 +386,8 @@ CONFIG_RESET_CONTROLLER=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_RTC_CLASS=y -# CONFIG_RTC_DRV_CMOS is not set # CONFIG_RTC_DRV_BBNSM is not set +# CONFIG_RTC_DRV_CMOS is not set # CONFIG_RTC_DRV_IMXDI is not set # CONFIG_RTC_DRV_MXC is not set # CONFIG_RTC_DRV_MXC_V2 is not set @@ -474,9 +468,15 @@ CONFIG_USB_STORAGE=y CONFIG_USB_SUPPORT=y CONFIG_USB_ULPI_BUS=y CONFIG_USE_OF=y -# CONFIG_VIDEO_IMX7_CSI is not set CONFIG_VFP=y CONFIG_VFPv3=y +# CONFIG_VIDEO_DW100 is not set +# CONFIG_VIDEO_HANTRO is not set +# CONFIG_VIDEO_IMX7_CSI is not set +# CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 is not set +# CONFIG_VIDEO_IMX8_ISI is not set +# CONFIG_VIDEO_IMX_MIPI_CSIS is not set +# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set CONFIG_VMSPLIT_2G=y # CONFIG_VMSPLIT_3G is not set CONFIG_WATCHDOG_CORE=y diff --git a/target/linux/imx/cortexa53/config-default b/target/linux/imx/cortexa53/config-default index 026ddf6708..ac8e646da4 100644 --- a/target/linux/imx/cortexa53/config-default +++ b/target/linux/imx/cortexa53/config-default @@ -59,7 +59,6 @@ CONFIG_CRYPTO_SHA256_ARM64=y CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_SHA512_ARM64=y CONFIG_CRYPTO_SHA512_ARM64_CE=y -# CONFIG_DRM_IMX_DCSS is not set # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -68,6 +67,7 @@ CONFIG_DEVFREQ_GOV_USERSPACE=y # CONFIG_DEVFREQ_THERMAL is not set # CONFIG_DMA_CMA is not set CONFIG_DMA_DIRECT_REMAP=y +# CONFIG_DRM_IMX_DCSS is not set CONFIG_DUMMY_CONSOLE=y CONFIG_DWMAC_DWC_QOS_ETH=y CONFIG_DWMAC_GENERIC=y diff --git a/target/linux/ipq40xx/config-6.6 b/target/linux/ipq40xx/config-6.6 index 683463628f..0ee2f433b1 100644 --- a/target/linux/ipq40xx/config-6.6 +++ b/target/linux/ipq40xx/config-6.6 @@ -220,11 +220,11 @@ CONFIG_I2C_HELPER_AUTO=y # CONFIG_I2C_QCOM_CCI is not set CONFIG_I2C_QUP=y CONFIG_INITRAMFS_SOURCE="" +# CONFIG_IOMMUFD is not set # CONFIG_IOMMU_DEBUGFS is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set CONFIG_IOMMU_SUPPORT=y -# CONFIG_IOMMUFD is not set # CONFIG_IPQ_APSS_PLL is not set CONFIG_IPQ_GCC_4019=y # CONFIG_IPQ_GCC_6018 is not set @@ -243,11 +243,11 @@ CONFIG_KMAP_LOCAL=y CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y # CONFIG_KPSS_XCC is not set # CONFIG_KRAITCC is not set -CONFIG_LED_TRIGGER_PHY=y CONFIG_LEDS_LP5523=y CONFIG_LEDS_LP5562=y CONFIG_LEDS_LP55XX_COMMON=y CONFIG_LEDS_TLC591XX=y +CONFIG_LED_TRIGGER_PHY=y CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y @@ -326,8 +326,8 @@ CONFIG_NVMEM=y CONFIG_NVMEM_QCOM_QFPROM=y # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set # CONFIG_NVMEM_SPMI_SDAM is not set -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_NVMEM_SYSFS=y +CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y @@ -369,11 +369,11 @@ CONFIG_PHY_QCOM_IPQ4019_USB=y # CONFIG_PHY_QCOM_PCIE2 is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set # CONFIG_PHY_QCOM_USB_SS is not set -# CONFIG_PHY_QCOM_SGMII_ETH is not set CONFIG_PINCTRL=y # CONFIG_PINCTRL_APQ8064 is not set # CONFIG_PINCTRL_APQ8084 is not set @@ -418,9 +418,9 @@ CONFIG_QCOM_IPQ4019_ESS_EDMA=y # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_RAMP_CTRL is not set -# CONFIG_QCOM_RPM_MASTER_STATS is not set # CONFIG_QCOM_RMTFS_MEM is not set # CONFIG_QCOM_RPMH is not set +# CONFIG_QCOM_RPM_MASTER_STATS is not set CONFIG_QCOM_SCM=y # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set CONFIG_QCOM_SMEM=y @@ -479,7 +479,6 @@ CONFIG_RWSEM_SPIN_ON_OWNER=y # CONFIG_SDM_VIDEOCC_845 is not set # CONFIG_SDX_GCC_65 is not set # CONFIG_SDX_GCC_75 is not set -# CONFIG_SM_GCC_7150 is not set CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MSM=y @@ -489,6 +488,7 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y # CONFIG_SM_CAMCC_8450 is not set +# CONFIG_SM_GCC_7150 is not set # CONFIG_SM_GCC_8150 is not set # CONFIG_SM_GCC_8250 is not set # CONFIG_SM_GCC_8450 is not set diff --git a/target/linux/ipq40xx/mikrotik/config-default b/target/linux/ipq40xx/mikrotik/config-default index 7234e4b8f6..9f90ea4193 100644 --- a/target/linux/ipq40xx/mikrotik/config-default +++ b/target/linux/ipq40xx/mikrotik/config-default @@ -4,10 +4,10 @@ CONFIG_MIKROTIK_WLAN_DECOMPRESS_LZ77=y CONFIG_MTD_ROUTERBOOT_PARTS=y CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y CONFIG_MTD_SPLIT_MINOR_FW=y -# CONFIG_NVMEM_LAYOUT_MIKROTIK is not set CONFIG_MTD_UBI=y CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_MTD_UBI_BLOCK=y CONFIG_MTD_UBI_NVMEM=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 +# CONFIG_NVMEM_LAYOUT_MIKROTIK is not set CONFIG_UBIFS_FS=y diff --git a/target/linux/ipq806x/config-6.6 b/target/linux/ipq806x/config-6.6 index 8c62332fce..88ec58e2c9 100644 --- a/target/linux/ipq806x/config-6.6 +++ b/target/linux/ipq806x/config-6.6 @@ -209,11 +209,11 @@ CONFIG_I2C_HELPER_AUTO=y # CONFIG_I2C_QCOM_CCI is not set CONFIG_I2C_QUP=y CONFIG_INITRAMFS_SOURCE="" +# CONFIG_IOMMUFD is not set # CONFIG_IOMMU_DEBUGFS is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set CONFIG_IOMMU_SUPPORT=y -# CONFIG_IOMMUFD is not set # CONFIG_IPQ_APSS_PLL is not set # CONFIG_IPQ_GCC_4019 is not set # CONFIG_IPQ_GCC_6018 is not set @@ -366,11 +366,11 @@ CONFIG_PHY_QCOM_IPQ806X_SATA=y # CONFIG_PHY_QCOM_PCIE2 is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set +# CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set # CONFIG_PHY_QCOM_USB_SS is not set -# CONFIG_PHY_QCOM_SGMII_ETH is not set -# CONFIG_PHY_QCOM_SNPS_EUSB2 is not set CONFIG_PINCTRL=y # CONFIG_PINCTRL_APQ8064 is not set # CONFIG_PINCTRL_APQ8084 is not set @@ -418,9 +418,9 @@ CONFIG_QCOM_NET_PHYLIB=y # CONFIG_QCOM_PDC is not set # CONFIG_QCOM_RAMP_CTRL is not set # CONFIG_QCOM_RMTFS_MEM is not set -CONFIG_QCOM_RPM_MASTER_STATS=y CONFIG_QCOM_RPMCC=y # CONFIG_QCOM_RPMH is not set +CONFIG_QCOM_RPM_MASTER_STATS=y CONFIG_QCOM_SCM=y # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set CONFIG_QCOM_SMEM=y diff --git a/target/linux/mpc85xx/p1020/config-default b/target/linux/mpc85xx/p1020/config-default index 36ace8015f..49574cd653 100644 --- a/target/linux/mpc85xx/p1020/config-default +++ b/target/linux/mpc85xx/p1020/config-default @@ -11,12 +11,10 @@ CONFIG_EEPROM_LEGACY=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_TBSYNC=y CONFIG_GPIO_74X164=y -CONFIG_GRO_CELLS=y # CONFIG_GPIO_MAX77620 is not set +CONFIG_GRO_CELLS=y CONFIG_HAVE_RCU_TABLE_FREE=y CONFIG_HIVEAP_330=y -CONFIG_PANDA=y -CONFIG_MSM460=y CONFIG_I2C_CHARDEV=y CONFIG_LEDS_LP5521=y CONFIG_LEDS_LP55XX_COMMON=y @@ -25,6 +23,7 @@ CONFIG_LOCK_SPIN_ON_OWNER=y # CONFIG_MAX77620_WATCHDOG is not set CONFIG_MFD_CORE=y CONFIG_MFD_MAX77620=y +CONFIG_MSM460=y CONFIG_MTD_CFI=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_PHYSMAP=y @@ -47,6 +46,7 @@ CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_SWITCHDEV=y CONFIG_NR_CPUS=2 CONFIG_PADATA=y +CONFIG_PANDA=y CONFIG_REGMAP_IRQ=y CONFIG_REGULATOR=y CONFIG_RFS_ACCEL=y diff --git a/target/linux/mvebu/cortexa72/config-6.6 b/target/linux/mvebu/cortexa72/config-6.6 index af9dcf3632..d6aaa8d0bd 100644 --- a/target/linux/mvebu/cortexa72/config-6.6 +++ b/target/linux/mvebu/cortexa72/config-6.6 @@ -59,11 +59,11 @@ CONFIG_MARVELL_10G_PHY=y CONFIG_MFD_CORE=y CONFIG_MFD_IEI_WT61P803_PUZZLE=y CONFIG_MFD_SYSCON=y -CONFIG_MMC_SDHCI_XENON=y -CONFIG_MODULES_USE_ELF_RELA=y CONFIG_MIKROTIK=y CONFIG_MIKROTIK_RB_SYSFS=y # CONFIG_MIKROTIK_WLAN_DECOMPRESS_LZ77 is not set +CONFIG_MMC_SDHCI_XENON=y +CONFIG_MODULES_USE_ELF_RELA=y CONFIG_MTD_ROUTERBOOT_PARTS=y CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y CONFIG_MVEBU_GICP=y diff --git a/target/linux/realtek/rtl839x/config-6.6 b/target/linux/realtek/rtl839x/config-6.6 index c8d841c01e..a357eb3966 100644 --- a/target/linux/realtek/rtl839x/config-6.6 +++ b/target/linux/realtek/rtl839x/config-6.6 @@ -102,8 +102,8 @@ CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_GPIO=y -# CONFIG_I2C_RTL9300 is not set # CONFIG_I2C_MUX_RTL9300 is not set +# CONFIG_I2C_RTL9300 is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y diff --git a/target/linux/sifiveu/config-6.6 b/target/linux/sifiveu/config-6.6 index 9a8cf8e48c..2e5474ce2f 100644 --- a/target/linux/sifiveu/config-6.6 +++ b/target/linux/sifiveu/config-6.6 @@ -9,10 +9,10 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_RV64I=y -# CONFIG_ARCH_THEAD is not set CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_STACKWALK=y +# CONFIG_ARCH_THEAD is not set CONFIG_ARCH_WANTS_THP_SWAP=y CONFIG_ASN1=y CONFIG_ASSOCIATIVE_ARRAY=y @@ -171,15 +171,15 @@ CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_OCORES=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INPUT=y -# CONFIG_IOMMU_DEBUGFS is not set # CONFIG_IOMMUFD is not set +# CONFIG_IOMMU_DEBUGFS is not set CONFIG_IOMMU_SUPPORT=y CONFIG_IO_URING=y -CONFIG_IRQ_STACKS=y CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y +CONFIG_IRQ_STACKS=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y CONFIG_KALLSYMS=y @@ -316,8 +316,8 @@ CONFIG_RISCV_ISA_SVPBMT=y CONFIG_RISCV_ISA_V=y CONFIG_RISCV_ISA_V_DEFAULT_ENABLE=y CONFIG_RISCV_ISA_ZBB=y -CONFIG_RISCV_ISA_ZICBOZ=y CONFIG_RISCV_ISA_ZICBOM=y +CONFIG_RISCV_ISA_ZICBOZ=y CONFIG_RISCV_SBI=y CONFIG_RISCV_SBI_V01=y CONFIG_RISCV_TIMER=y diff --git a/target/linux/starfive/config-6.6 b/target/linux/starfive/config-6.6 index cb39210a42..8ebced1165 100644 --- a/target/linux/starfive/config-6.6 +++ b/target/linux/starfive/config-6.6 @@ -166,10 +166,10 @@ CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set # CONFIG_EFI_ZBOOT is not set # CONFIG_ERRATA_ANDES is not set -CONFIG_ERRATA_STARFIVE_JH7100=y CONFIG_ERRATA_SIFIVE=y CONFIG_ERRATA_SIFIVE_CIP_1200=y CONFIG_ERRATA_SIFIVE_CIP_453=y +CONFIG_ERRATA_STARFIVE_JH7100=y # CONFIG_ERRATA_THEAD is not set CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y @@ -308,9 +308,9 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_DEFAULT="iso8859-15" CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_15=y +CONFIG_NONPORTABLE=y CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y -CONFIG_NONPORTABLE=y CONFIG_NR_CPUS=8 CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y @@ -499,8 +499,8 @@ CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y CONFIG_SPI_SPIDEV=y CONFIG_SRCU=y -CONFIG_STARFIVE_TIMER=y CONFIG_STARFIVE_JH7110_TIMER=y +CONFIG_STARFIVE_TIMER=y CONFIG_STARFIVE_WATCHDOG=y CONFIG_STMMAC_ETH=y CONFIG_STMMAC_PLATFORM=y diff --git a/target/linux/sunxi/cortexa53/config-6.6 b/target/linux/sunxi/cortexa53/config-6.6 index 55bcd4e8e5..89cd43a54e 100644 --- a/target/linux/sunxi/cortexa53/config-6.6 +++ b/target/linux/sunxi/cortexa53/config-6.6 @@ -4,18 +4,19 @@ CONFIG_ARCH_MMAP_RND_BITS=18 CONFIG_ARCH_MMAP_RND_BITS_MAX=24 CONFIG_ARCH_MMAP_RND_BITS_MIN=18 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 +# CONFIG_ARCH_NXP is not set CONFIG_ARCH_PROC_KCORE_TEXT=y CONFIG_ARCH_STACKWALK=y CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_ARM64=y CONFIG_ARM64_4K_PAGES=y CONFIG_ARM64_CRYPTO=y -CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_2051678=y -CONFIG_ARM64_ERRATUM_2077057=y -CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2054223=y CONFIG_ARM64_ERRATUM_2067961=y +CONFIG_ARM64_ERRATUM_2077057=y +CONFIG_ARM64_ERRATUM_2658417=y +CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y CONFIG_ARM64_PAGE_SHIFT=12 CONFIG_ARM64_PA_BITS=48 CONFIG_ARM64_PA_BITS_48=y @@ -38,8 +39,11 @@ CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_GHASH_ARM64_CE=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y +# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SIMD=y +# CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set +# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set CONFIG_DMA_DIRECT_REMAP=y CONFIG_DWMAC_SUN8I=y CONFIG_EEPROM_AT24=y @@ -59,6 +63,7 @@ CONFIG_MUSB_PIO_ONLY=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NOP_USB_XCEIV=y CONFIG_NO_IOPORT_MAP=y +# CONFIG_PAGE_TABLE_CHECK is not set CONFIG_PARTITION_PERCPU=y CONFIG_PHY_SUN50I_USB3=y CONFIG_PINCTRL_SUN50I_A100=y @@ -67,12 +72,13 @@ CONFIG_PINCTRL_SUN50I_A64=y CONFIG_PINCTRL_SUN50I_A64_R=y CONFIG_PINCTRL_SUN50I_H5=y CONFIG_PINCTRL_SUN50I_H6=y -CONFIG_PINCTRL_SUN50I_H6_R=y CONFIG_PINCTRL_SUN50I_H616=y CONFIG_PINCTRL_SUN50I_H616_R=y +CONFIG_PINCTRL_SUN50I_H6_R=y # CONFIG_PREEMPT_DYNAMIC is not set CONFIG_QUEUED_RWLOCKS=y CONFIG_QUEUED_SPINLOCKS=y +CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y # CONFIG_SCHED_CLUSTER is not set # CONFIG_SHADOW_CALL_STACK is not set @@ -91,6 +97,7 @@ CONFIG_SUN50I_H616_CCU=y CONFIG_SUN50I_H6_CCU=y CONFIG_SUN50I_H6_R_CCU=y # CONFIG_SUN6I_RTC_CCU is not set +CONFIG_SURFACE_PLATFORMS=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_THREAD_INFO_IN_TASK=y CONFIG_UNMAP_KERNEL_AT_EL0=y @@ -100,10 +107,3 @@ CONFIG_USB_MUSB_SUNXI=y CONFIG_USB_PHY=y CONFIG_VMAP_STACK=y CONFIG_ZONE_DMA32=y -CONFIG_SURFACE_PLATFORMS=y -# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set -# CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set -# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set -# CONFIG_PAGE_TABLE_CHECK is not set -CONFIG_RANDOMIZE_KSTACK_OFFSET=y -# CONFIG_ARCH_NXP is not set diff --git a/target/linux/x86/64/config-6.6 b/target/linux/x86/64/config-6.6 index b443231120..def4527f77 100644 --- a/target/linux/x86/64/config-6.6 +++ b/target/linux/x86/64/config-6.6 @@ -49,11 +49,11 @@ CONFIG_AGP_INTEL=y # CONFIG_AGP_SIS is not set # CONFIG_AGP_VIA is not set # CONFIG_AMD_HSMP is not set -# CONFIG_AMD_SFH_HID is not set CONFIG_AMD_IOMMU=y CONFIG_AMD_IOMMU_V2=y # CONFIG_AMD_PMF is not set # CONFIG_AMD_PTDMA is not set +# CONFIG_AMD_SFH_HID is not set CONFIG_APERTURE_HELPERS=y CONFIG_ARCH_CPUIDLE_HALTPOLL=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y @@ -100,13 +100,13 @@ CONFIG_CRC64_ROCKSOFT=y CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_AES_NI_INTEL=y CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y -# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set +# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set CONFIG_CRYPTO_BLAKE2S_X86=y # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set -# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set +# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA_X86_64 is not set # CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set # CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set @@ -121,16 +121,16 @@ CONFIG_CRYPTO_LRW=y # CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set # CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set # CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set -# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set # CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set +# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set # CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set # CONFIG_CRYPTO_SHA1_SSSE3 is not set # CONFIG_CRYPTO_SHA256_SSSE3 is not set # CONFIG_CRYPTO_SHA512_SSSE3 is not set CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM3_AVX_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set +# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_TWOFISH_AVX_X86_64 is not set # CONFIG_CRYPTO_TWOFISH_X86_64 is not set # CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set @@ -229,8 +229,8 @@ CONFIG_FB_SYS_FOPS=y CONFIG_FB_SYS_IMAGEBLIT=y CONFIG_FB_TILEBLITTING=y # CONFIG_FB_VESA is not set -CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y CONFIG_FONT_SUPPORT=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y diff --git a/target/linux/x86/generic/config-6.6 b/target/linux/x86/generic/config-6.6 index 6729f0e9cd..091584e077 100644 --- a/target/linux/x86/generic/config-6.6 +++ b/target/linux/x86/generic/config-6.6 @@ -162,8 +162,8 @@ CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_FOPS=y CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_VESA is not set -CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y CONFIG_FONT_SUPPORT=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y diff --git a/target/linux/x86/geode/config-6.6 b/target/linux/x86/geode/config-6.6 index 729dc30c27..f9f4a6aea9 100644 --- a/target/linux/x86/geode/config-6.6 +++ b/target/linux/x86/geode/config-6.6 @@ -37,8 +37,8 @@ CONFIG_ACPI_THERMAL=y # CONFIG_ADV_SWBUTTON is not set CONFIG_ALIX=y # CONFIG_AMD_PMF is not set -# CONFIG_ASUS_TF103C_DOCK is not set CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y +# CONFIG_ASUS_TF103C_DOCK is not set # CONFIG_ATA_PIIX is not set CONFIG_CS5535_CLOCK_EVENT_SRC=y CONFIG_CS5535_MFGPT=y diff --git a/target/linux/x86/legacy/config-6.6 b/target/linux/x86/legacy/config-6.6 index d5c4a55e5e..8ce9237a21 100644 --- a/target/linux/x86/legacy/config-6.6 +++ b/target/linux/x86/legacy/config-6.6 @@ -45,8 +45,8 @@ CONFIG_AGP_INTEL=y # CONFIG_AMD_PMF is not set CONFIG_APERTURE_HELPERS=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y -CONFIG_AUXILIARY_BUS=y # CONFIG_ASUS_TF103C_DOCK is not set +CONFIG_AUXILIARY_BUS=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BLK_DEV_SR=y CONFIG_CDROM=y @@ -120,8 +120,8 @@ CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_FOPS=y CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_VESA is not set -CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y CONFIG_FONT_SUPPORT=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y From b6bbc76c0b2a18b0a6771c4eec173f64783247fd Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 23 Oct 2024 00:10:02 +0200 Subject: [PATCH 06/16] include/package-pack: set missing Description on .apk creation Set missing description info on .apk creation. This was probably a TODO that wasn't notice when the final implementation was pushed. Fixes: d788ab376f85 ("build: add APK package build capabilities") Signed-off-by: Christian Marangi --- include/package-pack.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/package-pack.mk b/include/package-pack.mk index 26a3278834..a6ba9ca37c 100644 --- a/include/package-pack.mk +++ b/include/package-pack.mk @@ -339,7 +339,7 @@ else $(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \ --info "name:$(1)$$(ABIV_$(1))" \ --info "version:$(VERSION)" \ - --info "description:" \ + --info "description: $$(strip $$(Package/$(1)/description))" \ --info "arch:$(PKGARCH)" \ --info "license:$(LICENSE)" \ --info "origin:$(SOURCE)" \ From 43d07feb91a32774937467d30a6a03270310f73f Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 23 Oct 2024 12:17:40 +0200 Subject: [PATCH 07/16] airoha: en7581: refresh and fix PWM patch Refresh and fix PWM patch with new revision proposed upstream. Signed-off-by: Christian Marangi --- ...wm-airoha-Add-support-for-EN7581-SoC.patch | 113 +++++++----------- 1 file changed, 45 insertions(+), 68 deletions(-) diff --git a/target/linux/airoha/patches-6.6/108-pwm-airoha-Add-support-for-EN7581-SoC.patch b/target/linux/airoha/patches-6.6/108-pwm-airoha-Add-support-for-EN7581-SoC.patch index 5eb4696b39..8f83c696c4 100644 --- a/target/linux/airoha/patches-6.6/108-pwm-airoha-Add-support-for-EN7581-SoC.patch +++ b/target/linux/airoha/patches-6.6/108-pwm-airoha-Add-support-for-EN7581-SoC.patch @@ -1,18 +1,19 @@ -From b235c45e83c8c2a24746652982d569896b142de9 Mon Sep 17 00:00:00 2001 +From 97e4e7b106b08373f90ff1b8c4daf6c2254386a8 Mon Sep 17 00:00:00 2001 From: Benjamin Larsson -Date: Wed, 16 Oct 2024 12:07:34 +0200 -Subject: [PATCH 2/2] pwm: airoha: Add support for EN7581 SoC +Date: Wed, 23 Oct 2024 01:20:06 +0200 +Subject: [PATCH] pwm: airoha: Add support for EN7581 SoC Introduce driver for PWM module available on EN7581 SoC. Signed-off-by: Benjamin Larsson +Reviewed-by: AngeloGioacchino Del Regno Co-developed-by: Lorenzo Bianconi Signed-off-by: Lorenzo Bianconi --- - drivers/pwm/Kconfig | 11 + + drivers/pwm/Kconfig | 11 ++ drivers/pwm/Makefile | 1 + - drivers/pwm/pwm-airoha.c | 424 +++++++++++++++++++++++++++++++++++++++ - 3 files changed, 436 insertions(+) + drivers/pwm/pwm-airoha.c | 386 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 398 insertions(+) create mode 100644 drivers/pwm/pwm-airoha.c --- a/drivers/pwm/Kconfig @@ -47,7 +48,7 @@ Signed-off-by: Lorenzo Bianconi obj-$(CONFIG_PWM_ATMEL_HLCDC_PWM) += pwm-atmel-hlcdc.o --- /dev/null +++ b/drivers/pwm/pwm-airoha.c -@@ -0,0 +1,424 @@ +@@ -0,0 +1,400 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2022 Markus Gothe @@ -80,11 +81,12 @@ Signed-off-by: Lorenzo Bianconi +#define SGPIO_LED_DATA_DATA GENMASK(16, 0) + +#define REG_SGPIO_CLK_DIVR 0x0028 ++#define REG_SGPIO_CLK_DIVR_MASK GENMASK(1, 0) +#define REG_SGPIO_CLK_DLY 0x002c + +#define REG_SIPO_FLASH_MODE_CFG 0x0030 +#define SERIAL_GPIO_FLASH_MODE BIT(1) -+#define SERIAL_GPIO_MODE BIT(0) ++#define SERIAL_GPIO_MODE_74HC164 BIT(0) + +#define REG_GPIO_FLASH_PRD_SET(_n) (0x003c + ((_n) << 2)) +#define GPIO_FLASH_PRD_MASK(_n) GENMASK(15 + ((_n) << 4), ((_n) << 4)) @@ -98,7 +100,7 @@ Signed-off-by: Lorenzo Bianconi +#define REG_CYCLE_CFG_VALUE(_n) (0x0098 + ((_n) << 2)) +#define WAVE_GEN_CYCLE_MASK(_n) GENMASK(7 + ((_n) << 3), ((_n) << 3)) + -+#define EN7581_NUM_BUCKETS 8 ++#define PWM_NUM_BUCKETS 8 + +struct airoha_pwm_bucket { + /* Bitmask of PWM channels using this bucket */ @@ -115,7 +117,7 @@ Signed-off-by: Lorenzo Bianconi + struct device_node *np; + u64 initialized; + -+ struct airoha_pwm_bucket bucket[EN7581_NUM_BUCKETS]; ++ struct airoha_pwm_bucket bucket[PWM_NUM_BUCKETS]; +}; + +/* @@ -200,62 +202,25 @@ Signed-off-by: Lorenzo Bianconi + +static int airoha_pwm_sipo_init(struct airoha_pwm *pc) +{ -+ u32 clk_divr_val, sipo_clock_delay, sipo_clock_divisor; + u32 val; + + if (!(pc->initialized >> PWM_NUM_GPIO)) + return 0; + -+ /* -+ * Select the right shift register chip. -+ * By default 74HC164 is assumed. With this enabled -+ * 74HC595 chip is used that requires the latch pin -+ * to be triggered to apply the configuration. -+ */ -+ if (of_property_read_bool(pc->np, "airoha,74hc595-mode")) -+ regmap_set_bits(pc->regmap, REG_SIPO_FLASH_MODE_CFG, -+ SERIAL_GPIO_MODE); -+ else -+ regmap_clear_bits(pc->regmap, REG_SIPO_FLASH_MODE_CFG, -+ SERIAL_GPIO_MODE); ++ regmap_clear_bits(pc->regmap, REG_SIPO_FLASH_MODE_CFG, ++ SERIAL_GPIO_MODE_74HC164); + -+ if (of_property_read_u32(pc->np, "airoha,sipo-clock-divisor", -+ &sipo_clock_divisor)) -+ sipo_clock_divisor = 32; -+ -+ switch (sipo_clock_divisor) { -+ case 4: -+ clk_divr_val = 0; -+ break; -+ case 8: -+ clk_divr_val = 1; -+ break; -+ case 16: -+ clk_divr_val = 2; -+ break; -+ case 32: -+ clk_divr_val = 3; -+ break; -+ default: -+ return -EINVAL; -+ } -+ -+ /* Configure shift register timings */ -+ regmap_write(pc->regmap, REG_SGPIO_CLK_DIVR, clk_divr_val); -+ -+ if (of_property_read_u32(pc->np, "airoha,sipo-clock-delay", -+ &sipo_clock_delay)) -+ sipo_clock_delay = 1; -+ -+ if (sipo_clock_delay < 1 || sipo_clock_delay > sipo_clock_divisor / 2) -+ return -EINVAL; ++ /* Configure shift register timings, use 32x divisor */ ++ regmap_write(pc->regmap, REG_SGPIO_CLK_DIVR, ++ FIELD_PREP(REG_SGPIO_CLK_DIVR_MASK, 0x3)); + + /* -+ * The actual delay is sclkdly + 1 so subtract 1 from -+ * sipo-clock-delay to calculate the register value ++ * The actual delay is clock + 1. ++ * Notice that clock delay should not be greater ++ * than (divisor / 2) - 1. ++ * Set to 0 by default. (aka 1) + */ -+ sipo_clock_delay--; -+ regmap_write(pc->regmap, REG_SGPIO_CLK_DLY, sipo_clock_delay); ++ regmap_write(pc->regmap, REG_SGPIO_CLK_DLY, 0x0); + + /* + * It it necessary to after muxing explicitly shift out all @@ -365,7 +330,7 @@ Signed-off-by: Lorenzo Bianconi + +static void airoha_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) +{ -+ struct airoha_pwm *pc = pwmchip_get_drvdata(chip); ++ struct airoha_pwm *pc = container_of(chip, struct airoha_pwm, chip); + + /* Disable PWM and release the waveform */ + airoha_pwm_config_flash_map(pc, pwm->hwpwm, -1); @@ -380,7 +345,7 @@ Signed-off-by: Lorenzo Bianconi +static int airoha_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, + const struct pwm_state *state) +{ -+ struct airoha_pwm *pc = pwmchip_get_drvdata(chip); ++ struct airoha_pwm *pc = container_of(chip, struct airoha_pwm, chip); + u64 duty = state->enabled ? state->duty_cycle : 0; + u64 period = state->period; + @@ -405,7 +370,7 @@ Signed-off-by: Lorenzo Bianconi +static int airoha_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, + struct pwm_state *state) +{ -+ struct airoha_pwm *pc = pwmchip_get_drvdata(chip); ++ struct airoha_pwm *pc = container_of(chip, struct airoha_pwm, chip); + int i; + + /* find hwpwm in waveform generator bucket */ @@ -428,28 +393,39 @@ Signed-off-by: Lorenzo Bianconi +static const struct pwm_ops airoha_pwm_ops = { + .get_state = airoha_pwm_get_state, + .apply = airoha_pwm_apply, ++ .owner = THIS_MODULE, +}; + +static int airoha_pwm_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct airoha_pwm *pc; -+ struct pwm_chip *chip; + -+ chip = devm_pwmchip_alloc(dev, PWM_NUM_GPIO + PWM_NUM_SIPO, -+ sizeof(*pc)); -+ if (IS_ERR(chip)) -+ return PTR_ERR(chip); ++ pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL); ++ if (!pc) ++ return -ENOMEM; + -+ chip->ops = &airoha_pwm_ops; -+ pc = pwmchip_get_drvdata(chip); + pc->np = dev->of_node; ++ pc->chip.dev = dev; ++ pc->chip.ops = &airoha_pwm_ops; ++ pc->chip.npwm = PWM_NUM_GPIO + PWM_NUM_SIPO; + + pc->regmap = device_node_to_regmap(dev->parent->of_node); + if (IS_ERR(pc->regmap)) + return PTR_ERR(pc->regmap); + -+ return devm_pwmchip_add(&pdev->dev, chip); ++ platform_set_drvdata(pdev, pc); ++ ++ return pwmchip_add(&pc->chip); ++} ++ ++static int airoha_pwm_remove(struct platform_device *pdev) ++{ ++ struct airoha_pwm *pc = platform_get_drvdata(pdev); ++ ++ pwmchip_remove(&pc->chip); ++ ++ return 0; +} + +static const struct of_device_id airoha_pwm_of_match[] = { @@ -464,6 +440,7 @@ Signed-off-by: Lorenzo Bianconi + .of_match_table = airoha_pwm_of_match, + }, + .probe = airoha_pwm_probe, ++ .remove = airoha_pwm_remove, +}; +module_platform_driver(airoha_pwm_driver); + From d7dc5b1b4d12fbc23b3e19c7a5bee9b7e020d233 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 23 Oct 2024 12:19:03 +0200 Subject: [PATCH 08/16] airoha: rename subtarget from en7581 to an7581 The Airoha EN7581 got renamed to AN7581 due to move from Econet to Airoha. To save on compatibility, use both compatible for the device. Signed-off-by: Christian Marangi --- target/linux/airoha/Makefile | 2 +- .../airoha/{en7581 => an7581}/config-6.6 | 0 .../linux/airoha/{en7581 => an7581}/target.mk | 6 +++--- ...n7581-evb-emmc.dts => an7581-evb-emmc.dts} | 6 +++--- .../dts/{en7581-evb.dts => an7581-evb.dts} | 6 +++--- .../airoha/dts/{en7581.dtsi => an7581.dtsi} | 0 .../airoha/image/{en7581.mk => an7581.mk} | 20 +++++++++---------- target/linux/airoha/modules.mk | 16 +++++++-------- 8 files changed, 28 insertions(+), 28 deletions(-) rename target/linux/airoha/{en7581 => an7581}/config-6.6 (100%) rename target/linux/airoha/{en7581 => an7581}/target.mk (55%) rename target/linux/airoha/dts/{en7581-evb-emmc.dts => an7581-evb-emmc.dts} (95%) rename target/linux/airoha/dts/{en7581-evb.dts => an7581-evb.dts} (96%) rename target/linux/airoha/dts/{en7581.dtsi => an7581.dtsi} (100%) rename target/linux/airoha/image/{en7581.mk => an7581.mk} (55%) diff --git a/target/linux/airoha/Makefile b/target/linux/airoha/Makefile index 58d5f1f78a..61b7b87692 100644 --- a/target/linux/airoha/Makefile +++ b/target/linux/airoha/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=airoha BOARDNAME:=Airoha ARM -SUBTARGETS:=en7523 en7581 +SUBTARGETS:=en7523 an7581 FEATURES:=dt squashfs nand ramdisk gpio KERNEL_PATCHVER:=6.6 diff --git a/target/linux/airoha/en7581/config-6.6 b/target/linux/airoha/an7581/config-6.6 similarity index 100% rename from target/linux/airoha/en7581/config-6.6 rename to target/linux/airoha/an7581/config-6.6 diff --git a/target/linux/airoha/en7581/target.mk b/target/linux/airoha/an7581/target.mk similarity index 55% rename from target/linux/airoha/en7581/target.mk rename to target/linux/airoha/an7581/target.mk index d890d9ef58..1c0e8d02f6 100644 --- a/target/linux/airoha/en7581/target.mk +++ b/target/linux/airoha/an7581/target.mk @@ -1,11 +1,11 @@ ARCH:=aarch64 -SUBTARGET:=en7581 -BOARDNAME:=EN7581 +SUBTARGET:=an7581 +BOARDNAME:=AN7581 CPU_TYPE:=cortex-a53 KERNELNAME:=Image dtbs FEATURES+=pwm source-only define Target/Description - Build firmware images for Airoha en7581 ARM based boards. + Build firmware images for Airoha an7581 ARM based boards. endef diff --git a/target/linux/airoha/dts/en7581-evb-emmc.dts b/target/linux/airoha/dts/an7581-evb-emmc.dts similarity index 95% rename from target/linux/airoha/dts/en7581-evb-emmc.dts rename to target/linux/airoha/dts/an7581-evb-emmc.dts index 04c09e77b3..91d7977795 100644 --- a/target/linux/airoha/dts/en7581-evb-emmc.dts +++ b/target/linux/airoha/dts/an7581-evb-emmc.dts @@ -6,11 +6,11 @@ #include #include -#include "en7581.dtsi" +#include "an7581.dtsi" / { - model = "Airoha EN7581 Evaluation Board"; - compatible = "airoha,en7581-evb", "airoha,en7581"; + model = "Airoha AN7581 Evaluation Board"; + compatible = "airoha,an7581-evb", "airoha,an7581", "airoha,en7581"; aliases { serial0 = &uart1; diff --git a/target/linux/airoha/dts/en7581-evb.dts b/target/linux/airoha/dts/an7581-evb.dts similarity index 96% rename from target/linux/airoha/dts/en7581-evb.dts rename to target/linux/airoha/dts/an7581-evb.dts index 630cd76ae8..3cf531a29c 100644 --- a/target/linux/airoha/dts/en7581-evb.dts +++ b/target/linux/airoha/dts/an7581-evb.dts @@ -7,11 +7,11 @@ #include #include #include -#include "en7581.dtsi" +#include "an7581.dtsi" / { - model = "Airoha EN7581 Evaluation Board"; - compatible = "airoha,en7581-evb", "airoha,en7581"; + model = "Airoha AN7581 Evaluation Board"; + compatible = "airoha,an7581-evb", "airoha,an7581", "airoha,en7581"; aliases { serial0 = &uart1; diff --git a/target/linux/airoha/dts/en7581.dtsi b/target/linux/airoha/dts/an7581.dtsi similarity index 100% rename from target/linux/airoha/dts/en7581.dtsi rename to target/linux/airoha/dts/an7581.dtsi diff --git a/target/linux/airoha/image/en7581.mk b/target/linux/airoha/image/an7581.mk similarity index 55% rename from target/linux/airoha/image/en7581.mk rename to target/linux/airoha/image/an7581.mk index 7fc6b8ec0e..78918879f7 100644 --- a/target/linux/airoha/image/en7581.mk +++ b/target/linux/airoha/image/an7581.mk @@ -4,24 +4,24 @@ define Device/FitImageLzma KERNEL_NAME := Image endef -define Device/airoha_en7581-evb +define Device/airoha_an7581-evb $(call Device/FitImageLzma) DEVICE_VENDOR := Airoha - DEVICE_MODEL := EN7581 Evaluation Board (SNAND) - DEVICE_PACKAGES := kmod-leds-pwm kmod-i2c-en7581 kmod-pwm-airoha kmod-input-gpio-keys-polled - DEVICE_DTS := en7581-evb + DEVICE_MODEL := AN7581 Evaluation Board (SNAND) + DEVICE_PACKAGES := kmod-leds-pwm kmod-i2c-an7581 kmod-pwm-airoha kmod-input-gpio-keys-polled + DEVICE_DTS := an7581-evb DEVICE_DTS_DIR := ../dts DEVICE_DTS_CONFIG := config@1 KERNEL_LOADADDR := 0x80088000 IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs | append-metadata endef -TARGET_DEVICES += airoha_en7581-evb +TARGET_DEVICES += airoha_an7581-evb -define Device/airoha_en7581-evb-emmc +define Device/airoha_an7581-evb-emmc DEVICE_VENDOR := Airoha - DEVICE_MODEL := EN7581 Evaluation Board (EMMC) - DEVICE_DTS := en7581-evb-emmc + DEVICE_MODEL := AN7581 Evaluation Board (EMMC) + DEVICE_DTS := an7581-evb-emmc DEVICE_DTS_DIR := ../dts - DEVICE_PACKAGES := kmod-i2c-en7581 + DEVICE_PACKAGES := kmod-i2c-an7581 endef -TARGET_DEVICES += airoha_en7581-evb-emmc +TARGET_DEVICES += airoha_an7581-evb-emmc diff --git a/target/linux/airoha/modules.mk b/target/linux/airoha/modules.mk index 38126d5bc4..cbefe38996 100644 --- a/target/linux/airoha/modules.mk +++ b/target/linux/airoha/modules.mk @@ -5,25 +5,25 @@ OTHER_MENU:=Other modules I2C_MT7621_MODULES:= \ CONFIG_I2C_MT7621:drivers/i2c/busses/i2c-mt7621 -define KernelPackage/i2c-en7581 +define KernelPackage/i2c-an7581 SUBMENU:=$(OTHER_MENU) $(call i2c_defaults,$(I2C_MT7621_MODULES),79) TITLE:=Airoha I2C Controller DEPENDS:=+kmod-i2c-core \ - @(TARGET_airoha_en7581) + @(TARGET_airoha_an7581) endef -define KernelPackage/i2c-en7581/description +define KernelPackage/i2c-an7581/description Kernel modules for enable mt7621 i2c controller. endef -$(eval $(call KernelPackage,i2c-en7581)) +$(eval $(call KernelPackage,i2c-an7581)) -define KernelPackage/pwm-en7581 +define KernelPackage/pwm-an7581 SUBMENU:=$(OTHER_MENU) TITLE:=Airoha EN7581 PWM - DEPENDS:=@(TARGET_airoha_en7581) + DEPENDS:=@(TARGET_airoha_an7581) KCONFIG:= \ CONFIG_PWM=y \ CONFIG_PWM_AIROHA=y \ @@ -33,10 +33,10 @@ define KernelPackage/pwm-en7581 AUTOLOAD:=$(call AutoProbe,pwm-airoha) endef -define KernelPackage/pwm-en7581/description +define KernelPackage/pwm-an7581/description Kernel module to use the PWM channel on Airoha SoC endef -$(eval $(call KernelPackage,pwm-en7581)) +$(eval $(call KernelPackage,pwm-an7581)) From eee3c695f3922c9bbacef9e4c2b1b71e8174fee1 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 23 Oct 2024 13:36:29 +0100 Subject: [PATCH 09/16] linux-firmware: add offloading firmware for MT7988 Package wireless offloading firmware for MediaTek MT7988. Signed-off-by: Daniel Golle --- package/firmware/linux-firmware/mediatek.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/firmware/linux-firmware/mediatek.mk b/package/firmware/linux-firmware/mediatek.mk index 5c448e1033..d520557196 100644 --- a/package/firmware/linux-firmware/mediatek.mk +++ b/package/firmware/linux-firmware/mediatek.mk @@ -96,3 +96,13 @@ define Package/mt7988-2p5g-phy-firmware/install $(1)/lib/firmware/mediatek/mt7988 endef $(eval $(call BuildPackage,mt7988-2p5g-phy-firmware)) + +Package/mt7988-wo-firmware = $(call Package/firmware-default,MT7988 offload firmware,,LICENCE.mediatek) +define Package/mt7988-wo-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/mediatek/mt7988 + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/mediatek/mt7988/mt7988_wo_0.bin \ + $(PKG_BUILD_DIR)/mediatek/mt7988/mt7988_wo_1.bin \ + $(1)/lib/firmware/mediatek/mt7988 +endef +$(eval $(call BuildPackage,mt7988-wo-firmware)) From b27075e12ba6a530bf7babf451dee52345eda8a2 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 23 Oct 2024 13:38:55 +0100 Subject: [PATCH 10/16] mediatek: add wireless offloading firmware to MT7988 boards Install mt7988-wo-firmware by default on boards based on MT7988. Signed-off-by: Daniel Golle --- target/linux/mediatek/image/filogic.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index ac535aeaa0..37fe740c31 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -208,7 +208,7 @@ define Device/smartrg_sdg-8733 $(call Device/adtran_smartrg) DEVICE_MODEL := SDG-8733 DEVICE_DTS := mt7988a-smartrg-SDG-8733 - DEVICE_PACKAGES += kmod-mt7996-firmware kmod-phy-aquantia kmod-usb3 + DEVICE_PACKAGES += kmod-mt7996-firmware kmod-phy-aquantia kmod-usb3 mt7988-wo-firmware endef TARGET_DEVICES += smartrg_sdg-8733 @@ -216,7 +216,7 @@ define Device/smartrg_sdg-8733a $(call Device/adtran_smartrg) DEVICE_MODEL := SDG-8733A DEVICE_DTS := mt7988d-smartrg-SDG-8733A - DEVICE_PACKAGES += mt7988-2p5g-phy-firmware kmod-mt7996-233-firmware kmod-phy-aquantia + DEVICE_PACKAGES += mt7988-2p5g-phy-firmware kmod-mt7996-233-firmware kmod-phy-aquantia mt7988-wo-firmware endef TARGET_DEVICES += smartrg_sdg-8733a @@ -224,7 +224,7 @@ define Device/smartrg_sdg-8734 $(call Device/adtran_smartrg) DEVICE_MODEL := SDG-8734 DEVICE_DTS := mt7988a-smartrg-SDG-8734 - DEVICE_PACKAGES += kmod-mt7996-firmware kmod-phy-aquantia kmod-sfp kmod-usb3 + DEVICE_PACKAGES += kmod-mt7996-firmware kmod-phy-aquantia kmod-sfp kmod-usb3 mt7988-wo-firmware endef TARGET_DEVICES += smartrg_sdg-8734 @@ -378,7 +378,7 @@ define Device/bananapi_bpi-r4-common DEVICE_DTS_OVERLAY:= mt7988a-bananapi-bpi-r4-emmc mt7988a-bananapi-bpi-r4-rtc mt7988a-bananapi-bpi-r4-sd mt7988a-bananapi-bpi-r4-wifi-mt7996a DEVICE_DTC_FLAGS := --pad 4096 DEVICE_PACKAGES := kmod-hwmon-pwmfan kmod-i2c-mux-pca954x kmod-eeprom-at24 kmod-mt7996-firmware kmod-mt7996-233-firmware \ - kmod-rtc-pcf8563 kmod-sfp kmod-usb3 e2fsprogs f2fsck mkf2fs + kmod-rtc-pcf8563 kmod-sfp kmod-usb3 e2fsprogs f2fsck mkf2fs mt7988-wo-firmware IMAGES := sysupgrade.itb KERNEL_LOADADDR := 0x46000000 KERNEL_INITRAMFS_SUFFIX := -recovery.itb From 8e294af41b7b535307f92f805f0a163a620616e1 Mon Sep 17 00:00:00 2001 From: John Audia Date: Tue, 22 Oct 2024 15:59:20 -0400 Subject: [PATCH 11/16] kernel: bump 6.6 to 6.6.58 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.58 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/16758 Signed-off-by: Hauke Mehrtens --- include/kernel-6.6 | 4 +-- ...-net-macb-Also-set-DMA-coherent-mask.patch | 26 +++++++++---------- .../780-usb-net-MeigLink_modem_support.patch | 4 +-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/kernel-6.6 b/include/kernel-6.6 index a5048a4e6f..df3464ab41 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .57 -LINUX_KERNEL_HASH-6.6.57 = 66ce426ef96f99b8e1ef7ac72e780c730ef8b970f7aa5708501c4274d7abb7b3 +LINUX_VERSION-6.6 = .58 +LINUX_KERNEL_HASH-6.6.58 = e7df81e588d70fab5ec3ec3bb04ac53d51f0860fc3b1ec45e0a4167a026899db diff --git a/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch b/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch index 508aaad932..cbfab3e4e6 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch @@ -191,7 +191,7 @@ Signed-off-by: Jonathan Bell static void macb_init_buffers(struct macb *bp) { struct macb_queue *queue; -@@ -969,6 +985,7 @@ static int macb_mii_init(struct macb *bp +@@ -977,6 +993,7 @@ static int macb_mii_init(struct macb *bp bp->mii_bus->write = &macb_mdio_write_c22; bp->mii_bus->read_c45 = &macb_mdio_read_c45; bp->mii_bus->write_c45 = &macb_mdio_write_c45; @@ -199,7 +199,7 @@ Signed-off-by: Jonathan Bell snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", bp->pdev->name, bp->pdev->id); bp->mii_bus->priv = bp; -@@ -1640,6 +1657,11 @@ static int macb_rx(struct macb_queue *qu +@@ -1648,6 +1665,11 @@ static int macb_rx(struct macb_queue *qu macb_init_rx_ring(queue); queue_writel(queue, RBQP, queue->rx_ring_dma); @@ -211,7 +211,7 @@ Signed-off-by: Jonathan Bell macb_writel(bp, NCR, ctrl | MACB_BIT(RE)); -@@ -1940,8 +1962,9 @@ static irqreturn_t macb_interrupt(int ir +@@ -1948,8 +1970,9 @@ static irqreturn_t macb_interrupt(int ir queue_writel(queue, ISR, MACB_BIT(TCOMP) | MACB_BIT(TXUBR)); @@ -222,7 +222,7 @@ Signed-off-by: Jonathan Bell wmb(); // ensure softirq can see update } -@@ -2394,6 +2417,11 @@ static netdev_tx_t macb_start_xmit(struc +@@ -2402,6 +2425,11 @@ static netdev_tx_t macb_start_xmit(struc skb_tx_timestamp(skb); spin_lock_irq(&bp->lock); @@ -234,7 +234,7 @@ Signed-off-by: Jonathan Bell macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART)); spin_unlock_irq(&bp->lock); -@@ -2768,6 +2796,37 @@ static void macb_configure_dma(struct ma +@@ -2776,6 +2804,37 @@ static void macb_configure_dma(struct ma } } @@ -272,7 +272,7 @@ Signed-off-by: Jonathan Bell static void macb_init_hw(struct macb *bp) { u32 config; -@@ -2796,6 +2855,11 @@ static void macb_init_hw(struct macb *bp +@@ -2804,6 +2863,11 @@ static void macb_init_hw(struct macb *bp if (bp->caps & MACB_CAPS_JUMBO) bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK; @@ -284,7 +284,7 @@ Signed-off-by: Jonathan Bell macb_configure_dma(bp); /* Enable RX partial store and forward and set watermark */ -@@ -3157,6 +3221,52 @@ static void gem_get_ethtool_strings(stru +@@ -3165,6 +3229,52 @@ static void gem_get_ethtool_strings(stru } } @@ -337,7 +337,7 @@ Signed-off-by: Jonathan Bell static struct net_device_stats *macb_get_stats(struct net_device *dev) { struct macb *bp = netdev_priv(dev); -@@ -3749,6 +3859,8 @@ static const struct ethtool_ops macb_eth +@@ -3757,6 +3867,8 @@ static const struct ethtool_ops macb_eth }; static const struct ethtool_ops gem_ethtool_ops = { @@ -346,7 +346,7 @@ Signed-off-by: Jonathan Bell .get_regs_len = macb_get_regs_len, .get_regs = macb_get_regs, .get_wol = macb_get_wol, -@@ -3758,6 +3870,8 @@ static const struct ethtool_ops gem_etht +@@ -3766,6 +3878,8 @@ static const struct ethtool_ops gem_etht .get_ethtool_stats = gem_get_ethtool_stats, .get_strings = gem_get_ethtool_strings, .get_sset_count = gem_get_sset_count, @@ -355,7 +355,7 @@ Signed-off-by: Jonathan Bell .get_link_ksettings = macb_get_link_ksettings, .set_link_ksettings = macb_set_link_ksettings, .get_ringparam = macb_get_ringparam, -@@ -5054,6 +5168,11 @@ static int macb_probe(struct platform_de +@@ -5062,6 +5176,11 @@ static int macb_probe(struct platform_de } } } @@ -367,7 +367,7 @@ Signed-off-by: Jonathan Bell spin_lock_init(&bp->lock); /* setup capabilities */ -@@ -5109,6 +5228,21 @@ static int macb_probe(struct platform_de +@@ -5117,6 +5236,21 @@ static int macb_probe(struct platform_de else bp->phy_interface = interface; @@ -389,7 +389,7 @@ Signed-off-by: Jonathan Bell /* IP specific init */ err = init(pdev); if (err) -@@ -5185,6 +5319,19 @@ static int macb_remove(struct platform_d +@@ -5193,6 +5327,19 @@ static int macb_remove(struct platform_d return 0; } @@ -409,7 +409,7 @@ Signed-off-by: Jonathan Bell static int __maybe_unused macb_suspend(struct device *dev) { struct net_device *netdev = dev_get_drvdata(dev); -@@ -5399,6 +5546,7 @@ static const struct dev_pm_ops macb_pm_o +@@ -5407,6 +5554,7 @@ static const struct dev_pm_ops macb_pm_o static struct platform_driver macb_driver = { .probe = macb_probe, .remove = macb_remove, diff --git a/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch index 73a27ef6e2..e80dfbeb0f 100644 --- a/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch @@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1158,6 +1163,11 @@ static const struct usb_device_id option +@@ -1159,6 +1164,11 @@ static const struct usb_device_id option { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */ .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) }, @@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support /* Quectel products using Qualcomm vendor ID */ { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20), -@@ -1199,6 +1209,11 @@ static const struct usb_device_id option +@@ -1200,6 +1210,11 @@ static const struct usb_device_id option .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, From dfc8e8d09af2eddfbea9aa3b9897a8074db6e17c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 17 Oct 2024 16:48:20 -0700 Subject: [PATCH 12/16] apm821xx: move CONFIG_GENERIC_PHY up It's shared by both subtargets. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16754 Signed-off-by: Hauke Mehrtens --- target/linux/apm821xx/config-6.6 | 1 + target/linux/apm821xx/nand/config-default | 1 - target/linux/apm821xx/sata/config-default | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/apm821xx/config-6.6 b/target/linux/apm821xx/config-6.6 index 23342e78aa..33e586632c 100644 --- a/target/linux/apm821xx/config-6.6 +++ b/target/linux/apm821xx/config-6.6 @@ -100,6 +100,7 @@ CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_MSI_IRQ=y CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_PHY=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y diff --git a/target/linux/apm821xx/nand/config-default b/target/linux/apm821xx/nand/config-default index 220ee3b9c0..6c425553b4 100644 --- a/target/linux/apm821xx/nand/config-default +++ b/target/linux/apm821xx/nand/config-default @@ -2,7 +2,6 @@ CONFIG_AT803X_PHY=y CONFIG_BCH=y CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_ZSTD=y -CONFIG_GENERIC_PHY=y CONFIG_GRO_CELLS=y CONFIG_HWMON=y CONFIG_MTD_NAND_CORE=y diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default index c12f01f87d..fdd5bf8bbd 100644 --- a/target/linux/apm821xx/sata/config-default +++ b/target/linux/apm821xx/sata/config-default @@ -15,7 +15,6 @@ CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y CONFIG_FREEZER=y CONFIG_FW_CACHE=y -CONFIG_GENERIC_PHY=y CONFIG_GPIO_74XX_MMIO=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y From 4175828482f988921fdd4678ea7c89d069e1c145 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 17 Oct 2024 16:27:02 -0700 Subject: [PATCH 13/16] mpc85xx: move CONFIG_MTD_SPLIT_FIRMWARE up It's shared by all targets. Unlike the other shared symbols, it's not removed by kernel_oldconfig. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16756 Signed-off-by: Hauke Mehrtens --- target/linux/mpc85xx/config-6.6 | 1 + target/linux/mpc85xx/p1010/config-default | 1 - target/linux/mpc85xx/p1020/config-default | 1 - target/linux/mpc85xx/p2020/config-default | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target/linux/mpc85xx/config-6.6 b/target/linux/mpc85xx/config-6.6 index ef08a51979..14d5650fb5 100644 --- a/target/linux/mpc85xx/config-6.6 +++ b/target/linux/mpc85xx/config-6.6 @@ -165,6 +165,7 @@ CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_RAW_NAND=y CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_SPLIT_FIRMWARE=y # CONFIG_MVME2500 is not set CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_SG_DMA_LENGTH=y diff --git a/target/linux/mpc85xx/p1010/config-default b/target/linux/mpc85xx/p1010/config-default index 1cd84b52ca..5a17e38f5c 100644 --- a/target/linux/mpc85xx/p1010/config-default +++ b/target/linux/mpc85xx/p1010/config-default @@ -8,7 +8,6 @@ CONFIG_MEMORY=y CONFIG_MTD_CFI=y CONFIG_MTD_NAND_FSL_IFC=y CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_SPLIT_TPLINK_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y CONFIG_MTD_UBI=y diff --git a/target/linux/mpc85xx/p1020/config-default b/target/linux/mpc85xx/p1020/config-default index 49574cd653..66710a9ace 100644 --- a/target/linux/mpc85xx/p1020/config-default +++ b/target/linux/mpc85xx/p1020/config-default @@ -27,7 +27,6 @@ CONFIG_MSM460=y CONFIG_MTD_CFI=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_SPLIT_FIT_FW=y CONFIG_MTD_SPLIT_UIMAGE_FW=y CONFIG_MTD_UBI=y diff --git a/target/linux/mpc85xx/p2020/config-default b/target/linux/mpc85xx/p2020/config-default index 01774cd6d6..ff8c8cb939 100644 --- a/target/linux/mpc85xx/p2020/config-default +++ b/target/linux/mpc85xx/p2020/config-default @@ -15,7 +15,6 @@ CONFIG_MPC85xx_RDB=y CONFIG_MTD_CFI=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_PHYSMAP=y -CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_SPLIT_FIT_FW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y From abeaf8df5c8ad486d2beb110d87cb511fb5cd831 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 24 Oct 2024 12:45:36 +0200 Subject: [PATCH 14/16] include/package-pack: remove whitespace for Description info for APK Remove whitespace for Description info for .apk creation Fixes: b6bbc76c0b2a ("include/package-pack: set missing Description on .apk creation") Signed-off-by: Christian Marangi --- include/package-pack.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/package-pack.mk b/include/package-pack.mk index a6ba9ca37c..9a284e05d4 100644 --- a/include/package-pack.mk +++ b/include/package-pack.mk @@ -339,7 +339,7 @@ else $(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \ --info "name:$(1)$$(ABIV_$(1))" \ --info "version:$(VERSION)" \ - --info "description: $$(strip $$(Package/$(1)/description))" \ + --info "description:$$(strip $$(Package/$(1)/description))" \ --info "arch:$(PKGARCH)" \ --info "license:$(LICENSE)" \ --info "origin:$(SOURCE)" \ From 6835ff8cbcc826ce64b073872e740a7399cb0b47 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 24 Oct 2024 12:46:47 +0200 Subject: [PATCH 15/16] include/package-pack: Set missing Maintainer and URL for APK Set missing Maintainer and URL info for .apk creation. Fixes: d788ab376f85 ("build: add APK package build capabilities") Signed-off-by: Christian Marangi --- include/package-pack.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/package-pack.mk b/include/package-pack.mk index 9a284e05d4..9991050c14 100644 --- a/include/package-pack.mk +++ b/include/package-pack.mk @@ -343,6 +343,8 @@ else --info "arch:$(PKGARCH)" \ --info "license:$(LICENSE)" \ --info "origin:$(SOURCE)" \ + --info "url:$(URL)" \ + --info "maintainer:$(MAINTAINER)" \ --info "provides:$$(foreach prov,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), \ $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1))))),$$(prov)=$(VERSION) )" \ --script "post-install:$$(ADIR_$(1))/post-install" \ From 27657050d02f13d1e737293ac7ad08686b4c6fd3 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 24 Oct 2024 00:03:13 +0200 Subject: [PATCH 16/16] mbedtls: update to 3.6.2 Fixes the following security problem: * CVE-2024-49195: Fix a buffer underrun in mbedtls_pk_write_key_der() when called on an opaque key, MBEDTLS_USE_PSA_CRYPTO is enabled, and the output buffer is smaller than the actual output. Fix a related buffer underrun in mbedtls_pk_write_key_pem() when called on an opaque RSA key, MBEDTLS_USE_PSA_CRYPTO is enabled and MBEDTLS_MPI_MAX_SIZE is smaller than needed for a 4096-bit RSA key. Link: https://github.com/openwrt/openwrt/pull/16768 Signed-off-by: Hauke Mehrtens --- package/libs/mbedtls/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index 19d8c27303..2efdf86cd2 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mbedtls -PKG_VERSION:=3.6.1 +PKG_VERSION:=3.6.2 PKG_RELEASE:=1 PKG_BUILD_FLAGS:=no-mips16 gc-sections no-lto PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL=https://github.com/Mbed-TLS/$(PKG_NAME)/releases/download/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=fc8bef0991b43629b7e5319de6f34f13359011105e08e3e16eed3a9fe6ffd3a3 +PKG_HASH:=8b54fb9bcf4d5a7078028e0520acddefb7900b3e66fec7f7175bb5b7d85ccdca PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE