From 60fd6260b95af92864e0038226b58de78d7fb9a6 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 29 Jun 2020 09:39:00 -0500 Subject: Linux v5.7.6 rebase Signed-off-by: Justin M. Forbes --- configs/fedora/generic/arm/CONFIG_HISILICON_IRQ_MBIGEN | 2 +- configs/fedora/generic/arm/CONFIG_ROCKCHIP_CDN_DP | 2 +- configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599 | 1 - configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER | 3 +++ configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599 (limited to 'configs/fedora/generic/arm') diff --git a/configs/fedora/generic/arm/CONFIG_HISILICON_IRQ_MBIGEN b/configs/fedora/generic/arm/CONFIG_HISILICON_IRQ_MBIGEN index 72ab88e11..5ca6d30d1 100644 --- a/configs/fedora/generic/arm/CONFIG_HISILICON_IRQ_MBIGEN +++ b/configs/fedora/generic/arm/CONFIG_HISILICON_IRQ_MBIGEN @@ -1 +1 @@ -# CONFIG_HISILICON_IRQ_MBIGEN is not set +CONFIG_HISILICON_IRQ_MBIGEN=y diff --git a/configs/fedora/generic/arm/CONFIG_ROCKCHIP_CDN_DP b/configs/fedora/generic/arm/CONFIG_ROCKCHIP_CDN_DP index 98a696d76..86d2137bd 100644 --- a/configs/fedora/generic/arm/CONFIG_ROCKCHIP_CDN_DP +++ b/configs/fedora/generic/arm/CONFIG_ROCKCHIP_CDN_DP @@ -1 +1 @@ -# CONFIG_ROCKCHIP_CDN_DP is not set +CONFIG_ROCKCHIP_CDN_DP=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599 b/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599 deleted file mode 100644 index aba5e985e..000000000 --- a/configs/fedora/generic/arm/aarch64/CONFIG_DRM_PANEL_XINGBANGDA_XBD599 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DRM_PANEL_XINGBANGDA_XBD599=m diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER b/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER index 6d42a47fc..b730690db 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER +++ b/configs/fedora/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER @@ -1 +1,4 @@ +# We technically want this to be 13 for Fedora with 4K pages but that's only +# an option with an out of tree patch. Keep this 11 for compatibility until +# we figure out what we want here CONFIG_FORCE_MAX_ZONEORDER=13 diff --git a/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE b/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE index cd440ed6d..4f5e59821 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE +++ b/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE @@ -1 +1,2 @@ -# CONFIG_HIGHPTE is not set +# TODO fix due to hardware errata +CONFIG_HIGHPTE=y -- cgit