From e40db2ac5526574df66407236bf771755abe9f8a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 8 Apr 2025 21:48:08 +0200 Subject: [PATCH] package/esp-hosted: bump to version 2025-04-08 This version add support for esp32c5 and local patch has been committed so drop it. Signed-off-by: Giulio Benetti Signed-off-by: Julien Olivain --- package/esp-hosted/0001-Fix-Linux-6.13.patch | 35 -------------------- package/esp-hosted/esp-hosted.hash | 2 +- package/esp-hosted/esp-hosted.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/esp-hosted/0001-Fix-Linux-6.13.patch diff --git a/package/esp-hosted/0001-Fix-Linux-6.13.patch b/package/esp-hosted/0001-Fix-Linux-6.13.patch deleted file mode 100644 index 98f86e8a8f..0000000000 --- a/package/esp-hosted/0001-Fix-Linux-6.13.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f41f4a55e7787c9517ca6ac72f83dc244b4011e4 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 5 Apr 2025 00:35:23 +0200 -Subject: [PATCH] Fix Linux 6.13 - -With Linux commit: -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0809a9ccac4a2ffdfd1561bb551aec6099775545 -spi_alloc_master() has been renamed to spi_alloc_host() so let's rename it -accordingly checking for Linux version 6.13.0. - -Upstream: https://github.com/espressif/esp-hosted/pull/589 -Signed-off-by: Giulio Benetti ---- - esp_hosted_ng/host/spi/esp_spi.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/esp_hosted_ng/host/spi/esp_spi.c b/esp_hosted_ng/host/spi/esp_spi.c -index 51df26d8d7..fc63487821 100644 ---- a/esp_hosted_ng/host/spi/esp_spi.c -+++ b/esp_hosted_ng/host/spi/esp_spi.c -@@ -394,7 +394,11 @@ static struct spi_controller *spi_busnum_to_master(u16 bus_num) - pdev->num_resources = 0; - platform_device_add(pdev); - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0)) -+ master = spi_alloc_host(&pdev->dev, sizeof(void *)); -+#else - master = spi_alloc_master(&pdev->dev, sizeof(void *)); -+#endif - if (!master) { - pr_err("Error: failed to allocate SPI master device\n"); - platform_device_del(pdev); --- -2.39.5 - diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index ac0164c38c..8de3c00190 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7fd95a9b47c203a8bd0fdcab21f15c9d4cf1cad936f0206a94da0d932dd42206 esp-hosted-927a34f99724bb744efaf865a7c75cc1615f59a2.tar.gz +sha256 66c07e2f69d8a10fb111b6df27fbe3558734d660207a54391c46eea3e12b29ee esp-hosted-9a2312b0b2630e41bacb3091faaba489cb43b0ab.tar.gz sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index f4382e7fee..4c249eec46 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESP_HOSTED_VERSION = 927a34f99724bb744efaf865a7c75cc1615f59a2 +ESP_HOSTED_VERSION = 9a2312b0b2630e41bacb3091faaba489cb43b0ab ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0