Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-libc-headers: use Poky's default version 5.16 

Also, fix the sequence number of the GPIO_SET_DEBOUNCE_IOCTL ioctl. Same
fix has been done in Linux.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2022-06-22 15:43:35 +02:00
parent 33f881806a
commit c6b55f492f
4 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -6,9 +6,6 @@ PREFERRED_PROVIDER_virtual/kernel ??= "linux-dey"
PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp ??= "linux-fslc" PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp ??= "linux-fslc"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
# Update default libc version
LINUXLIBCVERSION ?= "5.4%"
# #
# Linux and U-Boot supported versions: # Linux and U-Boot supported versions:
# #

20
meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-gpio-uapi-add-userspace-support-for-setting-debounce.patch
View File

@ -10,16 +10,17 @@ gpiolib.
https://jira.digi.com/browse/DEL-6425 https://jira.digi.com/browse/DEL-6425
Signed-off-by: Hector Bujanda <hector.bujanda@digi.com> Signed-off-by: Hector Bujanda <hector.bujanda@digi.com>
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
--- ---
include/uapi/linux/gpio.h | 12 ++++++++++++ include/uapi/linux/gpio.h | 12 ++++++++++++
1 file changed, 12 insertions(+) 1 file changed, 12 insertions(+)
diff --git a/include/uapi/linux/gpio.h b/include/uapi/linux/gpio.h diff --git a/include/uapi/linux/gpio.h b/include/uapi/linux/gpio.h
index 4ebfe0ac6c5b..95569071f11b 100644 index eaaea3d8e6b4..638f6dfb6e76 100644
--- a/include/uapi/linux/gpio.h --- a/include/uapi/linux/gpio.h
+++ b/include/uapi/linux/gpio.h +++ b/include/uapi/linux/gpio.h
@@ -53,6 +53,17 @@ struct gpioline_info { @@ -336,6 +336,17 @@ struct gpioline_info {
char consumer[32]; char consumer[GPIO_MAX_NAME_SIZE];
}; };
+/** +/**
@ -36,10 +37,11 @@ index 4ebfe0ac6c5b..95569071f11b 100644
/* Maximum number of requested handles */ /* Maximum number of requested handles */
#define GPIOHANDLES_MAX 64 #define GPIOHANDLES_MAX 64
@@ -154,5 +165,6 @@ struct gpioevent_data { @@ -501,6 +512,7 @@ struct gpioevent_data {
#define GPIO_GET_LINEINFO_IOCTL _IOWR(0xB4, 0x02, struct gpioline_info) */
#define GPIO_GET_LINEHANDLE_IOCTL _IOWR(0xB4, 0x03, struct gpiohandle_request) #define GPIO_GET_CHIPINFO_IOCTL _IOR(0xB4, 0x01, struct gpiochip_info)
#define GPIO_GET_LINEEVENT_IOCTL _IOWR(0xB4, 0x04, struct gpioevent_request) #define GPIO_GET_LINEINFO_UNWATCH_IOCTL _IOWR(0xB4, 0x0C, __u32)
+#define GPIO_SET_DEBOUNCE_IOCTL _IOW(0xB4, 0x05, struct gpioline_debounce) +#define GPIO_SET_DEBOUNCE_IOCTL _IOW(0xB4, 0xA0, struct gpioline_debounce)
#endif /* _UAPI_GPIO_H_ */ /*
* v2 ioctl()s

5
meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bbappend → meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.16.bbappend
View File

@ -1,8 +1,7 @@
# Copyright (C) 2020 Digi International, Inc. # Copyright (C) 2020-2022 Digi International, Inc.
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI:append = " \ SRC_URI:append:imx-nxp-bsp = " \
file://0001-gpio-uapi-add-userspace-support-for-setting-debounce.patch \ file://0001-gpio-uapi-add-userspace-support-for-setting-debounce.patch \
" "

20
meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers_5.4.bb
View File

@ -1,20 +0,0 @@
require recipes-kernel/linux-libc-headers/linux-libc-headers.inc
FILESEXTRAPATHS:prepend := "${COREBASE}/meta/recipes-kernel/linux-libc-headers/linux-libc-headers:"
SRC_URI:append:libc-musl = "\
file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \
file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \
file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \
"
SRC_URI:append = "\
file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \
"
SRC_URI[md5sum] = "ce9b2d974d27408a61c53a30d3f98fb9"
SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491"
DEPENDS += "rsync-native"