From 7644b3ba6fd374d50e26b7ee36aca3f50920efe7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 19 Mar 2019 15:23:00 +0000 Subject: [PATCH 01/26] enable stmmac dwc-qos for tegra --- configs/fedora/generic/arm/CONFIG_DWMAC_DWC_QOS_ETH | 2 +- kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/fedora/generic/arm/CONFIG_DWMAC_DWC_QOS_ETH b/configs/fedora/generic/arm/CONFIG_DWMAC_DWC_QOS_ETH index 6ed7a8e38..3039e8507 100644 --- a/configs/fedora/generic/arm/CONFIG_DWMAC_DWC_QOS_ETH +++ b/configs/fedora/generic/arm/CONFIG_DWMAC_DWC_QOS_ETH @@ -1 +1 @@ -# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_DWC_QOS_ETH=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 1746eae95..d48bde72e 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1596,7 +1596,7 @@ CONFIG_DVB_USB_ZD1301=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_DWC_QOS_ETH=m CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_MESON=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 6c9684769..11efc0bdf 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1588,7 +1588,7 @@ CONFIG_DVB_USB_ZD1301=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_DWC_QOS_ETH=m CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_MESON=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 51ec4d1f8..779416ae0 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1643,7 +1643,7 @@ CONFIG_DVB_USB_ZD1301=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_DWC_QOS_ETH=m CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_MESON=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 33c2d4d29..25d592b93 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1571,7 +1571,7 @@ CONFIG_DVB_USB_ZD1301=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_DWC_QOS_ETH=m CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 783532a9a..bc3f66676 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1564,7 +1564,7 @@ CONFIG_DVB_USB_ZD1301=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_DWC_QOS_ETH=m CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 0bd7d82b9..3ece3890c 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1636,7 +1636,7 @@ CONFIG_DVB_USB_ZD1301=m CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m -# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_DWC_QOS_ETH=m CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_MESON=m From f1f58566b3e50491c0305ad75bff0dc09b46ff5d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 19 Mar 2019 17:58:59 +0000 Subject: [PATCH 02/26] arm: build in some drivers needed by tegra jetson platforms --- configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MAX77620 | 2 +- configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MAX77620 | 2 +- .../fedora/generic/arm/aarch64/CONFIG_REGULATOR_MAX77620 | 2 +- kernel-aarch64-debug.config | 6 +++--- kernel-aarch64.config | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MAX77620 b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MAX77620 index fd5e22a31..f084c0667 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MAX77620 +++ b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MAX77620 @@ -1 +1 @@ -CONFIG_GPIO_MAX77620=m +CONFIG_GPIO_MAX77620=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MAX77620 b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MAX77620 index 3b44d6941..f98e657d8 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MAX77620 +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MAX77620 @@ -1 +1 @@ -CONFIG_PINCTRL_MAX77620=m +CONFIG_PINCTRL_MAX77620=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_MAX77620 b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_MAX77620 index db0158399..2101358d4 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_MAX77620 +++ b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_MAX77620 @@ -1 +1 @@ -CONFIG_REGULATOR_MAX77620=m +CONFIG_REGULATOR_MAX77620=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index d48bde72e..2d9ed7040 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1939,7 +1939,7 @@ CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MAX732X is not set -CONFIG_GPIO_MAX77620=m +CONFIG_GPIO_MAX77620=y CONFIG_GPIO_MB86S7X=m # CONFIG_GPIO_MC33880 is not set # CONFIG_GPIO_MOCKUP is not set @@ -4395,7 +4395,7 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ4019 is not set # CONFIG_PINCTRL_IPQ8064 is not set # CONFIG_PINCTRL_IPQ8074 is not set -CONFIG_PINCTRL_MAX77620=m +CONFIG_PINCTRL_MAX77620=y # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set # CONFIG_PINCTRL_MESON8B is not set @@ -4744,7 +4744,7 @@ CONFIG_REGULATOR_HI655X=m # CONFIG_REGULATOR_LTC3589 is not set # CONFIG_REGULATOR_LTC3676 is not set # CONFIG_REGULATOR_MAX1586 is not set -CONFIG_REGULATOR_MAX77620=m +CONFIG_REGULATOR_MAX77620=y CONFIG_REGULATOR_MAX77686=m CONFIG_REGULATOR_MAX77802=m # CONFIG_REGULATOR_MAX8649 is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 11efc0bdf..2e722ab88 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1923,7 +1923,7 @@ CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MAX732X is not set -CONFIG_GPIO_MAX77620=m +CONFIG_GPIO_MAX77620=y CONFIG_GPIO_MB86S7X=m # CONFIG_GPIO_MC33880 is not set # CONFIG_GPIO_MOCKUP is not set @@ -4375,7 +4375,7 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ4019 is not set # CONFIG_PINCTRL_IPQ8064 is not set # CONFIG_PINCTRL_IPQ8074 is not set -CONFIG_PINCTRL_MAX77620=m +CONFIG_PINCTRL_MAX77620=y # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MDM9615 is not set # CONFIG_PINCTRL_MESON8B is not set @@ -4723,7 +4723,7 @@ CONFIG_REGULATOR_HI655X=m # CONFIG_REGULATOR_LTC3589 is not set # CONFIG_REGULATOR_LTC3676 is not set # CONFIG_REGULATOR_MAX1586 is not set -CONFIG_REGULATOR_MAX77620=m +CONFIG_REGULATOR_MAX77620=y CONFIG_REGULATOR_MAX77686=m CONFIG_REGULATOR_MAX77802=m # CONFIG_REGULATOR_MAX8649 is not set From 34d65b13dad479cf45cf360257db3a08a3abd6e4 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 20 Mar 2019 13:02:44 +0100 Subject: [PATCH 03/26] Make the mainline vboxguest drv feature set match VirtualBox 6.0.x (#1689750) --- ...ent-passing-requestor-info-to-the-ho.patch | 663 ++++++++++++++++++ kernel.spec | 6 + 2 files changed, 669 insertions(+) create mode 100644 0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch diff --git a/0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch b/0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch new file mode 100644 index 000000000..27379c45c --- /dev/null +++ b/0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch @@ -0,0 +1,663 @@ +From 58b89b03f14fde3b5eda78b9137109b7a860a607 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Tue, 19 Mar 2019 14:05:31 +0100 +Subject: [PATCH] virt: vbox: Implement passing requestor info to the host for + VirtualBox 6.0.x + +VirtualBox 6.0.x has a new feature where the guest kernel driver passes +info about the origin of the request (e.g. userspace or kernelspace) to +the hypervisor. + +If we do not pass this information then when running the 6.0.x userspace +guest-additions tools on a 6.0.x host, some requests will get denied +with a VERR_VERSION_MISMATCH error, breaking vboxservice.service and +the mounting of shared folders marked to be auto-mounted. + +This commit implements passing the requestor info to the host, fixing this. + +Cc: stable@vger.kernel.org +Signed-off-by: Hans de Goede +--- + drivers/virt/vboxguest/vboxguest_core.c | 106 ++++++++++++++------- + drivers/virt/vboxguest/vboxguest_core.h | 15 +-- + drivers/virt/vboxguest/vboxguest_linux.c | 26 ++++- + drivers/virt/vboxguest/vboxguest_utils.c | 32 ++++--- + drivers/virt/vboxguest/vboxguest_version.h | 9 +- + drivers/virt/vboxguest/vmmdev.h | 8 +- + include/linux/vbox_utils.h | 12 ++- + include/uapi/linux/vbox_vmmdev_types.h | 31 ++++++ + 8 files changed, 168 insertions(+), 71 deletions(-) + +diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c +index 1475ed5ffcde..2ec5b34ffed7 100644 +--- a/drivers/virt/vboxguest/vboxguest_core.c ++++ b/drivers/virt/vboxguest/vboxguest_core.c +@@ -27,6 +27,10 @@ + + #define GUEST_MAPPINGS_TRIES 5 + ++#define VBG_KERNEL_REQUEST \ ++ (VMMDEV_REQUESTOR_KERNEL | VMMDEV_REQUESTOR_USR_DRV | \ ++ VMMDEV_REQUESTOR_CON_DONT_KNOW | VMMDEV_REQUESTOR_TRUST_NOT_GIVEN) ++ + /** + * Reserves memory in which the VMM can relocate any guest mappings + * that are floating around. +@@ -48,7 +52,8 @@ static void vbg_guest_mappings_init(struct vbg_dev *gdev) + int i, rc; + + /* Query the required space. */ +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_GET_HYPERVISOR_INFO); ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_GET_HYPERVISOR_INFO, ++ VBG_KERNEL_REQUEST); + if (!req) + return; + +@@ -135,7 +140,8 @@ static void vbg_guest_mappings_exit(struct vbg_dev *gdev) + * Tell the host that we're going to free the memory we reserved for + * it, the free it up. (Leak the memory if anything goes wrong here.) + */ +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_HYPERVISOR_INFO); ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_HYPERVISOR_INFO, ++ VBG_KERNEL_REQUEST); + if (!req) + return; + +@@ -172,8 +178,10 @@ static int vbg_report_guest_info(struct vbg_dev *gdev) + struct vmmdev_guest_info2 *req2 = NULL; + int rc, ret = -ENOMEM; + +- req1 = vbg_req_alloc(sizeof(*req1), VMMDEVREQ_REPORT_GUEST_INFO); +- req2 = vbg_req_alloc(sizeof(*req2), VMMDEVREQ_REPORT_GUEST_INFO2); ++ req1 = vbg_req_alloc(sizeof(*req1), VMMDEVREQ_REPORT_GUEST_INFO, ++ VBG_KERNEL_REQUEST); ++ req2 = vbg_req_alloc(sizeof(*req2), VMMDEVREQ_REPORT_GUEST_INFO2, ++ VBG_KERNEL_REQUEST); + if (!req1 || !req2) + goto out_free; + +@@ -187,8 +195,8 @@ static int vbg_report_guest_info(struct vbg_dev *gdev) + req2->additions_minor = VBG_VERSION_MINOR; + req2->additions_build = VBG_VERSION_BUILD; + req2->additions_revision = VBG_SVN_REV; +- /* (no features defined yet) */ +- req2->additions_features = 0; ++ req2->additions_features = ++ VMMDEV_GUEST_INFO2_ADDITIONS_FEATURES_REQUESTOR_INFO; + strlcpy(req2->name, VBG_VERSION_STRING, + sizeof(req2->name)); + +@@ -230,7 +238,8 @@ static int vbg_report_driver_status(struct vbg_dev *gdev, bool active) + struct vmmdev_guest_status *req; + int rc; + +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_REPORT_GUEST_STATUS); ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_REPORT_GUEST_STATUS, ++ VBG_KERNEL_REQUEST); + if (!req) + return -ENOMEM; + +@@ -423,7 +432,8 @@ static int vbg_heartbeat_host_config(struct vbg_dev *gdev, bool enabled) + struct vmmdev_heartbeat *req; + int rc; + +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_HEARTBEAT_CONFIGURE); ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_HEARTBEAT_CONFIGURE, ++ VBG_KERNEL_REQUEST); + if (!req) + return -ENOMEM; + +@@ -457,7 +467,8 @@ static int vbg_heartbeat_init(struct vbg_dev *gdev) + + gdev->guest_heartbeat_req = vbg_req_alloc( + sizeof(*gdev->guest_heartbeat_req), +- VMMDEVREQ_GUEST_HEARTBEAT); ++ VMMDEVREQ_GUEST_HEARTBEAT, ++ VBG_KERNEL_REQUEST); + if (!gdev->guest_heartbeat_req) + return -ENOMEM; + +@@ -528,7 +539,8 @@ static int vbg_reset_host_event_filter(struct vbg_dev *gdev, + struct vmmdev_mask *req; + int rc; + +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_CTL_GUEST_FILTER_MASK); ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_CTL_GUEST_FILTER_MASK, ++ VBG_KERNEL_REQUEST); + if (!req) + return -ENOMEM; + +@@ -567,8 +579,14 @@ static int vbg_set_session_event_filter(struct vbg_dev *gdev, + u32 changed, previous; + int rc, ret = 0; + +- /* Allocate a request buffer before taking the spinlock */ +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_CTL_GUEST_FILTER_MASK); ++ /* ++ * Allocate a request buffer before taking the spinlock, when ++ * the session is being terminated the requestor is the kernel, ++ * as we're cleaning up. ++ */ ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_CTL_GUEST_FILTER_MASK, ++ session_termination ? VBG_KERNEL_REQUEST : ++ session->requestor); + if (!req) { + if (!session_termination) + return -ENOMEM; +@@ -627,7 +645,8 @@ static int vbg_reset_host_capabilities(struct vbg_dev *gdev) + struct vmmdev_mask *req; + int rc; + +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_GUEST_CAPABILITIES); ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_GUEST_CAPABILITIES, ++ VBG_KERNEL_REQUEST); + if (!req) + return -ENOMEM; + +@@ -662,8 +681,14 @@ static int vbg_set_session_capabilities(struct vbg_dev *gdev, + u32 changed, previous; + int rc, ret = 0; + +- /* Allocate a request buffer before taking the spinlock */ +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_GUEST_CAPABILITIES); ++ /* ++ * Allocate a request buffer before taking the spinlock, when ++ * the session is being terminated the requestor is the kernel, ++ * as we're cleaning up. ++ */ ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_GUEST_CAPABILITIES, ++ session_termination ? VBG_KERNEL_REQUEST : ++ session->requestor); + if (!req) { + if (!session_termination) + return -ENOMEM; +@@ -722,7 +747,8 @@ static int vbg_query_host_version(struct vbg_dev *gdev) + struct vmmdev_host_version *req; + int rc, ret; + +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_GET_HOST_VERSION); ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_GET_HOST_VERSION, ++ VBG_KERNEL_REQUEST); + if (!req) + return -ENOMEM; + +@@ -783,19 +809,24 @@ int vbg_core_init(struct vbg_dev *gdev, u32 fixed_events) + + gdev->mem_balloon.get_req = + vbg_req_alloc(sizeof(*gdev->mem_balloon.get_req), +- VMMDEVREQ_GET_MEMBALLOON_CHANGE_REQ); ++ VMMDEVREQ_GET_MEMBALLOON_CHANGE_REQ, ++ VBG_KERNEL_REQUEST); + gdev->mem_balloon.change_req = + vbg_req_alloc(sizeof(*gdev->mem_balloon.change_req), +- VMMDEVREQ_CHANGE_MEMBALLOON); ++ VMMDEVREQ_CHANGE_MEMBALLOON, ++ VBG_KERNEL_REQUEST); + gdev->cancel_req = + vbg_req_alloc(sizeof(*(gdev->cancel_req)), +- VMMDEVREQ_HGCM_CANCEL2); ++ VMMDEVREQ_HGCM_CANCEL2, ++ VBG_KERNEL_REQUEST); + gdev->ack_events_req = + vbg_req_alloc(sizeof(*gdev->ack_events_req), +- VMMDEVREQ_ACKNOWLEDGE_EVENTS); ++ VMMDEVREQ_ACKNOWLEDGE_EVENTS, ++ VBG_KERNEL_REQUEST); + gdev->mouse_status_req = + vbg_req_alloc(sizeof(*gdev->mouse_status_req), +- VMMDEVREQ_GET_MOUSE_STATUS); ++ VMMDEVREQ_GET_MOUSE_STATUS, ++ VBG_KERNEL_REQUEST); + + if (!gdev->mem_balloon.get_req || !gdev->mem_balloon.change_req || + !gdev->cancel_req || !gdev->ack_events_req || +@@ -892,9 +923,9 @@ void vbg_core_exit(struct vbg_dev *gdev) + * vboxguest_linux.c calls this when userspace opens the char-device. + * Return: A pointer to the new session or an ERR_PTR on error. + * @gdev: The Guest extension device. +- * @user: Set if this is a session for the vboxuser device. ++ * @requestor: VMMDEV_REQUESTOR_* flags + */ +-struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, bool user) ++struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, u32 requestor) + { + struct vbg_session *session; + +@@ -903,7 +934,7 @@ struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, bool user) + return ERR_PTR(-ENOMEM); + + session->gdev = gdev; +- session->user_session = user; ++ session->requestor = requestor; + + return session; + } +@@ -924,7 +955,9 @@ void vbg_core_close_session(struct vbg_session *session) + if (!session->hgcm_client_ids[i]) + continue; + +- vbg_hgcm_disconnect(gdev, session->hgcm_client_ids[i], &rc); ++ /* requestor is kernel here, as we're cleaning up. */ ++ vbg_hgcm_disconnect(gdev, VBG_KERNEL_REQUEST, ++ session->hgcm_client_ids[i], &rc); + } + + kfree(session); +@@ -1152,7 +1185,8 @@ static int vbg_req_allowed(struct vbg_dev *gdev, struct vbg_session *session, + return -EPERM; + } + +- if (trusted_apps_only && session->user_session) { ++ if (trusted_apps_only && ++ (session->requestor & VMMDEV_REQUESTOR_USER_DEVICE)) { + vbg_err("Denying userspace vmm call type %#08x through vboxuser device node\n", + req->request_type); + return -EPERM; +@@ -1209,8 +1243,8 @@ static int vbg_ioctl_hgcm_connect(struct vbg_dev *gdev, + if (i >= ARRAY_SIZE(session->hgcm_client_ids)) + return -EMFILE; + +- ret = vbg_hgcm_connect(gdev, &conn->u.in.loc, &client_id, +- &conn->hdr.rc); ++ ret = vbg_hgcm_connect(gdev, session->requestor, &conn->u.in.loc, ++ &client_id, &conn->hdr.rc); + + mutex_lock(&gdev->session_mutex); + if (ret == 0 && conn->hdr.rc >= 0) { +@@ -1251,7 +1285,8 @@ static int vbg_ioctl_hgcm_disconnect(struct vbg_dev *gdev, + if (i >= ARRAY_SIZE(session->hgcm_client_ids)) + return -EINVAL; + +- ret = vbg_hgcm_disconnect(gdev, client_id, &disconn->hdr.rc); ++ ret = vbg_hgcm_disconnect(gdev, session->requestor, client_id, ++ &disconn->hdr.rc); + + mutex_lock(&gdev->session_mutex); + if (ret == 0 && disconn->hdr.rc >= 0) +@@ -1313,12 +1348,12 @@ static int vbg_ioctl_hgcm_call(struct vbg_dev *gdev, + } + + if (IS_ENABLED(CONFIG_COMPAT) && f32bit) +- ret = vbg_hgcm_call32(gdev, client_id, ++ ret = vbg_hgcm_call32(gdev, session->requestor, client_id, + call->function, call->timeout_ms, + VBG_IOCTL_HGCM_CALL_PARMS32(call), + call->parm_count, &call->hdr.rc); + else +- ret = vbg_hgcm_call(gdev, client_id, ++ ret = vbg_hgcm_call(gdev, session->requestor, client_id, + call->function, call->timeout_ms, + VBG_IOCTL_HGCM_CALL_PARMS(call), + call->parm_count, &call->hdr.rc); +@@ -1408,6 +1443,7 @@ static int vbg_ioctl_check_balloon(struct vbg_dev *gdev, + } + + static int vbg_ioctl_write_core_dump(struct vbg_dev *gdev, ++ struct vbg_session *session, + struct vbg_ioctl_write_coredump *dump) + { + struct vmmdev_write_core_dump *req; +@@ -1415,7 +1451,8 @@ static int vbg_ioctl_write_core_dump(struct vbg_dev *gdev, + if (vbg_ioctl_chk(&dump->hdr, sizeof(dump->u.in), 0)) + return -EINVAL; + +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_WRITE_COREDUMP); ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_WRITE_COREDUMP, ++ session->requestor); + if (!req) + return -ENOMEM; + +@@ -1476,7 +1513,7 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) + case VBG_IOCTL_CHECK_BALLOON: + return vbg_ioctl_check_balloon(gdev, data); + case VBG_IOCTL_WRITE_CORE_DUMP: +- return vbg_ioctl_write_core_dump(gdev, data); ++ return vbg_ioctl_write_core_dump(gdev, session, data); + } + + /* Variable sized requests. */ +@@ -1508,7 +1545,8 @@ int vbg_core_set_mouse_status(struct vbg_dev *gdev, u32 features) + struct vmmdev_mouse_status *req; + int rc; + +- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_MOUSE_STATUS); ++ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_MOUSE_STATUS, ++ VBG_KERNEL_REQUEST); + if (!req) + return -ENOMEM; + +diff --git a/drivers/virt/vboxguest/vboxguest_core.h b/drivers/virt/vboxguest/vboxguest_core.h +index 7ad9ec45bfa9..4188c12b839f 100644 +--- a/drivers/virt/vboxguest/vboxguest_core.h ++++ b/drivers/virt/vboxguest/vboxguest_core.h +@@ -154,15 +154,15 @@ struct vbg_session { + * host. Protected by vbg_gdev.session_mutex. + */ + u32 guest_caps; +- /** Does this session belong to a root process or a user one? */ +- bool user_session; ++ /** VMMDEV_REQUESTOR_* flags */ ++ u32 requestor; + /** Set on CANCEL_ALL_WAITEVENTS, protected by vbg_devevent_spinlock. */ + bool cancel_waiters; + }; + + int vbg_core_init(struct vbg_dev *gdev, u32 fixed_events); + void vbg_core_exit(struct vbg_dev *gdev); +-struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, bool user); ++struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, u32 requestor); + void vbg_core_close_session(struct vbg_session *session); + int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data); + int vbg_core_set_mouse_status(struct vbg_dev *gdev, u32 features); +@@ -172,12 +172,13 @@ irqreturn_t vbg_core_isr(int irq, void *dev_id); + void vbg_linux_mouse_event(struct vbg_dev *gdev); + + /* Private (non exported) functions form vboxguest_utils.c */ +-void *vbg_req_alloc(size_t len, enum vmmdev_request_type req_type); ++void *vbg_req_alloc(size_t len, enum vmmdev_request_type req_type, ++ u32 requestor); + void vbg_req_free(void *req, size_t len); + int vbg_req_perform(struct vbg_dev *gdev, void *req); + int vbg_hgcm_call32( +- struct vbg_dev *gdev, u32 client_id, u32 function, u32 timeout_ms, +- struct vmmdev_hgcm_function_parameter32 *parm32, u32 parm_count, +- int *vbox_status); ++ struct vbg_dev *gdev, u32 requestor, u32 client_id, u32 function, ++ u32 timeout_ms, struct vmmdev_hgcm_function_parameter32 *parm32, ++ u32 parm_count, int *vbox_status); + + #endif +diff --git a/drivers/virt/vboxguest/vboxguest_linux.c b/drivers/virt/vboxguest/vboxguest_linux.c +index 6e2a9619192d..6e8c0f1c1056 100644 +--- a/drivers/virt/vboxguest/vboxguest_linux.c ++++ b/drivers/virt/vboxguest/vboxguest_linux.c +@@ -5,6 +5,7 @@ + * Copyright (C) 2006-2016 Oracle Corporation + */ + ++#include + #include + #include + #include +@@ -28,6 +29,23 @@ static DEFINE_MUTEX(vbg_gdev_mutex); + /** Global vbg_gdev pointer used by vbg_get/put_gdev. */ + static struct vbg_dev *vbg_gdev; + ++static u32 vbg_misc_device_requestor(struct inode *inode) ++{ ++ u32 requestor = VMMDEV_REQUESTOR_USERMODE | ++ VMMDEV_REQUESTOR_CON_DONT_KNOW | ++ VMMDEV_REQUESTOR_TRUST_NOT_GIVEN; ++ ++ if (from_kuid(current_user_ns(), current->cred->uid) == 0) ++ requestor |= VMMDEV_REQUESTOR_USR_ROOT; ++ else ++ requestor |= VMMDEV_REQUESTOR_USR_USER; ++ ++ if (in_egroup_p(inode->i_gid)) ++ requestor |= VMMDEV_REQUESTOR_GRP_VBOX; ++ ++ return requestor; ++} ++ + static int vbg_misc_device_open(struct inode *inode, struct file *filp) + { + struct vbg_session *session; +@@ -36,7 +54,7 @@ static int vbg_misc_device_open(struct inode *inode, struct file *filp) + /* misc_open sets filp->private_data to our misc device */ + gdev = container_of(filp->private_data, struct vbg_dev, misc_device); + +- session = vbg_core_open_session(gdev, false); ++ session = vbg_core_open_session(gdev, vbg_misc_device_requestor(inode)); + if (IS_ERR(session)) + return PTR_ERR(session); + +@@ -53,7 +71,8 @@ static int vbg_misc_device_user_open(struct inode *inode, struct file *filp) + gdev = container_of(filp->private_data, struct vbg_dev, + misc_device_user); + +- session = vbg_core_open_session(gdev, false); ++ session = vbg_core_open_session(gdev, vbg_misc_device_requestor(inode) | ++ VMMDEV_REQUESTOR_USER_DEVICE); + if (IS_ERR(session)) + return PTR_ERR(session); + +@@ -115,7 +134,8 @@ static long vbg_misc_device_ioctl(struct file *filp, unsigned int req, + req == VBG_IOCTL_VMMDEV_REQUEST_BIG; + + if (is_vmmdev_req) +- buf = vbg_req_alloc(size, VBG_IOCTL_HDR_TYPE_DEFAULT); ++ buf = vbg_req_alloc(size, VBG_IOCTL_HDR_TYPE_DEFAULT, ++ session->requestor); + else + buf = kmalloc(size, GFP_KERNEL); + if (!buf) +diff --git a/drivers/virt/vboxguest/vboxguest_utils.c b/drivers/virt/vboxguest/vboxguest_utils.c +index bf4474214b4d..75fd140b02ff 100644 +--- a/drivers/virt/vboxguest/vboxguest_utils.c ++++ b/drivers/virt/vboxguest/vboxguest_utils.c +@@ -62,7 +62,8 @@ VBG_LOG(vbg_err, pr_err); + VBG_LOG(vbg_debug, pr_debug); + #endif + +-void *vbg_req_alloc(size_t len, enum vmmdev_request_type req_type) ++void *vbg_req_alloc(size_t len, enum vmmdev_request_type req_type, ++ u32 requestor) + { + struct vmmdev_request_header *req; + int order = get_order(PAGE_ALIGN(len)); +@@ -78,7 +79,7 @@ void *vbg_req_alloc(size_t len, enum vmmdev_request_type req_type) + req->request_type = req_type; + req->rc = VERR_GENERAL_FAILURE; + req->reserved1 = 0; +- req->reserved2 = 0; ++ req->requestor = requestor; + + return req; + } +@@ -119,7 +120,7 @@ static bool hgcm_req_done(struct vbg_dev *gdev, + return done; + } + +-int vbg_hgcm_connect(struct vbg_dev *gdev, ++int vbg_hgcm_connect(struct vbg_dev *gdev, u32 requestor, + struct vmmdev_hgcm_service_location *loc, + u32 *client_id, int *vbox_status) + { +@@ -127,7 +128,7 @@ int vbg_hgcm_connect(struct vbg_dev *gdev, + int rc; + + hgcm_connect = vbg_req_alloc(sizeof(*hgcm_connect), +- VMMDEVREQ_HGCM_CONNECT); ++ VMMDEVREQ_HGCM_CONNECT, requestor); + if (!hgcm_connect) + return -ENOMEM; + +@@ -153,13 +154,15 @@ int vbg_hgcm_connect(struct vbg_dev *gdev, + } + EXPORT_SYMBOL(vbg_hgcm_connect); + +-int vbg_hgcm_disconnect(struct vbg_dev *gdev, u32 client_id, int *vbox_status) ++int vbg_hgcm_disconnect(struct vbg_dev *gdev, u32 requestor, ++ u32 client_id, int *vbox_status) + { + struct vmmdev_hgcm_disconnect *hgcm_disconnect = NULL; + int rc; + + hgcm_disconnect = vbg_req_alloc(sizeof(*hgcm_disconnect), +- VMMDEVREQ_HGCM_DISCONNECT); ++ VMMDEVREQ_HGCM_DISCONNECT, ++ requestor); + if (!hgcm_disconnect) + return -ENOMEM; + +@@ -593,9 +596,10 @@ static int hgcm_call_copy_back_result( + return 0; + } + +-int vbg_hgcm_call(struct vbg_dev *gdev, u32 client_id, u32 function, +- u32 timeout_ms, struct vmmdev_hgcm_function_parameter *parms, +- u32 parm_count, int *vbox_status) ++int vbg_hgcm_call(struct vbg_dev *gdev, u32 requestor, u32 client_id, ++ u32 function, u32 timeout_ms, ++ struct vmmdev_hgcm_function_parameter *parms, u32 parm_count, ++ int *vbox_status) + { + struct vmmdev_hgcm_call *call; + void **bounce_bufs = NULL; +@@ -615,7 +619,7 @@ int vbg_hgcm_call(struct vbg_dev *gdev, u32 client_id, u32 function, + goto free_bounce_bufs; + } + +- call = vbg_req_alloc(size, VMMDEVREQ_HGCM_CALL); ++ call = vbg_req_alloc(size, VMMDEVREQ_HGCM_CALL, requestor); + if (!call) { + ret = -ENOMEM; + goto free_bounce_bufs; +@@ -647,9 +651,9 @@ EXPORT_SYMBOL(vbg_hgcm_call); + + #ifdef CONFIG_COMPAT + int vbg_hgcm_call32( +- struct vbg_dev *gdev, u32 client_id, u32 function, u32 timeout_ms, +- struct vmmdev_hgcm_function_parameter32 *parm32, u32 parm_count, +- int *vbox_status) ++ struct vbg_dev *gdev, u32 requestor, u32 client_id, u32 function, ++ u32 timeout_ms, struct vmmdev_hgcm_function_parameter32 *parm32, ++ u32 parm_count, int *vbox_status) + { + struct vmmdev_hgcm_function_parameter *parm64 = NULL; + u32 i, size; +@@ -689,7 +693,7 @@ int vbg_hgcm_call32( + goto out_free; + } + +- ret = vbg_hgcm_call(gdev, client_id, function, timeout_ms, ++ ret = vbg_hgcm_call(gdev, requestor, client_id, function, timeout_ms, + parm64, parm_count, vbox_status); + if (ret < 0) + goto out_free; +diff --git a/drivers/virt/vboxguest/vboxguest_version.h b/drivers/virt/vboxguest/vboxguest_version.h +index 77f0c8f8a231..84834dad38d5 100644 +--- a/drivers/virt/vboxguest/vboxguest_version.h ++++ b/drivers/virt/vboxguest/vboxguest_version.h +@@ -9,11 +9,10 @@ + #ifndef __VBOX_VERSION_H__ + #define __VBOX_VERSION_H__ + +-/* Last synced October 4th 2017 */ +-#define VBG_VERSION_MAJOR 5 +-#define VBG_VERSION_MINOR 2 ++#define VBG_VERSION_MAJOR 6 ++#define VBG_VERSION_MINOR 0 + #define VBG_VERSION_BUILD 0 +-#define VBG_SVN_REV 68940 +-#define VBG_VERSION_STRING "5.2.0" ++#define VBG_SVN_REV 127566 ++#define VBG_VERSION_STRING "6.0.0" + + #endif +diff --git a/drivers/virt/vboxguest/vmmdev.h b/drivers/virt/vboxguest/vmmdev.h +index 5e2ae978935d..6337b8d75d96 100644 +--- a/drivers/virt/vboxguest/vmmdev.h ++++ b/drivers/virt/vboxguest/vmmdev.h +@@ -98,8 +98,8 @@ struct vmmdev_request_header { + s32 rc; + /** Reserved field no.1. MBZ. */ + u32 reserved1; +- /** Reserved field no.2. MBZ. */ +- u32 reserved2; ++ /** IN: Requestor information (VMMDEV_REQUESTOR_*) */ ++ u32 requestor; + }; + VMMDEV_ASSERT_SIZE(vmmdev_request_header, 24); + +@@ -247,6 +247,8 @@ struct vmmdev_guest_info { + }; + VMMDEV_ASSERT_SIZE(vmmdev_guest_info, 24 + 8); + ++#define VMMDEV_GUEST_INFO2_ADDITIONS_FEATURES_REQUESTOR_INFO BIT(0) ++ + /** struct vmmdev_guestinfo2 - Guest information report, version 2. */ + struct vmmdev_guest_info2 { + /** Header. */ +@@ -259,7 +261,7 @@ struct vmmdev_guest_info2 { + u32 additions_build; + /** SVN revision. */ + u32 additions_revision; +- /** Feature mask, currently unused. */ ++ /** Feature mask. */ + u32 additions_features; + /** + * The intentional meaning of this field was: +diff --git a/include/linux/vbox_utils.h b/include/linux/vbox_utils.h +index a240ed2a0372..ff56c443180c 100644 +--- a/include/linux/vbox_utils.h ++++ b/include/linux/vbox_utils.h +@@ -24,15 +24,17 @@ __printf(1, 2) void vbg_debug(const char *fmt, ...); + #define vbg_debug pr_debug + #endif + +-int vbg_hgcm_connect(struct vbg_dev *gdev, ++int vbg_hgcm_connect(struct vbg_dev *gdev, u32 requestor, + struct vmmdev_hgcm_service_location *loc, + u32 *client_id, int *vbox_status); + +-int vbg_hgcm_disconnect(struct vbg_dev *gdev, u32 client_id, int *vbox_status); ++int vbg_hgcm_disconnect(struct vbg_dev *gdev, u32 requestor, ++ u32 client_id, int *vbox_status); + +-int vbg_hgcm_call(struct vbg_dev *gdev, u32 client_id, u32 function, +- u32 timeout_ms, struct vmmdev_hgcm_function_parameter *parms, +- u32 parm_count, int *vbox_status); ++int vbg_hgcm_call(struct vbg_dev *gdev, u32 requestor, u32 client_id, ++ u32 function, u32 timeout_ms, ++ struct vmmdev_hgcm_function_parameter *parms, u32 parm_count, ++ int *vbox_status); + + /** + * Convert a VirtualBox status code to a standard Linux kernel return value. +diff --git a/include/uapi/linux/vbox_vmmdev_types.h b/include/uapi/linux/vbox_vmmdev_types.h +index 0e68024f36c7..8c535c2594ad 100644 +--- a/include/uapi/linux/vbox_vmmdev_types.h ++++ b/include/uapi/linux/vbox_vmmdev_types.h +@@ -102,6 +102,37 @@ enum vmmdev_request_type { + #define VMMDEVREQ_HGCM_CALL VMMDEVREQ_HGCM_CALL32 + #endif + ++/* vmmdev_request_header.requestor defines */ ++ ++/* Requestor user not given. */ ++#define VMMDEV_REQUESTOR_USR_NOT_GIVEN 0x00000000 ++/* The kernel driver (VBoxGuest) is the requestor. */ ++#define VMMDEV_REQUESTOR_USR_DRV 0x00000001 ++/* Some other kernel driver is the requestor. */ ++#define VMMDEV_REQUESTOR_USR_DRV_OTHER 0x00000002 ++/* The root or a admin user is the requestor. */ ++#define VMMDEV_REQUESTOR_USR_ROOT 0x00000003 ++/* Regular joe user is making the request. */ ++#define VMMDEV_REQUESTOR_USR_USER 0x00000006 ++/* User classification mask. */ ++#define VMMDEV_REQUESTOR_USR_MASK 0x00000007 ++/* Kernel mode request. */ ++#define VMMDEV_REQUESTOR_KERNEL 0x00000000 ++/* User mode request. */ ++#define VMMDEV_REQUESTOR_USERMODE 0x00000008 ++/* Don't know the physical console association of the requestor. */ ++#define VMMDEV_REQUESTOR_CON_DONT_KNOW 0x00000000 ++/* Console classification mask. */ ++#define VMMDEV_REQUESTOR_CON_MASK 0x00000040 ++/* Requestor is member of special VirtualBox user group. */ ++#define VMMDEV_REQUESTOR_GRP_VBOX 0x00000080 ++/* Requestor trust level: Unspecified */ ++#define VMMDEV_REQUESTOR_TRUST_NOT_GIVEN 0x00000000 ++/* Requestor trust level mask */ ++#define VMMDEV_REQUESTOR_TRUST_MASK 0x00007000 ++/* Requestor is using the less trusted user device node (/dev/vboxuser) */ ++#define VMMDEV_REQUESTOR_USER_DEVICE 0x00008000 ++ + /** HGCM service location types. */ + enum vmmdev_hgcm_service_location_type { + VMMDEV_HGCM_LOC_INVALID = 0, +-- +2.21.0 + diff --git a/kernel.spec b/kernel.spec index 2df21ff66..3f5e44d72 100644 --- a/kernel.spec +++ b/kernel.spec @@ -579,6 +579,9 @@ Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch Patch506: 0001-s390-jump_label-Correct-asm-contraint.patch Patch507: 0001-Drop-that-for-now.patch +# rhbz 1689750, patch submitted upstream +Patch508: 0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch + # END OF PATCH DEFINITIONS %endif @@ -1852,6 +1855,9 @@ fi # # %changelog +* Wed Mar 20 2019 Hans de Goede +- Make the mainline vboxguest drv feature set match VirtualBox 6.0.x (#1689750) + * Mon Mar 18 2019 Jeremy Cline - 5.1.0-0.rc1.git0.1 - Linux v5.1-rc1 From 47ae8ce524c4c0565a7c531d7b32e3ee0b293b2e Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 20 Mar 2019 14:19:12 +0000 Subject: [PATCH 04/26] Linux v5.1-rc1-15-gbabf09c3837f --- gitrev | 2 +- kernel.spec | 8 ++++++-- sources | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index cac19f388..e926dc3f3 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -f261c4e529dac5608a604d3dd3ae1cd2adf23c89 +babf09c3837f3cf4b58225225609445419c338e6 diff --git a/kernel.spec b/kernel.spec index 3f5e44d72..6a9dacdea 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -1855,6 +1855,10 @@ fi # # %changelog +* Wed Mar 20 2019 Jeremy Cline - 5.1.0-0.rc1.git1.1 +- Linux v5.1-rc1-15-gbabf09c3837f +- Reenable debugging options. + * Wed Mar 20 2019 Hans de Goede - Make the mainline vboxguest drv feature set match VirtualBox 6.0.x (#1689750) diff --git a/sources b/sources index 17ff4c626..a8e6b8da6 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc1.xz) = 013b5354de22870555cf604d756acb0ab90e4383c59e11671611a6dbd88de8cca4ca4727a428e5aa563b6aad66aad01539eee0d9adb594c58d18edffe3f2e82e +SHA512 (patch-5.1-rc1-git1.xz) = fa2716c6490ec4da20064772f48e7e256d2d355d571b2f26ef11a140a4615e239169ad9bfb830985d5841d0708c47af6b40e907dd44d8e0535f69dcb43e2af99 From 03cb47494c67632be0f46032cffbd861126fa033 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Thu, 21 Mar 2019 10:34:06 -0400 Subject: [PATCH 05/26] configs: remove CONFIG_SUN50I_A64_UNSTABLE_TIMER The patch that added the Kconfig symbol SUN50I_A64_UNSTABLE_TIMER was dropped in commit 60a8ce36abae7 ("Raspberry Pi DT updates, Update AllWinner A64 timer errata workaround"). So it's safe to drop it from the configuration generation system too. Signed-off-by: Paul Bolle --- .../fedora/generic/arm/aarch64/CONFIG_SUN50I_A64_UNSTABLE_TIMER | 1 - kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - 3 files changed, 3 deletions(-) delete mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_A64_UNSTABLE_TIMER diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_A64_UNSTABLE_TIMER b/configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_A64_UNSTABLE_TIMER deleted file mode 100644 index 1bf3b8e41..000000000 --- a/configs/fedora/generic/arm/aarch64/CONFIG_SUN50I_A64_UNSTABLE_TIMER +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SUN50I_A64_UNSTABLE_TIMER=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 2d9ed7040..4e0697c74 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -5986,7 +5986,6 @@ CONFIG_ST_UVIS25=m CONFIG_ST_UVIS25_SPI=m # CONFIG_SUN4I_EMAC is not set CONFIG_SUN50I_A64_CCU=y -CONFIG_SUN50I_A64_UNSTABLE_TIMER=y CONFIG_SUN50I_DE2_BUS=y CONFIG_SUN50I_ERRATUM_UNKNOWN1=y CONFIG_SUN50I_H6_CCU=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 2e722ab88..94b587d34 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -5964,7 +5964,6 @@ CONFIG_ST_UVIS25=m CONFIG_ST_UVIS25_SPI=m # CONFIG_SUN4I_EMAC is not set CONFIG_SUN50I_A64_CCU=y -CONFIG_SUN50I_A64_UNSTABLE_TIMER=y CONFIG_SUN50I_DE2_BUS=y CONFIG_SUN50I_ERRATUM_UNKNOWN1=y CONFIG_SUN50I_H6_CCU=y From c9ac9acfb08914b971493e06b87fa4919ffc8ca2 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Thu, 21 Mar 2019 14:40:24 +0000 Subject: [PATCH 06/26] Remove three Kconfig symbols dropped before v5.0 Three Kconfig symbols were added to upstream v5.0-rc1 but dropped before v5.0 was released (for various reasons): FB_LOGO_CENTER, RESCTRL, and X86_RESCTRL. Remove them from our configuration generation system too. Signed-off-by: Paul Bolle --- configs/fedora/generic/CONFIG_FB_LOGO_CENTER | 1 - configs/fedora/generic/x86/CONFIG_RESCTRL | 1 - configs/fedora/generic/x86/CONFIG_X86_RESCTRL | 1 - kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - kernel-i686-debug.config | 3 --- kernel-i686.config | 3 --- kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - kernel-x86_64-debug.config | 3 --- kernel-x86_64.config | 3 --- 17 files changed, 25 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_FB_LOGO_CENTER delete mode 100644 configs/fedora/generic/x86/CONFIG_RESCTRL delete mode 100644 configs/fedora/generic/x86/CONFIG_X86_RESCTRL diff --git a/configs/fedora/generic/CONFIG_FB_LOGO_CENTER b/configs/fedora/generic/CONFIG_FB_LOGO_CENTER deleted file mode 100644 index 467865002..000000000 --- a/configs/fedora/generic/CONFIG_FB_LOGO_CENTER +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FB_LOGO_CENTER is not set diff --git a/configs/fedora/generic/x86/CONFIG_RESCTRL b/configs/fedora/generic/x86/CONFIG_RESCTRL deleted file mode 100644 index 1822f0b7a..000000000 --- a/configs/fedora/generic/x86/CONFIG_RESCTRL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RESCTRL=y diff --git a/configs/fedora/generic/x86/CONFIG_X86_RESCTRL b/configs/fedora/generic/x86/CONFIG_X86_RESCTRL deleted file mode 100644 index 81d50f7c6..000000000 --- a/configs/fedora/generic/x86/CONFIG_X86_RESCTRL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_X86_RESCTRL=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 4e0697c74..775c0d5cb 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1734,7 +1734,6 @@ CONFIG_FB_EFI=y # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LOGO_CENTER is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 94b587d34..130223c7f 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1718,7 +1718,6 @@ CONFIG_FB_EFI=y # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LOGO_CENTER is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 779416ae0..d516b5296 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1789,7 +1789,6 @@ CONFIG_FB_EFI=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_IMX is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LOGO_CENTER is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 25d592b93..d8928d09f 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1713,7 +1713,6 @@ CONFIG_FB_EFI=y # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LOGO_CENTER is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index bc3f66676..e17d8f203 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1698,7 +1698,6 @@ CONFIG_FB_EFI=y # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LOGO_CENTER is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 3ece3890c..ec4f9039d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1774,7 +1774,6 @@ CONFIG_FB_EFI=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_IMX is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LOGO_CENTER is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index beaf55e2b..dfe91a77b 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1530,7 +1530,6 @@ CONFIG_FB_I810=m # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_LE80578 is not set -# CONFIG_FB_LOGO_CENTER is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -4403,7 +4402,6 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m # CONFIG_RENESAS_PHY is not set -CONFIG_RESCTRL=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -6494,7 +6492,6 @@ CONFIG_X86_PTDUMP=y # CONFIG_X86_RDC321X is not set # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_RESCTRL=y CONFIG_X86_RESERVE_LOW=64 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_SPEEDSTEP_ICH=y diff --git a/kernel-i686.config b/kernel-i686.config index 7c2ead4ff..b59b97f81 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1513,7 +1513,6 @@ CONFIG_FB_I810=m # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_LE80578 is not set -# CONFIG_FB_LOGO_CENTER is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -4383,7 +4382,6 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m # CONFIG_RENESAS_PHY is not set -CONFIG_RESCTRL=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -6473,7 +6471,6 @@ CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_RDC321X is not set # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_RESCTRL=y CONFIG_X86_RESERVE_LOW=64 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_SPEEDSTEP_ICH=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index ed796c797..bdbf119d2 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1382,7 +1382,6 @@ CONFIG_FB_EFI=y CONFIG_FB_IBM_GXT4500=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LOGO_CENTER is not set CONFIG_FB_MATROX_G=y # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX_MILLENIUM is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index a921ba2f3..7fff95122 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1365,7 +1365,6 @@ CONFIG_FB_EFI=y CONFIG_FB_IBM_GXT4500=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LOGO_CENTER is not set CONFIG_FB_MATROX_G=y # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX_MILLENIUM is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 46c72feb6..197817317 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1387,7 +1387,6 @@ CONFIG_FB_EFI=y # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LOGO_CENTER is not set CONFIG_FB=m # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index d1727fbe6..2cad3793d 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1370,7 +1370,6 @@ CONFIG_FB_EFI=y # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LOGO_CENTER is not set CONFIG_FB=m # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 2bf7fb1fd..35ccdec08 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1575,7 +1575,6 @@ CONFIG_FB_I810=m # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_LE80578 is not set -# CONFIG_FB_LOGO_CENTER is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -4446,7 +4445,6 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m # CONFIG_RENESAS_PHY is not set -CONFIG_RESCTRL=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -6543,7 +6541,6 @@ CONFIG_X86_PM_TIMER=y CONFIG_X86_POWERNOW_K8=m CONFIG_X86_PTDUMP=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_RESCTRL=y CONFIG_X86_RESERVE_LOW=64 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_SYSFB is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index f538fa6f8..83459b6b2 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1558,7 +1558,6 @@ CONFIG_FB_I810=m # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_LE80578 is not set -# CONFIG_FB_LOGO_CENTER is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -4426,7 +4425,6 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m # CONFIG_RENESAS_PHY is not set -CONFIG_RESCTRL=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -6522,7 +6520,6 @@ CONFIG_X86_PM_TIMER=y CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_PTDUMP is not set CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -CONFIG_X86_RESCTRL=y CONFIG_X86_RESERVE_LOW=64 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_SYSFB is not set From 2e975b2183b33da2520b7e735538b879170667d7 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Thu, 21 Mar 2019 15:11:23 +0000 Subject: [PATCH 07/26] Remove all Kconfig symbols dropped in v5.1-rc1 There are 23 Kconfig symbols referenced in the files used for configuration generation and in the shipped .config files that were dropped in upstream v5.1-rc1. The references to these symbols can be safely removed. These symbols are: CONFIG_AD7152 CONFIG_DEFAULT_SECURITY_DAC CONFIG_DEFAULT_SECURITY_SELINUX CONFIG_EARLY_PRINTK_EFI CONFIG_EXOFS_FS CONFIG_EXT4_ENCRYPTION CONFIG_F2FS_FS_ENCRYPTION CONFIG_FB_XGI CONFIG_MTD_MT81xx_NOR CONFIG_NFT_CHAIN_NAT_IPV4 CONFIG_NFT_CHAIN_NAT_IPV6 CONFIG_NFT_MASQ_IPV4 CONFIG_NFT_MASQ_IPV6 CONFIG_NFT_REDIR_IPV4 CONFIG_NFT_REDIR_IPV6 CONFIG_SCSI_OSD_DEBUG CONFIG_SCSI_OSD_DPRINT_SENSE CONFIG_SCSI_OSD_INITIATOR CONFIG_SCSI_OSD_ULD CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE CONFIG_SND_AUDIO_GRAPH_SCU_CARD CONFIG_SND_SIMPLE_SCU_CARD CONFIG_UBIFS_FS_ENCRYPTION Signed-off-by: Paul Bolle --- configs/fedora/generic/CONFIG_AD7152 | 1 - .../generic/CONFIG_DEFAULT_SECURITY_DAC | 1 - .../generic/CONFIG_DEFAULT_SECURITY_SELINUX | 1 - configs/fedora/generic/CONFIG_EXOFS_FS | 1 - configs/fedora/generic/CONFIG_EXT4_ENCRYPTION | 1 - .../fedora/generic/CONFIG_F2FS_FS_ENCRYPTION | 1 - configs/fedora/generic/CONFIG_FB_XGI | 1 - .../fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV4 | 1 - .../fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV6 | 1 - configs/fedora/generic/CONFIG_NFT_MASQ_IPV4 | 1 - configs/fedora/generic/CONFIG_NFT_MASQ_IPV6 | 1 - configs/fedora/generic/CONFIG_NFT_REDIR_IPV4 | 1 - configs/fedora/generic/CONFIG_NFT_REDIR_IPV6 | 1 - configs/fedora/generic/CONFIG_SCSI_OSD_DEBUG | 1 - .../generic/CONFIG_SCSI_OSD_DPRINT_SENSE | 1 - .../fedora/generic/CONFIG_SCSI_OSD_INITIATOR | 1 - configs/fedora/generic/CONFIG_SCSI_OSD_ULD | 1 - .../CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE | 1 - .../generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD | 1 - .../fedora/generic/CONFIG_SND_SIMPLE_SCU_CARD | 1 - .../fedora/generic/CONFIG_UBIFS_FS_ENCRYPTION | 1 - .../generic/arm/armv7/CONFIG_MTD_MT81xx_NOR | 1 - .../generic/x86/CONFIG_EARLY_PRINTK_EFI | 1 - kernel-aarch64-debug.config | 21 ------------------ kernel-aarch64.config | 21 ------------------ kernel-armv7hl-debug.config | 22 ------------------- kernel-armv7hl-lpae-debug.config | 22 ------------------- kernel-armv7hl-lpae.config | 22 ------------------- kernel-armv7hl.config | 22 ------------------- kernel-i686-debug.config | 22 ------------------- kernel-i686.config | 22 ------------------- kernel-ppc64le-debug.config | 21 ------------------ kernel-ppc64le.config | 21 ------------------ kernel-s390x-debug.config | 21 ------------------ kernel-s390x.config | 21 ------------------ kernel-x86_64-debug.config | 22 ------------------- kernel-x86_64.config | 22 ------------------- 37 files changed, 325 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_AD7152 delete mode 100644 configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC delete mode 100644 configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX delete mode 100644 configs/fedora/generic/CONFIG_EXOFS_FS delete mode 100644 configs/fedora/generic/CONFIG_EXT4_ENCRYPTION delete mode 100644 configs/fedora/generic/CONFIG_F2FS_FS_ENCRYPTION delete mode 100644 configs/fedora/generic/CONFIG_FB_XGI delete mode 100644 configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV4 delete mode 100644 configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV6 delete mode 100644 configs/fedora/generic/CONFIG_NFT_MASQ_IPV4 delete mode 100644 configs/fedora/generic/CONFIG_NFT_MASQ_IPV6 delete mode 100644 configs/fedora/generic/CONFIG_NFT_REDIR_IPV4 delete mode 100644 configs/fedora/generic/CONFIG_NFT_REDIR_IPV6 delete mode 100644 configs/fedora/generic/CONFIG_SCSI_OSD_DEBUG delete mode 100644 configs/fedora/generic/CONFIG_SCSI_OSD_DPRINT_SENSE delete mode 100644 configs/fedora/generic/CONFIG_SCSI_OSD_INITIATOR delete mode 100644 configs/fedora/generic/CONFIG_SCSI_OSD_ULD delete mode 100644 configs/fedora/generic/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE delete mode 100644 configs/fedora/generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD delete mode 100644 configs/fedora/generic/CONFIG_SND_SIMPLE_SCU_CARD delete mode 100644 configs/fedora/generic/CONFIG_UBIFS_FS_ENCRYPTION delete mode 100644 configs/fedora/generic/arm/armv7/CONFIG_MTD_MT81xx_NOR delete mode 100644 configs/fedora/generic/x86/CONFIG_EARLY_PRINTK_EFI diff --git a/configs/fedora/generic/CONFIG_AD7152 b/configs/fedora/generic/CONFIG_AD7152 deleted file mode 100644 index 24be7e64e..000000000 --- a/configs/fedora/generic/CONFIG_AD7152 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_AD7152 is not set diff --git a/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC b/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC deleted file mode 100644 index a3af1ff70..000000000 --- a/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DEFAULT_SECURITY_DAC is not set diff --git a/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX b/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX deleted file mode 100644 index ef2f9974a..000000000 --- a/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEFAULT_SECURITY_SELINUX=y diff --git a/configs/fedora/generic/CONFIG_EXOFS_FS b/configs/fedora/generic/CONFIG_EXOFS_FS deleted file mode 100644 index 46dfd9d1c..000000000 --- a/configs/fedora/generic/CONFIG_EXOFS_FS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_EXOFS_FS is not set diff --git a/configs/fedora/generic/CONFIG_EXT4_ENCRYPTION b/configs/fedora/generic/CONFIG_EXT4_ENCRYPTION deleted file mode 100644 index 2758bcf0b..000000000 --- a/configs/fedora/generic/CONFIG_EXT4_ENCRYPTION +++ /dev/null @@ -1 +0,0 @@ -CONFIG_EXT4_ENCRYPTION=y diff --git a/configs/fedora/generic/CONFIG_F2FS_FS_ENCRYPTION b/configs/fedora/generic/CONFIG_F2FS_FS_ENCRYPTION deleted file mode 100644 index 9be753d68..000000000 --- a/configs/fedora/generic/CONFIG_F2FS_FS_ENCRYPTION +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_F2FS_FS_ENCRYPTION is not set diff --git a/configs/fedora/generic/CONFIG_FB_XGI b/configs/fedora/generic/CONFIG_FB_XGI deleted file mode 100644 index 6f60e1ed2..000000000 --- a/configs/fedora/generic/CONFIG_FB_XGI +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FB_XGI is not set diff --git a/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV4 b/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV4 deleted file mode 100644 index dabdbc46a..000000000 --- a/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV4 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NFT_CHAIN_NAT_IPV4=m diff --git a/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV6 b/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV6 deleted file mode 100644 index 1afb99374..000000000 --- a/configs/fedora/generic/CONFIG_NFT_CHAIN_NAT_IPV6 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NFT_CHAIN_NAT_IPV6=m diff --git a/configs/fedora/generic/CONFIG_NFT_MASQ_IPV4 b/configs/fedora/generic/CONFIG_NFT_MASQ_IPV4 deleted file mode 100644 index 5a5ec1c61..000000000 --- a/configs/fedora/generic/CONFIG_NFT_MASQ_IPV4 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NFT_MASQ_IPV4=m diff --git a/configs/fedora/generic/CONFIG_NFT_MASQ_IPV6 b/configs/fedora/generic/CONFIG_NFT_MASQ_IPV6 deleted file mode 100644 index d1e703f9b..000000000 --- a/configs/fedora/generic/CONFIG_NFT_MASQ_IPV6 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NFT_MASQ_IPV6=m diff --git a/configs/fedora/generic/CONFIG_NFT_REDIR_IPV4 b/configs/fedora/generic/CONFIG_NFT_REDIR_IPV4 deleted file mode 100644 index 8f2025454..000000000 --- a/configs/fedora/generic/CONFIG_NFT_REDIR_IPV4 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NFT_REDIR_IPV4=m diff --git a/configs/fedora/generic/CONFIG_NFT_REDIR_IPV6 b/configs/fedora/generic/CONFIG_NFT_REDIR_IPV6 deleted file mode 100644 index 23f2aa25b..000000000 --- a/configs/fedora/generic/CONFIG_NFT_REDIR_IPV6 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NFT_REDIR_IPV6=m diff --git a/configs/fedora/generic/CONFIG_SCSI_OSD_DEBUG b/configs/fedora/generic/CONFIG_SCSI_OSD_DEBUG deleted file mode 100644 index 94c77fa09..000000000 --- a/configs/fedora/generic/CONFIG_SCSI_OSD_DEBUG +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SCSI_OSD_DEBUG is not set diff --git a/configs/fedora/generic/CONFIG_SCSI_OSD_DPRINT_SENSE b/configs/fedora/generic/CONFIG_SCSI_OSD_DPRINT_SENSE deleted file mode 100644 index ff51990d8..000000000 --- a/configs/fedora/generic/CONFIG_SCSI_OSD_DPRINT_SENSE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SCSI_OSD_DPRINT_SENSE=1 diff --git a/configs/fedora/generic/CONFIG_SCSI_OSD_INITIATOR b/configs/fedora/generic/CONFIG_SCSI_OSD_INITIATOR deleted file mode 100644 index 052e3e9c9..000000000 --- a/configs/fedora/generic/CONFIG_SCSI_OSD_INITIATOR +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SCSI_OSD_INITIATOR=m diff --git a/configs/fedora/generic/CONFIG_SCSI_OSD_ULD b/configs/fedora/generic/CONFIG_SCSI_OSD_ULD deleted file mode 100644 index 34f6a7895..000000000 --- a/configs/fedora/generic/CONFIG_SCSI_OSD_ULD +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SCSI_OSD_ULD=m diff --git a/configs/fedora/generic/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE b/configs/fedora/generic/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE deleted file mode 100644 index afb675430..000000000 --- a/configs/fedora/generic/CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 diff --git a/configs/fedora/generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD b/configs/fedora/generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD deleted file mode 100644 index 12d870d77..000000000 --- a/configs/fedora/generic/CONFIG_SND_AUDIO_GRAPH_SCU_CARD +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set diff --git a/configs/fedora/generic/CONFIG_SND_SIMPLE_SCU_CARD b/configs/fedora/generic/CONFIG_SND_SIMPLE_SCU_CARD deleted file mode 100644 index e50c18374..000000000 --- a/configs/fedora/generic/CONFIG_SND_SIMPLE_SCU_CARD +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SIMPLE_SCU_CARD=m diff --git a/configs/fedora/generic/CONFIG_UBIFS_FS_ENCRYPTION b/configs/fedora/generic/CONFIG_UBIFS_FS_ENCRYPTION deleted file mode 100644 index 163dac774..000000000 --- a/configs/fedora/generic/CONFIG_UBIFS_FS_ENCRYPTION +++ /dev/null @@ -1 +0,0 @@ -CONFIG_UBIFS_FS_ENCRYPTION=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_MT81xx_NOR b/configs/fedora/generic/arm/armv7/CONFIG_MTD_MT81xx_NOR deleted file mode 100644 index 204cf13ab..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_MT81xx_NOR +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MTD_MT81xx_NOR is not set diff --git a/configs/fedora/generic/x86/CONFIG_EARLY_PRINTK_EFI b/configs/fedora/generic/x86/CONFIG_EARLY_PRINTK_EFI deleted file mode 100644 index b895363c6..000000000 --- a/configs/fedora/generic/x86/CONFIG_EARLY_PRINTK_EFI +++ /dev/null @@ -1 +0,0 @@ -CONFIG_EARLY_PRINTK_EFI=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 775c0d5cb..c9ff6cf6f 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -96,7 +96,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1292,8 +1291,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DETECT_HUNG_TASK=y # CONFIG_DEV_APPLETALK is not set @@ -1664,7 +1661,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1673,7 +1669,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_DEBUG=y -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1693,7 +1688,6 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1769,7 +1763,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set CONFIG_FB_XILINX=m CONFIG_FB=y CONFIG_FCOE_FNIC=m @@ -4000,8 +3993,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -4021,8 +4012,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -4032,8 +4021,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -5106,10 +5093,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m # CONFIG_SCSI_PM8001 is not set CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -5173,7 +5156,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -5498,7 +5480,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AUDIO_GRAPH_CARD=m -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -5631,7 +5612,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set @@ -6332,7 +6312,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 130223c7f..bc29b8354 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -96,7 +96,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1285,8 +1284,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DETECT_HUNG_TASK is not set # CONFIG_DEV_APPLETALK is not set @@ -1656,7 +1653,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1665,7 +1661,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1685,7 +1680,6 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1753,7 +1747,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set CONFIG_FB_XILINX=m CONFIG_FB=y CONFIG_FCOE_FNIC=m @@ -3980,8 +3973,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -4001,8 +3992,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -4012,8 +4001,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -5085,10 +5072,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m # CONFIG_SCSI_PM8001 is not set CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -5152,7 +5135,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -5477,7 +5459,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AUDIO_GRAPH_CARD=m -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -5609,7 +5590,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set @@ -6310,7 +6290,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index d516b5296..74680b57e 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -68,7 +68,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1295,8 +1294,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set CONFIG_DETECT_HUNG_TASK=y @@ -1710,7 +1707,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1719,7 +1715,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_DEBUG=y -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1747,7 +1742,6 @@ CONFIG_EXYNOS_THERMAL=y # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1825,7 +1819,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set # CONFIG_FB_XILINX is not set CONFIG_FB=y CONFIG_FCOE_FNIC=m @@ -3636,7 +3629,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MCHP23K256 is not set -# CONFIG_MTD_MT81xx_NOR is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_NAND_BRCMNAND is not set CONFIG_MTD_NAND_CAFE=m @@ -4125,8 +4117,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -4146,8 +4136,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -4157,8 +4145,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -5300,10 +5286,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m # CONFIG_SCSI_PM8001 is not set CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -5366,7 +5348,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -5705,7 +5686,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AUDIO_GRAPH_CARD=m -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -5845,7 +5825,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AC97_CODEC=m @@ -6639,7 +6618,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index d8928d09f..c9cd68dd9 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -68,7 +68,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1251,8 +1250,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set CONFIG_DETECT_HUNG_TASK=y @@ -1636,7 +1633,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1645,7 +1641,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_DEBUG=y -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1672,7 +1667,6 @@ CONFIG_EXYNOS_THERMAL=y # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1748,7 +1742,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set # CONFIG_FB_XILINX is not set CONFIG_FB=y CONFIG_FCOE_FNIC=m @@ -3487,7 +3480,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MCHP23K256 is not set -# CONFIG_MTD_MT81xx_NOR is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_NAND_BRCMNAND is not set CONFIG_MTD_NAND_CAFE=m @@ -3970,8 +3962,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -3991,8 +3981,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -4002,8 +3990,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -5023,10 +5009,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m # CONFIG_SCSI_PM8001 is not set CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -5089,7 +5071,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -5412,7 +5393,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AUDIO_GRAPH_CARD=m -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -5548,7 +5528,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AC97_CODEC=m @@ -6261,7 +6240,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index e17d8f203..ac46efb01 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -68,7 +68,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1244,8 +1243,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set # CONFIG_DETECT_HUNG_TASK is not set @@ -1629,7 +1626,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1638,7 +1634,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1665,7 +1660,6 @@ CONFIG_EXYNOS_THERMAL=y # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1733,7 +1727,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set # CONFIG_FB_XILINX is not set CONFIG_FB=y CONFIG_FCOE_FNIC=m @@ -3468,7 +3461,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MCHP23K256 is not set -# CONFIG_MTD_MT81xx_NOR is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_NAND_BRCMNAND is not set CONFIG_MTD_NAND_CAFE=m @@ -3951,8 +3943,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -3972,8 +3962,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -3983,8 +3971,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -5003,10 +4989,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m # CONFIG_SCSI_PM8001 is not set CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -5069,7 +5051,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -5392,7 +5373,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AUDIO_GRAPH_CARD=m -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -5527,7 +5507,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AC97_CODEC=m @@ -6240,7 +6219,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index ec4f9039d..6b35cf491 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -68,7 +68,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1288,8 +1287,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set # CONFIG_DETECT_HUNG_TASK is not set @@ -1703,7 +1700,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1712,7 +1708,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1740,7 +1735,6 @@ CONFIG_EXYNOS_THERMAL=y # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1810,7 +1804,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set # CONFIG_FB_XILINX is not set CONFIG_FB=y CONFIG_FCOE_FNIC=m @@ -3617,7 +3610,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MCHP23K256 is not set -# CONFIG_MTD_MT81xx_NOR is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_NAND_BRCMNAND is not set CONFIG_MTD_NAND_CAFE=m @@ -4106,8 +4098,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -4127,8 +4117,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -4138,8 +4126,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -5280,10 +5266,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m # CONFIG_SCSI_PM8001 is not set CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -5346,7 +5328,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -5685,7 +5666,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m CONFIG_SND_AUDIO_GRAPH_CARD=m -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -5824,7 +5804,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AC97_CODEC=m @@ -6618,7 +6597,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index dfe91a77b..9634bf0f5 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -104,7 +104,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1089,8 +1088,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m @@ -1377,7 +1374,6 @@ CONFIG_E1000E=m CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y -CONFIG_EARLY_PRINTK_EFI=y CONFIG_EARLY_PRINTK_USB_XDBC=y # CONFIG_EBC_C384_WDT is not set CONFIG_ECHO=m @@ -1451,7 +1447,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1460,7 +1455,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_DEBUG=y -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1479,7 +1473,6 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1569,7 +1562,6 @@ CONFIG_FB_VGA16=m CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set CONFIG_FB=y CONFIG_FCOE_FNIC=m CONFIG_FCOE=m @@ -3762,8 +3754,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -3783,8 +3773,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -3794,8 +3782,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -4688,10 +4674,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_PM8001=m CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -4748,7 +4730,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -5062,7 +5043,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m # CONFIG_SND_AUDIO_GRAPH_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -5184,7 +5164,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set @@ -5820,7 +5799,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-i686.config b/kernel-i686.config index b59b97f81..9cb41e257 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -104,7 +104,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1081,8 +1080,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m @@ -1368,7 +1365,6 @@ CONFIG_E1000E=m CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y -CONFIG_EARLY_PRINTK_EFI=y CONFIG_EARLY_PRINTK_USB_XDBC=y # CONFIG_EBC_C384_WDT is not set CONFIG_ECHO=m @@ -1442,7 +1438,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1451,7 +1446,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1470,7 +1464,6 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1552,7 +1545,6 @@ CONFIG_FB_VGA16=m CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set CONFIG_FB=y CONFIG_FCOE_FNIC=m CONFIG_FCOE=m @@ -3743,8 +3735,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -3764,8 +3754,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -3775,8 +3763,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -4668,10 +4654,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_PM8001=m CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -4728,7 +4710,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -5042,7 +5023,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m # CONFIG_SND_AUDIO_GRAPH_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -5163,7 +5143,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set @@ -5799,7 +5778,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index bdbf119d2..7169d3f08 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -67,7 +67,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1010,8 +1009,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_APPLETALK=m @@ -1313,7 +1310,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1322,7 +1318,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_DEBUG=y -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1341,7 +1336,6 @@ CONFIG_EXTRA_TARGETS="" # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1419,7 +1413,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set CONFIG_FB=y CONFIG_FCOE_FNIC=m CONFIG_FCOE=m @@ -3487,8 +3480,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -3508,8 +3499,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -3519,8 +3508,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -4392,10 +4379,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_PM8001=m CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -4448,7 +4431,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -4749,7 +4731,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m # CONFIG_SND_AUDIO_GRAPH_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -4871,7 +4852,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set CONFIG_SND_SOC_ADAU1761_I2C=m @@ -5453,7 +5433,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 7fff95122..a43dd1ce4 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -67,7 +67,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1002,8 +1001,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_APPLETALK=m @@ -1304,7 +1301,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1313,7 +1309,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1332,7 +1327,6 @@ CONFIG_EXTRA_TARGETS="" # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1402,7 +1396,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set CONFIG_FB=y CONFIG_FCOE_FNIC=m CONFIG_FCOE=m @@ -3466,8 +3459,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -3487,8 +3478,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -3498,8 +3487,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -4370,10 +4357,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_PM8001=m CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -4426,7 +4409,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -4727,7 +4709,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m # CONFIG_SND_AUDIO_GRAPH_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -4848,7 +4829,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set CONFIG_SND_SOC_ADAU1761_I2C=m @@ -5430,7 +5410,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 197817317..8d2e304f7 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -68,7 +68,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1018,8 +1017,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_APPLETALK=m @@ -1320,7 +1317,6 @@ CONFIG_ETHERNET=y # CONFIG_ETHOC is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set CONFIG_EXPOLINE_AUTO=y # CONFIG_EXPOLINE_FULL is not set @@ -1330,7 +1326,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_DEBUG=y -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1348,7 +1343,6 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1422,7 +1416,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set CONFIG_FCOE_FNIC=m # CONFIG_FCOE is not set # CONFIG_FDDI is not set @@ -3457,8 +3450,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -3478,8 +3469,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -3489,8 +3478,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -4340,10 +4327,6 @@ CONFIG_SCSI_MVSAS_TASKLET=y CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m # CONFIG_SCSI_PM8001 is not set # CONFIG_SCSI_PMCRAID is not set # CONFIG_SCSI_PPA is not set @@ -4396,7 +4379,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -4693,7 +4675,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m # CONFIG_SND_AUDIO_GRAPH_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -4814,7 +4795,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set CONFIG_SND_SOC_ADAU1761_I2C=m @@ -5395,7 +5375,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 2cad3793d..a72714ceb 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -68,7 +68,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1010,8 +1009,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_APPLETALK=m @@ -1311,7 +1308,6 @@ CONFIG_ETHERNET=y # CONFIG_ETHOC is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set CONFIG_EXPOLINE_AUTO=y # CONFIG_EXPOLINE_FULL is not set @@ -1321,7 +1317,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1339,7 +1334,6 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1405,7 +1399,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set CONFIG_FCOE_FNIC=m # CONFIG_FCOE is not set # CONFIG_FDDI is not set @@ -3436,8 +3429,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -3457,8 +3448,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -3468,8 +3457,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -4318,10 +4305,6 @@ CONFIG_SCSI_MVSAS_TASKLET=y CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m # CONFIG_SCSI_PM8001 is not set # CONFIG_SCSI_PMCRAID is not set # CONFIG_SCSI_PPA is not set @@ -4374,7 +4357,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -4671,7 +4653,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m # CONFIG_SND_AUDIO_GRAPH_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -4791,7 +4772,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ADAU1701 is not set CONFIG_SND_SOC_ADAU1761_I2C=m @@ -5372,7 +5352,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 35ccdec08..e173506d8 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -107,7 +107,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1129,8 +1128,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m @@ -1421,7 +1418,6 @@ CONFIG_E1000E=m CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y -CONFIG_EARLY_PRINTK_EFI=y CONFIG_EARLY_PRINTK_USB_XDBC=y # CONFIG_EBC_C384_WDT is not set CONFIG_ECHO=m @@ -1496,7 +1492,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1505,7 +1500,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set CONFIG_EXT4_DEBUG=y -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1527,7 +1521,6 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1612,7 +1605,6 @@ CONFIG_FB_VGA16=m CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set CONFIG_FB=y CONFIG_FCOE_FNIC=m CONFIG_FCOE=m @@ -3806,8 +3798,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -3827,8 +3817,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -3838,8 +3826,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -4734,10 +4720,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_PM8001=m CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -4793,7 +4775,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -5113,7 +5094,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m # CONFIG_SND_AUDIO_GRAPH_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -5235,7 +5215,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set @@ -5875,7 +5854,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 83459b6b2..4f5460c49 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -107,7 +107,6 @@ CONFIG_AD5272=m # CONFIG_AD5933 is not set CONFIG_AD7124=m # CONFIG_AD7150 is not set -# CONFIG_AD7152 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -1121,8 +1120,6 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 # CONFIG_DEFAULT_RENO is not set -# CONFIG_DEFAULT_SECURITY_DAC is not set -CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m @@ -1412,7 +1409,6 @@ CONFIG_E1000E=m CONFIG_E1000=m CONFIG_E100=m CONFIG_EARLY_PRINTK_DBGP=y -CONFIG_EARLY_PRINTK_EFI=y CONFIG_EARLY_PRINTK_USB_XDBC=y # CONFIG_EBC_C384_WDT is not set CONFIG_ECHO=m @@ -1487,7 +1483,6 @@ CONFIG_ETHERNET=y CONFIG_ETHOC=m # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1496,7 +1491,6 @@ CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS=y @@ -1518,7 +1512,6 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_EZX_PCAP is not set # CONFIG_F2FS_CHECK_FS is not set # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_F2FS_FS=m CONFIG_F2FS_FS_POSIX_ACL=y CONFIG_F2FS_FS_SECURITY=y @@ -1595,7 +1588,6 @@ CONFIG_FB_VGA16=m CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -# CONFIG_FB_XGI is not set CONFIG_FB=y CONFIG_FCOE_FNIC=m CONFIG_FCOE=m @@ -3787,8 +3779,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m @@ -3808,8 +3798,6 @@ CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m # CONFIG_NFTL is not set CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m @@ -3819,8 +3807,6 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT=m @@ -4714,10 +4700,6 @@ CONFIG_SCSI_MVUMI=m CONFIG_SCSI_MYRB=m CONFIG_SCSI_MYRS=m # CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_PM8001=m CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_PPA is not set @@ -4773,7 +4755,6 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_SAFESETID is not set CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y @@ -5093,7 +5074,6 @@ CONFIG_SND_AU8810=m CONFIG_SND_AU8820=m CONFIG_SND_AU8830=m # CONFIG_SND_AUDIO_GRAPH_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set # CONFIG_SND_AW2 is not set CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m @@ -5214,7 +5194,6 @@ CONFIG_SND_SEQUENCER_OSS=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_CARD_UTILS=m -CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set @@ -5854,7 +5833,6 @@ CONFIG_TYPHOON=m CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_AUTHENTICATION=y -CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_XATTR=y From 70e042b78c22ac796e64990d2fa1d1c75c71bd43 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 22 Mar 2019 14:14:08 +0000 Subject: [PATCH 08/26] Linux v5.1-rc1-66-gfd1f297b794c --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index e926dc3f3..1503c3486 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -babf09c3837f3cf4b58225225609445419c338e6 +fd1f297b794c77e52412dc621b5884210291eeee diff --git a/kernel.spec b/kernel.spec index 6a9dacdea..d0b130dce 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1855,6 +1855,9 @@ fi # # %changelog +* Fri Mar 22 2019 Jeremy Cline - 5.1.0-0.rc1.git2.1 +- Linux v5.1-rc1-66-gfd1f297b794c + * Wed Mar 20 2019 Jeremy Cline - 5.1.0-0.rc1.git1.1 - Linux v5.1-rc1-15-gbabf09c3837f - Reenable debugging options. diff --git a/sources b/sources index a8e6b8da6..6aca6d320 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc1.xz) = 013b5354de22870555cf604d756acb0ab90e4383c59e11671611a6dbd88de8cca4ca4727a428e5aa563b6aad66aad01539eee0d9adb594c58d18edffe3f2e82e -SHA512 (patch-5.1-rc1-git1.xz) = fa2716c6490ec4da20064772f48e7e256d2d355d571b2f26ef11a140a4615e239169ad9bfb830985d5841d0708c47af6b40e907dd44d8e0535f69dcb43e2af99 +SHA512 (patch-5.1-rc1-git2.xz) = 1633b72619cfb2a20934d11f153ca32e22de75ebc4bef6c9baf2d2644237b1832bfdeec554d93d638fdb30609a0049a9cc0e9def49047793d4b12e8d90ff8c0f From 509cc04d2b84005bdfdaf14ef250f37962d9d57f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 24 Mar 2019 17:16:09 +0000 Subject: [PATCH 09/26] Fixes for Tegra Jetson TX series, Initial support for NVIDIA Jetson Nano --- ...IA-Jetson-Nano-Developer-Kit-support.patch | 2072 +++++++++++++++++ arm64-tegra-jetson-tx1-fixes.patch | 68 + kernel.spec | 10 + 3 files changed, 2150 insertions(+) create mode 100644 arm64-tegra-Add-NVIDIA-Jetson-Nano-Developer-Kit-support.patch create mode 100644 arm64-tegra-jetson-tx1-fixes.patch diff --git a/arm64-tegra-Add-NVIDIA-Jetson-Nano-Developer-Kit-support.patch b/arm64-tegra-Add-NVIDIA-Jetson-Nano-Developer-Kit-support.patch new file mode 100644 index 000000000..a1a67acb7 --- /dev/null +++ b/arm64-tegra-Add-NVIDIA-Jetson-Nano-Developer-Kit-support.patch @@ -0,0 +1,2072 @@ +From patchwork Mon Mar 18 23:23:13 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Thierry Reding +X-Patchwork-Id: 10858639 +Return-Path: + +Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org + [172.30.200.125]) + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A67F4139A + for ; + Mon, 18 Mar 2019 23:23:33 +0000 (UTC) +Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) + by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F8DE29533 + for ; + Mon, 18 Mar 2019 23:23:33 +0000 (UTC) +Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) + id 633B329535; Mon, 18 Mar 2019 23:23:33 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on + pdx-wl-mail.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, + score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, + DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED + autolearn=ham version=3.3.1 +Received: from bombadil.infradead.org (bombadil.infradead.org + [198.137.202.133]) + (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A839F29534 + for ; + Mon, 18 Mar 2019 23:23:30 +0000 (UTC) +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=bombadil.20170209; h=Sender: + Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: + List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To + :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: + Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: + List-Owner; bh=2sU+x4hpA091D/jLGC2R38K/qJyHoHy9wmqJHJ4ewwg=; b=s0ieDGUxGdSDNa + vX5s18fXiTjoB7P9zv0GlxWzXQCJqQnxdX57USnUmcJMrg1Gzh0oO6+LbDlASCJSEu4t4Pn7hb1tt + QbPb0EOt4m0z7CTU0k16yypmP3R4+w1kni4KJqLww66tos1GauMtfKXDjSRtIA4l0dgGtR7aNBE82 + 5oCmrX0w1hEVLkCDzjYBdjCP+M+lqDTzPMXMmRxTdBNuLHBZlpOWNy0Z9M6LYoS/BzLzjrLuvQRUM + CPkrR9J2QPuQLpebQsKnFgBKtttcwe5GLzdoong9cLVOUHGiL0QatEc7GvsgZ8u+x6SXhDJDlap3K + 1nFd52NWhIDDBjsrF3gQ==; +Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) + by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) + id 1h61bH-0004MJ-ST; Mon, 18 Mar 2019 23:23:23 +0000 +Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) + by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) + id 1h61bB-0004Lt-LJ + for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 23:23:22 +0000 +Received: by mail-wm1-x344.google.com with SMTP id a188so14550973wmf.3 + for ; + Mon, 18 Mar 2019 16:23:17 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; + h=from:to:cc:subject:date:message-id:mime-version + :content-transfer-encoding; + bh=NgkgycOAutPIwHnXZGiuxniA3uvcp0YWgMh4155m5jM=; + b=sIxPnczXC6LZ8Nuatp9CwqTh+kMPdq1DeydDq03Y7JOGGZITyag0jU8RKTzXWtvN+i + 4zZtdAf16PV7AOfxiu2uJFQuRevS39dpUjowVJQgPb1LjOY03uzzoBzk57HQ/9Il5Qt3 + uZxXo6sRxXgssI+EvcggoPUatVMFQy6zLwo8DVs3mNCbtFiJ4/W1bE+2vYjVIetbN9PY + w2++/X0FUZocY0xc+46hZJnFnrIYd7a5K0Sc8Z31sAbC+54SWRlFpJrJJo4Yv2GFK+gb + fsnQWE8L9xUox0ndssND/fuUAOeZgaReMQonwSxvdhNPxUXxnwKCGNEY3GnUXX+83K2a + AVkA== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20161025; + h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version + :content-transfer-encoding; + bh=NgkgycOAutPIwHnXZGiuxniA3uvcp0YWgMh4155m5jM=; + b=FO8o351SBCPiidIgPz1Ovubpo6/n9gLt21bJFitAyCvYruNIFu+YPUTfbnqkjzS6ZB + XeH8IUFoiILRU5zOAtsyqEvvm2mNEjSZlMefWXMmMaLftSU/Fp3PI9JuSs13e7+fY4d2 + pN2iK6nvFPlMl5CDfHOxNx5gxMPEzGL8XlOaZBTVUssKP5kL5UeqC+7BJwZl/Z5EuXhw + jnSzSn1L+MOzedaX4SPZC3S/lNVXAH6QBW6r06z3n4aH20JfMS7lsmbUi0LR1vJIHhOe + p1rV0RV5Sv1pBvckRhfIIv76KVLBP6FQY4Q8rutmFYo7gVoIbnkNMnT2sqU5rP89t2IG + Ez5g== +X-Gm-Message-State: APjAAAVTaayWQNyKAXTz8OnNFFycoVzi7ddiZfAbCYHQzcjBMFlQHpPK + T7qwajPBVoorwvW5+VwD1vE= +X-Google-Smtp-Source: + APXvYqyklaLHE005LYV5tVa6uV4lfxi+pkvZ4R79N1xrAuzuYsDP3nz53oMQmiMTL+jTaq+hwlcC0Q== +X-Received: by 2002:a7b:ce92:: with SMTP id q18mr1064644wmj.80.1552951395286; + Mon, 18 Mar 2019 16:23:15 -0700 (PDT) +Received: from localhost (pD9E51D2D.dip0.t-ipconnect.de. [217.229.29.45]) + by smtp.gmail.com with ESMTPSA id e5sm16582805wrh.71.2019.03.18.16.23.14 + (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); + Mon, 18 Mar 2019 16:23:14 -0700 (PDT) +From: Thierry Reding +To: Thierry Reding +Subject: [PATCH] arm64: tegra: Add NVIDIA Jetson Nano Developer Kit support +Date: Tue, 19 Mar 2019 00:23:13 +0100 +Message-Id: <20190318232313.24270-1-thierry.reding@gmail.com> +X-Mailer: git-send-email 2.21.0 +MIME-Version: 1.0 +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20190318_162317_924900_0FAC7D5E +X-CRM114-Status: GOOD ( 15.39 ) +X-BeenThere: linux-arm-kernel@lists.infradead.org +X-Mailman-Version: 2.1.21 +Precedence: list +List-Id: +List-Unsubscribe: + , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: + , + +Cc: linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org, + Jonathan Hunter +Content-Type: text/plain; charset="us-ascii" +Sender: "linux-arm-kernel" +Errors-To: + linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org +X-Virus-Scanned: ClamAV using ClamSMTP + +From: Thierry Reding + +The Jetson Nano Developer Kit is a Tegra X1 based development board. It +is similar to Jetson TX1 but it is not pin compatible. It features 4 GB +of LPDDR4, an SPI NOR flash for early boot firmware and an SD card slot +used for storage. + +HDMI 2.0 or DP 1.2 are available for display, four USB ports (3 USB 2.0 +and 1 USB 3.0) can be used to attach a variety of peripherals and a PCI +Ethernet controller provides onboard network connectivity. + +A 40-pin header on the board can be used to extend the capabilities and +exposed interfaces of the Jetson Nano. + +Signed-off-by: Thierry Reding +--- +This patch, along with some related patches can be found in the p3450 +branch in the following repository: + + https://github.com/thierryreding/linux + + arch/arm64/boot/dts/nvidia/Makefile | 1 + + .../boot/dts/nvidia/tegra210-p3450-0000.dts | 1911 +++++++++++++++++ + 2 files changed, 1912 insertions(+) + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts + +diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile +index 6b8ab5568481..bcd018c3162b 100644 +--- a/arch/arm64/boot/dts/nvidia/Makefile ++++ b/arch/arm64/boot/dts/nvidia/Makefile +@@ -3,6 +3,7 @@ dtb-$(CONFIG_ARCH_TEGRA_132_SOC) += tegra132-norrin.dtb + dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-0000.dtb + dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-2180.dtb + dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2571.dtb ++dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p3450-0000.dtb + dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-smaug.dtb + dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2894-0050-a08.dtb + dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb +diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +new file mode 100644 +index 000000000000..b1d8a49ca8c4 +--- /dev/null ++++ b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +@@ -0,0 +1,1911 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/dts-v1/; ++ ++#include ++#include ++#include ++ ++#include "tegra210.dtsi" ++ ++/ { ++ model = "NVIDIA Jetson Nano Developer Kit"; ++ compatible = "nvidia,p3450-0000", "nvidia,tegra210"; ++ ++ aliases { ++ ethernet = "/pcie@1003000/pci@2,0/ethernet@0,0"; ++ rtc0 = "/i2c@7000d000/pmic@3c"; ++ rtc1 = "/rtc@7000e000"; ++ serial0 = &uarta; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ memory { ++ device_type = "memory"; ++ reg = <0x0 0x80000000 0x1 0x0>; ++ }; ++ ++ pcie@1003000 { ++ status = "okay"; ++ ++ hvddio-pex-supply = <&vdd_1v8>; ++ dvddio-pex-supply = <&vdd_pex_1v05>; ++ vddio-pex-ctl-supply = <&vdd_1v8>; ++ ++ pci@1,0 { ++ phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-1}>, ++ <&{/padctl@7009f000/pads/pcie/lanes/pcie-2}>, ++ <&{/padctl@7009f000/pads/pcie/lanes/pcie-3}>, ++ <&{/padctl@7009f000/pads/pcie/lanes/pcie-4}>; ++ phy-names = "pcie-0", "pcie-1", "pcie-2", "pcie-3"; ++ nvidia,num-lanes = <4>; ++ status = "okay"; ++ }; ++ ++ pci@2,0 { ++ phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>; ++ phy-names = "pcie-0"; ++ status = "okay"; ++ ++ ethernet@0,0 { ++ reg = <0x000000 0 0 0 0>; ++ mac-address = [ 00 00 00 00 00 00 ]; ++ }; ++ }; ++ }; ++ ++ host1x@50000000 { ++ dpaux@54040000 { ++ status = "okay"; ++ }; ++ ++ sor@54580000 { ++ status = "okay"; ++ ++ avdd-io-supply = <&avdd_1v05>; ++ vdd-pll-supply = <&vdd_1v8>; ++ hdmi-supply = <&vdd_hdmi>; ++ ++ nvidia,ddc-i2c-bus = <&hdmi_ddc>; ++ nvidia,hpd-gpio = <&gpio TEGRA_GPIO(CC, 1) ++ GPIO_ACTIVE_LOW>; ++ nvidia,xbar-cfg = <0 1 2 3 4>; ++ }; ++ }; ++ ++ gpu@57000000 { ++ vdd-supply = <&vdd_gpu>; ++ status = "okay"; ++ }; ++ ++ pinmux: pinmux@700008d4 { ++ pinctrl-names = "boot"; ++ pinctrl-0 = <&state_boot>; ++ ++ state_boot: pinmux { ++ pex_l0_rst_n_pa0 { ++ nvidia,pins = "pex_l0_rst_n_pa0"; ++ nvidia,function = "pe0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ pex_l0_clkreq_n_pa1 { ++ nvidia,pins = "pex_l0_clkreq_n_pa1"; ++ nvidia,function = "pe0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ pex_wake_n_pa2 { ++ nvidia,pins = "pex_wake_n_pa2"; ++ nvidia,function = "pe"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ pex_l1_rst_n_pa3 { ++ nvidia,pins = "pex_l1_rst_n_pa3"; ++ nvidia,function = "pe1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ pex_l1_clkreq_n_pa4 { ++ nvidia,pins = "pex_l1_clkreq_n_pa4"; ++ nvidia,function = "pe1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ sata_led_active_pa5 { ++ nvidia,pins = "sata_led_active_pa5"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pa6 { ++ nvidia,pins = "pa6"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap1_fs_pb0 { ++ nvidia,pins = "dap1_fs_pb0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap1_din_pb1 { ++ nvidia,pins = "dap1_din_pb1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap1_dout_pb2 { ++ nvidia,pins = "dap1_dout_pb2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap1_sclk_pb3 { ++ nvidia,pins = "dap1_sclk_pb3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi2_mosi_pb4 { ++ nvidia,pins = "spi2_mosi_pb4"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi2_miso_pb5 { ++ nvidia,pins = "spi2_miso_pb5"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi2_sck_pb6 { ++ nvidia,pins = "spi2_sck_pb6"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi2_cs0_pb7 { ++ nvidia,pins = "spi2_cs0_pb7"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi1_mosi_pc0 { ++ nvidia,pins = "spi1_mosi_pc0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi1_miso_pc1 { ++ nvidia,pins = "spi1_miso_pc1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi1_sck_pc2 { ++ nvidia,pins = "spi1_sck_pc2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi1_cs0_pc3 { ++ nvidia,pins = "spi1_cs0_pc3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi1_cs1_pc4 { ++ nvidia,pins = "spi1_cs1_pc4"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi4_sck_pc5 { ++ nvidia,pins = "spi4_sck_pc5"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi4_cs0_pc6 { ++ nvidia,pins = "spi4_cs0_pc6"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi4_mosi_pc7 { ++ nvidia,pins = "spi4_mosi_pc7"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spi4_miso_pd0 { ++ nvidia,pins = "spi4_miso_pd0"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart3_tx_pd1 { ++ nvidia,pins = "uart3_tx_pd1"; ++ nvidia,function = "uartc"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart3_rx_pd2 { ++ nvidia,pins = "uart3_rx_pd2"; ++ nvidia,function = "uartc"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart3_rts_pd3 { ++ nvidia,pins = "uart3_rts_pd3"; ++ nvidia,function = "uartc"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart3_cts_pd4 { ++ nvidia,pins = "uart3_cts_pd4"; ++ nvidia,function = "uartc"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dmic1_clk_pe0 { ++ nvidia,pins = "dmic1_clk_pe0"; ++ nvidia,function = "i2s3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dmic1_dat_pe1 { ++ nvidia,pins = "dmic1_dat_pe1"; ++ nvidia,function = "i2s3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dmic2_clk_pe2 { ++ nvidia,pins = "dmic2_clk_pe2"; ++ nvidia,function = "i2s3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dmic2_dat_pe3 { ++ nvidia,pins = "dmic2_dat_pe3"; ++ nvidia,function = "i2s3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dmic3_clk_pe4 { ++ nvidia,pins = "dmic3_clk_pe4"; ++ nvidia,function = "rsvd2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dmic3_dat_pe5 { ++ nvidia,pins = "dmic3_dat_pe5"; ++ nvidia,function = "rsvd2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pe6 { ++ nvidia,pins = "pe6"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pe7 { ++ nvidia,pins = "pe7"; ++ nvidia,function = "pwm3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ gen3_i2c_scl_pf0 { ++ nvidia,pins = "gen3_i2c_scl_pf0"; ++ nvidia,function = "i2c3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ gen3_i2c_sda_pf1 { ++ nvidia,pins = "gen3_i2c_sda_pf1"; ++ nvidia,function = "i2c3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ uart2_tx_pg0 { ++ nvidia,pins = "uart2_tx_pg0"; ++ nvidia,function = "uartb"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart2_rx_pg1 { ++ nvidia,pins = "uart2_rx_pg1"; ++ nvidia,function = "uartb"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart2_rts_pg2 { ++ nvidia,pins = "uart2_rts_pg2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart2_cts_pg3 { ++ nvidia,pins = "uart2_cts_pg3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ wifi_en_ph0 { ++ nvidia,pins = "wifi_en_ph0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ wifi_rst_ph1 { ++ nvidia,pins = "wifi_rst_ph1"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ wifi_wake_ap_ph2 { ++ nvidia,pins = "wifi_wake_ap_ph2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ ap_wake_bt_ph3 { ++ nvidia,pins = "ap_wake_bt_ph3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ bt_rst_ph4 { ++ nvidia,pins = "bt_rst_ph4"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ bt_wake_ap_ph5 { ++ nvidia,pins = "bt_wake_ap_ph5"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ ph6 { ++ nvidia,pins = "ph6"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ ap_wake_nfc_ph7 { ++ nvidia,pins = "ap_wake_nfc_ph7"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ nfc_en_pi0 { ++ nvidia,pins = "nfc_en_pi0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ nfc_int_pi1 { ++ nvidia,pins = "nfc_int_pi1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ gps_en_pi2 { ++ nvidia,pins = "gps_en_pi2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ gps_rst_pi3 { ++ nvidia,pins = "gps_rst_pi3"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart4_tx_pi4 { ++ nvidia,pins = "uart4_tx_pi4"; ++ nvidia,function = "uartd"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart4_rx_pi5 { ++ nvidia,pins = "uart4_rx_pi5"; ++ nvidia,function = "uartd"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart4_rts_pi6 { ++ nvidia,pins = "uart4_rts_pi6"; ++ nvidia,function = "uartd"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart4_cts_pi7 { ++ nvidia,pins = "uart4_cts_pi7"; ++ nvidia,function = "uartd"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ gen1_i2c_sda_pj0 { ++ nvidia,pins = "gen1_i2c_sda_pj0"; ++ nvidia,function = "i2c1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ gen1_i2c_scl_pj1 { ++ nvidia,pins = "gen1_i2c_scl_pj1"; ++ nvidia,function = "i2c1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ gen2_i2c_scl_pj2 { ++ nvidia,pins = "gen2_i2c_scl_pj2"; ++ nvidia,function = "i2c2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ gen2_i2c_sda_pj3 { ++ nvidia,pins = "gen2_i2c_sda_pj3"; ++ nvidia,function = "i2c2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ dap4_fs_pj4 { ++ nvidia,pins = "dap4_fs_pj4"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap4_din_pj5 { ++ nvidia,pins = "dap4_din_pj5"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap4_dout_pj6 { ++ nvidia,pins = "dap4_dout_pj6"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap4_sclk_pj7 { ++ nvidia,pins = "dap4_sclk_pj7"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pk0 { ++ nvidia,pins = "pk0"; ++ nvidia,function = "rsvd2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pk1 { ++ nvidia,pins = "pk1"; ++ nvidia,function = "rsvd2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pk2 { ++ nvidia,pins = "pk2"; ++ nvidia,function = "rsvd2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pk3 { ++ nvidia,pins = "pk3"; ++ nvidia,function = "rsvd2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pk4 { ++ nvidia,pins = "pk4"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pk5 { ++ nvidia,pins = "pk5"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pk6 { ++ nvidia,pins = "pk6"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pk7 { ++ nvidia,pins = "pk7"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pl0 { ++ nvidia,pins = "pl0"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pl1 { ++ nvidia,pins = "pl1"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc1_clk_pm0 { ++ nvidia,pins = "sdmmc1_clk_pm0"; ++ nvidia,function = "sdmmc1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc1_cmd_pm1 { ++ nvidia,pins = "sdmmc1_cmd_pm1"; ++ nvidia,function = "sdmmc1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc1_dat3_pm2 { ++ nvidia,pins = "sdmmc1_dat3_pm2"; ++ nvidia,function = "sdmmc1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc1_dat2_pm3 { ++ nvidia,pins = "sdmmc1_dat2_pm3"; ++ nvidia,function = "sdmmc1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc1_dat1_pm4 { ++ nvidia,pins = "sdmmc1_dat1_pm4"; ++ nvidia,function = "sdmmc1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc1_dat0_pm5 { ++ nvidia,pins = "sdmmc1_dat0_pm5"; ++ nvidia,function = "sdmmc1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc3_clk_pp0 { ++ nvidia,pins = "sdmmc3_clk_pp0"; ++ nvidia,function = "sdmmc3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc3_cmd_pp1 { ++ nvidia,pins = "sdmmc3_cmd_pp1"; ++ nvidia,function = "sdmmc3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc3_dat3_pp2 { ++ nvidia,pins = "sdmmc3_dat3_pp2"; ++ nvidia,function = "sdmmc3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc3_dat2_pp3 { ++ nvidia,pins = "sdmmc3_dat2_pp3"; ++ nvidia,function = "sdmmc3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc3_dat1_pp4 { ++ nvidia,pins = "sdmmc3_dat1_pp4"; ++ nvidia,function = "sdmmc3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ sdmmc3_dat0_pp5 { ++ nvidia,pins = "sdmmc3_dat0_pp5"; ++ nvidia,function = "sdmmc3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ cam1_mclk_ps0 { ++ nvidia,pins = "cam1_mclk_ps0"; ++ nvidia,function = "extperiph3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ cam2_mclk_ps1 { ++ nvidia,pins = "cam2_mclk_ps1"; ++ nvidia,function = "extperiph3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ cam_i2c_scl_ps2 { ++ nvidia,pins = "cam_i2c_scl_ps2"; ++ nvidia,function = "i2cvi"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ cam_i2c_sda_ps3 { ++ nvidia,pins = "cam_i2c_sda_ps3"; ++ nvidia,function = "i2cvi"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ cam_rst_ps4 { ++ nvidia,pins = "cam_rst_ps4"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ cam_af_en_ps5 { ++ nvidia,pins = "cam_af_en_ps5"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ cam_flash_en_ps6 { ++ nvidia,pins = "cam_flash_en_ps6"; ++ nvidia,function = "rsvd2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ cam1_pwdn_ps7 { ++ nvidia,pins = "cam1_pwdn_ps7"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ cam2_pwdn_pt0 { ++ nvidia,pins = "cam2_pwdn_pt0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ cam1_strobe_pt1 { ++ nvidia,pins = "cam1_strobe_pt1"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart1_tx_pu0 { ++ nvidia,pins = "uart1_tx_pu0"; ++ nvidia,function = "uarta"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart1_rx_pu1 { ++ nvidia,pins = "uart1_rx_pu1"; ++ nvidia,function = "uarta"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart1_rts_pu2 { ++ nvidia,pins = "uart1_rts_pu2"; ++ nvidia,function = "uarta"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ uart1_cts_pu3 { ++ nvidia,pins = "uart1_cts_pu3"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ lcd_bl_pwm_pv0 { ++ nvidia,pins = "lcd_bl_pwm_pv0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ lcd_bl_en_pv1 { ++ nvidia,pins = "lcd_bl_en_pv1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ lcd_rst_pv2 { ++ nvidia,pins = "lcd_rst_pv2"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ lcd_gpio1_pv3 { ++ nvidia,pins = "lcd_gpio1_pv3"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ lcd_gpio2_pv4 { ++ nvidia,pins = "lcd_gpio2_pv4"; ++ nvidia,function = "pwm1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ ap_ready_pv5 { ++ nvidia,pins = "ap_ready_pv5"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ touch_rst_pv6 { ++ nvidia,pins = "touch_rst_pv6"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ touch_clk_pv7 { ++ nvidia,pins = "touch_clk_pv7"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ modem_wake_ap_px0 { ++ nvidia,pins = "modem_wake_ap_px0"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ touch_int_px1 { ++ nvidia,pins = "touch_int_px1"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ motion_int_px2 { ++ nvidia,pins = "motion_int_px2"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ als_prox_int_px3 { ++ nvidia,pins = "als_prox_int_px3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ temp_alert_px4 { ++ nvidia,pins = "temp_alert_px4"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ button_power_on_px5 { ++ nvidia,pins = "button_power_on_px5"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ button_vol_up_px6 { ++ nvidia,pins = "button_vol_up_px6"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ button_vol_down_px7 { ++ nvidia,pins = "button_vol_down_px7"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ button_slide_sw_py0 { ++ nvidia,pins = "button_slide_sw_py0"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ button_home_py1 { ++ nvidia,pins = "button_home_py1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ lcd_te_py2 { ++ nvidia,pins = "lcd_te_py2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pwr_i2c_scl_py3 { ++ nvidia,pins = "pwr_i2c_scl_py3"; ++ nvidia,function = "i2cpmu"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ pwr_i2c_sda_py4 { ++ nvidia,pins = "pwr_i2c_sda_py4"; ++ nvidia,function = "i2cpmu"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ clk_32k_out_py5 { ++ nvidia,pins = "clk_32k_out_py5"; ++ nvidia,function = "rsvd2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pz0 { ++ nvidia,pins = "pz0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pz1 { ++ nvidia,pins = "pz1"; ++ nvidia,function = "sdmmc1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pz2 { ++ nvidia,pins = "pz2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pz3 { ++ nvidia,pins = "pz3"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pz4 { ++ nvidia,pins = "pz4"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pz5 { ++ nvidia,pins = "pz5"; ++ nvidia,function = "soc"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap2_fs_paa0 { ++ nvidia,pins = "dap2_fs_paa0"; ++ nvidia,function = "i2s2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap2_sclk_paa1 { ++ nvidia,pins = "dap2_sclk_paa1"; ++ nvidia,function = "i2s2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap2_din_paa2 { ++ nvidia,pins = "dap2_din_paa2"; ++ nvidia,function = "i2s2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dap2_dout_paa3 { ++ nvidia,pins = "dap2_dout_paa3"; ++ nvidia,function = "i2s2"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ aud_mclk_pbb0 { ++ nvidia,pins = "aud_mclk_pbb0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dvfs_pwm_pbb1 { ++ nvidia,pins = "dvfs_pwm_pbb1"; ++ nvidia,function = "cldvfs"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ dvfs_clk_pbb2 { ++ nvidia,pins = "dvfs_clk_pbb2"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ gpio_x1_aud_pbb3 { ++ nvidia,pins = "gpio_x1_aud_pbb3"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ gpio_x3_aud_pbb4 { ++ nvidia,pins = "gpio_x3_aud_pbb4"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ hdmi_cec_pcc0 { ++ nvidia,pins = "hdmi_cec_pcc0"; ++ nvidia,function = "cec"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ hdmi_int_dp_hpd_pcc1 { ++ nvidia,pins = "hdmi_int_dp_hpd_pcc1"; ++ nvidia,function = "dp"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ spdif_out_pcc2 { ++ nvidia,pins = "spdif_out_pcc2"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ spdif_in_pcc3 { ++ nvidia,pins = "spdif_in_pcc3"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ usb_vbus_en0_pcc4 { ++ nvidia,pins = "usb_vbus_en0_pcc4"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ usb_vbus_en1_pcc5 { ++ nvidia,pins = "usb_vbus_en1_pcc5"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ dp_hpd0_pcc6 { ++ nvidia,pins = "dp_hpd0_pcc6"; ++ nvidia,function = "dp"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pcc7 { ++ nvidia,pins = "pcc7"; ++ nvidia,function = "rsvd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ nvidia,io-hv = ; ++ }; ++ spi2_cs1_pdd0 { ++ nvidia,pins = "spi2_cs1_pdd0"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ qspi_sck_pee0 { ++ nvidia,pins = "qspi_sck_pee0"; ++ nvidia,function = "qspi"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ qspi_cs_n_pee1 { ++ nvidia,pins = "qspi_cs_n_pee1"; ++ nvidia,function = "qspi"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ qspi_io0_pee2 { ++ nvidia,pins = "qspi_io0_pee2"; ++ nvidia,function = "qspi"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ qspi_io1_pee3 { ++ nvidia,pins = "qspi_io1_pee3"; ++ nvidia,function = "qspi"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ qspi_io2_pee4 { ++ nvidia,pins = "qspi_io2_pee4"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ qspi_io3_pee5 { ++ nvidia,pins = "qspi_io3_pee5"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ core_pwr_req { ++ nvidia,pins = "core_pwr_req"; ++ nvidia,function = "core"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ cpu_pwr_req { ++ nvidia,pins = "cpu_pwr_req"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ pwr_int_n { ++ nvidia,pins = "pwr_int_n"; ++ nvidia,function = "pmi"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ clk_32k_in { ++ nvidia,pins = "clk_32k_in"; ++ nvidia,function = "clk"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ jtag_rtck { ++ nvidia,pins = "jtag_rtck"; ++ nvidia,function = "jtag"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ clk_req { ++ nvidia,pins = "clk_req"; ++ nvidia,function = "rsvd1"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ shutdown { ++ nvidia,pins = "shutdown"; ++ nvidia,function = "shutdown"; ++ nvidia,pull = ; ++ nvidia,tristate = ; ++ nvidia,enable-input = ; ++ nvidia,open-drain = ; ++ }; ++ }; ++ }; ++ ++ /* debug port */ ++ serial@70006000 { ++ status = "okay"; ++ }; ++ ++ hdmi_ddc: i2c@7000c700 { ++ status = "okay"; ++ clock-frequency = <100000>; ++ }; ++ ++ i2c@7000d000 { ++ status = "okay"; ++ clock-frequency = <400000>; ++ ++ pmic: pmic@3c { ++ compatible = "maxim,max77620"; ++ reg = <0x3c>; ++ interrupts = ; ++ ++ #interrupt-cells = <2>; ++ interrupt-controller; ++ ++ #gpio-cells = <2>; ++ gpio-controller; ++ ++ pinctrl-names = "default"; ++ pinctrl-0 = <&max77620_default>; ++ ++ max77620_default: pinmux { ++ gpio0 { ++ pins = "gpio0"; ++ function = "gpio"; ++ }; ++ ++ gpio1 { ++ pins = "gpio1"; ++ function = "fps-out"; ++ drive-push-pull = <1>; ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <0>; ++ maxim,active-fps-power-down-slot = <7>; ++ }; ++ ++ gpio2 { ++ pins = "gpio2"; ++ function = "fps-out"; ++ drive-open-drain = <1>; ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <0>; ++ maxim,active-fps-power-down-slot = <7>; ++ }; ++ ++ gpio3 { ++ pins = "gpio3"; ++ function = "fps-out"; ++ drive-open-drain = <1>; ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <4>; ++ maxim,active-fps-power-down-slot = <3>; ++ }; ++ ++ gpio4 { ++ pins = "gpio4"; ++ function = "32k-out1"; ++ }; ++ ++ gpio5_6_7 { ++ pins = "gpio5", "gpio6", "gpio7"; ++ function = "gpio"; ++ drive-push-pull = <1>; ++ }; ++ }; ++ ++ fps { ++ fps0 { ++ maxim,fps-event-source = ; ++ maxim,suspend-fps-time-period-us = <5120>; ++ }; ++ ++ fps1 { ++ maxim,fps-event-source = ; ++ maxim,suspend-fps-time-period-us = <5120>; ++ }; ++ ++ fps2 { ++ maxim,fps-event-source = ; ++ }; ++ }; ++ ++ regulators { ++ in-ldo0-1-supply = <&vdd_pre>; ++ in-ldo2-supply = <&vdd_3v3_sys>; ++ in-ldo3-5-supply = <&vdd_1v8>; ++ in-ldo4-6-supply = <&vdd_5v0_sys>; ++ in-ldo7-8-supply = <&vdd_pre>; ++ in-sd0-supply = <&vdd_5v0_sys>; ++ in-sd1-supply = <&vdd_5v0_sys>; ++ in-sd2-supply = <&vdd_5v0_sys>; ++ in-sd3-supply = <&vdd_5v0_sys>; ++ ++ vdd_soc: sd0 { ++ regulator-name = "VDD_SOC"; ++ regulator-min-microvolt = <1000000>; ++ regulator-max-microvolt = <1170000>; ++ regulator-enable-ramp-delay = <146>; ++ regulator-disable-ramp-delay = <4080>; ++ regulator-ramp-delay = <27500>; ++ regulator-ramp-delay-scale = <300>; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <1>; ++ maxim,active-fps-power-down-slot = <6>; ++ }; ++ ++ vdd_ddr: sd1 { ++ regulator-name = "VDD_DDR_1V1_PMIC"; ++ regulator-min-microvolt = <1150000>; ++ regulator-max-microvolt = <1150000>; ++ regulator-enable-ramp-delay = <176>; ++ regulator-disable-ramp-delay = <145800>; ++ regulator-ramp-delay = <27500>; ++ regulator-ramp-delay-scale = <300>; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <5>; ++ maxim,active-fps-power-down-slot = <2>; ++ }; ++ ++ vdd_pre: sd2 { ++ regulator-name = "VDD_PRE_REG_1V35"; ++ regulator-min-microvolt = <1350000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-enable-ramp-delay = <176>; ++ regulator-disable-ramp-delay = <32000>; ++ regulator-ramp-delay = <27500>; ++ regulator-ramp-delay-scale = <350>; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <2>; ++ maxim,active-fps-power-down-slot = <5>; ++ }; ++ ++ vdd_1v8: sd3 { ++ regulator-name = "VDD_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-enable-ramp-delay = <242>; ++ regulator-disable-ramp-delay = <118000>; ++ regulator-ramp-delay = <27500>; ++ regulator-ramp-delay-scale = <360>; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <3>; ++ maxim,active-fps-power-down-slot = <4>; ++ }; ++ ++ vdd_sys_1v2: ldo0 { ++ regulator-name = "AVDD_SYS_1V2"; ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <1200000>; ++ regulator-enable-ramp-delay = <26>; ++ regulator-disable-ramp-delay = <626>; ++ regulator-ramp-delay = <100000>; ++ regulator-ramp-delay-scale = <200>; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <0>; ++ maxim,active-fps-power-down-slot = <7>; ++ }; ++ ++ vdd_pex_1v05: ldo1 { ++ regulator-name = "VDD_PEX_1V05"; ++ regulator-min-microvolt = <1050000>; ++ regulator-max-microvolt = <1050000>; ++ regulator-enable-ramp-delay = <22>; ++ regulator-disable-ramp-delay = <650>; ++ regulator-ramp-delay = <100000>; ++ regulator-ramp-delay-scale = <200>; ++ ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <0>; ++ maxim,active-fps-power-down-slot = <7>; ++ }; ++ ++ vddio_sdmmc: ldo2 { ++ regulator-name = "VDDIO_SDMMC"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-enable-ramp-delay = <62>; ++ regulator-disable-ramp-delay = <650>; ++ regulator-ramp-delay = <100000>; ++ regulator-ramp-delay-scale = <200>; ++ ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <0>; ++ maxim,active-fps-power-down-slot = <7>; ++ }; ++ ++ ldo3 { ++ status = "disabled"; ++ }; ++ ++ vdd_rtc: ldo4 { ++ regulator-name = "VDD_RTC"; ++ regulator-min-microvolt = <850000>; ++ regulator-max-microvolt = <1100000>; ++ regulator-enable-ramp-delay = <22>; ++ regulator-disable-ramp-delay = <610>; ++ regulator-ramp-delay = <100000>; ++ regulator-ramp-delay-scale = <200>; ++ regulator-disable-active-discharge; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <1>; ++ maxim,active-fps-power-down-slot = <6>; ++ }; ++ ++ ldo5 { ++ status = "disabled"; ++ }; ++ ++ ldo6 { ++ status = "disabled"; ++ }; ++ ++ avdd_1v05_pll: ldo7 { ++ regulator-name = "AVDD_1V05_PLL"; ++ regulator-min-microvolt = <1050000>; ++ regulator-max-microvolt = <1050000>; ++ regulator-enable-ramp-delay = <24>; ++ regulator-disable-ramp-delay = <2768>; ++ regulator-ramp-delay = <100000>; ++ regulator-ramp-delay-scale = <200>; ++ ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <3>; ++ maxim,active-fps-power-down-slot = <4>; ++ }; ++ ++ avdd_1v05: ldo8 { ++ regulator-name = "AVDD_SATA_HDMI_DP_1V05"; ++ regulator-min-microvolt = <1050000>; ++ regulator-max-microvolt = <1050000>; ++ regulator-enable-ramp-delay = <22>; ++ regulator-disable-ramp-delay = <1160>; ++ regulator-ramp-delay = <100000>; ++ regulator-ramp-delay-scale = <200>; ++ ++ maxim,active-fps-source = ; ++ maxim,active-fps-power-up-slot = <6>; ++ maxim,active-fps-power-down-slot = <1>; ++ }; ++ }; ++ }; ++ }; ++ ++ pmc@7000e400 { ++ nvidia,invert-interrupt; ++ }; ++ ++ hda@70030000 { ++ status = "okay"; ++ }; ++ ++ usb@70090000 { ++ phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>, ++ <&{/padctl@7009f000/pads/usb2/lanes/usb2-1}>, ++ <&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>, ++ <&{/padctl@7009f000/pads/pcie/lanes/pcie-6}>; ++ phy-names = "usb2-0", "usb2-1", "usb2-2", "usb3-0"; ++ ++ avdd-usb-supply = <&vdd_3v3_sys>; ++ dvddio-pex-supply = <&vdd_pex_1v05>; ++ hvddio-pex-supply = <&vdd_1v8>; ++ ++ status = "okay"; ++ }; ++ ++ padctl@7009f000 { ++ status = "okay"; ++ ++ avdd-pll-utmip-supply = <&vdd_1v8>; ++ avdd-pll-uerefe-supply = <&vdd_pex_1v05>; ++ dvdd-pex-pll-supply = <&vdd_pex_1v05>; ++ hvdd-pex-pll-e-supply = <&vdd_1v8>; ++ ++ pads { ++ usb2 { ++ status = "okay"; ++ ++ lanes { ++ usb2-0 { ++ nvidia,function = "xusb"; ++ status = "okay"; ++ }; ++ ++ usb2-1 { ++ nvidia,function = "xusb"; ++ status = "okay"; ++ }; ++ ++ usb2-2 { ++ nvidia,function = "xusb"; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ pcie { ++ status = "okay"; ++ ++ lanes { ++ pcie-0 { ++ nvidia,function = "pcie-x1"; ++ status = "okay"; ++ }; ++ ++ pcie-1 { ++ nvidia,function = "pcie-x4"; ++ status = "okay"; ++ }; ++ ++ pcie-2 { ++ nvidia,function = "pcie-x4"; ++ status = "okay"; ++ }; ++ ++ pcie-3 { ++ nvidia,function = "pcie-x4"; ++ status = "okay"; ++ }; ++ ++ pcie-4 { ++ nvidia,function = "pcie-x4"; ++ status = "okay"; ++ }; ++ ++ pcie-5 { ++ nvidia,function = "usb3-ss"; ++ status = "okay"; ++ }; ++ ++ pcie-6 { ++ nvidia,function = "usb3-ss"; ++ status = "okay"; ++ }; ++ }; ++ }; ++ }; ++ ++ ports { ++ usb2-0 { ++ status = "okay"; ++ mode = "otg"; ++ }; ++ ++ usb2-1 { ++ status = "okay"; ++ mode = "host"; ++ }; ++ ++ usb2-2 { ++ status = "okay"; ++ mode = "host"; ++ }; ++ ++ usb3-0 { ++ status = "okay"; ++ nvidia,usb2-companion = <1>; ++ vbus-supply = <&vdd_hub_3v3>; ++ }; ++ }; ++ }; ++ ++ sdhci@700b0000 { ++ status = "okay"; ++ bus-width = <4>; ++ ++ cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>; ++ ++ vqmmc-supply = <&vddio_sdmmc>; ++ vmmc-supply = <&vdd_3v3_sd>; ++ }; ++ ++ clocks { ++ compatible = "simple-bus"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ clk32k_in: clock@0 { ++ compatible = "fixed-clock"; ++ reg = <0>; ++ #clock-cells = <0>; ++ clock-frequency = <32768>; ++ }; ++ }; ++ ++ cpus { ++ cpu@0 { ++ enable-method = "psci"; ++ }; ++ ++ cpu@1 { ++ enable-method = "psci"; ++ }; ++ ++ cpu@2 { ++ enable-method = "psci"; ++ }; ++ ++ cpu@3 { ++ enable-method = "psci"; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ ++ power { ++ label = "Power"; ++ gpios = <&gpio TEGRA_GPIO(X, 5) GPIO_ACTIVE_LOW>; ++ linux,input-type = ; ++ linux,code = ; ++ debounce-interval = <30>; ++ wakeup-event-action = ; ++ wakeup-source; ++ }; ++ ++ force-recovery { ++ label = "Force Recovery"; ++ gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>; ++ linux,input-type = ; ++ linux,code = ; ++ debounce-interval = <30>; ++ }; ++ }; ++ ++ psci { ++ compatible = "arm,psci-1.0"; ++ method = "smc"; ++ }; ++ ++ regulators { ++ compatible = "simple-bus"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ vdd_5v0_sys: regulator@0 { ++ compatible = "regulator-fixed"; ++ reg = <0>; ++ ++ regulator-name = "VDD_5V0_SYS"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ vdd_3v3_sys: regulator@1 { ++ compatible = "regulator-fixed"; ++ reg = <1>; ++ regulator-name = "VDD_3V3_SYS"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-enable-ramp-delay = <240>; ++ regulator-disable-ramp-delay = <11340>; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ gpio = <&pmic 3 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ ++ vin-supply = <&vdd_5v0_sys>; ++ }; ++ ++ vdd_3v3_sd: regulator@2 { ++ compatible = "regulator-fixed"; ++ reg = <2>; ++ ++ regulator-name = "VDD_3V3_SD"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ ++ gpio = <&gpio TEGRA_GPIO(Z, 3) GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ ++ vin-supply = <&vdd_3v3_sys>; ++ }; ++ ++ vdd_hdmi: regulator@3 { ++ compatible = "regulator-fixed"; ++ reg = <3>; ++ ++ regulator-name = "VDD_HDMI_5V0"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ ++ vin-supply = <&vdd_5v0_sys>; ++ }; ++ ++ vdd_hub_3v3: regulator@4 { ++ compatible = "regulator-fixed"; ++ reg = <4>; ++ ++ regulator-name = "VDD_HUB_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ ++ gpio = <&gpio TEGRA_GPIO(A, 6) GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ ++ vin-supply = <&vdd_5v0_sys>; ++ }; ++ ++ vdd_cpu: regulator@5 { ++ compatible = "regulator-fixed"; ++ reg = <5>; ++ ++ regulator-name = "VDD_CPU"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ gpio = <&pmic 5 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ ++ vin-supply = <&vdd_5v0_sys>; ++ }; ++ ++ vdd_gpu: regulator@6 { ++ compatible = "regulator-fixed"; ++ reg = <6>; ++ ++ regulator-name = "VDD_GPU"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-enable-ramp-delay = <250>; ++ ++ gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ ++ vin-supply = <&vdd_5v0_sys>; ++ }; ++ }; ++}; diff --git a/arm64-tegra-jetson-tx1-fixes.patch b/arm64-tegra-jetson-tx1-fixes.patch new file mode 100644 index 000000000..4ac5ea22a --- /dev/null +++ b/arm64-tegra-jetson-tx1-fixes.patch @@ -0,0 +1,68 @@ +From 005e0b987019fff6013dff99f44d9f6ce68f08ad Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sat, 23 Mar 2019 17:42:18 +0000 +Subject: [PATCH 1/3] arm64: tegra210: Jetson TX1: disable WP to make SD card + work + +There's some issue with Write Protect detection on the Jetson TX1 +so just apply a quirk to disable the check for the time being. + +Signed-off-by: Peter Robinson +--- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +index a96e6ee70c21..072788646cbf 100644 +--- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi ++++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +@@ -1456,6 +1456,7 @@ + sdhci@700b0000 { + status = "okay"; + bus-width = <4>; ++ disable-wp; + + cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>; + +-- +2.20.1 + +From aea4a7a551fd7342299d34f04a8b75f58644ac07 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Sat, 23 Mar 2019 17:45:10 +0000 +Subject: [PATCH 2/3] arm64: tegra210: Jetson TX1: disable display panel and + associated backlight + +The Jetson TX1 dev kit doesn't ship with a screen by default and if +it's not there it appears to crash on boot so disable them both by +default until we work out the problem. + +Signed-off-by: Peter Robinson +--- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts b/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts +index 37e3c46e753f..a16f24f1d5ff 100644 +--- a/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts ++++ b/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts +@@ -36,7 +36,7 @@ + + host1x@50000000 { + dsi@54300000 { +- status = "okay"; ++ status = "disabled"; + + avdd-dsi-csi-supply = <&vdd_dsi_csi>; + +@@ -54,6 +54,8 @@ + + i2c@7000c400 { + backlight: backlight@2c { ++ status = "disabled"; ++ + compatible = "ti,lp8557"; + reg = <0x2c>; + +-- +2.20.1 diff --git a/kernel.spec b/kernel.spec index d0b130dce..2c3e9cd23 100644 --- a/kernel.spec +++ b/kernel.spec @@ -568,6 +568,12 @@ Patch312: arm64-rock960-enable-tsadc.patch Patch339: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch +# Tegra bits +Patch340: arm64-tegra-jetson-tx1-fixes.patch + +# https://patchwork.kernel.org/patch/10858639/ +Patch341: arm64-tegra-Add-NVIDIA-Jetson-Nano-Developer-Kit-support.patch + # 400 - IBM (ppc/s390x) patches # 500 - Temp fixes/CVEs etc @@ -1855,6 +1861,10 @@ fi # # %changelog +* Sat Mar 23 2019 Peter Robinson +- Fixes for Tegra Jetson TX series +- Initial support for NVIDIA Jetson Nano + * Fri Mar 22 2019 Jeremy Cline - 5.1.0-0.rc1.git2.1 - Linux v5.1-rc1-66-gfd1f297b794c From a89bed2f8ee6c2e88e75f0db882b18a38d78032c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 25 Mar 2019 00:00:26 +0000 Subject: [PATCH 10/26] TPM fix (rhbz 1688283) --- kernel.spec | 3 + ...invalid-condition-in-tpm_common_poll.patch | 103 ++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch diff --git a/kernel.spec b/kernel.spec index 2c3e9cd23..bcd8737ee 100644 --- a/kernel.spec +++ b/kernel.spec @@ -588,6 +588,9 @@ Patch507: 0001-Drop-that-for-now.patch # rhbz 1689750, patch submitted upstream Patch508: 0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch +# rhbz 1688283 +Patch512: v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch + # END OF PATCH DEFINITIONS %endif diff --git a/v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch b/v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch new file mode 100644 index 000000000..606373aa4 --- /dev/null +++ b/v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch @@ -0,0 +1,103 @@ +From patchwork Thu Mar 21 23:02:12 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +X-Patchwork-Submitter: Tadeusz Struk +X-Patchwork-Id: 10864497 +Return-Path: +Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org + [172.30.200.125]) + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 711816C2 + for ; + Thu, 21 Mar 2019 23:02:15 +0000 (UTC) +Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) + by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57B312A4A8 + for ; + Thu, 21 Mar 2019 23:02:15 +0000 (UTC) +Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) + id 4AA482A539; Thu, 21 Mar 2019 23:02:15 +0000 (UTC) +X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on + pdx-wl-mail.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, + RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C399A2A4A8 + for ; + Thu, 21 Mar 2019 23:02:14 +0000 (UTC) +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1727157AbfCUXCO (ORCPT + ); + Thu, 21 Mar 2019 19:02:14 -0400 +Received: from mga04.intel.com ([192.55.52.120]:7149 "EHLO mga04.intel.com" + rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP + id S1727086AbfCUXCO (ORCPT ); + Thu, 21 Mar 2019 19:02:14 -0400 +X-Amp-Result: SKIPPED(no attachment in message) +X-Amp-File-Uploaded: False +Received: from orsmga004.jf.intel.com ([10.7.209.38]) + by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; + 21 Mar 2019 16:02:13 -0700 +X-ExtLoop1: 1 +X-IronPort-AV: E=Sophos;i="5.60,254,1549958400"; + d="scan'208";a="284777192" +Received: from jdemuth-mobl.amr.corp.intel.com (HELO + tstruk-mobl1.jf.intel.com) ([10.251.150.110]) + by orsmga004.jf.intel.com with ESMTP; 21 Mar 2019 16:02:13 -0700 +Subject: [PATCH v3] tpm: fix an invalid condition in tpm_common_poll +From: Tadeusz Struk +To: jarkko.sakkinen@linux.intel.com +Cc: grawity@gmail.com, James.Bottomley@HansenPartnership.com, + linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, + stable@vger.kernel.org, tadeusz.struk@intel.com +Date: Thu, 21 Mar 2019 16:02:12 -0700 +Message-ID: + <155320933278.5015.1752135965699928631.stgit@tstruk-mobl1.jf.intel.com> +User-Agent: StGit/unknown-version +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Sender: linux-integrity-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-integrity@vger.kernel.org +X-Virus-Scanned: ClamAV using ClamSMTP + +The poll condition should only check response_length, +because reads should only be issued if there is data to read. +The response_read flag only prevents double writes. +The problem was that the write set the response_read to false, +enqued a tpm job, and returned. Then application called poll +which checked the response_read flag and returned EPOLLIN. +Then the application called read, but got nothing. +After all that the async_work kicked in. +Added also mutex_lock around the poll check to prevent +other possible race conditions. + +Fixes: 9488585b21bef0df12 ("tpm: add support for partial reads") +Reported-by: Mantas Mikulėnas +Tested-by: Mantas Mikulėnas +Signed-off-by: Tadeusz Struk +--- + drivers/char/tpm/tpm-dev-common.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c +index 5eecad233ea1..7312d3214381 100644 +--- a/drivers/char/tpm/tpm-dev-common.c ++++ b/drivers/char/tpm/tpm-dev-common.c +@@ -203,12 +203,14 @@ __poll_t tpm_common_poll(struct file *file, poll_table *wait) + __poll_t mask = 0; + + poll_wait(file, &priv->async_wait, wait); ++ mutex_lock(&priv->buffer_mutex); + +- if (!priv->response_read || priv->response_length) ++ if (priv->response_length) + mask = EPOLLIN | EPOLLRDNORM; + else + mask = EPOLLOUT | EPOLLWRNORM; + ++ mutex_unlock(&priv->buffer_mutex); + return mask; + } + From 915ea3021562fce59e9e9a9882b9118555970bd8 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 25 Mar 2019 14:30:45 +0000 Subject: [PATCH 11/26] Disable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index bcd8737ee..6db3c8853 100644 --- a/kernel.spec +++ b/kernel.spec @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -1864,6 +1864,9 @@ fi # # %changelog +* Mon Mar 25 2019 Jeremy Cline +- Disable debugging options. + * Sat Mar 23 2019 Peter Robinson - Fixes for Tegra Jetson TX series - Initial support for NVIDIA Jetson Nano From 45e5a1f373d708b10afabbf252d240a2e73b78e1 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 25 Mar 2019 14:51:10 +0000 Subject: [PATCH 12/26] Linux v5.1-rc2 --- configs/fedora/generic/CONFIG_CHARLCD_BL_FLASH | 1 + configs/fedora/generic/CONFIG_CHARLCD_BL_OFF | 1 + configs/fedora/generic/CONFIG_CHARLCD_BL_ON | 1 + configs/fedora/generic/CONFIG_PANEL_CHANGE_MESSAGE | 1 + configs/fedora/generic/CONFIG_PARPORT_PANEL | 1 + kernel-aarch64-debug.config | 5 +++++ kernel-aarch64.config | 5 +++++ kernel-armv7hl-debug.config | 5 +++++ kernel-armv7hl-lpae-debug.config | 5 +++++ kernel-armv7hl-lpae.config | 5 +++++ kernel-armv7hl.config | 5 +++++ kernel-i686-debug.config | 5 +++++ kernel-i686.config | 5 +++++ kernel-ppc64le-debug.config | 5 +++++ kernel-ppc64le.config | 5 +++++ kernel-s390x-debug.config | 5 +++++ kernel-s390x.config | 5 +++++ kernel-x86_64-debug.config | 5 +++++ kernel-x86_64.config | 5 +++++ kernel.spec | 7 +++++-- sources | 3 +-- 21 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 configs/fedora/generic/CONFIG_CHARLCD_BL_FLASH create mode 100644 configs/fedora/generic/CONFIG_CHARLCD_BL_OFF create mode 100644 configs/fedora/generic/CONFIG_CHARLCD_BL_ON create mode 100644 configs/fedora/generic/CONFIG_PANEL_CHANGE_MESSAGE create mode 100644 configs/fedora/generic/CONFIG_PARPORT_PANEL diff --git a/configs/fedora/generic/CONFIG_CHARLCD_BL_FLASH b/configs/fedora/generic/CONFIG_CHARLCD_BL_FLASH new file mode 100644 index 000000000..e94ac2650 --- /dev/null +++ b/configs/fedora/generic/CONFIG_CHARLCD_BL_FLASH @@ -0,0 +1 @@ +CONFIG_CHARLCD_BL_FLASH=y diff --git a/configs/fedora/generic/CONFIG_CHARLCD_BL_OFF b/configs/fedora/generic/CONFIG_CHARLCD_BL_OFF new file mode 100644 index 000000000..5f11fc1e0 --- /dev/null +++ b/configs/fedora/generic/CONFIG_CHARLCD_BL_OFF @@ -0,0 +1 @@ +# CONFIG_CHARLCD_BL_OFF is not set diff --git a/configs/fedora/generic/CONFIG_CHARLCD_BL_ON b/configs/fedora/generic/CONFIG_CHARLCD_BL_ON new file mode 100644 index 000000000..56c1e7cda --- /dev/null +++ b/configs/fedora/generic/CONFIG_CHARLCD_BL_ON @@ -0,0 +1 @@ +# CONFIG_CHARLCD_BL_ON is not set diff --git a/configs/fedora/generic/CONFIG_PANEL_CHANGE_MESSAGE b/configs/fedora/generic/CONFIG_PANEL_CHANGE_MESSAGE new file mode 100644 index 000000000..fb2a2555e --- /dev/null +++ b/configs/fedora/generic/CONFIG_PANEL_CHANGE_MESSAGE @@ -0,0 +1 @@ +# CONFIG_PANEL_CHANGE_MESSAGE is not set diff --git a/configs/fedora/generic/CONFIG_PARPORT_PANEL b/configs/fedora/generic/CONFIG_PARPORT_PANEL new file mode 100644 index 000000000..6e173ccd0 --- /dev/null +++ b/configs/fedora/generic/CONFIG_PARPORT_PANEL @@ -0,0 +1 @@ +# CONFIG_PARPORT_PANEL is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index c9ff6cf6f..b4b4a4e74 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -880,6 +880,9 @@ CONFIG_CHARGER_QCOM_SMBB=m # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -4176,6 +4179,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -4185,6 +4189,7 @@ CONFIG_PARAVIRT=y # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y CONFIG_PATA_ACPI=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index bc29b8354..3e9ddf442 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -880,6 +880,9 @@ CONFIG_CHARGER_QCOM_SMBB=m # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -4156,6 +4159,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -4165,6 +4169,7 @@ CONFIG_PARAVIRT=y # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y CONFIG_PATA_ACPI=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 74680b57e..a14f81189 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -894,6 +894,9 @@ CONFIG_CHARGER_SMB347=m CONFIG_CHARGER_TPS65090=m CONFIG_CHARGER_TPS65217=m CONFIG_CHARGER_TWL4030=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -4333,6 +4336,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set CONFIG_PALMAS_GPADC=m +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -4342,6 +4346,7 @@ CONFIG_PARAVIRT=y # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y # CONFIG_PATA_ALI is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index c9cd68dd9..492622199 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -865,6 +865,9 @@ CONFIG_CHARGER_MAX8997=m # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m CONFIG_CHARGER_TPS65090=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -4145,6 +4148,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -4154,6 +4158,7 @@ CONFIG_PARAVIRT=y # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y # CONFIG_PATA_ALI is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index ac46efb01..df7505392 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -865,6 +865,9 @@ CONFIG_CHARGER_MAX8997=m # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m CONFIG_CHARGER_TPS65090=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -4126,6 +4129,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -4135,6 +4139,7 @@ CONFIG_PARAVIRT=y # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y # CONFIG_PATA_ALI is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 6b35cf491..753e1798c 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -894,6 +894,9 @@ CONFIG_CHARGER_SMB347=m CONFIG_CHARGER_TPS65090=m CONFIG_CHARGER_TPS65217=m CONFIG_CHARGER_TWL4030=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -4314,6 +4317,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set CONFIG_PALMAS_GPADC=m +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -4323,6 +4327,7 @@ CONFIG_PARAVIRT=y # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y # CONFIG_PATA_ALI is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 9634bf0f5..8be528172 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -736,6 +736,9 @@ CONFIG_CHARGER_CROS_USBPD=m # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set # CONFIG_CHECKPOINT_RESTORE is not set @@ -3926,6 +3929,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_POISONING is not set CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PANASONIC_LAPTOP=m +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -3939,6 +3943,7 @@ CONFIG_PARMAN=m CONFIG_PARPORT_1284=y # CONFIG_PARPORT_AX88796 is not set CONFIG_PARPORT=m +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC_FIFO is not set CONFIG_PARPORT_PC=m CONFIG_PARPORT_PC_PCMCIA=m diff --git a/kernel-i686.config b/kernel-i686.config index 9cb41e257..f1b01cec3 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -735,6 +735,9 @@ CONFIG_CHARGER_CROS_USBPD=m # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set # CONFIG_CHECKPOINT_RESTORE is not set @@ -3907,6 +3910,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_POISONING is not set CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PANASONIC_LAPTOP=m +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -3920,6 +3924,7 @@ CONFIG_PARMAN=m CONFIG_PARPORT_1284=y # CONFIG_PARPORT_AX88796 is not set CONFIG_PARPORT=m +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC_FIFO is not set CONFIG_PARPORT_PC=m CONFIG_PARPORT_PC_PCMCIA=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 7169d3f08..40ab2f4ce 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -674,6 +674,9 @@ CONFIG_CGROUPS=y # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -3647,6 +3650,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -3655,6 +3659,7 @@ CONFIG_PAPR_SCM=m # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y CONFIG_PATA_ALI=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index a43dd1ce4..7b35f1d41 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -673,6 +673,9 @@ CONFIG_CGROUPS=y # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -3626,6 +3629,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -3634,6 +3638,7 @@ CONFIG_PAPR_SCM=m # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y CONFIG_PATA_ALI=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 8d2e304f7..8eb57e9ec 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -681,6 +681,9 @@ CONFIG_CGROUPS=y # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set # CONFIG_CHARGER_SMB347 is not set +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -3614,6 +3617,7 @@ CONFIG_PACK_STACK=y # CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -3621,6 +3625,7 @@ CONFIG_PANTHERLORD_FF=y # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y CONFIG_PATA_ALI=m diff --git a/kernel-s390x.config b/kernel-s390x.config index a72714ceb..75ace4633 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -680,6 +680,9 @@ CONFIG_CGROUPS=y # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set # CONFIG_CHARGER_SMB347 is not set +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -3593,6 +3596,7 @@ CONFIG_PACK_STACK=y # CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_OWNER is not set # CONFIG_PAGE_POISONING is not set +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -3600,6 +3604,7 @@ CONFIG_PANTHERLORD_FF=y # CONFIG_PARIDE is not set CONFIG_PARMAN=m # CONFIG_PARPORT is not set +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y CONFIG_PATA_ALI=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index e173506d8..40a3afb1f 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -745,6 +745,9 @@ CONFIG_CHARGER_CROS_USBPD=m # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -3974,6 +3977,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_POISONING is not set CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PANASONIC_LAPTOP=m +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -3987,6 +3991,7 @@ CONFIG_PARMAN=m CONFIG_PARPORT_1284=y # CONFIG_PARPORT_AX88796 is not set CONFIG_PARPORT=m +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC_FIFO is not set CONFIG_PARPORT_PC=m CONFIG_PARPORT_PC_PCMCIA=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 4f5460c49..0e13b05c8 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -744,6 +744,9 @@ CONFIG_CHARGER_CROS_USBPD=m # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m +CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y @@ -3955,6 +3958,7 @@ CONFIG_PACKET=y # CONFIG_PAGE_POISONING is not set CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PANASONIC_LAPTOP=m +# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_TIMEOUT=0 @@ -3968,6 +3972,7 @@ CONFIG_PARMAN=m CONFIG_PARPORT_1284=y # CONFIG_PARPORT_AX88796 is not set CONFIG_PARPORT=m +# CONFIG_PARPORT_PANEL is not set # CONFIG_PARPORT_PC_FIFO is not set CONFIG_PARPORT_PC=m CONFIG_PARPORT_PC_PCMCIA=m diff --git a/kernel.spec b/kernel.spec index 6db3c8853..515cf9f16 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 1 +%global rcrev 2 # The git snapshot level -%define gitrev 2 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1864,6 +1864,9 @@ fi # # %changelog +* Mon Mar 25 2019 Jeremy Cline - 5.1.0-0.rc2.git0.1 +- Linux v5.1-rc2 + * Mon Mar 25 2019 Jeremy Cline - Disable debugging options. diff --git a/sources b/sources index 6aca6d320..f71bc9ba7 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 -SHA512 (patch-5.1-rc1.xz) = 013b5354de22870555cf604d756acb0ab90e4383c59e11671611a6dbd88de8cca4ca4727a428e5aa563b6aad66aad01539eee0d9adb594c58d18edffe3f2e82e -SHA512 (patch-5.1-rc1-git2.xz) = 1633b72619cfb2a20934d11f153ca32e22de75ebc4bef6c9baf2d2644237b1832bfdeec554d93d638fdb30609a0049a9cc0e9def49047793d4b12e8d90ff8c0f +SHA512 (patch-5.1-rc2.xz) = 97ea50f639b986b9cee8d44d01bddb25c92fd263322f9a22e4bdf06307f1a67ad9d345666928ba9a790b0f366bb012b748bd0e073999d4547e1cafc9ecdc770e From 4f39cfdf959a1522f83063c2966ffdfb4036c0eb Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 25 Mar 2019 16:02:32 +0000 Subject: [PATCH 13/26] Enable W1_MASTER_GPIO on aarch64 (rbhz #1671934) --- configs/fedora/generic/arm/{armv7 => }/CONFIG_W1_MASTER_GPIO | 0 kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename configs/fedora/generic/arm/{armv7 => }/CONFIG_W1_MASTER_GPIO (100%) diff --git a/configs/fedora/generic/arm/armv7/CONFIG_W1_MASTER_GPIO b/configs/fedora/generic/arm/CONFIG_W1_MASTER_GPIO similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_W1_MASTER_GPIO rename to configs/fedora/generic/arm/CONFIG_W1_MASTER_GPIO diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index b4b4a4e74..93caa9cd0 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -6920,7 +6920,7 @@ CONFIG_W1=m # CONFIG_W1_MASTER_DS1WM is not set CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_DS2490=m -# CONFIG_W1_MASTER_GPIO is not set +CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_MASTER_MATROX is not set CONFIG_W1_SLAVE_DS2405=m CONFIG_W1_SLAVE_DS2406=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 3e9ddf442..d5fe83d71 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6898,7 +6898,7 @@ CONFIG_W1=m # CONFIG_W1_MASTER_DS1WM is not set CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_DS2490=m -# CONFIG_W1_MASTER_GPIO is not set +CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_MASTER_MATROX is not set CONFIG_W1_SLAVE_DS2405=m CONFIG_W1_SLAVE_DS2406=m From f1512dfeef19e4231dc1def9c99cd0400c9fa265 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 26 Mar 2019 14:31:32 +0000 Subject: [PATCH 14/26] Initial NXP i.MX8 enablement --- configs/fedora/generic/CONFIG_SPI_FSL_QUADSPI | 1 - .../arm/{armv7/armv7 => }/CONFIG_AHCI_IMX | 0 .../generic/arm/CONFIG_ARM_IMX6Q_CPUFREQ | 1 + .../CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI | 0 .../CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM | 0 .../armv7 => }/CONFIG_CRYPTO_DEV_MXC_SCC | 0 .../generic/arm/CONFIG_CRYPTO_DEV_MXS_DCP | 1 + .../generic/arm/CONFIG_CRYPTO_DEV_SAHARA | 1 + .../arm/{armv7/armv7 => }/CONFIG_FB_IMX | 0 configs/fedora/generic/arm/CONFIG_FB_MX3 | 1 + .../arm/{armv7/armv7 => }/CONFIG_FB_MXS | 0 .../generic/arm/{armv7/armv7 => }/CONFIG_FEC | 0 .../arm/{armv7/armv7 => }/CONFIG_IMX7D_ADC | 0 configs/fedora/generic/arm/CONFIG_IMX_DMA | 1 + .../arm/{armv7/armv7 => }/CONFIG_IMX_GPCV2 | 0 .../generic/arm/{armv7 => }/CONFIG_IMX_MBOX | 0 .../generic/arm/{armv7 => }/CONFIG_IMX_SCU | 0 .../arm/{armv7/armv7 => }/CONFIG_IMX_SDMA | 0 configs/fedora/generic/arm/CONFIG_IMX_WEIM | 1 + .../fedora/generic/arm/CONFIG_KEYBOARD_IMX | 1 + configs/fedora/generic/arm/CONFIG_MMC_MXC | 1 + .../armv7 => }/CONFIG_MMC_SDHCI_ESDHC_IMX | 0 .../arm/{armv7/armv7 => }/CONFIG_MX3_IPU | 0 configs/fedora/generic/arm/CONFIG_MXS_DMA | 1 + .../fedora/generic/arm/CONFIG_NVMEM_IMX_IIM | 1 + configs/fedora/generic/arm/CONFIG_PATA_IMX | 1 + .../arm/{armv7/armv7 => }/CONFIG_PCI_IMX6 | 0 .../generic/arm/CONFIG_REGULATOR_ANATOP | 2 +- .../arm/{armv7 => }/CONFIG_REGULATOR_PFUZE100 | 0 .../fedora/generic/arm/CONFIG_RTC_DRV_IMXDI | 1 + .../{armv7/armv7 => }/CONFIG_RTC_DRV_IMX_SC | 0 configs/fedora/generic/arm/CONFIG_RTC_DRV_MXC | 1 + .../fedora/generic/arm/CONFIG_RTC_DRV_MXC_V2 | 1 + .../generic/arm/CONFIG_SERIAL_FSL_LPUART | 1 + .../arm/CONFIG_SERIAL_FSL_LPUART_CONSOLE | 1 + .../arm/{armv7/armv7 => }/CONFIG_SERIAL_IMX | 0 .../armv7 => }/CONFIG_SERIAL_IMX_CONSOLE | 0 .../armv7 => }/CONFIG_SND_SOC_FSL_ASOC_CARD | 0 .../{armv7/armv7 => }/CONFIG_SND_SOC_FSL_ASRC | 0 .../{armv7/armv7 => }/CONFIG_SND_SOC_FSL_ESAI | 0 .../{armv7/armv7 => }/CONFIG_SND_SOC_FSL_SAI | 0 .../armv7 => }/CONFIG_SND_SOC_FSL_SPDIF | 0 .../{armv7/armv7 => }/CONFIG_SND_SOC_FSL_SSI | 0 .../armv7 => }/CONFIG_SND_SOC_FSL_UTILS | 0 .../arm/{armv7/armv7 => }/CONFIG_SPI_IMX | 0 .../arm/{armv7/armv7 => }/CONFIG_VIDEO_CODA | 0 .../{armv7/armv7 => }/CONFIG_VIDEO_IMX_PXP | 0 .../fedora/generic/arm/CONFIG_W1_MASTER_MXC | 1 + .../generic/arm/aarch64/CONFIG_ARCH_MXC | 1 + .../generic/arm/aarch64/CONFIG_CLK_IMX8MM | 1 + .../generic/arm/aarch64/CONFIG_CLK_IMX8MQ | 1 + .../generic/arm/aarch64/CONFIG_CLK_IMX8QXP | 1 + .../generic/arm/aarch64/CONFIG_IMX_THERMAL | 1 + .../arm/aarch64/CONFIG_PHY_FSL_IMX8MQ_USB | 1 + .../generic/arm/aarch64/CONFIG_PINCTRL_IMX8MM | 1 + .../generic/arm/aarch64/CONFIG_PINCTRL_IMX8MQ | 1 + .../generic/arm/aarch64/CONFIG_PINCTRL_IMX8QM | 1 + .../arm/aarch64/CONFIG_PINCTRL_IMX8QXP | 1 + .../generic/arm/aarch64/CONFIG_SND_IMX_SOC | 1 + .../generic/arm/aarch64/CONFIG_USB_EHCI_MXC | 1 + .../generic/arm/aarch64/CONFIG_USB_FSL_USB2 | 1 + .../generic/arm/aarch64/CONFIG_USB_MXS_PHY | 1 + .../arm/armv7/armv7/CONFIG_DRM_ETNAVIV | 1 - .../armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL | 1 - .../generic/arm/armv7/armv7/CONFIG_IMX_DMA | 1 - .../arm/armv7/armv7/CONFIG_KEYBOARD_IMX | 1 - .../generic/arm/armv7/armv7/CONFIG_MMC_MXC | 1 - .../generic/arm/armv7/armv7/CONFIG_MXS_DMA | 1 - .../arm/armv7/armv7/CONFIG_REGULATOR_ANATOP | 1 - .../arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI | 1 - .../arm/armv7/armv7/CONFIG_RTC_DRV_MXC | 1 - kernel-aarch64-debug.config | 70 ++++++++++++++++--- kernel-aarch64.config | 70 ++++++++++++++++--- kernel-armv7hl-debug.config | 18 +++-- kernel-armv7hl-lpae-debug.config | 51 +++++++++++--- kernel-armv7hl-lpae.config | 51 +++++++++++--- kernel-armv7hl.config | 18 +++-- kernel-i686-debug.config | 1 - kernel-i686.config | 1 - kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - kernel-x86_64-debug.config | 1 - kernel-x86_64.config | 1 - kernel.spec | 3 + 86 files changed, 261 insertions(+), 71 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_SPI_FSL_QUADSPI rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_AHCI_IMX (100%) create mode 100644 configs/fedora/generic/arm/CONFIG_ARM_IMX6Q_CPUFREQ rename configs/fedora/generic/arm/{aarch64 => }/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI (100%) rename configs/fedora/generic/arm/{aarch64 => }/CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_CRYPTO_DEV_MXC_SCC (100%) create mode 100644 configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MXS_DCP create mode 100644 configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SAHARA rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_FB_IMX (100%) create mode 100644 configs/fedora/generic/arm/CONFIG_FB_MX3 rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_FB_MXS (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_FEC (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_IMX7D_ADC (100%) create mode 100644 configs/fedora/generic/arm/CONFIG_IMX_DMA rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_IMX_GPCV2 (100%) rename configs/fedora/generic/arm/{armv7 => }/CONFIG_IMX_MBOX (100%) rename configs/fedora/generic/arm/{armv7 => }/CONFIG_IMX_SCU (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_IMX_SDMA (100%) create mode 100644 configs/fedora/generic/arm/CONFIG_IMX_WEIM create mode 100644 configs/fedora/generic/arm/CONFIG_KEYBOARD_IMX create mode 100644 configs/fedora/generic/arm/CONFIG_MMC_MXC rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_MMC_SDHCI_ESDHC_IMX (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_MX3_IPU (100%) create mode 100644 configs/fedora/generic/arm/CONFIG_MXS_DMA create mode 100644 configs/fedora/generic/arm/CONFIG_NVMEM_IMX_IIM create mode 100644 configs/fedora/generic/arm/CONFIG_PATA_IMX rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_PCI_IMX6 (100%) rename configs/fedora/generic/arm/{armv7 => }/CONFIG_REGULATOR_PFUZE100 (100%) create mode 100644 configs/fedora/generic/arm/CONFIG_RTC_DRV_IMXDI rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_RTC_DRV_IMX_SC (100%) create mode 100644 configs/fedora/generic/arm/CONFIG_RTC_DRV_MXC create mode 100644 configs/fedora/generic/arm/CONFIG_RTC_DRV_MXC_V2 create mode 100644 configs/fedora/generic/arm/CONFIG_SERIAL_FSL_LPUART create mode 100644 configs/fedora/generic/arm/CONFIG_SERIAL_FSL_LPUART_CONSOLE rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_SERIAL_IMX (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_SERIAL_IMX_CONSOLE (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_SND_SOC_FSL_ASOC_CARD (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_SND_SOC_FSL_ASRC (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_SND_SOC_FSL_ESAI (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_SND_SOC_FSL_SAI (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_SND_SOC_FSL_SPDIF (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_SND_SOC_FSL_SSI (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_SND_SOC_FSL_UTILS (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_SPI_IMX (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_VIDEO_CODA (100%) rename configs/fedora/generic/arm/{armv7/armv7 => }/CONFIG_VIDEO_IMX_PXP (100%) create mode 100644 configs/fedora/generic/arm/CONFIG_W1_MASTER_MXC create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_ARCH_MXC create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8MM create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8MQ create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8QXP create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_IMX_THERMAL create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PHY_FSL_IMX8MQ_USB create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MM create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MQ create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8QM create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8QXP create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_SND_IMX_SOC create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_USB_EHCI_MXC create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_USB_FSL_USB2 create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_USB_MXS_PHY delete mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV delete mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL delete mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_DMA delete mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_IMX delete mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_MMC_MXC delete mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_MXS_DMA delete mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP delete mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI delete mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_MXC diff --git a/configs/fedora/generic/CONFIG_SPI_FSL_QUADSPI b/configs/fedora/generic/CONFIG_SPI_FSL_QUADSPI deleted file mode 100644 index 96dbf0e34..000000000 --- a/configs/fedora/generic/CONFIG_SPI_FSL_QUADSPI +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SPI_FSL_QUADSPI is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_AHCI_IMX b/configs/fedora/generic/arm/CONFIG_AHCI_IMX similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_AHCI_IMX rename to configs/fedora/generic/arm/CONFIG_AHCI_IMX diff --git a/configs/fedora/generic/arm/CONFIG_ARM_IMX6Q_CPUFREQ b/configs/fedora/generic/arm/CONFIG_ARM_IMX6Q_CPUFREQ new file mode 100644 index 000000000..323e1b514 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_ARM_IMX6Q_CPUFREQ @@ -0,0 +1 @@ +# CONFIG_ARM_IMX6Q_CPUFREQ is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI similarity index 100% rename from configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI rename to configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM similarity index 100% rename from configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM rename to configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXC_SCC b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MXC_SCC similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXC_SCC rename to configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MXC_SCC diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MXS_DCP b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MXS_DCP new file mode 100644 index 000000000..7e925a191 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_MXS_DCP @@ -0,0 +1 @@ +# CONFIG_CRYPTO_DEV_MXS_DCP is not set diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SAHARA b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SAHARA new file mode 100644 index 000000000..087395025 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SAHARA @@ -0,0 +1 @@ +# CONFIG_CRYPTO_DEV_SAHARA is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_FB_IMX b/configs/fedora/generic/arm/CONFIG_FB_IMX similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_FB_IMX rename to configs/fedora/generic/arm/CONFIG_FB_IMX diff --git a/configs/fedora/generic/arm/CONFIG_FB_MX3 b/configs/fedora/generic/arm/CONFIG_FB_MX3 new file mode 100644 index 000000000..71d6457ed --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_FB_MX3 @@ -0,0 +1 @@ +# CONFIG_FB_MX3 is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_FB_MXS b/configs/fedora/generic/arm/CONFIG_FB_MXS similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_FB_MXS rename to configs/fedora/generic/arm/CONFIG_FB_MXS diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_FEC b/configs/fedora/generic/arm/CONFIG_FEC similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_FEC rename to configs/fedora/generic/arm/CONFIG_FEC diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX7D_ADC b/configs/fedora/generic/arm/CONFIG_IMX7D_ADC similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX7D_ADC rename to configs/fedora/generic/arm/CONFIG_IMX7D_ADC diff --git a/configs/fedora/generic/arm/CONFIG_IMX_DMA b/configs/fedora/generic/arm/CONFIG_IMX_DMA new file mode 100644 index 000000000..c2b9fd159 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_IMX_DMA @@ -0,0 +1 @@ +# CONFIG_IMX_DMA is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_GPCV2 b/configs/fedora/generic/arm/CONFIG_IMX_GPCV2 similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_GPCV2 rename to configs/fedora/generic/arm/CONFIG_IMX_GPCV2 diff --git a/configs/fedora/generic/arm/armv7/CONFIG_IMX_MBOX b/configs/fedora/generic/arm/CONFIG_IMX_MBOX similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_IMX_MBOX rename to configs/fedora/generic/arm/CONFIG_IMX_MBOX diff --git a/configs/fedora/generic/arm/armv7/CONFIG_IMX_SCU b/configs/fedora/generic/arm/CONFIG_IMX_SCU similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_IMX_SCU rename to configs/fedora/generic/arm/CONFIG_IMX_SCU diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_SDMA b/configs/fedora/generic/arm/CONFIG_IMX_SDMA similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_SDMA rename to configs/fedora/generic/arm/CONFIG_IMX_SDMA diff --git a/configs/fedora/generic/arm/CONFIG_IMX_WEIM b/configs/fedora/generic/arm/CONFIG_IMX_WEIM new file mode 100644 index 000000000..0f4b6e6ba --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_IMX_WEIM @@ -0,0 +1 @@ +# CONFIG_IMX_WEIM is not set diff --git a/configs/fedora/generic/arm/CONFIG_KEYBOARD_IMX b/configs/fedora/generic/arm/CONFIG_KEYBOARD_IMX new file mode 100644 index 000000000..39076efbf --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_KEYBOARD_IMX @@ -0,0 +1 @@ +# CONFIG_KEYBOARD_IMX is not set diff --git a/configs/fedora/generic/arm/CONFIG_MMC_MXC b/configs/fedora/generic/arm/CONFIG_MMC_MXC new file mode 100644 index 000000000..bc3cbe608 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_MMC_MXC @@ -0,0 +1 @@ +# CONFIG_MMC_MXC is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_ESDHC_IMX b/configs/fedora/generic/arm/CONFIG_MMC_SDHCI_ESDHC_IMX similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_ESDHC_IMX rename to configs/fedora/generic/arm/CONFIG_MMC_SDHCI_ESDHC_IMX diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MX3_IPU b/configs/fedora/generic/arm/CONFIG_MX3_IPU similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_MX3_IPU rename to configs/fedora/generic/arm/CONFIG_MX3_IPU diff --git a/configs/fedora/generic/arm/CONFIG_MXS_DMA b/configs/fedora/generic/arm/CONFIG_MXS_DMA new file mode 100644 index 000000000..8e2d703b6 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_MXS_DMA @@ -0,0 +1 @@ +# CONFIG_MXS_DMA is not set diff --git a/configs/fedora/generic/arm/CONFIG_NVMEM_IMX_IIM b/configs/fedora/generic/arm/CONFIG_NVMEM_IMX_IIM new file mode 100644 index 000000000..de7c8053a --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_NVMEM_IMX_IIM @@ -0,0 +1 @@ +# CONFIG_NVMEM_IMX_IIM is not set diff --git a/configs/fedora/generic/arm/CONFIG_PATA_IMX b/configs/fedora/generic/arm/CONFIG_PATA_IMX new file mode 100644 index 000000000..5ae9f8824 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_PATA_IMX @@ -0,0 +1 @@ +# CONFIG_PATA_IMX is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PCI_IMX6 b/configs/fedora/generic/arm/CONFIG_PCI_IMX6 similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_PCI_IMX6 rename to configs/fedora/generic/arm/CONFIG_PCI_IMX6 diff --git a/configs/fedora/generic/arm/CONFIG_REGULATOR_ANATOP b/configs/fedora/generic/arm/CONFIG_REGULATOR_ANATOP index 909e86360..14c5f9e64 100644 --- a/configs/fedora/generic/arm/CONFIG_REGULATOR_ANATOP +++ b/configs/fedora/generic/arm/CONFIG_REGULATOR_ANATOP @@ -1 +1 @@ -# CONFIG_REGULATOR_ANATOP is not set +CONFIG_REGULATOR_ANATOP=m diff --git a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_PFUZE100 b/configs/fedora/generic/arm/CONFIG_REGULATOR_PFUZE100 similarity index 100% rename from configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_PFUZE100 rename to configs/fedora/generic/arm/CONFIG_REGULATOR_PFUZE100 diff --git a/configs/fedora/generic/arm/CONFIG_RTC_DRV_IMXDI b/configs/fedora/generic/arm/CONFIG_RTC_DRV_IMXDI new file mode 100644 index 000000000..b575e983e --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_RTC_DRV_IMXDI @@ -0,0 +1 @@ +# CONFIG_RTC_DRV_IMXDI is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMX_SC b/configs/fedora/generic/arm/CONFIG_RTC_DRV_IMX_SC similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMX_SC rename to configs/fedora/generic/arm/CONFIG_RTC_DRV_IMX_SC diff --git a/configs/fedora/generic/arm/CONFIG_RTC_DRV_MXC b/configs/fedora/generic/arm/CONFIG_RTC_DRV_MXC new file mode 100644 index 000000000..4b035bde6 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_RTC_DRV_MXC @@ -0,0 +1 @@ +# CONFIG_RTC_DRV_MXC is not set diff --git a/configs/fedora/generic/arm/CONFIG_RTC_DRV_MXC_V2 b/configs/fedora/generic/arm/CONFIG_RTC_DRV_MXC_V2 new file mode 100644 index 000000000..e76becfc0 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_RTC_DRV_MXC_V2 @@ -0,0 +1 @@ +# CONFIG_RTC_DRV_MXC_V2 is not set diff --git a/configs/fedora/generic/arm/CONFIG_SERIAL_FSL_LPUART b/configs/fedora/generic/arm/CONFIG_SERIAL_FSL_LPUART new file mode 100644 index 000000000..7869769de --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_SERIAL_FSL_LPUART @@ -0,0 +1 @@ +CONFIG_SERIAL_FSL_LPUART=y diff --git a/configs/fedora/generic/arm/CONFIG_SERIAL_FSL_LPUART_CONSOLE b/configs/fedora/generic/arm/CONFIG_SERIAL_FSL_LPUART_CONSOLE new file mode 100644 index 000000000..7d8b19a47 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_SERIAL_FSL_LPUART_CONSOLE @@ -0,0 +1 @@ +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_IMX b/configs/fedora/generic/arm/CONFIG_SERIAL_IMX similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_IMX rename to configs/fedora/generic/arm/CONFIG_SERIAL_IMX diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_IMX_CONSOLE b/configs/fedora/generic/arm/CONFIG_SERIAL_IMX_CONSOLE similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_SERIAL_IMX_CONSOLE rename to configs/fedora/generic/arm/CONFIG_SERIAL_IMX_CONSOLE diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASOC_CARD b/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_ASOC_CARD similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASOC_CARD rename to configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_ASOC_CARD diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASRC b/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_ASRC similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ASRC rename to configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_ASRC diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ESAI b/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_ESAI similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_ESAI rename to configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_ESAI diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SAI b/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_SAI similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SAI rename to configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_SAI diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SPDIF b/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_SPDIF similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SPDIF rename to configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_SPDIF diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SSI b/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_SSI similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_SSI rename to configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_SSI diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_UTILS b/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_UTILS similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_FSL_UTILS rename to configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_UTILS diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_IMX b/configs/fedora/generic/arm/CONFIG_SPI_IMX similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_IMX rename to configs/fedora/generic/arm/CONFIG_SPI_IMX diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_CODA b/configs/fedora/generic/arm/CONFIG_VIDEO_CODA similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_CODA rename to configs/fedora/generic/arm/CONFIG_VIDEO_CODA diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_PXP b/configs/fedora/generic/arm/CONFIG_VIDEO_IMX_PXP similarity index 100% rename from configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_PXP rename to configs/fedora/generic/arm/CONFIG_VIDEO_IMX_PXP diff --git a/configs/fedora/generic/arm/CONFIG_W1_MASTER_MXC b/configs/fedora/generic/arm/CONFIG_W1_MASTER_MXC new file mode 100644 index 000000000..2e6db03d9 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_W1_MASTER_MXC @@ -0,0 +1 @@ +# CONFIG_W1_MASTER_MXC is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_MXC b/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_MXC new file mode 100644 index 000000000..5568226d1 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_MXC @@ -0,0 +1 @@ +CONFIG_ARCH_MXC=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8MM b/configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8MM new file mode 100644 index 000000000..c2bcb4711 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8MM @@ -0,0 +1 @@ +CONFIG_CLK_IMX8MM=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8MQ b/configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8MQ new file mode 100644 index 000000000..a039cc4ee --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8MQ @@ -0,0 +1 @@ +CONFIG_CLK_IMX8MQ=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8QXP b/configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8QXP new file mode 100644 index 000000000..743a3c9cd --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_CLK_IMX8QXP @@ -0,0 +1 @@ +CONFIG_CLK_IMX8QXP=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_IMX_THERMAL b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_THERMAL new file mode 100644 index 000000000..0d6fe2af1 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_THERMAL @@ -0,0 +1 @@ +# CONFIG_IMX_THERMAL is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_FSL_IMX8MQ_USB b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_FSL_IMX8MQ_USB new file mode 100644 index 000000000..6610b9861 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_FSL_IMX8MQ_USB @@ -0,0 +1 @@ +CONFIG_PHY_FSL_IMX8MQ_USB=m diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MM b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MM new file mode 100644 index 000000000..2cf2e4e7d --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MM @@ -0,0 +1 @@ +CONFIG_PINCTRL_IMX8MM=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MQ b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MQ new file mode 100644 index 000000000..68f50f0e6 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MQ @@ -0,0 +1 @@ +CONFIG_PINCTRL_IMX8MQ=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8QM b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8QM new file mode 100644 index 000000000..ec05342e9 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8QM @@ -0,0 +1 @@ +CONFIG_PINCTRL_IMX8QM=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8QXP b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8QXP new file mode 100644 index 000000000..f7a3afa62 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8QXP @@ -0,0 +1 @@ +CONFIG_PINCTRL_IMX8QXP=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_IMX_SOC b/configs/fedora/generic/arm/aarch64/CONFIG_SND_IMX_SOC new file mode 100644 index 000000000..f0bf90c04 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_IMX_SOC @@ -0,0 +1 @@ +# CONFIG_SND_IMX_SOC is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_USB_EHCI_MXC b/configs/fedora/generic/arm/aarch64/CONFIG_USB_EHCI_MXC new file mode 100644 index 000000000..30e8604fe --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_USB_EHCI_MXC @@ -0,0 +1 @@ +# CONFIG_USB_EHCI_MXC is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_USB_FSL_USB2 b/configs/fedora/generic/arm/aarch64/CONFIG_USB_FSL_USB2 new file mode 100644 index 000000000..9956301ef --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_USB_FSL_USB2 @@ -0,0 +1 @@ +# CONFIG_USB_FSL_USB2 is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_USB_MXS_PHY b/configs/fedora/generic/arm/aarch64/CONFIG_USB_MXS_PHY new file mode 100644 index 000000000..f476360c7 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_USB_MXS_PHY @@ -0,0 +1 @@ +# CONFIG_USB_MXS_PHY is not set diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV deleted file mode 100644 index 699299fab..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DRM_ETNAVIV=m diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL deleted file mode 100644 index ddd9d5832..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_ETNAVIV_THERMAL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DRM_ETNAVIV_THERMAL=y diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_DMA b/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_DMA deleted file mode 100644 index 47814badb..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_DMA +++ /dev/null @@ -1 +0,0 @@ -CONFIG_IMX_DMA=m diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_IMX b/configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_IMX deleted file mode 100644 index ef9fc6544..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_KEYBOARD_IMX +++ /dev/null @@ -1 +0,0 @@ -CONFIG_KEYBOARD_IMX=m diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MMC_MXC b/configs/fedora/generic/arm/armv7/armv7/CONFIG_MMC_MXC deleted file mode 100644 index 2d42c24fc..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MMC_MXC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MMC_MXC=m diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MXS_DMA b/configs/fedora/generic/arm/armv7/armv7/CONFIG_MXS_DMA deleted file mode 100644 index f423496a4..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MXS_DMA +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MXS_DMA=y diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP deleted file mode 100644 index 14c5f9e64..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_ANATOP +++ /dev/null @@ -1 +0,0 @@ -CONFIG_REGULATOR_ANATOP=m diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI b/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI deleted file mode 100644 index 8e6794d69..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_IMXDI +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RTC_DRV_IMXDI=m diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_MXC b/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_MXC deleted file mode 100644 index f1a8235ba..000000000 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_MXC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RTC_DRV_MXC=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 93caa9cd0..f980f25c5 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -157,6 +157,7 @@ CONFIG_AFS_DEBUG=y CONFIG_AFS_FSCACHE=y CONFIG_AFS_FS=m CONFIG_AHCI_CEVA=m +CONFIG_AHCI_IMX=m CONFIG_AHCI_MVEBU=m CONFIG_AHCI_QORIQ=m CONFIG_AHCI_SUNXI=m @@ -244,7 +245,7 @@ CONFIG_ARCH_LAYERSCAPE=y CONFIG_ARCH_MESON=y CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MVEBU=y -# CONFIG_ARCH_MXC is not set +CONFIG_ARCH_MXC=y # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_OMAP1 is not set # CONFIG_ARCH_PXA is not set @@ -340,6 +341,7 @@ CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC=y CONFIG_ARM_GLOBAL_TIMER=y +# CONFIG_ARM_IMX6Q_CPUFREQ is not set CONFIG_ARM_MHU=m CONFIG_ARM_PL172_MPMC=m CONFIG_ARM_PMU=y @@ -919,6 +921,9 @@ CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y CONFIG_CLKDEV_LOOKUP=y # CONFIG_CLK_HSDK is not set +CONFIG_CLK_IMX8MM=y +CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y # CONFIG_CLK_QORIQ is not set CONFIG_CLK_RASPBERRYPI_CPU=y CONFIG_CLK_SP810=y @@ -1114,11 +1119,14 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_CRYPTO_DEV_HISI_SEC is not set CONFIG_CRYPTO_DEV_MARVELL_CESA=m +# CONFIG_CRYPTO_DEV_MXC_SCC is not set +# CONFIG_CRYPTO_DEV_MXS_DCP is not set CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_QCOM_RNG=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_SAFEXCEL=m +# CONFIG_CRYPTO_DEV_SAHARA is not set CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y @@ -1730,6 +1738,7 @@ CONFIG_FB_EFI=y # CONFIG_FB_I740 is not set # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set +# CONFIG_FB_IMX is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set @@ -1739,6 +1748,8 @@ CONFIG_FB_EFI=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_METRONOME is not set CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_MX3 is not set +CONFIG_FB_MXS=m # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set @@ -1772,6 +1783,7 @@ CONFIG_FCOE_FNIC=m CONFIG_FCOE=m # CONFIG_FDDI is not set CONFIG_FEALNX=m +CONFIG_FEC=m CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_FIREWIRE is not set @@ -2380,9 +2392,17 @@ CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set CONFIG_IMX2_WDT=m +CONFIG_IMX7D_ADC=m +# CONFIG_IMX_DMA is not set +CONFIG_IMX_GPCV2=y # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_IMX_IRQSTEER is not set +CONFIG_IMX_MBOX=m CONFIG_IMX_SCU_PD=y +CONFIG_IMX_SCU=y +CONFIG_IMX_SDMA=m +# CONFIG_IMX_THERMAL is not set +# CONFIG_IMX_WEIM is not set CONFIG_INA2XX_ADC=m CONFIG_INDIRECT_PIO=y CONFIG_INET6_AH=m @@ -2847,6 +2867,7 @@ CONFIG_KEYBOARD_CROS_EC=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_GPIO_POLLED=m +# CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_LM8333 is not set @@ -3396,6 +3417,7 @@ CONFIG_MMC_MESON_GX=m CONFIG_MMC_MESON_MX_SDIO=m # CONFIG_MMC_MTK is not set CONFIG_MMC_MVSDIO=m +# CONFIG_MMC_MXC is not set CONFIG_MMC_QCOM_DML=y CONFIG_MMC_REALTEK_PCI=m CONFIG_MMC_REALTEK_USB=m @@ -3403,6 +3425,7 @@ CONFIG_MMC_RICOH_MMC=y CONFIG_MMC_SDHCI_ACPI=m # CONFIG_MMC_SDHCI_AM654 is not set CONFIG_MMC_SDHCI_CADENCE=m +CONFIG_MMC_SDHCI_ESDHC_IMX=m CONFIG_MMC_SDHCI_F_SDH30=m CONFIG_MMC_SDHCI_IPROC=m CONFIG_MMC_SDHCI=m @@ -3584,8 +3607,10 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m +# CONFIG_MX3_IPU is not set # CONFIG_MXC4005 is not set # CONFIG_MXC6255 is not set +# CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y @@ -4111,6 +4136,7 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA=y CONFIG_NVME_FC=m +# CONFIG_NVMEM_IMX_IIM is not set CONFIG_NVMEM_SUNXI_SID=m CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y @@ -4211,6 +4237,7 @@ CONFIG_PATA_ACPI=m # CONFIG_PATA_HPT3X2N is not set # CONFIG_PATA_HPT3X3_DMA is not set # CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IMX is not set # CONFIG_PATA_IT8213 is not set # CONFIG_PATA_IT821X is not set # CONFIG_PATA_JMICRON is not set @@ -4281,6 +4308,7 @@ CONFIG_PCI_HISI=y CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_HOST_THUNDER_ECAM=y CONFIG_PCI_HOST_THUNDER_PEM=y +CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y CONFIG_PCI_LAYERSCAPE=y CONFIG_PCI_MESON=y @@ -4328,7 +4356,7 @@ CONFIG_PHY_CADENCE_DPHY=m CONFIG_PHY_CADENCE_DP=m CONFIG_PHY_CADENCE_SIERRA=m # CONFIG_PHY_CPCAP_USB is not set -# CONFIG_PHY_FSL_IMX8MQ_USB is not set +CONFIG_PHY_FSL_IMX8MQ_USB=m CONFIG_PHY_HI6220_USB=m CONFIG_PHY_HISI_INNO_USB2=m CONFIG_PHY_HISTB_COMBPHY=m @@ -4383,6 +4411,10 @@ CONFIG_PINCTRL_AXP209=m CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_CHERRYVIEW is not set # CONFIG_PINCTRL_GEMINILAKE is not set +CONFIG_PINCTRL_IMX8MM=y +CONFIG_PINCTRL_IMX8MQ=y +CONFIG_PINCTRL_IMX8QM=y +CONFIG_PINCTRL_IMX8QXP=y # CONFIG_PINCTRL_IPQ4019 is not set # CONFIG_PINCTRL_IPQ8064 is not set # CONFIG_PINCTRL_IPQ8074 is not set @@ -4713,7 +4745,7 @@ CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set CONFIG_REGULATOR_ACT8865=m # CONFIG_REGULATOR_AD5398 is not set -# CONFIG_REGULATOR_ANATOP is not set +CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_AS3722=m CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BD9571MWV=m @@ -4744,7 +4776,7 @@ CONFIG_REGULATOR_MAX77802=m CONFIG_REGULATOR_MAX8973=m # CONFIG_REGULATOR_MCP16502 is not set # CONFIG_REGULATOR_MT6311 is not set -# CONFIG_REGULATOR_PFUZE100 is not set +CONFIG_REGULATOR_PFUZE100=m # CONFIG_REGULATOR_PV88060 is not set # CONFIG_REGULATOR_PV88080 is not set # CONFIG_REGULATOR_PV88090 is not set @@ -4908,6 +4940,8 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m +# CONFIG_RTC_DRV_IMXDI is not set +CONFIG_RTC_DRV_IMX_SC=m CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -4925,6 +4959,8 @@ CONFIG_RTC_DRV_MAX77686=m CONFIG_RTC_DRV_MCP795=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_MV=m +# CONFIG_RTC_DRV_MXC is not set +# CONFIG_RTC_DRV_MXC_V2 is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -5374,8 +5410,11 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_CTRL_TTYPORT=y CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y -# CONFIG_SERIAL_FSL_LPUART is not set +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y # CONFIG_SERIAL_IFX6X60 is not set +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_IMX=y CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_KGDB_NMI is not set # CONFIG_SERIAL_MAX3100 is not set @@ -5561,6 +5600,7 @@ CONFIG_SND_HRTIMER=m CONFIG_SND_I2S_HI6210_I2S=m CONFIG_SND_ICE1712=m CONFIG_SND_ICE1724=m +# CONFIG_SND_IMX_SOC is not set CONFIG_SND_INDIGODJ=m CONFIG_SND_INDIGODJX=m CONFIG_SND_INDIGOIO=m @@ -5666,13 +5706,14 @@ CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES8328_I2C=m CONFIG_SND_SOC_ES8328=m CONFIG_SND_SOC_ES8328_SPI=m -# CONFIG_SND_SOC_FSL_ASOC_CARD is not set -# CONFIG_SND_SOC_FSL_ASRC is not set -# CONFIG_SND_SOC_FSL_ESAI is not set +CONFIG_SND_SOC_FSL_ASOC_CARD=m +CONFIG_SND_SOC_FSL_ASRC=m +CONFIG_SND_SOC_FSL_ESAI=m # CONFIG_SND_SOC_FSL_MICFIL is not set -# CONFIG_SND_SOC_FSL_SAI is not set -# CONFIG_SND_SOC_FSL_SPDIF is not set -# CONFIG_SND_SOC_FSL_SSI is not set +CONFIG_SND_SOC_FSL_SAI=m +CONFIG_SND_SOC_FSL_SPDIF=m +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_UTILS=m CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set CONFIG_SND_SOC_HDAC_HDA=m @@ -5876,6 +5917,7 @@ CONFIG_SPI_FSL_LPSPI=m CONFIG_SPI_FSL_QUADSPI=m # CONFIG_SPI_FSL_SPI is not set CONFIG_SPI_GPIO=m +CONFIG_SPI_IMX=m # CONFIG_SPI_LM70_LLP is not set # CONFIG_SPI_LOOPBACK_TEST is not set CONFIG_SPI_MASTER=y @@ -6423,6 +6465,7 @@ CONFIG_USB_EHCI_FSL=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_MXC is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TEGRA=m CONFIG_USB_EHCI_TT_NEWSCHED=y @@ -6434,6 +6477,7 @@ CONFIG_USB_EPSON2888=y CONFIG_USB_EZUSB_FX2=m # CONFIG_USB_FOTG210_HCD is not set # CONFIG_USB_FOTG210_UDC is not set +# CONFIG_USB_FSL_USB2 is not set CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_FUSB300 is not set @@ -6561,6 +6605,7 @@ CONFIG_USB_MUSB_SUNXI=m # CONFIG_USB_MUSB_TUSB6010 is not set # CONFIG_USB_MV_U3D is not set CONFIG_USB_MV_UDC=m +# CONFIG_USB_MXS_PHY is not set # CONFIG_USB_NET2272 is not set # CONFIG_USB_NET2280 is not set CONFIG_USB_NET_AQC111=m @@ -6789,6 +6834,7 @@ CONFIG_VIDEO_BCM2835=m CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_CADENCE is not set CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_CROS_EC_CEC=m CONFIG_VIDEO_CX18_ALSA=m @@ -6821,6 +6867,7 @@ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set CONFIG_VIDEO_IVTV=m @@ -6922,6 +6969,7 @@ CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_MASTER_MATROX is not set +# CONFIG_W1_MASTER_MXC is not set CONFIG_W1_SLAVE_DS2405=m CONFIG_W1_SLAVE_DS2406=m CONFIG_W1_SLAVE_DS2408=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index d5fe83d71..270ef1ad1 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -157,6 +157,7 @@ CONFIG_AFS_DEBUG=y CONFIG_AFS_FSCACHE=y CONFIG_AFS_FS=m CONFIG_AHCI_CEVA=m +CONFIG_AHCI_IMX=m CONFIG_AHCI_MVEBU=m CONFIG_AHCI_QORIQ=m CONFIG_AHCI_SUNXI=m @@ -244,7 +245,7 @@ CONFIG_ARCH_LAYERSCAPE=y CONFIG_ARCH_MESON=y CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MVEBU=y -# CONFIG_ARCH_MXC is not set +CONFIG_ARCH_MXC=y # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_OMAP1 is not set # CONFIG_ARCH_PXA is not set @@ -340,6 +341,7 @@ CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC=y CONFIG_ARM_GLOBAL_TIMER=y +# CONFIG_ARM_IMX6Q_CPUFREQ is not set CONFIG_ARM_MHU=m CONFIG_ARM_PL172_MPMC=m CONFIG_ARM_PMU=y @@ -919,6 +921,9 @@ CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y CONFIG_CLKDEV_LOOKUP=y # CONFIG_CLK_HSDK is not set +CONFIG_CLK_IMX8MM=y +CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y # CONFIG_CLK_QORIQ is not set CONFIG_CLK_RASPBERRYPI_CPU=y CONFIG_CLK_SP810=y @@ -1114,11 +1119,14 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_CRYPTO_DEV_HISI_SEC is not set CONFIG_CRYPTO_DEV_MARVELL_CESA=m +# CONFIG_CRYPTO_DEV_MXC_SCC is not set +# CONFIG_CRYPTO_DEV_MXS_DCP is not set CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_QCOM_RNG=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_SAFEXCEL=m +# CONFIG_CRYPTO_DEV_SAHARA is not set CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y @@ -1714,6 +1722,7 @@ CONFIG_FB_EFI=y # CONFIG_FB_I740 is not set # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set +# CONFIG_FB_IMX is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set @@ -1723,6 +1732,8 @@ CONFIG_FB_EFI=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_METRONOME is not set CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_MX3 is not set +CONFIG_FB_MXS=m # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set @@ -1756,6 +1767,7 @@ CONFIG_FCOE_FNIC=m CONFIG_FCOE=m # CONFIG_FDDI is not set CONFIG_FEALNX=m +CONFIG_FEC=m CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_FIREWIRE is not set @@ -2364,9 +2376,17 @@ CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set CONFIG_IMX2_WDT=m +CONFIG_IMX7D_ADC=m +# CONFIG_IMX_DMA is not set +CONFIG_IMX_GPCV2=y # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_IMX_IRQSTEER is not set +CONFIG_IMX_MBOX=m CONFIG_IMX_SCU_PD=y +CONFIG_IMX_SCU=y +CONFIG_IMX_SDMA=m +# CONFIG_IMX_THERMAL is not set +# CONFIG_IMX_WEIM is not set CONFIG_INA2XX_ADC=m CONFIG_INDIRECT_PIO=y CONFIG_INET6_AH=m @@ -2829,6 +2849,7 @@ CONFIG_KEYBOARD_CROS_EC=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_GPIO_POLLED=m +# CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_LM8333 is not set @@ -3377,6 +3398,7 @@ CONFIG_MMC_MESON_GX=m CONFIG_MMC_MESON_MX_SDIO=m # CONFIG_MMC_MTK is not set CONFIG_MMC_MVSDIO=m +# CONFIG_MMC_MXC is not set CONFIG_MMC_QCOM_DML=y CONFIG_MMC_REALTEK_PCI=m CONFIG_MMC_REALTEK_USB=m @@ -3384,6 +3406,7 @@ CONFIG_MMC_RICOH_MMC=y CONFIG_MMC_SDHCI_ACPI=m # CONFIG_MMC_SDHCI_AM654 is not set CONFIG_MMC_SDHCI_CADENCE=m +CONFIG_MMC_SDHCI_ESDHC_IMX=m CONFIG_MMC_SDHCI_F_SDH30=m CONFIG_MMC_SDHCI_IPROC=m CONFIG_MMC_SDHCI=m @@ -3564,8 +3587,10 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m +# CONFIG_MX3_IPU is not set # CONFIG_MXC4005 is not set # CONFIG_MXC6255 is not set +# CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y @@ -4091,6 +4116,7 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA=y CONFIG_NVME_FC=m +# CONFIG_NVMEM_IMX_IIM is not set CONFIG_NVMEM_SUNXI_SID=m CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y @@ -4191,6 +4217,7 @@ CONFIG_PATA_ACPI=m # CONFIG_PATA_HPT3X2N is not set # CONFIG_PATA_HPT3X3_DMA is not set # CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IMX is not set # CONFIG_PATA_IT8213 is not set # CONFIG_PATA_IT821X is not set # CONFIG_PATA_JMICRON is not set @@ -4261,6 +4288,7 @@ CONFIG_PCI_HISI=y CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_HOST_THUNDER_ECAM=y CONFIG_PCI_HOST_THUNDER_PEM=y +CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y CONFIG_PCI_LAYERSCAPE=y CONFIG_PCI_MESON=y @@ -4308,7 +4336,7 @@ CONFIG_PHY_CADENCE_DPHY=m CONFIG_PHY_CADENCE_DP=m CONFIG_PHY_CADENCE_SIERRA=m # CONFIG_PHY_CPCAP_USB is not set -# CONFIG_PHY_FSL_IMX8MQ_USB is not set +CONFIG_PHY_FSL_IMX8MQ_USB=m CONFIG_PHY_HI6220_USB=m CONFIG_PHY_HISI_INNO_USB2=m CONFIG_PHY_HISTB_COMBPHY=m @@ -4363,6 +4391,10 @@ CONFIG_PINCTRL_AXP209=m CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_CHERRYVIEW is not set # CONFIG_PINCTRL_GEMINILAKE is not set +CONFIG_PINCTRL_IMX8MM=y +CONFIG_PINCTRL_IMX8MQ=y +CONFIG_PINCTRL_IMX8QM=y +CONFIG_PINCTRL_IMX8QXP=y # CONFIG_PINCTRL_IPQ4019 is not set # CONFIG_PINCTRL_IPQ8064 is not set # CONFIG_PINCTRL_IPQ8074 is not set @@ -4692,7 +4724,7 @@ CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set CONFIG_REGULATOR_ACT8865=m # CONFIG_REGULATOR_AD5398 is not set -# CONFIG_REGULATOR_ANATOP is not set +CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_AS3722=m CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BD9571MWV=m @@ -4723,7 +4755,7 @@ CONFIG_REGULATOR_MAX77802=m CONFIG_REGULATOR_MAX8973=m # CONFIG_REGULATOR_MCP16502 is not set # CONFIG_REGULATOR_MT6311 is not set -# CONFIG_REGULATOR_PFUZE100 is not set +CONFIG_REGULATOR_PFUZE100=m # CONFIG_REGULATOR_PV88060 is not set # CONFIG_REGULATOR_PV88080 is not set # CONFIG_REGULATOR_PV88090 is not set @@ -4887,6 +4919,8 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m +# CONFIG_RTC_DRV_IMXDI is not set +CONFIG_RTC_DRV_IMX_SC=m CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -4904,6 +4938,8 @@ CONFIG_RTC_DRV_MAX77686=m CONFIG_RTC_DRV_MCP795=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_MV=m +# CONFIG_RTC_DRV_MXC is not set +# CONFIG_RTC_DRV_MXC_V2 is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -5353,8 +5389,11 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_CTRL_TTYPORT=y CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y -# CONFIG_SERIAL_FSL_LPUART is not set +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y # CONFIG_SERIAL_IFX6X60 is not set +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_IMX=y CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_KGDB_NMI is not set # CONFIG_SERIAL_MAX3100 is not set @@ -5540,6 +5579,7 @@ CONFIG_SND_HRTIMER=m CONFIG_SND_I2S_HI6210_I2S=m CONFIG_SND_ICE1712=m CONFIG_SND_ICE1724=m +# CONFIG_SND_IMX_SOC is not set CONFIG_SND_INDIGODJ=m CONFIG_SND_INDIGODJX=m CONFIG_SND_INDIGOIO=m @@ -5644,13 +5684,14 @@ CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES8328_I2C=m CONFIG_SND_SOC_ES8328=m CONFIG_SND_SOC_ES8328_SPI=m -# CONFIG_SND_SOC_FSL_ASOC_CARD is not set -# CONFIG_SND_SOC_FSL_ASRC is not set -# CONFIG_SND_SOC_FSL_ESAI is not set +CONFIG_SND_SOC_FSL_ASOC_CARD=m +CONFIG_SND_SOC_FSL_ASRC=m +CONFIG_SND_SOC_FSL_ESAI=m # CONFIG_SND_SOC_FSL_MICFIL is not set -# CONFIG_SND_SOC_FSL_SAI is not set -# CONFIG_SND_SOC_FSL_SPDIF is not set -# CONFIG_SND_SOC_FSL_SSI is not set +CONFIG_SND_SOC_FSL_SAI=m +CONFIG_SND_SOC_FSL_SPDIF=m +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_UTILS=m CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set CONFIG_SND_SOC_HDAC_HDA=m @@ -5854,6 +5895,7 @@ CONFIG_SPI_FSL_LPSPI=m CONFIG_SPI_FSL_QUADSPI=m # CONFIG_SPI_FSL_SPI is not set CONFIG_SPI_GPIO=m +CONFIG_SPI_IMX=m # CONFIG_SPI_LM70_LLP is not set # CONFIG_SPI_LOOPBACK_TEST is not set CONFIG_SPI_MASTER=y @@ -6401,6 +6443,7 @@ CONFIG_USB_EHCI_FSL=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_MXC is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TEGRA=m CONFIG_USB_EHCI_TT_NEWSCHED=y @@ -6412,6 +6455,7 @@ CONFIG_USB_EPSON2888=y CONFIG_USB_EZUSB_FX2=m # CONFIG_USB_FOTG210_HCD is not set # CONFIG_USB_FOTG210_UDC is not set +# CONFIG_USB_FSL_USB2 is not set CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_FUSB300 is not set @@ -6539,6 +6583,7 @@ CONFIG_USB_MUSB_SUNXI=m # CONFIG_USB_MUSB_TUSB6010 is not set # CONFIG_USB_MV_U3D is not set CONFIG_USB_MV_UDC=m +# CONFIG_USB_MXS_PHY is not set # CONFIG_USB_NET2272 is not set # CONFIG_USB_NET2280 is not set CONFIG_USB_NET_AQC111=m @@ -6767,6 +6812,7 @@ CONFIG_VIDEO_BCM2835=m CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_CADENCE is not set CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_CROS_EC_CEC=m CONFIG_VIDEO_CX18_ALSA=m @@ -6799,6 +6845,7 @@ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set CONFIG_VIDEO_IVTV=m @@ -6900,6 +6947,7 @@ CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_MASTER_MATROX is not set +# CONFIG_W1_MASTER_MXC is not set CONFIG_W1_SLAVE_DS2405=m CONFIG_W1_SLAVE_DS2406=m CONFIG_W1_SLAVE_DS2408=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index a14f81189..c665591ec 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1098,6 +1098,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m CONFIG_CRYPTO_DEV_EXYNOS_RNG=m CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=m # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192 @@ -1107,6 +1108,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=m CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m +CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_CRYPTO_DEV_HISI_SEC is not set @@ -1794,6 +1796,7 @@ CONFIG_FB_EFI=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_METRONOME is not set CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_MX3 is not set CONFIG_FB_MXS=m # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_NVIDIA is not set @@ -2425,7 +2428,7 @@ CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m -CONFIG_IMX_DMA=m +# CONFIG_IMX_DMA is not set CONFIG_IMX_GPCV2_PM_DOMAINS=y CONFIG_IMX_GPCV2=y CONFIG_IMX_IPUV3_CORE=m @@ -2908,7 +2911,7 @@ CONFIG_KEYBOARD_CROS_EC=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_IMX=m +# CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_LM8333 is not set @@ -3488,7 +3491,7 @@ CONFIG_MMC_DW_ROCKCHIP=m CONFIG_MMC_MESON_MX_SDIO=m # CONFIG_MMC_MTK is not set CONFIG_MMC_MVSDIO=m -CONFIG_MMC_MXC=m +# CONFIG_MMC_MXC is not set CONFIG_MMC_OMAP_HS=m CONFIG_MMC_OMAP=m CONFIG_MMC_QCOM_DML=y @@ -3710,7 +3713,7 @@ CONFIG_MWL8K=m # CONFIG_MX3_IPU is not set # CONFIG_MXC4005 is not set # CONFIG_MXC6255 is not set -CONFIG_MXS_DMA=y +# CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y @@ -5084,7 +5087,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m -CONFIG_RTC_DRV_IMXDI=m +# CONFIG_RTC_DRV_IMXDI is not set CONFIG_RTC_DRV_IMX_SC=m CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m @@ -5107,7 +5110,7 @@ CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_MESON=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_MV=m -CONFIG_RTC_DRV_MXC=m +# CONFIG_RTC_DRV_MXC is not set CONFIG_RTC_DRV_MXC_V2=m CONFIG_RTC_DRV_OMAP=m CONFIG_RTC_DRV_PALMAS=m @@ -5574,7 +5577,8 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_CTRL_TTYPORT=y CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y -# CONFIG_SERIAL_FSL_LPUART is not set +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y # CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_IMX=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 492622199..cbfb9c4a4 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -131,6 +131,7 @@ CONFIG_AFS_FSCACHE=y CONFIG_AFS_FS=m # CONFIG_AHCI_CEVA is not set CONFIG_AHCI_DM816=m +CONFIG_AHCI_IMX=m CONFIG_AHCI_MVEBU=m # CONFIG_AHCI_QORIQ is not set CONFIG_AHCI_SUNXI=m @@ -319,6 +320,7 @@ CONFIG_ARM_GIC=y CONFIG_ARM_GLOBAL_TIMER=y CONFIG_ARM_HIGHBANK_CPUFREQ=m # CONFIG_ARM_HIGHBANK_CPUIDLE is not set +# CONFIG_ARM_IMX6Q_CPUFREQ is not set CONFIG_ARM_KPROBES_TEST=m CONFIG_ARM_LPAE=y CONFIG_ARM_MHU=m @@ -1064,6 +1066,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m CONFIG_CRYPTO_DEV_EXYNOS_RNG=m CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=m # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192 @@ -1073,14 +1076,18 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=m CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m +CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_CRYPTO_DEV_HISI_SEC is not set CONFIG_CRYPTO_DEV_MARVELL_CESA=m +# CONFIG_CRYPTO_DEV_MXC_SCC is not set +# CONFIG_CRYPTO_DEV_MXS_DCP is not set # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set CONFIG_CRYPTO_DEV_QCOM_RNG=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_S5P=m +# CONFIG_CRYPTO_DEV_SAHARA is not set # CONFIG_CRYPTO_DEV_SP_CCP is not set CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y @@ -1709,6 +1716,7 @@ CONFIG_FB_EFI=y # CONFIG_FB_I740 is not set # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set +# CONFIG_FB_IMX is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set @@ -1718,6 +1726,8 @@ CONFIG_FB_EFI=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_METRONOME is not set CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_MX3 is not set +CONFIG_FB_MXS=m # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set @@ -1751,6 +1761,7 @@ CONFIG_FCOE_FNIC=m CONFIG_FCOE=m # CONFIG_FDDI is not set CONFIG_FEALNX=m +CONFIG_FEC=m CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_FIREWIRE is not set @@ -2330,11 +2341,16 @@ CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set CONFIG_IMX2_WDT=m +CONFIG_IMX7D_ADC=m +# CONFIG_IMX_DMA is not set +CONFIG_IMX_GPCV2=y # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_IMX_IRQSTEER is not set CONFIG_IMX_MBOX=m # CONFIG_IMX_SCU_PD is not set CONFIG_IMX_SCU=y +CONFIG_IMX_SDMA=m +# CONFIG_IMX_WEIM is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -2795,6 +2811,7 @@ CONFIG_KEYBOARD_CROS_EC=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_GPIO_POLLED=m +# CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_LM8333 is not set @@ -3358,6 +3375,7 @@ CONFIG_MMC_DW_ROCKCHIP=m CONFIG_MMC_MESON_MX_SDIO=m # CONFIG_MMC_MTK is not set CONFIG_MMC_MVSDIO=m +# CONFIG_MMC_MXC is not set CONFIG_MMC_OMAP_HS=m CONFIG_MMC_REALTEK_PCI=m CONFIG_MMC_REALTEK_USB=m @@ -3366,6 +3384,7 @@ CONFIG_MMC_SDHCI_ACPI=m # CONFIG_MMC_SDHCI_AM654 is not set CONFIG_MMC_SDHCI_CADENCE=m CONFIG_MMC_SDHCI_DOVE=m +CONFIG_MMC_SDHCI_ESDHC_IMX=m # CONFIG_MMC_SDHCI_F_SDH30 is not set CONFIG_MMC_SDHCI_IPROC=m CONFIG_MMC_SDHCI=m @@ -3556,8 +3575,10 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m +# CONFIG_MX3_IPU is not set # CONFIG_MXC4005 is not set # CONFIG_MXC6255 is not set +# CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y @@ -4179,6 +4200,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_PATA_HPT3X2N is not set # CONFIG_PATA_HPT3X3_DMA is not set # CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IMX is not set # CONFIG_PATA_IT8213 is not set # CONFIG_PATA_IT821X is not set # CONFIG_PATA_JMICRON is not set @@ -4241,6 +4263,7 @@ CONFIG_PCIE_PTM=y # CONFIG_PCI_GOOLPC is not set CONFIG_PCI_HERMES=m CONFIG_PCI_HOST_GENERIC=y +CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y CONFIG_PCI_KEYSTONE=y # CONFIG_PCI_LAYERSCAPE is not set @@ -4627,7 +4650,7 @@ CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m -# CONFIG_REGULATOR_ANATOP is not set +CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_AS3722=m CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BD9571MWV=m @@ -4818,6 +4841,8 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m +# CONFIG_RTC_DRV_IMXDI is not set +CONFIG_RTC_DRV_IMX_SC=m CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -4837,6 +4862,8 @@ CONFIG_RTC_DRV_MAX8997=m CONFIG_RTC_DRV_MESON=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_MV=m +# CONFIG_RTC_DRV_MXC is not set +# CONFIG_RTC_DRV_MXC_V2 is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -5291,8 +5318,11 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_CTRL_TTYPORT=y CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y -# CONFIG_SERIAL_FSL_LPUART is not set +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y # CONFIG_SERIAL_IFX6X60 is not set +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_IMX=y CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_KGDB_NMI is not set # CONFIG_SERIAL_MAX3100 is not set @@ -5584,13 +5614,14 @@ CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES8328_I2C=m CONFIG_SND_SOC_ES8328=m CONFIG_SND_SOC_ES8328_SPI=m -# CONFIG_SND_SOC_FSL_ASOC_CARD is not set -# CONFIG_SND_SOC_FSL_ASRC is not set -# CONFIG_SND_SOC_FSL_ESAI is not set +CONFIG_SND_SOC_FSL_ASOC_CARD=m +CONFIG_SND_SOC_FSL_ASRC=m +CONFIG_SND_SOC_FSL_ESAI=m # CONFIG_SND_SOC_FSL_MICFIL is not set -# CONFIG_SND_SOC_FSL_SAI is not set -# CONFIG_SND_SOC_FSL_SPDIF is not set -# CONFIG_SND_SOC_FSL_SSI is not set +CONFIG_SND_SOC_FSL_SAI=m +CONFIG_SND_SOC_FSL_SPDIF=m +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_UTILS=m CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set CONFIG_SND_SOC_HDAC_HDA=m @@ -5802,6 +5833,7 @@ CONFIG_SPI_FSL_LPSPI=m CONFIG_SPI_FSL_QUADSPI=m # CONFIG_SPI_FSL_SPI is not set CONFIG_SPI_GPIO=m +CONFIG_SPI_IMX=m # CONFIG_SPI_LM70_LLP is not set # CONFIG_SPI_LOOPBACK_TEST is not set CONFIG_SPI_MASTER=y @@ -6723,6 +6755,7 @@ CONFIG_VIDEO_BCM2835=m CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_CADENCE is not set CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_CROS_EC_CEC=m CONFIG_VIDEO_CX18_ALSA=m @@ -6759,6 +6792,7 @@ CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m # CONFIG_VIDEO_IMX_MEDIA is not set +CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set CONFIG_VIDEO_IVTV=m @@ -6865,6 +6899,7 @@ CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_MASTER_MATROX is not set +# CONFIG_W1_MASTER_MXC is not set CONFIG_W1_SLAVE_DS2405=m CONFIG_W1_SLAVE_DS2406=m CONFIG_W1_SLAVE_DS2408=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index df7505392..7ce530afb 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -131,6 +131,7 @@ CONFIG_AFS_FSCACHE=y CONFIG_AFS_FS=m # CONFIG_AHCI_CEVA is not set CONFIG_AHCI_DM816=m +CONFIG_AHCI_IMX=m CONFIG_AHCI_MVEBU=m # CONFIG_AHCI_QORIQ is not set CONFIG_AHCI_SUNXI=m @@ -319,6 +320,7 @@ CONFIG_ARM_GIC=y CONFIG_ARM_GLOBAL_TIMER=y CONFIG_ARM_HIGHBANK_CPUFREQ=m # CONFIG_ARM_HIGHBANK_CPUIDLE is not set +# CONFIG_ARM_IMX6Q_CPUFREQ is not set CONFIG_ARM_KPROBES_TEST=m CONFIG_ARM_LPAE=y CONFIG_ARM_MHU=m @@ -1064,6 +1066,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m CONFIG_CRYPTO_DEV_EXYNOS_RNG=m CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=m # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192 @@ -1073,14 +1076,18 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=m CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m +CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_CRYPTO_DEV_HISI_SEC is not set CONFIG_CRYPTO_DEV_MARVELL_CESA=m +# CONFIG_CRYPTO_DEV_MXC_SCC is not set +# CONFIG_CRYPTO_DEV_MXS_DCP is not set # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set CONFIG_CRYPTO_DEV_QCOM_RNG=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_S5P=m +# CONFIG_CRYPTO_DEV_SAHARA is not set # CONFIG_CRYPTO_DEV_SP_CCP is not set CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y @@ -1694,6 +1701,7 @@ CONFIG_FB_EFI=y # CONFIG_FB_I740 is not set # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set +# CONFIG_FB_IMX is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set @@ -1703,6 +1711,8 @@ CONFIG_FB_EFI=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_METRONOME is not set CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_MX3 is not set +CONFIG_FB_MXS=m # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set @@ -1736,6 +1746,7 @@ CONFIG_FCOE_FNIC=m CONFIG_FCOE=m # CONFIG_FDDI is not set CONFIG_FEALNX=m +CONFIG_FEC=m CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_FIREWIRE is not set @@ -2315,11 +2326,16 @@ CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set CONFIG_IMX2_WDT=m +CONFIG_IMX7D_ADC=m +# CONFIG_IMX_DMA is not set +CONFIG_IMX_GPCV2=y # CONFIG_IMX_IPUV3_CORE is not set # CONFIG_IMX_IRQSTEER is not set CONFIG_IMX_MBOX=m # CONFIG_IMX_SCU_PD is not set CONFIG_IMX_SCU=y +CONFIG_IMX_SDMA=m +# CONFIG_IMX_WEIM is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -2778,6 +2794,7 @@ CONFIG_KEYBOARD_CROS_EC=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_GPIO_POLLED=m +# CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_LM8333 is not set @@ -3340,6 +3357,7 @@ CONFIG_MMC_DW_ROCKCHIP=m CONFIG_MMC_MESON_MX_SDIO=m # CONFIG_MMC_MTK is not set CONFIG_MMC_MVSDIO=m +# CONFIG_MMC_MXC is not set CONFIG_MMC_OMAP_HS=m CONFIG_MMC_REALTEK_PCI=m CONFIG_MMC_REALTEK_USB=m @@ -3348,6 +3366,7 @@ CONFIG_MMC_SDHCI_ACPI=m # CONFIG_MMC_SDHCI_AM654 is not set CONFIG_MMC_SDHCI_CADENCE=m CONFIG_MMC_SDHCI_DOVE=m +CONFIG_MMC_SDHCI_ESDHC_IMX=m # CONFIG_MMC_SDHCI_F_SDH30 is not set CONFIG_MMC_SDHCI_IPROC=m CONFIG_MMC_SDHCI=m @@ -3537,8 +3556,10 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m +# CONFIG_MX3_IPU is not set # CONFIG_MXC4005 is not set # CONFIG_MXC6255 is not set +# CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y @@ -4160,6 +4181,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_PATA_HPT3X2N is not set # CONFIG_PATA_HPT3X3_DMA is not set # CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IMX is not set # CONFIG_PATA_IT8213 is not set # CONFIG_PATA_IT821X is not set # CONFIG_PATA_JMICRON is not set @@ -4222,6 +4244,7 @@ CONFIG_PCIE_PTM=y # CONFIG_PCI_GOOLPC is not set CONFIG_PCI_HERMES=m CONFIG_PCI_HOST_GENERIC=y +CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y CONFIG_PCI_KEYSTONE=y # CONFIG_PCI_LAYERSCAPE is not set @@ -4607,7 +4630,7 @@ CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set CONFIG_REGULATOR_ACT8865=m CONFIG_REGULATOR_AD5398=m -# CONFIG_REGULATOR_ANATOP is not set +CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_AS3722=m CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BD9571MWV=m @@ -4798,6 +4821,8 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m +# CONFIG_RTC_DRV_IMXDI is not set +CONFIG_RTC_DRV_IMX_SC=m CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m CONFIG_RTC_DRV_ISL1208=m @@ -4817,6 +4842,8 @@ CONFIG_RTC_DRV_MAX8997=m CONFIG_RTC_DRV_MESON=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_MV=m +# CONFIG_RTC_DRV_MXC is not set +# CONFIG_RTC_DRV_MXC_V2 is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -5271,8 +5298,11 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_CTRL_TTYPORT=y CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y -# CONFIG_SERIAL_FSL_LPUART is not set +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y # CONFIG_SERIAL_IFX6X60 is not set +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_IMX=y CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_KGDB_NMI is not set # CONFIG_SERIAL_MAX3100 is not set @@ -5563,13 +5593,14 @@ CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES8328_I2C=m CONFIG_SND_SOC_ES8328=m CONFIG_SND_SOC_ES8328_SPI=m -# CONFIG_SND_SOC_FSL_ASOC_CARD is not set -# CONFIG_SND_SOC_FSL_ASRC is not set -# CONFIG_SND_SOC_FSL_ESAI is not set +CONFIG_SND_SOC_FSL_ASOC_CARD=m +CONFIG_SND_SOC_FSL_ASRC=m +CONFIG_SND_SOC_FSL_ESAI=m # CONFIG_SND_SOC_FSL_MICFIL is not set -# CONFIG_SND_SOC_FSL_SAI is not set -# CONFIG_SND_SOC_FSL_SPDIF is not set -# CONFIG_SND_SOC_FSL_SSI is not set +CONFIG_SND_SOC_FSL_SAI=m +CONFIG_SND_SOC_FSL_SPDIF=m +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_UTILS=m CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set CONFIG_SND_SOC_HDAC_HDA=m @@ -5781,6 +5812,7 @@ CONFIG_SPI_FSL_LPSPI=m CONFIG_SPI_FSL_QUADSPI=m # CONFIG_SPI_FSL_SPI is not set CONFIG_SPI_GPIO=m +CONFIG_SPI_IMX=m # CONFIG_SPI_LM70_LLP is not set # CONFIG_SPI_LOOPBACK_TEST is not set CONFIG_SPI_MASTER=y @@ -6702,6 +6734,7 @@ CONFIG_VIDEO_BCM2835=m CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_CADENCE is not set CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_CROS_EC_CEC=m CONFIG_VIDEO_CX18_ALSA=m @@ -6738,6 +6771,7 @@ CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m # CONFIG_VIDEO_IMX_MEDIA is not set +CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set CONFIG_VIDEO_IVTV=m @@ -6844,6 +6878,7 @@ CONFIG_W1_MASTER_DS2482=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_GPIO=m # CONFIG_W1_MASTER_MATROX is not set +# CONFIG_W1_MASTER_MXC is not set CONFIG_W1_SLAVE_DS2405=m CONFIG_W1_SLAVE_DS2406=m CONFIG_W1_SLAVE_DS2408=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 753e1798c..c1cb0a650 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1098,6 +1098,7 @@ CONFIG_CRYPTO_DEV_CHELSIO_TLS=m CONFIG_CRYPTO_DEV_EXYNOS_RNG=m CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=m # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192 @@ -1107,6 +1108,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=m CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m +CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_CRYPTO_DEV_HISI_SEC is not set @@ -1779,6 +1781,7 @@ CONFIG_FB_EFI=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_METRONOME is not set CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_MX3 is not set CONFIG_FB_MXS=m # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_NVIDIA is not set @@ -2410,7 +2413,7 @@ CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m -CONFIG_IMX_DMA=m +# CONFIG_IMX_DMA is not set CONFIG_IMX_GPCV2_PM_DOMAINS=y CONFIG_IMX_GPCV2=y CONFIG_IMX_IPUV3_CORE=m @@ -2891,7 +2894,7 @@ CONFIG_KEYBOARD_CROS_EC=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_GPIO_POLLED=m -CONFIG_KEYBOARD_IMX=m +# CONFIG_KEYBOARD_IMX is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_LM8333 is not set @@ -3470,7 +3473,7 @@ CONFIG_MMC_DW_ROCKCHIP=m CONFIG_MMC_MESON_MX_SDIO=m # CONFIG_MMC_MTK is not set CONFIG_MMC_MVSDIO=m -CONFIG_MMC_MXC=m +# CONFIG_MMC_MXC is not set CONFIG_MMC_OMAP_HS=m CONFIG_MMC_OMAP=m CONFIG_MMC_QCOM_DML=y @@ -3691,7 +3694,7 @@ CONFIG_MWL8K=m # CONFIG_MX3_IPU is not set # CONFIG_MXC4005 is not set # CONFIG_MXC6255 is not set -CONFIG_MXS_DMA=y +# CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y @@ -5064,7 +5067,7 @@ CONFIG_RTC_DRV_FM3130=m # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_RTC_DRV_HYM8563=m -CONFIG_RTC_DRV_IMXDI=m +# CONFIG_RTC_DRV_IMXDI is not set CONFIG_RTC_DRV_IMX_SC=m CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_ISL12026=m @@ -5087,7 +5090,7 @@ CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_MESON=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_MV=m -CONFIG_RTC_DRV_MXC=m +# CONFIG_RTC_DRV_MXC is not set CONFIG_RTC_DRV_MXC_V2=m CONFIG_RTC_DRV_OMAP=m CONFIG_RTC_DRV_PALMAS=m @@ -5554,7 +5557,8 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_SERIAL_DEV_CTRL_TTYPORT=y CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y -# CONFIG_SERIAL_FSL_LPUART is not set +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y # CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_IMX=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 8be528172..e47ea6983 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -5412,7 +5412,6 @@ CONFIG_SPARSEMEM_MANUAL=y # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set CONFIG_SPI_FSL_LPSPI=m -# CONFIG_SPI_FSL_QUADSPI is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set diff --git a/kernel-i686.config b/kernel-i686.config index f1b01cec3..94c0324a7 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -5391,7 +5391,6 @@ CONFIG_SPARSEMEM_MANUAL=y # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set CONFIG_SPI_FSL_LPSPI=m -# CONFIG_SPI_FSL_QUADSPI is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 40ab2f4ce..f170a4b15 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5060,7 +5060,6 @@ CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set CONFIG_SPI_FSL_LPSPI=m -# CONFIG_SPI_FSL_QUADSPI is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 7b35f1d41..922d4f2ce 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5037,7 +5037,6 @@ CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set CONFIG_SPI_FSL_LPSPI=m -# CONFIG_SPI_FSL_QUADSPI is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 8eb57e9ec..c212ea6d6 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5000,7 +5000,6 @@ CONFIG_SPARSEMEM_MANUAL=y # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set CONFIG_SPI_FSL_LPSPI=m -# CONFIG_SPI_FSL_QUADSPI is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 75ace4633..1a87cb9b2 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -4977,7 +4977,6 @@ CONFIG_SPARSEMEM_MANUAL=y # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set CONFIG_SPI_FSL_LPSPI=m -# CONFIG_SPI_FSL_QUADSPI is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 40a3afb1f..53e740b08 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -5467,7 +5467,6 @@ CONFIG_SPARSEMEM=y # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set CONFIG_SPI_FSL_LPSPI=m -# CONFIG_SPI_FSL_QUADSPI is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 0e13b05c8..0827ec6b9 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -5446,7 +5446,6 @@ CONFIG_SPARSEMEM=y # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set CONFIG_SPI_FSL_LPSPI=m -# CONFIG_SPI_FSL_QUADSPI is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_LM70_LLP is not set diff --git a/kernel.spec b/kernel.spec index 515cf9f16..cb49d192c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1864,6 +1864,9 @@ fi # # %changelog +* Tue Mar 26 2019 Peter Robinson +- Initial NXP i.MX8 enablement + * Mon Mar 25 2019 Jeremy Cline - 5.1.0-0.rc2.git0.1 - Linux v5.1-rc2 From 15e9d9f66d97eedbb403a11b57f7183e8a991e78 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 26 Mar 2019 19:04:06 +0000 Subject: [PATCH 15/26] Reenable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index cb49d192c..6c69a7287 100644 --- a/kernel.spec +++ b/kernel.spec @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -1864,6 +1864,9 @@ fi # # %changelog +* Tue Mar 26 2019 Jeremy Cline +- Reenable debugging options. + * Tue Mar 26 2019 Peter Robinson - Initial NXP i.MX8 enablement From f86f195b902c5f671e9d70c33e27b91585c2ad03 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 26 Mar 2019 19:06:04 +0000 Subject: [PATCH 16/26] Linux v5.1-rc2-16-g65ae689329c5 --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gitrev b/gitrev index 1503c3486..5fe642c60 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -fd1f297b794c77e52412dc621b5884210291eeee +65ae689329c5d6a149b9201df9321368fbdb6a5c diff --git a/kernel.spec b/kernel.spec index 6c69a7287..3d7f9e17d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1864,6 +1864,9 @@ fi # # %changelog +* Tue Mar 26 2019 Jeremy Cline - 5.1.0-0.rc2.git1.1 +- Linux v5.1-rc2-16-g65ae689329c5 + * Tue Mar 26 2019 Jeremy Cline - Reenable debugging options. diff --git a/sources b/sources index f71bc9ba7..cfbdef50e 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc2.xz) = 97ea50f639b986b9cee8d44d01bddb25c92fd263322f9a22e4bdf06307f1a67ad9d345666928ba9a790b0f366bb012b748bd0e073999d4547e1cafc9ecdc770e +SHA512 (patch-5.1-rc2-git1.xz) = e5fcb505d725fdcb541e54092a7a7c1ef6ca7bd5d00d60d4e89c9c215c775e26442b402b83b16f93e5bf1287e0e67d9c00cb9f8a9fb22f4d993a55c234e63ab9 From 2129b130595d80de5f75792d3077ffb9fc7122f6 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 27 Mar 2019 16:18:16 +0000 Subject: [PATCH 17/26] Align the IPv4 netfilter configs with the IPv6 configs (rhbz 1672657) IPv6 builds as a module, change IPv4 to be built as a module as well. --- configs/fedora/generic/CONFIG_IP_NF_FILTER | 2 +- configs/fedora/generic/CONFIG_IP_NF_IPTABLES | 2 +- configs/fedora/generic/CONFIG_IP_NF_TARGET_REJECT | 2 +- configs/fedora/generic/CONFIG_NF_REJECT_IPV4 | 1 + kernel-aarch64-debug.config | 7 ++++--- kernel-aarch64.config | 7 ++++--- kernel-armv7hl-debug.config | 7 ++++--- kernel-armv7hl-lpae-debug.config | 7 ++++--- kernel-armv7hl-lpae.config | 7 ++++--- kernel-armv7hl.config | 7 ++++--- kernel-i686-debug.config | 7 ++++--- kernel-i686.config | 7 ++++--- kernel-ppc64le-debug.config | 7 ++++--- kernel-ppc64le.config | 7 ++++--- kernel-s390x-debug.config | 7 ++++--- kernel-s390x.config | 7 ++++--- kernel-x86_64-debug.config | 7 ++++--- kernel-x86_64.config | 7 ++++--- kernel.spec | 3 +++ 19 files changed, 63 insertions(+), 45 deletions(-) create mode 100644 configs/fedora/generic/CONFIG_NF_REJECT_IPV4 diff --git a/configs/fedora/generic/CONFIG_IP_NF_FILTER b/configs/fedora/generic/CONFIG_IP_NF_FILTER index 25420dc0e..24e5d7ee2 100644 --- a/configs/fedora/generic/CONFIG_IP_NF_FILTER +++ b/configs/fedora/generic/CONFIG_IP_NF_FILTER @@ -1 +1 @@ -CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_FILTER=m diff --git a/configs/fedora/generic/CONFIG_IP_NF_IPTABLES b/configs/fedora/generic/CONFIG_IP_NF_IPTABLES index c8db0b068..5238d9e0b 100644 --- a/configs/fedora/generic/CONFIG_IP_NF_IPTABLES +++ b/configs/fedora/generic/CONFIG_IP_NF_IPTABLES @@ -1 +1 @@ -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_IPTABLES=m diff --git a/configs/fedora/generic/CONFIG_IP_NF_TARGET_REJECT b/configs/fedora/generic/CONFIG_IP_NF_TARGET_REJECT index 688d27b6a..7db5e7783 100644 --- a/configs/fedora/generic/CONFIG_IP_NF_TARGET_REJECT +++ b/configs/fedora/generic/CONFIG_IP_NF_TARGET_REJECT @@ -1 +1 @@ -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m diff --git a/configs/fedora/generic/CONFIG_NF_REJECT_IPV4 b/configs/fedora/generic/CONFIG_NF_REJECT_IPV4 new file mode 100644 index 000000000..8223fd900 --- /dev/null +++ b/configs/fedora/generic/CONFIG_NF_REJECT_IPV4 @@ -0,0 +1 @@ +CONFIG_NF_REJECT_IPV4=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index f980f25c5..14e56c0f5 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2590,8 +2590,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2605,7 +2605,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3987,6 +3987,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y CONFIG_NFSD_FAULT_INJECTION=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 270ef1ad1..c97bc335c 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2574,8 +2574,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2589,7 +2589,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3967,6 +3967,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y # CONFIG_NFSD_FAULT_INJECTION is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index c665591ec..c3a758609 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2634,8 +2634,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2649,7 +2649,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -4089,6 +4089,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y CONFIG_NFSD_FAULT_INJECTION=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index cbfb9c4a4..5b07a2d3c 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2535,8 +2535,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2550,7 +2550,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3952,6 +3952,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y CONFIG_NFSD_FAULT_INJECTION=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 7ce530afb..d038b57a7 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2520,8 +2520,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2535,7 +2535,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3933,6 +3933,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y # CONFIG_NFSD_FAULT_INJECTION is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index c1cb0a650..5bccfb46c 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2619,8 +2619,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2634,7 +2634,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -4070,6 +4070,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y # CONFIG_NFSD_FAULT_INJECTION is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index e47ea6983..c26820bc2 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2377,8 +2377,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2392,7 +2392,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3723,6 +3723,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y CONFIG_NFSD_FAULT_INJECTION=y diff --git a/kernel-i686.config b/kernel-i686.config index 94c0324a7..ab9a380bc 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2360,8 +2360,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2375,7 +2375,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3704,6 +3704,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y # CONFIG_NFSD_FAULT_INJECTION is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index f170a4b15..83dc0cb05 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2145,8 +2145,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2160,7 +2160,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3449,6 +3449,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y CONFIG_NFSD_FAULT_INJECTION=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 922d4f2ce..515366ec6 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2128,8 +2128,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2143,7 +2143,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3428,6 +3428,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y # CONFIG_NFSD_FAULT_INJECTION is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index c212ea6d6..5c8fceda9 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2123,8 +2123,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2138,7 +2138,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3419,6 +3419,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y CONFIG_NFSD_FAULT_INJECTION=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 1a87cb9b2..17754b608 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2106,8 +2106,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2121,7 +2121,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3398,6 +3398,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y # CONFIG_NFSD_FAULT_INJECTION is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 53e740b08..4aa25da33 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2431,8 +2431,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2446,7 +2446,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3767,6 +3767,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y CONFIG_NFSD_FAULT_INJECTION=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 0827ec6b9..96ceff717 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2414,8 +2414,8 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2429,7 +2429,7 @@ CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y @@ -3748,6 +3748,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NFP_APP_FLOWER=y # CONFIG_NFP_DEBUG is not set CONFIG_NFP=m +CONFIG_NF_REJECT_IPV4=m CONFIG_NF_REJECT_IPV6=m CONFIG_NFSD_BLOCKLAYOUT=y # CONFIG_NFSD_FAULT_INJECTION is not set diff --git a/kernel.spec b/kernel.spec index 3d7f9e17d..5d24a3799 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1864,6 +1864,9 @@ fi # # %changelog +* Wed Mar 27 2019 Jeremy Cline +- Build iptable_filter as module + * Tue Mar 26 2019 Jeremy Cline - 5.1.0-0.rc2.git1.1 - Linux v5.1-rc2-16-g65ae689329c5 From b844f75ea2d651e5fdd74fdcadb93580128bdf96 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 27 Mar 2019 18:04:20 +0000 Subject: [PATCH 18/26] Linux v5.1-rc2-24-g14c741de9386 --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index 5fe642c60..ec8efdf9f 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -65ae689329c5d6a149b9201df9321368fbdb6a5c +14c741de93861749dfb60b4964028541f5c506ca diff --git a/kernel.spec b/kernel.spec index 5d24a3799..fe07085c4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1864,6 +1864,9 @@ fi # # %changelog +* Wed Mar 27 2019 Jeremy Cline - 5.1.0-0.rc2.git2.1 +- Linux v5.1-rc2-24-g14c741de9386 + * Wed Mar 27 2019 Jeremy Cline - Build iptable_filter as module diff --git a/sources b/sources index cfbdef50e..025a5cd04 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc2.xz) = 97ea50f639b986b9cee8d44d01bddb25c92fd263322f9a22e4bdf06307f1a67ad9d345666928ba9a790b0f366bb012b748bd0e073999d4547e1cafc9ecdc770e -SHA512 (patch-5.1-rc2-git1.xz) = e5fcb505d725fdcb541e54092a7a7c1ef6ca7bd5d00d60d4e89c9c215c775e26442b402b83b16f93e5bf1287e0e67d9c00cb9f8a9fb22f4d993a55c234e63ab9 +SHA512 (patch-5.1-rc2-git2.xz) = 067b0b14cdaa7f05d955c382e5cb4f7c6df8bed8f92a9eafd283130a2ba54a13c3280cc785b024aa7d40c6b79acd02daa446da44c49b147f20dd04dc1469cce2 From c552794cd500b06b635527d8043eacb60b3bd63d Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 28 Mar 2019 20:06:43 +0000 Subject: [PATCH 19/26] Linux v5.1-rc2-243-g8c7ae38d1ce1 --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index ec8efdf9f..b00b57eaa 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -14c741de93861749dfb60b4964028541f5c506ca +8c7ae38d1ce12a0eaeba655df8562552b3596c7f diff --git a/kernel.spec b/kernel.spec index fe07085c4..a4d474f0e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1864,6 +1864,9 @@ fi # # %changelog +* Thu Mar 28 2019 Jeremy Cline - 5.1.0-0.rc2.git3.1 +- Linux v5.1-rc2-243-g8c7ae38d1ce1 + * Wed Mar 27 2019 Jeremy Cline - 5.1.0-0.rc2.git2.1 - Linux v5.1-rc2-24-g14c741de9386 diff --git a/sources b/sources index 025a5cd04..9fa67d08e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc2.xz) = 97ea50f639b986b9cee8d44d01bddb25c92fd263322f9a22e4bdf06307f1a67ad9d345666928ba9a790b0f366bb012b748bd0e073999d4547e1cafc9ecdc770e -SHA512 (patch-5.1-rc2-git2.xz) = 067b0b14cdaa7f05d955c382e5cb4f7c6df8bed8f92a9eafd283130a2ba54a13c3280cc785b024aa7d40c6b79acd02daa446da44c49b147f20dd04dc1469cce2 +SHA512 (patch-5.1-rc2-git3.xz) = 2f4164f2203e14b5e5b86c97dee91ea158561407ad8bfaf7fa2898519312e566a98510898eebea57868d3777b7513587089646a79ebcf078f349ce72d218dea6 From ad0b6d368abfab33ae31bd8edeb0165116ba06d3 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 29 Mar 2019 19:36:44 +0000 Subject: [PATCH 20/26] Pick up a mm fix causing hangs (rhbz 1693525) --- ...-when-resetting-pageblock-skip-hints.patch | 113 ++++++++++++++++++ kernel.spec | 3 + 2 files changed, 116 insertions(+) create mode 100644 Correct-zone-boundary-handling-when-resetting-pageblock-skip-hints.patch diff --git a/Correct-zone-boundary-handling-when-resetting-pageblock-skip-hints.patch b/Correct-zone-boundary-handling-when-resetting-pageblock-skip-hints.patch new file mode 100644 index 000000000..c0eb9bcab --- /dev/null +++ b/Correct-zone-boundary-handling-when-resetting-pageblock-skip-hints.patch @@ -0,0 +1,113 @@ +From patchwork Wed Mar 27 08:54:24 2019 +Date: Wed, 27 Mar 2019 08:54:24 +0000 +From: Mel Gorman +To: Andrew Morton +Cc: Mikhail Gavrilov , + Daniel Jordan , Qian Cai , + linux-mm@kvack.org, vbabka@suse.cz, linux-kernel@vger.kernel.org +Subject: [PATCH] Correct zone boundary handling when resetting pageblock skip + hints + +Mikhail Gavrilo reported the following bug being triggered in a Fedora +kernel based on 5.1-rc1 but it is relevant to a vanilla kernel. + + kernel: page dumped because: VM_BUG_ON_PAGE(PagePoisoned(p)) + kernel: ------------[ cut here ]------------ + kernel: kernel BUG at include/linux/mm.h:1021! + kernel: invalid opcode: 0000 [#1] SMP NOPTI + kernel: CPU: 6 PID: 116 Comm: kswapd0 Tainted: G C 5.1.0-0.rc1.git1.3.fc31.x86_64 #1 + kernel: Hardware name: System manufacturer System Product Name/ROG STRIX X470-I GAMING, BIOS 1201 12/07/2018 + kernel: RIP: 0010:__reset_isolation_pfn+0x244/0x2b0 + kernel: Code: fe 06 e8 0f 8e fc ff 44 0f b6 4c 24 04 48 85 c0 0f 85 dc fe ff ff e9 68 fe ff ff 48 c7 c6 58 b7 2e 8c 4c 89 ff e8 0c 75 00 00 <0f> 0b 48 c7 c6 58 b7 2e 8c e8 fe 74 00 00 0f 0b 48 89 fa 41 b8 01 + kernel: RSP: 0018:ffff9e2d03f0fde8 EFLAGS: 00010246 + kernel: RAX: 0000000000000034 RBX: 000000000081f380 RCX: ffff8cffbddd6c20 + kernel: RDX: 0000000000000000 RSI: 0000000000000006 RDI: ffff8cffbddd6c20 + kernel: RBP: 0000000000000001 R08: 0000009898b94613 R09: 0000000000000000 + kernel: R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000100000 + kernel: R13: 0000000000100000 R14: 0000000000000001 R15: ffffca7de07ce000 + kernel: FS: 0000000000000000(0000) GS:ffff8cffbdc00000(0000) knlGS:0000000000000000 + kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 + kernel: CR2: 00007fc1670e9000 CR3: 00000007f5276000 CR4: 00000000003406e0 + kernel: Call Trace: + kernel: __reset_isolation_suitable+0x62/0x120 + kernel: reset_isolation_suitable+0x3b/0x40 + kernel: kswapd+0x147/0x540 + kernel: ? finish_wait+0x90/0x90 + kernel: kthread+0x108/0x140 + kernel: ? balance_pgdat+0x560/0x560 + kernel: ? kthread_park+0x90/0x90 + kernel: ret_from_fork+0x27/0x50 + +He bisected it down to commit e332f741a8dd ("mm, compaction: be selective +about what pageblocks to clear skip hints"). The problem is that the patch +in question was sloppy with respect to the handling of zone boundaries. In +some instances, it was possible for PFNs outside of a zone to be examined +and if those were not properly initialised or poisoned then it would +trigger the VM_BUG_ON. This patch corrects the zone boundary issues when +resetting pageblock skip hints and Mikhail reported that the bug did not +trigger after 30 hours of testing. + +Fixes: e332f741a8dd ("mm, compaction: be selective about what pageblocks to clear skip hints") +Reported-and-tested-by: Mikhail Gavrilov +Signed-off-by: Mel Gorman +--- + mm/compaction.c | 27 +++++++++++++++++---------- + 1 file changed, 17 insertions(+), 10 deletions(-) + +diff --git a/mm/compaction.c b/mm/compaction.c +index f171a83707ce..b4930bf93c8a 100644 +--- a/mm/compaction.c ++++ b/mm/compaction.c +@@ -242,6 +242,7 @@ __reset_isolation_pfn(struct zone *zone, unsigned long pfn, bool check_source, + bool check_target) + { + struct page *page = pfn_to_online_page(pfn); ++ struct page *block_page; + struct page *end_page; + unsigned long block_pfn; + +@@ -267,20 +268,26 @@ __reset_isolation_pfn(struct zone *zone, unsigned long pfn, bool check_source, + get_pageblock_migratetype(page) != MIGRATE_MOVABLE) + return false; + ++ /* Ensure the start of the pageblock or zone is online and valid */ ++ block_pfn = pageblock_start_pfn(pfn); ++ block_page = pfn_to_online_page(max(block_pfn, zone->zone_start_pfn)); ++ if (block_page) { ++ page = block_page; ++ pfn = block_pfn; ++ } ++ ++ /* Ensure the end of the pageblock or zone is online and valid */ ++ block_pfn += pageblock_nr_pages; ++ block_pfn = min(block_pfn, zone_end_pfn(zone) - 1); ++ end_page = pfn_to_online_page(block_pfn); ++ if (!end_page) ++ return false; ++ + /* + * Only clear the hint if a sample indicates there is either a + * free page or an LRU page in the block. One or other condition + * is necessary for the block to be a migration source/target. + */ +- block_pfn = pageblock_start_pfn(pfn); +- pfn = max(block_pfn, zone->zone_start_pfn); +- page = pfn_to_page(pfn); +- if (zone != page_zone(page)) +- return false; +- pfn = block_pfn + pageblock_nr_pages; +- pfn = min(pfn, zone_end_pfn(zone)); +- end_page = pfn_to_page(pfn); +- + do { + if (pfn_valid_within(pfn)) { + if (check_source && PageLRU(page)) { +@@ -309,7 +316,7 @@ __reset_isolation_pfn(struct zone *zone, unsigned long pfn, bool check_source, + static void __reset_isolation_suitable(struct zone *zone) + { + unsigned long migrate_pfn = zone->zone_start_pfn; +- unsigned long free_pfn = zone_end_pfn(zone); ++ unsigned long free_pfn = zone_end_pfn(zone) - 1; + unsigned long reset_migrate = free_pfn; + unsigned long reset_free = migrate_pfn; + bool source_set = false; diff --git a/kernel.spec b/kernel.spec index a4d474f0e..4b2415f75 100644 --- a/kernel.spec +++ b/kernel.spec @@ -591,6 +591,9 @@ Patch508: 0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch # rhbz 1688283 Patch512: v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch +# https://patchwork.kernel.org/patch/10872997/ +Patch513: Correct-zone-boundary-handling-when-resetting-pageblock-skip-hints.patch + # END OF PATCH DEFINITIONS %endif From 677dc70b60fa4d9603bdf605c716da4388c024b5 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 29 Mar 2019 19:43:21 +0000 Subject: [PATCH 21/26] Linux v5.1-rc2-247-g9936328b41ce --- gitrev | 2 +- kernel.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index b00b57eaa..9a3cf269b 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -8c7ae38d1ce12a0eaeba655df8562552b3596c7f +9936328b41ce4bce8f20269dcac8cb476c8d0820 diff --git a/kernel.spec b/kernel.spec index 4b2415f75..c34cea835 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1867,6 +1867,10 @@ fi # # %changelog +* Fri Mar 29 2019 Jeremy Cline - 5.1.0-0.rc2.git4.1 +- Linux v5.1-rc2-247-g9936328b41ce +- Pick up a mm fix causing hangs (rhbz 1693525) + * Thu Mar 28 2019 Jeremy Cline - 5.1.0-0.rc2.git3.1 - Linux v5.1-rc2-243-g8c7ae38d1ce1 diff --git a/sources b/sources index 9fa67d08e..9a79b9674 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc2.xz) = 97ea50f639b986b9cee8d44d01bddb25c92fd263322f9a22e4bdf06307f1a67ad9d345666928ba9a790b0f366bb012b748bd0e073999d4547e1cafc9ecdc770e -SHA512 (patch-5.1-rc2-git3.xz) = 2f4164f2203e14b5e5b86c97dee91ea158561407ad8bfaf7fa2898519312e566a98510898eebea57868d3777b7513587089646a79ebcf078f349ce72d218dea6 +SHA512 (patch-5.1-rc2-git4.xz) = f7f3918bc8f05cc6e699881c8489639276d9c9b1a720e3296e6616dae411629406fe35c945e10f38ac42a914f23e6d7ad88c80a2d3509f6f32a3931845351c13 From ca14120224efaa8e05182eaa462a7ef66e24ca98 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 1 Apr 2019 15:29:49 +0000 Subject: [PATCH 22/26] Disable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index c34cea835..34c26ec5a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -1867,6 +1867,9 @@ fi # # %changelog +* Mon Apr 01 2019 Jeremy Cline +- Disable debugging options. + * Fri Mar 29 2019 Jeremy Cline - 5.1.0-0.rc2.git4.1 - Linux v5.1-rc2-247-g9936328b41ce - Pick up a mm fix causing hangs (rhbz 1693525) From e0aa9e60cc613dc1667ba6bca7f5fdd41b69cdc7 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 1 Apr 2019 15:40:43 +0000 Subject: [PATCH 23/26] Linux v5.1-rc3 --- ...ent-passing-requestor-info-to-the-ho.patch | 663 ------------------ .../generic/CONFIG_DEFAULT_SECURITY_DAC | 1 + .../generic/CONFIG_DEFAULT_SECURITY_SELINUX | 1 + kernel-aarch64-debug.config | 2 + kernel-aarch64.config | 2 + kernel-armv7hl-debug.config | 2 + kernel-armv7hl-lpae-debug.config | 2 + kernel-armv7hl-lpae.config | 2 + kernel-armv7hl.config | 2 + kernel-i686-debug.config | 2 + kernel-i686.config | 2 + kernel-ppc64le-debug.config | 2 + kernel-ppc64le.config | 2 + kernel-s390x-debug.config | 2 + kernel-s390x.config | 2 + kernel-x86_64-debug.config | 2 + kernel-x86_64.config | 2 + kernel.spec | 10 +- sources | 3 +- 19 files changed, 36 insertions(+), 670 deletions(-) delete mode 100644 0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch create mode 100644 configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC create mode 100644 configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX diff --git a/0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch b/0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch deleted file mode 100644 index 27379c45c..000000000 --- a/0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch +++ /dev/null @@ -1,663 +0,0 @@ -From 58b89b03f14fde3b5eda78b9137109b7a860a607 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Tue, 19 Mar 2019 14:05:31 +0100 -Subject: [PATCH] virt: vbox: Implement passing requestor info to the host for - VirtualBox 6.0.x - -VirtualBox 6.0.x has a new feature where the guest kernel driver passes -info about the origin of the request (e.g. userspace or kernelspace) to -the hypervisor. - -If we do not pass this information then when running the 6.0.x userspace -guest-additions tools on a 6.0.x host, some requests will get denied -with a VERR_VERSION_MISMATCH error, breaking vboxservice.service and -the mounting of shared folders marked to be auto-mounted. - -This commit implements passing the requestor info to the host, fixing this. - -Cc: stable@vger.kernel.org -Signed-off-by: Hans de Goede ---- - drivers/virt/vboxguest/vboxguest_core.c | 106 ++++++++++++++------- - drivers/virt/vboxguest/vboxguest_core.h | 15 +-- - drivers/virt/vboxguest/vboxguest_linux.c | 26 ++++- - drivers/virt/vboxguest/vboxguest_utils.c | 32 ++++--- - drivers/virt/vboxguest/vboxguest_version.h | 9 +- - drivers/virt/vboxguest/vmmdev.h | 8 +- - include/linux/vbox_utils.h | 12 ++- - include/uapi/linux/vbox_vmmdev_types.h | 31 ++++++ - 8 files changed, 168 insertions(+), 71 deletions(-) - -diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c -index 1475ed5ffcde..2ec5b34ffed7 100644 ---- a/drivers/virt/vboxguest/vboxguest_core.c -+++ b/drivers/virt/vboxguest/vboxguest_core.c -@@ -27,6 +27,10 @@ - - #define GUEST_MAPPINGS_TRIES 5 - -+#define VBG_KERNEL_REQUEST \ -+ (VMMDEV_REQUESTOR_KERNEL | VMMDEV_REQUESTOR_USR_DRV | \ -+ VMMDEV_REQUESTOR_CON_DONT_KNOW | VMMDEV_REQUESTOR_TRUST_NOT_GIVEN) -+ - /** - * Reserves memory in which the VMM can relocate any guest mappings - * that are floating around. -@@ -48,7 +52,8 @@ static void vbg_guest_mappings_init(struct vbg_dev *gdev) - int i, rc; - - /* Query the required space. */ -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_GET_HYPERVISOR_INFO); -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_GET_HYPERVISOR_INFO, -+ VBG_KERNEL_REQUEST); - if (!req) - return; - -@@ -135,7 +140,8 @@ static void vbg_guest_mappings_exit(struct vbg_dev *gdev) - * Tell the host that we're going to free the memory we reserved for - * it, the free it up. (Leak the memory if anything goes wrong here.) - */ -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_HYPERVISOR_INFO); -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_HYPERVISOR_INFO, -+ VBG_KERNEL_REQUEST); - if (!req) - return; - -@@ -172,8 +178,10 @@ static int vbg_report_guest_info(struct vbg_dev *gdev) - struct vmmdev_guest_info2 *req2 = NULL; - int rc, ret = -ENOMEM; - -- req1 = vbg_req_alloc(sizeof(*req1), VMMDEVREQ_REPORT_GUEST_INFO); -- req2 = vbg_req_alloc(sizeof(*req2), VMMDEVREQ_REPORT_GUEST_INFO2); -+ req1 = vbg_req_alloc(sizeof(*req1), VMMDEVREQ_REPORT_GUEST_INFO, -+ VBG_KERNEL_REQUEST); -+ req2 = vbg_req_alloc(sizeof(*req2), VMMDEVREQ_REPORT_GUEST_INFO2, -+ VBG_KERNEL_REQUEST); - if (!req1 || !req2) - goto out_free; - -@@ -187,8 +195,8 @@ static int vbg_report_guest_info(struct vbg_dev *gdev) - req2->additions_minor = VBG_VERSION_MINOR; - req2->additions_build = VBG_VERSION_BUILD; - req2->additions_revision = VBG_SVN_REV; -- /* (no features defined yet) */ -- req2->additions_features = 0; -+ req2->additions_features = -+ VMMDEV_GUEST_INFO2_ADDITIONS_FEATURES_REQUESTOR_INFO; - strlcpy(req2->name, VBG_VERSION_STRING, - sizeof(req2->name)); - -@@ -230,7 +238,8 @@ static int vbg_report_driver_status(struct vbg_dev *gdev, bool active) - struct vmmdev_guest_status *req; - int rc; - -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_REPORT_GUEST_STATUS); -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_REPORT_GUEST_STATUS, -+ VBG_KERNEL_REQUEST); - if (!req) - return -ENOMEM; - -@@ -423,7 +432,8 @@ static int vbg_heartbeat_host_config(struct vbg_dev *gdev, bool enabled) - struct vmmdev_heartbeat *req; - int rc; - -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_HEARTBEAT_CONFIGURE); -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_HEARTBEAT_CONFIGURE, -+ VBG_KERNEL_REQUEST); - if (!req) - return -ENOMEM; - -@@ -457,7 +467,8 @@ static int vbg_heartbeat_init(struct vbg_dev *gdev) - - gdev->guest_heartbeat_req = vbg_req_alloc( - sizeof(*gdev->guest_heartbeat_req), -- VMMDEVREQ_GUEST_HEARTBEAT); -+ VMMDEVREQ_GUEST_HEARTBEAT, -+ VBG_KERNEL_REQUEST); - if (!gdev->guest_heartbeat_req) - return -ENOMEM; - -@@ -528,7 +539,8 @@ static int vbg_reset_host_event_filter(struct vbg_dev *gdev, - struct vmmdev_mask *req; - int rc; - -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_CTL_GUEST_FILTER_MASK); -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_CTL_GUEST_FILTER_MASK, -+ VBG_KERNEL_REQUEST); - if (!req) - return -ENOMEM; - -@@ -567,8 +579,14 @@ static int vbg_set_session_event_filter(struct vbg_dev *gdev, - u32 changed, previous; - int rc, ret = 0; - -- /* Allocate a request buffer before taking the spinlock */ -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_CTL_GUEST_FILTER_MASK); -+ /* -+ * Allocate a request buffer before taking the spinlock, when -+ * the session is being terminated the requestor is the kernel, -+ * as we're cleaning up. -+ */ -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_CTL_GUEST_FILTER_MASK, -+ session_termination ? VBG_KERNEL_REQUEST : -+ session->requestor); - if (!req) { - if (!session_termination) - return -ENOMEM; -@@ -627,7 +645,8 @@ static int vbg_reset_host_capabilities(struct vbg_dev *gdev) - struct vmmdev_mask *req; - int rc; - -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_GUEST_CAPABILITIES); -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_GUEST_CAPABILITIES, -+ VBG_KERNEL_REQUEST); - if (!req) - return -ENOMEM; - -@@ -662,8 +681,14 @@ static int vbg_set_session_capabilities(struct vbg_dev *gdev, - u32 changed, previous; - int rc, ret = 0; - -- /* Allocate a request buffer before taking the spinlock */ -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_GUEST_CAPABILITIES); -+ /* -+ * Allocate a request buffer before taking the spinlock, when -+ * the session is being terminated the requestor is the kernel, -+ * as we're cleaning up. -+ */ -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_GUEST_CAPABILITIES, -+ session_termination ? VBG_KERNEL_REQUEST : -+ session->requestor); - if (!req) { - if (!session_termination) - return -ENOMEM; -@@ -722,7 +747,8 @@ static int vbg_query_host_version(struct vbg_dev *gdev) - struct vmmdev_host_version *req; - int rc, ret; - -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_GET_HOST_VERSION); -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_GET_HOST_VERSION, -+ VBG_KERNEL_REQUEST); - if (!req) - return -ENOMEM; - -@@ -783,19 +809,24 @@ int vbg_core_init(struct vbg_dev *gdev, u32 fixed_events) - - gdev->mem_balloon.get_req = - vbg_req_alloc(sizeof(*gdev->mem_balloon.get_req), -- VMMDEVREQ_GET_MEMBALLOON_CHANGE_REQ); -+ VMMDEVREQ_GET_MEMBALLOON_CHANGE_REQ, -+ VBG_KERNEL_REQUEST); - gdev->mem_balloon.change_req = - vbg_req_alloc(sizeof(*gdev->mem_balloon.change_req), -- VMMDEVREQ_CHANGE_MEMBALLOON); -+ VMMDEVREQ_CHANGE_MEMBALLOON, -+ VBG_KERNEL_REQUEST); - gdev->cancel_req = - vbg_req_alloc(sizeof(*(gdev->cancel_req)), -- VMMDEVREQ_HGCM_CANCEL2); -+ VMMDEVREQ_HGCM_CANCEL2, -+ VBG_KERNEL_REQUEST); - gdev->ack_events_req = - vbg_req_alloc(sizeof(*gdev->ack_events_req), -- VMMDEVREQ_ACKNOWLEDGE_EVENTS); -+ VMMDEVREQ_ACKNOWLEDGE_EVENTS, -+ VBG_KERNEL_REQUEST); - gdev->mouse_status_req = - vbg_req_alloc(sizeof(*gdev->mouse_status_req), -- VMMDEVREQ_GET_MOUSE_STATUS); -+ VMMDEVREQ_GET_MOUSE_STATUS, -+ VBG_KERNEL_REQUEST); - - if (!gdev->mem_balloon.get_req || !gdev->mem_balloon.change_req || - !gdev->cancel_req || !gdev->ack_events_req || -@@ -892,9 +923,9 @@ void vbg_core_exit(struct vbg_dev *gdev) - * vboxguest_linux.c calls this when userspace opens the char-device. - * Return: A pointer to the new session or an ERR_PTR on error. - * @gdev: The Guest extension device. -- * @user: Set if this is a session for the vboxuser device. -+ * @requestor: VMMDEV_REQUESTOR_* flags - */ --struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, bool user) -+struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, u32 requestor) - { - struct vbg_session *session; - -@@ -903,7 +934,7 @@ struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, bool user) - return ERR_PTR(-ENOMEM); - - session->gdev = gdev; -- session->user_session = user; -+ session->requestor = requestor; - - return session; - } -@@ -924,7 +955,9 @@ void vbg_core_close_session(struct vbg_session *session) - if (!session->hgcm_client_ids[i]) - continue; - -- vbg_hgcm_disconnect(gdev, session->hgcm_client_ids[i], &rc); -+ /* requestor is kernel here, as we're cleaning up. */ -+ vbg_hgcm_disconnect(gdev, VBG_KERNEL_REQUEST, -+ session->hgcm_client_ids[i], &rc); - } - - kfree(session); -@@ -1152,7 +1185,8 @@ static int vbg_req_allowed(struct vbg_dev *gdev, struct vbg_session *session, - return -EPERM; - } - -- if (trusted_apps_only && session->user_session) { -+ if (trusted_apps_only && -+ (session->requestor & VMMDEV_REQUESTOR_USER_DEVICE)) { - vbg_err("Denying userspace vmm call type %#08x through vboxuser device node\n", - req->request_type); - return -EPERM; -@@ -1209,8 +1243,8 @@ static int vbg_ioctl_hgcm_connect(struct vbg_dev *gdev, - if (i >= ARRAY_SIZE(session->hgcm_client_ids)) - return -EMFILE; - -- ret = vbg_hgcm_connect(gdev, &conn->u.in.loc, &client_id, -- &conn->hdr.rc); -+ ret = vbg_hgcm_connect(gdev, session->requestor, &conn->u.in.loc, -+ &client_id, &conn->hdr.rc); - - mutex_lock(&gdev->session_mutex); - if (ret == 0 && conn->hdr.rc >= 0) { -@@ -1251,7 +1285,8 @@ static int vbg_ioctl_hgcm_disconnect(struct vbg_dev *gdev, - if (i >= ARRAY_SIZE(session->hgcm_client_ids)) - return -EINVAL; - -- ret = vbg_hgcm_disconnect(gdev, client_id, &disconn->hdr.rc); -+ ret = vbg_hgcm_disconnect(gdev, session->requestor, client_id, -+ &disconn->hdr.rc); - - mutex_lock(&gdev->session_mutex); - if (ret == 0 && disconn->hdr.rc >= 0) -@@ -1313,12 +1348,12 @@ static int vbg_ioctl_hgcm_call(struct vbg_dev *gdev, - } - - if (IS_ENABLED(CONFIG_COMPAT) && f32bit) -- ret = vbg_hgcm_call32(gdev, client_id, -+ ret = vbg_hgcm_call32(gdev, session->requestor, client_id, - call->function, call->timeout_ms, - VBG_IOCTL_HGCM_CALL_PARMS32(call), - call->parm_count, &call->hdr.rc); - else -- ret = vbg_hgcm_call(gdev, client_id, -+ ret = vbg_hgcm_call(gdev, session->requestor, client_id, - call->function, call->timeout_ms, - VBG_IOCTL_HGCM_CALL_PARMS(call), - call->parm_count, &call->hdr.rc); -@@ -1408,6 +1443,7 @@ static int vbg_ioctl_check_balloon(struct vbg_dev *gdev, - } - - static int vbg_ioctl_write_core_dump(struct vbg_dev *gdev, -+ struct vbg_session *session, - struct vbg_ioctl_write_coredump *dump) - { - struct vmmdev_write_core_dump *req; -@@ -1415,7 +1451,8 @@ static int vbg_ioctl_write_core_dump(struct vbg_dev *gdev, - if (vbg_ioctl_chk(&dump->hdr, sizeof(dump->u.in), 0)) - return -EINVAL; - -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_WRITE_COREDUMP); -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_WRITE_COREDUMP, -+ session->requestor); - if (!req) - return -ENOMEM; - -@@ -1476,7 +1513,7 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data) - case VBG_IOCTL_CHECK_BALLOON: - return vbg_ioctl_check_balloon(gdev, data); - case VBG_IOCTL_WRITE_CORE_DUMP: -- return vbg_ioctl_write_core_dump(gdev, data); -+ return vbg_ioctl_write_core_dump(gdev, session, data); - } - - /* Variable sized requests. */ -@@ -1508,7 +1545,8 @@ int vbg_core_set_mouse_status(struct vbg_dev *gdev, u32 features) - struct vmmdev_mouse_status *req; - int rc; - -- req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_MOUSE_STATUS); -+ req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_MOUSE_STATUS, -+ VBG_KERNEL_REQUEST); - if (!req) - return -ENOMEM; - -diff --git a/drivers/virt/vboxguest/vboxguest_core.h b/drivers/virt/vboxguest/vboxguest_core.h -index 7ad9ec45bfa9..4188c12b839f 100644 ---- a/drivers/virt/vboxguest/vboxguest_core.h -+++ b/drivers/virt/vboxguest/vboxguest_core.h -@@ -154,15 +154,15 @@ struct vbg_session { - * host. Protected by vbg_gdev.session_mutex. - */ - u32 guest_caps; -- /** Does this session belong to a root process or a user one? */ -- bool user_session; -+ /** VMMDEV_REQUESTOR_* flags */ -+ u32 requestor; - /** Set on CANCEL_ALL_WAITEVENTS, protected by vbg_devevent_spinlock. */ - bool cancel_waiters; - }; - - int vbg_core_init(struct vbg_dev *gdev, u32 fixed_events); - void vbg_core_exit(struct vbg_dev *gdev); --struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, bool user); -+struct vbg_session *vbg_core_open_session(struct vbg_dev *gdev, u32 requestor); - void vbg_core_close_session(struct vbg_session *session); - int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data); - int vbg_core_set_mouse_status(struct vbg_dev *gdev, u32 features); -@@ -172,12 +172,13 @@ irqreturn_t vbg_core_isr(int irq, void *dev_id); - void vbg_linux_mouse_event(struct vbg_dev *gdev); - - /* Private (non exported) functions form vboxguest_utils.c */ --void *vbg_req_alloc(size_t len, enum vmmdev_request_type req_type); -+void *vbg_req_alloc(size_t len, enum vmmdev_request_type req_type, -+ u32 requestor); - void vbg_req_free(void *req, size_t len); - int vbg_req_perform(struct vbg_dev *gdev, void *req); - int vbg_hgcm_call32( -- struct vbg_dev *gdev, u32 client_id, u32 function, u32 timeout_ms, -- struct vmmdev_hgcm_function_parameter32 *parm32, u32 parm_count, -- int *vbox_status); -+ struct vbg_dev *gdev, u32 requestor, u32 client_id, u32 function, -+ u32 timeout_ms, struct vmmdev_hgcm_function_parameter32 *parm32, -+ u32 parm_count, int *vbox_status); - - #endif -diff --git a/drivers/virt/vboxguest/vboxguest_linux.c b/drivers/virt/vboxguest/vboxguest_linux.c -index 6e2a9619192d..6e8c0f1c1056 100644 ---- a/drivers/virt/vboxguest/vboxguest_linux.c -+++ b/drivers/virt/vboxguest/vboxguest_linux.c -@@ -5,6 +5,7 @@ - * Copyright (C) 2006-2016 Oracle Corporation - */ - -+#include - #include - #include - #include -@@ -28,6 +29,23 @@ static DEFINE_MUTEX(vbg_gdev_mutex); - /** Global vbg_gdev pointer used by vbg_get/put_gdev. */ - static struct vbg_dev *vbg_gdev; - -+static u32 vbg_misc_device_requestor(struct inode *inode) -+{ -+ u32 requestor = VMMDEV_REQUESTOR_USERMODE | -+ VMMDEV_REQUESTOR_CON_DONT_KNOW | -+ VMMDEV_REQUESTOR_TRUST_NOT_GIVEN; -+ -+ if (from_kuid(current_user_ns(), current->cred->uid) == 0) -+ requestor |= VMMDEV_REQUESTOR_USR_ROOT; -+ else -+ requestor |= VMMDEV_REQUESTOR_USR_USER; -+ -+ if (in_egroup_p(inode->i_gid)) -+ requestor |= VMMDEV_REQUESTOR_GRP_VBOX; -+ -+ return requestor; -+} -+ - static int vbg_misc_device_open(struct inode *inode, struct file *filp) - { - struct vbg_session *session; -@@ -36,7 +54,7 @@ static int vbg_misc_device_open(struct inode *inode, struct file *filp) - /* misc_open sets filp->private_data to our misc device */ - gdev = container_of(filp->private_data, struct vbg_dev, misc_device); - -- session = vbg_core_open_session(gdev, false); -+ session = vbg_core_open_session(gdev, vbg_misc_device_requestor(inode)); - if (IS_ERR(session)) - return PTR_ERR(session); - -@@ -53,7 +71,8 @@ static int vbg_misc_device_user_open(struct inode *inode, struct file *filp) - gdev = container_of(filp->private_data, struct vbg_dev, - misc_device_user); - -- session = vbg_core_open_session(gdev, false); -+ session = vbg_core_open_session(gdev, vbg_misc_device_requestor(inode) | -+ VMMDEV_REQUESTOR_USER_DEVICE); - if (IS_ERR(session)) - return PTR_ERR(session); - -@@ -115,7 +134,8 @@ static long vbg_misc_device_ioctl(struct file *filp, unsigned int req, - req == VBG_IOCTL_VMMDEV_REQUEST_BIG; - - if (is_vmmdev_req) -- buf = vbg_req_alloc(size, VBG_IOCTL_HDR_TYPE_DEFAULT); -+ buf = vbg_req_alloc(size, VBG_IOCTL_HDR_TYPE_DEFAULT, -+ session->requestor); - else - buf = kmalloc(size, GFP_KERNEL); - if (!buf) -diff --git a/drivers/virt/vboxguest/vboxguest_utils.c b/drivers/virt/vboxguest/vboxguest_utils.c -index bf4474214b4d..75fd140b02ff 100644 ---- a/drivers/virt/vboxguest/vboxguest_utils.c -+++ b/drivers/virt/vboxguest/vboxguest_utils.c -@@ -62,7 +62,8 @@ VBG_LOG(vbg_err, pr_err); - VBG_LOG(vbg_debug, pr_debug); - #endif - --void *vbg_req_alloc(size_t len, enum vmmdev_request_type req_type) -+void *vbg_req_alloc(size_t len, enum vmmdev_request_type req_type, -+ u32 requestor) - { - struct vmmdev_request_header *req; - int order = get_order(PAGE_ALIGN(len)); -@@ -78,7 +79,7 @@ void *vbg_req_alloc(size_t len, enum vmmdev_request_type req_type) - req->request_type = req_type; - req->rc = VERR_GENERAL_FAILURE; - req->reserved1 = 0; -- req->reserved2 = 0; -+ req->requestor = requestor; - - return req; - } -@@ -119,7 +120,7 @@ static bool hgcm_req_done(struct vbg_dev *gdev, - return done; - } - --int vbg_hgcm_connect(struct vbg_dev *gdev, -+int vbg_hgcm_connect(struct vbg_dev *gdev, u32 requestor, - struct vmmdev_hgcm_service_location *loc, - u32 *client_id, int *vbox_status) - { -@@ -127,7 +128,7 @@ int vbg_hgcm_connect(struct vbg_dev *gdev, - int rc; - - hgcm_connect = vbg_req_alloc(sizeof(*hgcm_connect), -- VMMDEVREQ_HGCM_CONNECT); -+ VMMDEVREQ_HGCM_CONNECT, requestor); - if (!hgcm_connect) - return -ENOMEM; - -@@ -153,13 +154,15 @@ int vbg_hgcm_connect(struct vbg_dev *gdev, - } - EXPORT_SYMBOL(vbg_hgcm_connect); - --int vbg_hgcm_disconnect(struct vbg_dev *gdev, u32 client_id, int *vbox_status) -+int vbg_hgcm_disconnect(struct vbg_dev *gdev, u32 requestor, -+ u32 client_id, int *vbox_status) - { - struct vmmdev_hgcm_disconnect *hgcm_disconnect = NULL; - int rc; - - hgcm_disconnect = vbg_req_alloc(sizeof(*hgcm_disconnect), -- VMMDEVREQ_HGCM_DISCONNECT); -+ VMMDEVREQ_HGCM_DISCONNECT, -+ requestor); - if (!hgcm_disconnect) - return -ENOMEM; - -@@ -593,9 +596,10 @@ static int hgcm_call_copy_back_result( - return 0; - } - --int vbg_hgcm_call(struct vbg_dev *gdev, u32 client_id, u32 function, -- u32 timeout_ms, struct vmmdev_hgcm_function_parameter *parms, -- u32 parm_count, int *vbox_status) -+int vbg_hgcm_call(struct vbg_dev *gdev, u32 requestor, u32 client_id, -+ u32 function, u32 timeout_ms, -+ struct vmmdev_hgcm_function_parameter *parms, u32 parm_count, -+ int *vbox_status) - { - struct vmmdev_hgcm_call *call; - void **bounce_bufs = NULL; -@@ -615,7 +619,7 @@ int vbg_hgcm_call(struct vbg_dev *gdev, u32 client_id, u32 function, - goto free_bounce_bufs; - } - -- call = vbg_req_alloc(size, VMMDEVREQ_HGCM_CALL); -+ call = vbg_req_alloc(size, VMMDEVREQ_HGCM_CALL, requestor); - if (!call) { - ret = -ENOMEM; - goto free_bounce_bufs; -@@ -647,9 +651,9 @@ EXPORT_SYMBOL(vbg_hgcm_call); - - #ifdef CONFIG_COMPAT - int vbg_hgcm_call32( -- struct vbg_dev *gdev, u32 client_id, u32 function, u32 timeout_ms, -- struct vmmdev_hgcm_function_parameter32 *parm32, u32 parm_count, -- int *vbox_status) -+ struct vbg_dev *gdev, u32 requestor, u32 client_id, u32 function, -+ u32 timeout_ms, struct vmmdev_hgcm_function_parameter32 *parm32, -+ u32 parm_count, int *vbox_status) - { - struct vmmdev_hgcm_function_parameter *parm64 = NULL; - u32 i, size; -@@ -689,7 +693,7 @@ int vbg_hgcm_call32( - goto out_free; - } - -- ret = vbg_hgcm_call(gdev, client_id, function, timeout_ms, -+ ret = vbg_hgcm_call(gdev, requestor, client_id, function, timeout_ms, - parm64, parm_count, vbox_status); - if (ret < 0) - goto out_free; -diff --git a/drivers/virt/vboxguest/vboxguest_version.h b/drivers/virt/vboxguest/vboxguest_version.h -index 77f0c8f8a231..84834dad38d5 100644 ---- a/drivers/virt/vboxguest/vboxguest_version.h -+++ b/drivers/virt/vboxguest/vboxguest_version.h -@@ -9,11 +9,10 @@ - #ifndef __VBOX_VERSION_H__ - #define __VBOX_VERSION_H__ - --/* Last synced October 4th 2017 */ --#define VBG_VERSION_MAJOR 5 --#define VBG_VERSION_MINOR 2 -+#define VBG_VERSION_MAJOR 6 -+#define VBG_VERSION_MINOR 0 - #define VBG_VERSION_BUILD 0 --#define VBG_SVN_REV 68940 --#define VBG_VERSION_STRING "5.2.0" -+#define VBG_SVN_REV 127566 -+#define VBG_VERSION_STRING "6.0.0" - - #endif -diff --git a/drivers/virt/vboxguest/vmmdev.h b/drivers/virt/vboxguest/vmmdev.h -index 5e2ae978935d..6337b8d75d96 100644 ---- a/drivers/virt/vboxguest/vmmdev.h -+++ b/drivers/virt/vboxguest/vmmdev.h -@@ -98,8 +98,8 @@ struct vmmdev_request_header { - s32 rc; - /** Reserved field no.1. MBZ. */ - u32 reserved1; -- /** Reserved field no.2. MBZ. */ -- u32 reserved2; -+ /** IN: Requestor information (VMMDEV_REQUESTOR_*) */ -+ u32 requestor; - }; - VMMDEV_ASSERT_SIZE(vmmdev_request_header, 24); - -@@ -247,6 +247,8 @@ struct vmmdev_guest_info { - }; - VMMDEV_ASSERT_SIZE(vmmdev_guest_info, 24 + 8); - -+#define VMMDEV_GUEST_INFO2_ADDITIONS_FEATURES_REQUESTOR_INFO BIT(0) -+ - /** struct vmmdev_guestinfo2 - Guest information report, version 2. */ - struct vmmdev_guest_info2 { - /** Header. */ -@@ -259,7 +261,7 @@ struct vmmdev_guest_info2 { - u32 additions_build; - /** SVN revision. */ - u32 additions_revision; -- /** Feature mask, currently unused. */ -+ /** Feature mask. */ - u32 additions_features; - /** - * The intentional meaning of this field was: -diff --git a/include/linux/vbox_utils.h b/include/linux/vbox_utils.h -index a240ed2a0372..ff56c443180c 100644 ---- a/include/linux/vbox_utils.h -+++ b/include/linux/vbox_utils.h -@@ -24,15 +24,17 @@ __printf(1, 2) void vbg_debug(const char *fmt, ...); - #define vbg_debug pr_debug - #endif - --int vbg_hgcm_connect(struct vbg_dev *gdev, -+int vbg_hgcm_connect(struct vbg_dev *gdev, u32 requestor, - struct vmmdev_hgcm_service_location *loc, - u32 *client_id, int *vbox_status); - --int vbg_hgcm_disconnect(struct vbg_dev *gdev, u32 client_id, int *vbox_status); -+int vbg_hgcm_disconnect(struct vbg_dev *gdev, u32 requestor, -+ u32 client_id, int *vbox_status); - --int vbg_hgcm_call(struct vbg_dev *gdev, u32 client_id, u32 function, -- u32 timeout_ms, struct vmmdev_hgcm_function_parameter *parms, -- u32 parm_count, int *vbox_status); -+int vbg_hgcm_call(struct vbg_dev *gdev, u32 requestor, u32 client_id, -+ u32 function, u32 timeout_ms, -+ struct vmmdev_hgcm_function_parameter *parms, u32 parm_count, -+ int *vbox_status); - - /** - * Convert a VirtualBox status code to a standard Linux kernel return value. -diff --git a/include/uapi/linux/vbox_vmmdev_types.h b/include/uapi/linux/vbox_vmmdev_types.h -index 0e68024f36c7..8c535c2594ad 100644 ---- a/include/uapi/linux/vbox_vmmdev_types.h -+++ b/include/uapi/linux/vbox_vmmdev_types.h -@@ -102,6 +102,37 @@ enum vmmdev_request_type { - #define VMMDEVREQ_HGCM_CALL VMMDEVREQ_HGCM_CALL32 - #endif - -+/* vmmdev_request_header.requestor defines */ -+ -+/* Requestor user not given. */ -+#define VMMDEV_REQUESTOR_USR_NOT_GIVEN 0x00000000 -+/* The kernel driver (VBoxGuest) is the requestor. */ -+#define VMMDEV_REQUESTOR_USR_DRV 0x00000001 -+/* Some other kernel driver is the requestor. */ -+#define VMMDEV_REQUESTOR_USR_DRV_OTHER 0x00000002 -+/* The root or a admin user is the requestor. */ -+#define VMMDEV_REQUESTOR_USR_ROOT 0x00000003 -+/* Regular joe user is making the request. */ -+#define VMMDEV_REQUESTOR_USR_USER 0x00000006 -+/* User classification mask. */ -+#define VMMDEV_REQUESTOR_USR_MASK 0x00000007 -+/* Kernel mode request. */ -+#define VMMDEV_REQUESTOR_KERNEL 0x00000000 -+/* User mode request. */ -+#define VMMDEV_REQUESTOR_USERMODE 0x00000008 -+/* Don't know the physical console association of the requestor. */ -+#define VMMDEV_REQUESTOR_CON_DONT_KNOW 0x00000000 -+/* Console classification mask. */ -+#define VMMDEV_REQUESTOR_CON_MASK 0x00000040 -+/* Requestor is member of special VirtualBox user group. */ -+#define VMMDEV_REQUESTOR_GRP_VBOX 0x00000080 -+/* Requestor trust level: Unspecified */ -+#define VMMDEV_REQUESTOR_TRUST_NOT_GIVEN 0x00000000 -+/* Requestor trust level mask */ -+#define VMMDEV_REQUESTOR_TRUST_MASK 0x00007000 -+/* Requestor is using the less trusted user device node (/dev/vboxuser) */ -+#define VMMDEV_REQUESTOR_USER_DEVICE 0x00008000 -+ - /** HGCM service location types. */ - enum vmmdev_hgcm_service_location_type { - VMMDEV_HGCM_LOC_INVALID = 0, --- -2.21.0 - diff --git a/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC b/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC new file mode 100644 index 000000000..a3af1ff70 --- /dev/null +++ b/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_DAC @@ -0,0 +1 @@ +# CONFIG_DEFAULT_SECURITY_DAC is not set diff --git a/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX b/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX new file mode 100644 index 000000000..ef2f9974a --- /dev/null +++ b/configs/fedora/generic/CONFIG_DEFAULT_SECURITY_SELINUX @@ -0,0 +1 @@ +CONFIG_DEFAULT_SECURITY_SELINUX=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 14e56c0f5..7c819d93d 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1302,6 +1302,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DETECT_HUNG_TASK=y # CONFIG_DEV_APPLETALK is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index c97bc335c..0137b5bce 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1295,6 +1295,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DETECT_HUNG_TASK is not set # CONFIG_DEV_APPLETALK is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index c3a758609..f60131f0a 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1299,6 +1299,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set CONFIG_DETECT_HUNG_TASK=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 5b07a2d3c..a98fc3f88 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1260,6 +1260,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set CONFIG_DETECT_HUNG_TASK=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index d038b57a7..1a93fd9dc 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1253,6 +1253,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set # CONFIG_DETECT_HUNG_TASK is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 5bccfb46c..a5102e226 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1292,6 +1292,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set # CONFIG_DETECT_HUNG_TASK is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index c26820bc2..f83d9509c 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1091,6 +1091,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m diff --git a/kernel-i686.config b/kernel-i686.config index ab9a380bc..ae761ca96 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1083,6 +1083,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 83dc0cb05..d0be922a6 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1012,6 +1012,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_APPLETALK=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 515366ec6..261f3d3f7 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1004,6 +1004,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_APPLETALK=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 5c8fceda9..6b2c281c3 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1020,6 +1020,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_APPLETALK=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 17754b608..79f15c2df 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1012,6 +1012,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_APPLETALK=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 4aa25da33..86fe169db 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1131,6 +1131,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 96ceff717..965cfe5fb 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1123,6 +1123,8 @@ CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 # CONFIG_DEFAULT_RENO is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m diff --git a/kernel.spec b/kernel.spec index 34c26ec5a..63453af17 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 2 +%global rcrev 3 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -585,9 +585,6 @@ Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch Patch506: 0001-s390-jump_label-Correct-asm-contraint.patch Patch507: 0001-Drop-that-for-now.patch -# rhbz 1689750, patch submitted upstream -Patch508: 0001-virt-vbox-Implement-passing-requestor-info-to-the-ho.patch - # rhbz 1688283 Patch512: v3-tpm-fix-an-invalid-condition-in-tpm_common_poll.patch @@ -1867,6 +1864,9 @@ fi # # %changelog +* Mon Apr 01 2019 Jeremy Cline - 5.1.0-0.rc3.git0.1 +- Linux v5.1-rc3 + * Mon Apr 01 2019 Jeremy Cline - Disable debugging options. diff --git a/sources b/sources index 9a79b9674..e46ec7810 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 -SHA512 (patch-5.1-rc2.xz) = 97ea50f639b986b9cee8d44d01bddb25c92fd263322f9a22e4bdf06307f1a67ad9d345666928ba9a790b0f366bb012b748bd0e073999d4547e1cafc9ecdc770e -SHA512 (patch-5.1-rc2-git4.xz) = f7f3918bc8f05cc6e699881c8489639276d9c9b1a720e3296e6616dae411629406fe35c945e10f38ac42a914f23e6d7ad88c80a2d3509f6f32a3931845351c13 +SHA512 (patch-5.1-rc3.xz) = 611cd9107732ddc6bc9d37568aa2021b0427a3ece506119a11b6e857a27e33be366a692dba7d6e91b885cf1f09236c5dd592fb7f74f0155b76c5c7dc44b9aade From 79281a6ba562f69a5db83ca3a14ae0bbac6f57a9 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 2 Apr 2019 18:58:17 +0000 Subject: [PATCH 24/26] Reenable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 63453af17..0c3d1a8b6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -1864,6 +1864,9 @@ fi # # %changelog +* Tue Apr 02 2019 Jeremy Cline +- Reenable debugging options. + * Mon Apr 01 2019 Jeremy Cline - 5.1.0-0.rc3.git0.1 - Linux v5.1-rc3 From 29502db8a0ea2238a647e1cf99cb71c117c6b38a Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 2 Apr 2019 19:37:04 +0000 Subject: [PATCH 25/26] Linux v5.1-rc3-14-g5e7a8ca31926 --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gitrev b/gitrev index 9a3cf269b..19ea72e99 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -9936328b41ce4bce8f20269dcac8cb476c8d0820 +5e7a8ca319268a70a6c7c3c1fde5bea38e1e5539 diff --git a/kernel.spec b/kernel.spec index 0c3d1a8b6..a8c317eee 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 3 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1864,6 +1864,9 @@ fi # # %changelog +* Tue Apr 02 2019 Jeremy Cline - 5.1.0-0.rc3.git1.1 +- Linux v5.1-rc3-14-g5e7a8ca31926 + * Tue Apr 02 2019 Jeremy Cline - Reenable debugging options. diff --git a/sources b/sources index e46ec7810..1df767843 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc3.xz) = 611cd9107732ddc6bc9d37568aa2021b0427a3ece506119a11b6e857a27e33be366a692dba7d6e91b885cf1f09236c5dd592fb7f74f0155b76c5c7dc44b9aade +SHA512 (patch-5.1-rc3-git1.xz) = 75bc63988cd203781480d79712dc6b14b44b0aa16f79bb198eb890ed2a8e3d61d8f238f763bdaa3c670f6e08ed5e1086791d6f2432caec666d9946586b28f3a9 From a0aaf95b00414be34609b8112b70604e4acf4d6c Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 3 Apr 2019 17:49:51 +0000 Subject: [PATCH 26/26] Linux v5.1-rc3-35-g8ed86627f715 --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index 19ea72e99..1c08ca2e8 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -5e7a8ca319268a70a6c7c3c1fde5bea38e1e5539 +8ed86627f715eacbd6db6862f9499d6d96ea4ad6 diff --git a/kernel.spec b/kernel.spec index a8c317eee..4d0e1e3c0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 3 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -1864,6 +1864,9 @@ fi # # %changelog +* Wed Apr 03 2019 Jeremy Cline - 5.1.0-0.rc3.git2.1 +- Linux v5.1-rc3-35-g8ed86627f715 + * Tue Apr 02 2019 Jeremy Cline - 5.1.0-0.rc3.git1.1 - Linux v5.1-rc3-14-g5e7a8ca31926 diff --git a/sources b/sources index 1df767843..7a174b786 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 SHA512 (patch-5.1-rc3.xz) = 611cd9107732ddc6bc9d37568aa2021b0427a3ece506119a11b6e857a27e33be366a692dba7d6e91b885cf1f09236c5dd592fb7f74f0155b76c5c7dc44b9aade -SHA512 (patch-5.1-rc3-git1.xz) = 75bc63988cd203781480d79712dc6b14b44b0aa16f79bb198eb890ed2a8e3d61d8f238f763bdaa3c670f6e08ed5e1086791d6f2432caec666d9946586b28f3a9 +SHA512 (patch-5.1-rc3-git2.xz) = 3e0a0efb709597b781ea66c5d1bbb0b897f287c496165f0e4c5cc8111438454e6e941eb8a3b0bcde6e812aa058c3616c909aec23adca85ea98ad92ef6dc3e3ad