From: David Arcari <darcari(a)redhat.com>
enable the rtc-rv8803 driver on RHEL and Fedora
Enable CONFIG_RTC_DRV_RV8803 for x86 and arm for RHEL.
Signed-off-by: David Arcari <darcari(a)redhat.com>
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_RTC_DRV_RV8803 b/redhat/configs/common/generic/arm/aarch64/CONFIG_RTC_DRV_RV8803
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_RTC_DRV_RV8803
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_RV8803=m
diff --git a/redhat/configs/common/generic/x86/CONFIG_RTC_DRV_RV8803 b/redhat/configs/common/generic/x86/CONFIG_RTC_DRV_RV8803
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_RTC_DRV_RV8803
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_RV8803=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2121
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Remove BUILD_SCRATCH_TARGET
BUILD_SCRATCH_TARGET was deprecated in 5.19.0 and can be removed.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,17 +1,12 @@
+include Makefile.variables
+
#
# Deprecated variables
#
# This section is intentionally left at the top of the Makefile so it won't be ignored.
#
-ifdef BUILD_SCRATCH_TARGET
- # deprecated in 5.19.0
- $(warning WARNING: BUILD_SCRATCH_TARGET will be deprecated in a later release, use BUILD_TARGET instead.)
- BUILD_TARGET:=$(BUILD_SCRATCH_TARGET)
-endif
-
-include Makefile.variables
-
# This deprecation message must come after GIT is set in Makefile.variables.
+
ifneq ($(GIT),git)
# deprecated in 5.20.0
$(warning WARNING: GIT($(GIT)) will be deprecated in a later release.)
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2126
From: Steve Best <sbest(a)redhat.com>
redhat/configs: change so watchdog is module versus builtin
Description:
Enable virtual watchdog timers provided by PAPR hypervisors.
Tested: make dist-configs
Signed-off-by: Steve Best <sbest(a)redhat.com>
diff --git a/redhat/configs/ark/generic/powerpc/CONFIG_PSERIES_WDT b/redhat/configs/ark/generic/powerpc/CONFIG_PSERIES_WDT
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/powerpc/CONFIG_PSERIES_WDT
+++ b/redhat/configs/ark/generic/powerpc/CONFIG_PSERIES_WDT
@@ -1 +1 @@
-CONFIG_PSERIES_WDT=y
+CONFIG_PSERIES_WDT=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2044
From: Mark Langsdorf <mlangsdo(a)redhat.com>
redhat/configs: move CONFIG_ACPI_VIDEO to common/generic
Now that ACPI video devices appear on ARM64 systems, the
kernel's config file has removed the dependency on
CONFIG_X86 for CONFIG_VIDEO. Move the config option from
common/generic/x86 to common/generic.
Signed-off-by: Mark Langsdorf <mlangsdo(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_ACPI_VIDEO b/redhat/configs/common/generic/CONFIG_ACPI_VIDEO
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_ACPI_VIDEO
+++ b/redhat/configs/common/generic/CONFIG_ACPI_VIDEO
@@ -1 +1 @@
-# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_VIDEO=m
diff --git a/redhat/configs/common/generic/arm/CONFIG_ACPI_VIDEO b/redhat/configs/common/generic/arm/CONFIG_ACPI_VIDEO
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/arm/CONFIG_ACPI_VIDEO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_VIDEO=m
diff --git a/redhat/configs/common/generic/x86/CONFIG_ACPI_VIDEO b/redhat/configs/common/generic/x86/CONFIG_ACPI_VIDEO
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/x86/CONFIG_ACPI_VIDEO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_VIDEO=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2111
From: David Arcari <darcari(a)redhat.com>
enable the rtc-rv8803 driver on RHEL
Enable CONFIG_RTC_DRV_RV8803 for x86 and arm for RHEL.
Signed-off-by: David Arcari <darcari(a)redhat.com>
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_RTC_DRV_RV8803 b/redhat/configs/ark/generic/arm/aarch64/CONFIG_RTC_DRV_RV8803
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_RTC_DRV_RV8803
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_RV8803=m
diff --git a/redhat/configs/ark/generic/x86/CONFIG_RTC_DRV_RV8803 b/redhat/configs/ark/generic/x86/CONFIG_RTC_DRV_RV8803
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/CONFIG_RTC_DRV_RV8803
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_RV8803=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2121
From: Clark Williams on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2117
Replace the (still functioning) merge.pl in redhat/configs with a
python version (merge.py) for ease of maintenance.
Signed-off-by: Clark Williams <williams(a)redhat.com>
---
redhat/configs/build_configs.sh | 2 +-
redhat/configs/merge.py | 58 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 1 deletions(-)