package/esp-hosted: bump version to 2024-06-05

Drop both local patches that have been committed upstream.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Giulio Benetti
2024-06-05 14:18:09 +02:00
committed by Arnout Vandecappelle
parent c986928aff
commit 2389750311
4 changed files with 2 additions and 76 deletions

View File

@@ -1,37 +0,0 @@
From 1cd8671eb64a1278466e7a9c90ceca1be0f8c0d5 Mon Sep 17 00:00:00 2001
From: Giulio Benetti <giulio.benetti@benettiengineering.com>
Date: Mon, 1 Apr 2024 17:15:19 +0200
Subject: [PATCH] esp_hosted_ng: fix build failure on Linux 6.9.0
With Linux commit:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=620d269f29a569ba37419cc03cf1da2d55f6252a
spi_master compatibility has gone, so let's redefine missing needed
macros spi_master and spi_master_put() locally if Linux version is >=
6.9.0.
Upstream: https://github.com/espressif/esp-hosted/pull/358
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
esp_hosted_ng/host/spi/esp_spi.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/esp_hosted_ng/host/spi/esp_spi.c b/esp_hosted_ng/host/spi/esp_spi.c
index d0bd513bd6..9817056b2d 100644
--- a/esp_hosted_ng/host/spi/esp_spi.c
+++ b/esp_hosted_ng/host/spi/esp_spi.c
@@ -378,6 +378,11 @@ static int __spi_controller_match(struct device *dev, const void *data)
return ctlr->bus_num == *bus_num;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0))
+#define spi_master spi_controller
+#define spi_master_put(_ctlr) spi_controller_put(_ctlr)
+#endif
+
static struct spi_controller *spi_busnum_to_master(u16 bus_num)
{
struct platform_device *pdev = NULL;
--
2.34.1

View File

@@ -1,37 +0,0 @@
From f8903bc2be7ae5ac9fb9bbeed8512e974c6e60ec Mon Sep 17 00:00:00 2001
From: Giulio Benetti <giulio.benetti@benettiengineering.com>
Date: Mon, 3 Jun 2024 21:53:38 +0200
Subject: [PATCH] esp_hosted_ng: Fix Bluetooth build failure on Linux 6.8.11+
After Linux commit:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=84a4bb6548a29326564f0e659fb8064503ecc1c7
BT_HS has been removed and consequently AMP controllers can't be created,
so at this point only HCI_PRIMARY has been left as unique controller type
to be created and this became implicit with no need to define if the
controller if HCI_PRIMARY or HCI_AMP. So let's assign HCI_PRIMARY up to
Linux 6.8.11 only preventing build failure.
Upstream: https://github.com/espressif/esp-hosted/pull/400
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
esp_hosted_ng/host/esp_bt.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/esp_hosted_ng/host/esp_bt.c b/esp_hosted_ng/host/esp_bt.c
index 3b78c11698..4598ac0e0a 100644
--- a/esp_hosted_ng/host/esp_bt.c
+++ b/esp_hosted_ng/host/esp_bt.c
@@ -240,7 +240,9 @@ int esp_init_bt(struct esp_adapter *adapter)
hdev->set_bdaddr = esp_bt_set_bdaddr;
#endif
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(6, 8, 11))
hdev->dev_type = HCI_PRIMARY;
+#endif
SET_HCIDEV_DEV(hdev, adapter->dev);
--
2.34.1

View File

@@ -1,3 +1,3 @@
# Locally calculated
sha256 8f25c01522fdcb2003ffbfcc0ccf4981f27bddc8080ba978e33590d56f5ae20b esp-hosted-669fd9cd1892bb8b364701968d5f06225346eea9.tar.gz
sha256 2c87d68c2b74dd000b128696abc0cdc76d22abfefb6581ff61b7d7bcdaab51f5 esp-hosted-b1422afc4fe0a2ea1ffd6b5459edddc4d968ee71.tar.gz
sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE

View File

@@ -4,7 +4,7 @@
#
################################################################################
ESP_HOSTED_VERSION = 669fd9cd1892bb8b364701968d5f06225346eea9
ESP_HOSTED_VERSION = b1422afc4fe0a2ea1ffd6b5459edddc4d968ee71
ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION))
ESP_HOSTED_DEPENDENCIES = linux
ESP_HOSTED_LICENSE = GPL-2.0