[OS-BUILD PATCH] RHMAINTAINERS: Update DMA Mapping entry
by GitLab Bridge on behalf of prarit
From: Jerry Snitselaar <jsnitsel(a)redhat.com>
I'm taking over the primary role for DMA Mapping
so update the maintainers entry.
RH-Acked-by: Myron Stowe <mstowe(a)redhat.com
RH-Acked-by: Don Dutile <ddutile(a)redhat.com>
Cc: Prarit Bhargava <prarit(a)redhat.com>
Cc: Donald Dutile <ddutile(a)redhat.com>
Signed-off-by: Jerry Snitselaar <jsnitsel(a)redhat.com>
---
redhat/rhdocs/MAINTAINERS/RHMAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS
index dda356a9d5e9..df60e8537ff2 100644
--- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS
+++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS
@@ -503,6 +503,7 @@ S: Maintained
F: drivers/scsi/hpsa*
DMA MAPPING SUPPORT
+M: Jerry Snitselaar <jsnitsel(a)redhat.com>
M: Donald Dutile <ddutile(a)redhat.com>
S: Maintained
F: kernel/dma/*
--
GitLab
3 years, 1 month
[OS-BUILD PATCH] redhat: Implement Makefile.dist
by GitLab Bridge on behalf of prarit
From: Prarit Bhargava <prarit(a)redhat.com>
One of the nice things about the RHEL and ARK trees is that commands like
'make dist-configs' and 'make dist-help' can be executed from the
top-level linux directory.
In the existing code, the makefile includes the top-level linux Makefile
if the targets are not dist-* or distg-*. Otherwise the commands are
executed with the redhat/Makefile* files. This is clunky and requires the
inclusion of the makefile in .gitignore which causes problems when
upstream modifies .gitignore.
A better approach is to include the code in a top-level Makefile.dist.
This change can then be moved upstream for inclusion with a oneline patch
to include Makefile.dist. Makefile.dist would not be included in the
gitignore file because we want to track changes for the file in our
own tree.
Move the makefile and Makefile.rhelver code into Makefile.dist, and
include Makefile.dist from the top-level Makefile.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
Cc: dzickus(a)redhat.com
Cc: jforbes(a)redhat.com
Cc: bcrocker(a)redhat.com
---
Makefile | 6 ++----
Makefile.rhelver => Makefile.dist | 19 ++++++++++++++++++-
makefile | 16 ----------------
redhat/Makefile | 4 ++--
redhat/Makefile.common | 2 +-
redhat/genspec.sh | 2 +-
redhat/kernel.spec.template | 2 +-
redhat/scripts/new_release.sh | 12 ++++++------
8 files changed, 31 insertions(+), 32 deletions(-)
rename Makefile.rhelver => Makefile.dist (77%)
delete mode 100644 makefile
diff --git a/Makefile b/Makefile
index f3d1dd649d9b..c9a0d4f20808 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,6 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
PHONY := __all
__all:
-# Set RHEL variables
-# Use this spot to avoid future merge conflicts
-include Makefile.rhelver
-
# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
#
@@ -273,6 +269,8 @@ no-sync-config-targets := $(no-dot-config-targets) install %install \
kernelrelease
single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.s %.symtypes %/
+-include Makefile.dist
+
config-build :=
mixed-build :=
need-config := 1
diff --git a/Makefile.rhelver b/Makefile.dist
similarity index 77%
rename from Makefile.rhelver
rename to Makefile.dist
index 8fceabade7c8..0b4f2d28e7b8 100644
--- a/Makefile.rhelver
+++ b/Makefile.dist
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 0
+RHEL_RELEASE = 1
#
# Early y+1 numbering
@@ -43,3 +43,20 @@ ifneq ("$(ZSTREAM)", "yes")
RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE)
endif
endif
+
+no-dot-config-targets += dist-% distg-%
+
+ifneq ($(filter dist-% distg-%,$(MAKECMDGOALS)),)
+_OUTPUT := "."
+# this section is needed in order to make O= to work
+ifeq ("$(origin O)", "command line")
+ _OUTPUT := "$(abspath $(O))"
+ _EXTRA_ARGS := O=$(_OUTPUT)
+endif
+endif
+
+dist-%::
+ $(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
+
+distg-%::
+ $(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
diff --git a/makefile b/makefile
deleted file mode 100644
index 819ac9a5cd60..000000000000
--- a/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-ifeq ($(filter dist-% distg-%,$(MAKECMDGOALS)),)
- include Makefile
-endif
-
-_OUTPUT := "."
-# this section is needed in order to make O= to work
-ifeq ("$(origin O)", "command line")
- _OUTPUT := "$(abspath $(O))"
- _EXTRA_ARGS := O=$(_OUTPUT)
-endif
-dist-%::
- $(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
-
-distg-%::
- $(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
-
diff --git a/redhat/Makefile b/redhat/Makefile
index 61dcc522fbc6..8c6a3a510768 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -256,7 +256,7 @@ sources-rh: $(TARBALL)
configs/process_configs.sh \
parallel_xz.sh \
generate_bls_conf.sh \
- ../Makefile.rhelver \
+ ../Makefile.dist \
README.rst \
$(SOURCES)/
@for KABIARCH in $(ARCH_LIST); do \
@@ -308,7 +308,7 @@ dist-release-finish: setup-source
@git add $(REDHAT)/$(CHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@git add $(REDHAT)/marker
- @git commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PREBUILD)$(BUILD)$(BUILDID)"
+ @git commit -s ../Makefile.dist $(REDHAT)/marker $(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PREBUILD)$(BUILD)$(BUILDID)"
@$(MAKE) dist-configs
@$(MAKE) dist-kabi
@$(MAKE) dist-kabi-dup
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index 6d048415ba6d..d4e68369fb05 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -1,6 +1,6 @@
TOPDIR:=$(shell git rev-parse --show-toplevel)
REDHAT:=$(TOPDIR)/redhat
-include $(TOPDIR)/Makefile.rhelver
+include $(TOPDIR)/Makefile.dist
RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
else echo rpm; fi)
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index b72dffe14729..1cd9095a69ea 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -253,7 +253,7 @@ if [ "$SINGLE_TARBALL" = 0 ]; then
":(exclude,top).gitignore" \
":(exclude,top).gitlab-ci.yml" \
":(exclude,top)makefile" \
- ":(exclude,top)Makefile.rhelver" \
+ ":(exclude,top)Makefile.dist" \
":(exclude,top)redhat")
for c in $COMMITS; do
patch=$(git format-patch --zero-commit -1 "$c")
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index d47c9cce8a0e..93fa8c2985b1 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -569,7 +569,7 @@ BuildRequires: asciidoc
# xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-%%TARBALL_VERSION%%.tar.xz
-Source1: Makefile.rhelver
+Source1: Makefile.dist
# Name of the packaged file containing signing key
diff --git a/redhat/scripts/new_release.sh b/redhat/scripts/new_release.sh
index 1e4c7bb1dc86..f1025f458d04 100755
--- a/redhat/scripts/new_release.sh
+++ b/redhat/scripts/new_release.sh
@@ -13,7 +13,7 @@ if [ -s "$RHPATH/linux-kernel-test.patch" ]; then
exit 1;
fi
-RELEASE=$(sed -n -e 's/^RHEL_RELEASE\ =\ \(.*\)/\1/p' $RHPATH/../Makefile.rhelver)
+RELEASE=$(sed -n -e 's/^RHEL_RELEASE\ =\ \(.*\)/\1/p' $RHPATH/../Makefile.dist)
YVER=$(echo $RELEASE | cut -d "." -f 1)
YVER=${YVER:=$RELEASE}
@@ -26,15 +26,15 @@ if [ "$ZSTREAM_FLAG" == "no" ]; then
if [ "$YSTREAM_FLAG" == "yes" ]; then
NEW_RELEASE="$[RELEASE + 1]";
else
- EARLY_YBUILD=$(sed -n -e 's/^EARLY_YBUILD:=\(.*\)/\1/p' $RHPATH/../Makefile.rhelver);
- EARLY_YRELEASE=$(sed -n -e 's/^EARLY_YRELEASE:=\(.*\)/\1/p' $RHPATH/../Makefile.rhelver);
+ EARLY_YBUILD=$(sed -n -e 's/^EARLY_YBUILD:=\(.*\)/\1/p' $RHPATH/../Makefile.dist);
+ EARLY_YRELEASE=$(sed -n -e 's/^EARLY_YRELEASE:=\(.*\)/\1/p' $RHPATH/../Makefile.dist);
if [ "$EARLY_YBUILD" != "$RELEASE" ]; then
NEW_EARLY_YRELEASE=1;
else
NEW_EARLY_YRELEASE="$[EARLY_YRELEASE + 1]";
fi
- sed -i -e "s/^EARLY_YBUILD:=$EARLY_YBUILD/EARLY_YBUILD:=$RELEASE/" $RHPATH/../Makefile.rhelver;
- sed -i -e "s/^EARLY_YRELEASE:=$EARLY_YRELEASE/EARLY_YRELEASE:=$NEW_EARLY_YRELEASE/" $RHPATH/../Makefile.rhelver;
+ sed -i -e "s/^EARLY_YBUILD:=$EARLY_YBUILD/EARLY_YBUILD:=$RELEASE/" $RHPATH/../Makefile.dist;
+ sed -i -e "s/^EARLY_YRELEASE:=$EARLY_YRELEASE/EARLY_YRELEASE:=$NEW_EARLY_YRELEASE/" $RHPATH/../Makefile.dist;
NEW_RELEASE=$RELEASE;
fi
elif [ "$ZSTREAM_FLAG" == "yes" ]; then
@@ -46,5 +46,5 @@ else
exit 1;
fi
-sed -i -e "s/RHEL_RELEASE\ =.*/RHEL_RELEASE\ =\ $NEW_RELEASE/" $RHPATH/../Makefile.rhelver;
+sed -i -e "s/RHEL_RELEASE\ =.*/RHEL_RELEASE\ =\ $NEW_RELEASE/" $RHPATH/../Makefile.dist;
--
GitLab
3 years, 1 month
[OS-BUILD PATCH] [redhat] New configs in lib/Kconfig.debug
by GitLab Bridge on behalf of redhat-patchlab
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
CONFIG_HARDLOCKUP_DETECTOR:
Say Y here to enable the kernel to act as a watchdog to detect
hard lockups.
Hardlockups are bugs that cause the CPU to loop in kernel mode
for more than 10 seconds, without letting other interrupts have a
chance to run. The current stack trace is displayed upon detection
and the system will stay locked up.
Symbol: HARDLOCKUP_DETECTOR [=n]
Type : bool
Defined at lib/Kconfig.debug:1000
Prompt: Detect Hard Lockups
Depends on: DEBUG_KERNEL [=y] && !S390 && (HAVE_HARDLOCKUP_DETECTOR_PERF [=y] || HAVE_HARDLOCKUP_DETECTOR_ARCH [=n])
Location:
-> Kernel hacking
-> Debug Oops, Lockups and Hangs
Selects: LOCKUP_DETECTOR [=y] && HARDLOCKUP_DETECTOR_PERF [=n] && HARDLOCKUP_DETECTOR_ARCH
---
Cc: Prarit Bhargava <prarit(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_HARDLOCKUP_DETECTOR | 1 +
.../generic/CONFIG_HARDLOCKUP_DETECTOR | 23 -------------------
2 files changed, 1 insertion(+), 23 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_HARDLOCKUP_DETECTOR
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_HARDLOCKUP_DETECTOR
diff --git a/redhat/configs/common/generic/CONFIG_HARDLOCKUP_DETECTOR b/redhat/configs/common/generic/CONFIG_HARDLOCKUP_DETECTOR
new file mode 100644
index 000000000000..32d4a56dd961
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_HARDLOCKUP_DETECTOR
@@ -0,0 +1 @@
+# CONFIG_HARDLOCKUP_DETECTOR is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_HARDLOCKUP_DETECTOR b/redhat/configs/pending-common/generic/CONFIG_HARDLOCKUP_DETECTOR
deleted file mode 100644
index cd74a33e67ea..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_HARDLOCKUP_DETECTOR
+++ /dev/null
@@ -1,23 +0,0 @@
-# CONFIG_HARDLOCKUP_DETECTOR:
-#
-# Say Y here to enable the kernel to act as a watchdog to detect
-# hard lockups.
-#
-# Hardlockups are bugs that cause the CPU to loop in kernel mode
-# for more than 10 seconds, without letting other interrupts have a
-# chance to run. The current stack trace is displayed upon detection
-# and the system will stay locked up.
-#
-# Symbol: HARDLOCKUP_DETECTOR [=n]
-# Type : bool
-# Defined at lib/Kconfig.debug:1000
-# Prompt: Detect Hard Lockups
-# Depends on: DEBUG_KERNEL [=y] && !S390 && (HAVE_HARDLOCKUP_DETECTOR_PERF [=y] || HAVE_HARDLOCKUP_DETECTOR_ARCH [=n])
-# Location:
-# -> Kernel hacking
-# -> Debug Oops, Lockups and Hangs
-# Selects: LOCKUP_DETECTOR [=y] && HARDLOCKUP_DETECTOR_PERF [=n] && HARDLOCKUP_DETECTOR_ARCH
-#
-#
-#
-# CONFIG_HARDLOCKUP_DETECTOR is not set
--
GitLab
3 years, 1 month
[OS-BUILD PATCH] [redhat] New configs in drivers/md
by GitLab Bridge on behalf of redhat-patchlab
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
CONFIG_DM_MULTIPATH_IOA:
This path selector selects the path based on the CPU the IO is
executed on and the CPU to path mapping setup at path addition time.
If unsure, say N.
Symbol: DM_MULTIPATH_IOA [=n]
Type : tristate
Defined at drivers/md/Kconfig:466
Prompt: I/O Path Selector based on CPU submission
Depends on: MD [=y] && DM_MULTIPATH [=m]
Location:
-> Device Drivers
-> Multiple devices driver support (RAID and LVM) (MD [=y])
-> Device mapper support (BLK_DEV_DM [=m])
-> Multipath target (DM_MULTIPATH [=m])
---
Cc: Nigel Croxon <ncroxon(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_DM_MULTIPATH_IOA | 1 +
.../generic/CONFIG_DM_MULTIPATH_IOA | 21 -------------------
2 files changed, 1 insertion(+), 21 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_DM_MULTIPATH_IOA
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_DM_MULTIPATH_IOA
diff --git a/redhat/configs/common/generic/CONFIG_DM_MULTIPATH_IOA b/redhat/configs/common/generic/CONFIG_DM_MULTIPATH_IOA
new file mode 100644
index 000000000000..9dbcf92fa81e
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_DM_MULTIPATH_IOA
@@ -0,0 +1 @@
+# CONFIG_DM_MULTIPATH_IOA is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_DM_MULTIPATH_IOA b/redhat/configs/pending-common/generic/CONFIG_DM_MULTIPATH_IOA
deleted file mode 100644
index 83a1a727f1bd..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_DM_MULTIPATH_IOA
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_DM_MULTIPATH_IOA:
-#
-# This path selector selects the path based on the CPU the IO is
-# executed on and the CPU to path mapping setup at path addition time.
-#
-# If unsure, say N.
-#
-# Symbol: DM_MULTIPATH_IOA [=n]
-# Type : tristate
-# Defined at drivers/md/Kconfig:466
-# Prompt: I/O Path Selector based on CPU submission
-# Depends on: MD [=y] && DM_MULTIPATH [=m]
-# Location:
-# -> Device Drivers
-# -> Multiple devices driver support (RAID and LVM) (MD [=y])
-# -> Device mapper support (BLK_DEV_DM [=m])
-# -> Multipath target (DM_MULTIPATH [=m])
-#
-#
-#
-# CONFIG_DM_MULTIPATH_IOA is not set
--
GitLab
3 years, 1 month
[OS-BUILD PATCH] [redhat] New configs in drivers/nvme
by GitLab Bridge on behalf of jeremycline
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
CONFIG_NVME_TARGET_PASSTHRU:
This enables target side NVMe passthru controller support for the
NVMe Over Fabrics protocol. It allows for hosts to manage and
directly access an actual NVMe controller residing on the target
side, incuding executing Vendor Unique Commands.
If unsure, say N.
Symbol: NVME_TARGET_PASSTHRU [=n]
Type : bool
Defined at drivers/nvme/target/Kconfig:19
Prompt: NVMe Target Passthrough support
Depends on: NVME_TARGET [=m] && (NVME_CORE [=m]=y || NVME_CORE [=m]=NVME_TARGET [=m])
Location:
-> Device Drivers
-> NVME Support
-> NVMe Target support (NVME_TARGET [=m])
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../generic/CONFIG_NVME_TARGET_PASSTHRU | 1 +
.../generic/CONFIG_NVME_TARGET_PASSTHRU | 22 -------------------
2 files changed, 1 insertion(+), 22 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_NVME_TARGET_PASSTHRU
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_NVME_TARGET_PASSTHRU
diff --git a/redhat/configs/common/generic/CONFIG_NVME_TARGET_PASSTHRU b/redhat/configs/common/generic/CONFIG_NVME_TARGET_PASSTHRU
new file mode 100644
index 000000000000..12bf02e23a41
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_NVME_TARGET_PASSTHRU
@@ -0,0 +1 @@
+# CONFIG_NVME_TARGET_PASSTHRU is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_NVME_TARGET_PASSTHRU b/redhat/configs/pending-common/generic/CONFIG_NVME_TARGET_PASSTHRU
deleted file mode 100644
index 2795e2bb3e5e..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_NVME_TARGET_PASSTHRU
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_NVME_TARGET_PASSTHRU:
-#
-# This enables target side NVMe passthru controller support for the
-# NVMe Over Fabrics protocol. It allows for hosts to manage and
-# directly access an actual NVMe controller residing on the target
-# side, incuding executing Vendor Unique Commands.
-#
-# If unsure, say N.
-#
-# Symbol: NVME_TARGET_PASSTHRU [=n]
-# Type : bool
-# Defined at drivers/nvme/target/Kconfig:19
-# Prompt: NVMe Target Passthrough support
-# Depends on: NVME_TARGET [=m] && (NVME_CORE [=m]=y || NVME_CORE [=m]=NVME_TARGET [=m])
-# Location:
-# -> Device Drivers
-# -> NVME Support
-# -> NVMe Target support (NVME_TARGET [=m])
-#
-#
-#
-# CONFIG_NVME_TARGET_PASSTHRU is not set
--
GitLab
3 years, 1 month
[OS-BUILD PATCH] common: enable RTC_SYSTOHC to supplement
update_persistent_clock64
by GitLab Bridge on behalf of pbrobinson
From: Peter Robinson <pbrobinson(a)gmail.com>
We already enable RTC_HCTOSYS in common config, this is the inverse
for syncing NTP to HW RTCs, and seems slightly better/preferred on
non x86-style CMOS RTCa than update_persistent_clock.
Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
---
redhat/configs/common/generic/CONFIG_RTC_SYSTOHC | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/redhat/configs/common/generic/CONFIG_RTC_SYSTOHC b/redhat/configs/common/generic/CONFIG_RTC_SYSTOHC
index 03ebe734a152..f3581c76b8c6 100644
--- a/redhat/configs/common/generic/CONFIG_RTC_SYSTOHC
+++ b/redhat/configs/common/generic/CONFIG_RTC_SYSTOHC
@@ -1 +1 @@
-# CONFIG_RTC_SYSTOHC is not set
+CONFIG_RTC_SYSTOHC=y
--
GitLab
3 years, 1 month
[OS-BUILD PATCH] efi: The EFI_VARS is legacy and now x86 only
by GitLab Bridge on behalf of pbrobinson
From: Peter Robinson <pbrobinson(a)gmail.com>
As of upstream commit 963fabf the EFI_VARS option is set to x86
only as it's long been deprecated pre !intel support and is due to
be removed so it now does nothing on arm platforms.
Fedora actually disabled this on x86 too, I do wonder if it's
worth considering disabling it in ark platforms too?
Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
Cc: Mark Salter <msalter(a)redhat.com>
Cc: Al Stone <ahs3(a)redhat.com>
---
redhat/configs/ark/generic/arm/aarch64/CONFIG_EFI_VARS | 1 -
redhat/configs/fedora/generic/arm/CONFIG_EFI_VARS | 1 -
2 files changed, 2 deletions(-)
delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_EFI_VARS
delete mode 100644 redhat/configs/fedora/generic/arm/CONFIG_EFI_VARS
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_EFI_VARS b/redhat/configs/ark/generic/arm/aarch64/CONFIG_EFI_VARS
deleted file mode 100644
index b9206d9f457a..000000000000
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_EFI_VARS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_VARS=y
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_EFI_VARS b/redhat/configs/fedora/generic/arm/CONFIG_EFI_VARS
deleted file mode 100644
index b9206d9f457a..000000000000
--- a/redhat/configs/fedora/generic/arm/CONFIG_EFI_VARS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_VARS=y
--
GitLab
3 years, 1 month
[OS-BUILD PATCH] generic: arm: enable SCMI for all options
by GitLab Bridge on behalf of pbrobinson
From: Peter Robinson <pbrobinson(a)gmail.com>
The Arm System Control and Management Interface (SCMI) specification is
a new standard firmware interface for Arm devices from Arm.
Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
CC: ahs3(a)redhat.com
---
redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_SCMI_PROTOCOL | 1 -
.../{fedora => common}/generic/arm/CONFIG_ARM_SCMI_CPUFREQ | 0
.../{fedora => common}/generic/arm/CONFIG_ARM_SCMI_POWER_DOMAIN | 0
.../{fedora => common}/generic/arm/CONFIG_ARM_SCMI_PROTOCOL | 0
.../{fedora => common}/generic/arm/CONFIG_COMMON_CLK_SCMI | 0
redhat/configs/{fedora => common}/generic/arm/CONFIG_RESET_SCMI | 0
.../{fedora => common}/generic/arm/CONFIG_SENSORS_ARM_SCMI | 0
7 files changed, 1 deletion(-)
delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_SCMI_PROTOCOL
rename redhat/configs/{fedora => common}/generic/arm/CONFIG_ARM_SCMI_CPUFREQ (100%)
rename redhat/configs/{fedora => common}/generic/arm/CONFIG_ARM_SCMI_POWER_DOMAIN (100%)
rename redhat/configs/{fedora => common}/generic/arm/CONFIG_ARM_SCMI_PROTOCOL (100%)
rename redhat/configs/{fedora => common}/generic/arm/CONFIG_COMMON_CLK_SCMI (100%)
rename redhat/configs/{fedora => common}/generic/arm/CONFIG_RESET_SCMI (100%)
rename redhat/configs/{fedora => common}/generic/arm/CONFIG_SENSORS_ARM_SCMI (100%)
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_SCMI_PROTOCOL b/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_SCMI_PROTOCOL
deleted file mode 100644
index 8e99d7695567..000000000000
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_SCMI_PROTOCOL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM_SCMI_PROTOCOL is not set
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_ARM_SCMI_CPUFREQ b/redhat/configs/common/generic/arm/CONFIG_ARM_SCMI_CPUFREQ
similarity index 100%
rename from redhat/configs/fedora/generic/arm/CONFIG_ARM_SCMI_CPUFREQ
rename to redhat/configs/common/generic/arm/CONFIG_ARM_SCMI_CPUFREQ
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_ARM_SCMI_POWER_DOMAIN b/redhat/configs/common/generic/arm/CONFIG_ARM_SCMI_POWER_DOMAIN
similarity index 100%
rename from redhat/configs/fedora/generic/arm/CONFIG_ARM_SCMI_POWER_DOMAIN
rename to redhat/configs/common/generic/arm/CONFIG_ARM_SCMI_POWER_DOMAIN
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_ARM_SCMI_PROTOCOL b/redhat/configs/common/generic/arm/CONFIG_ARM_SCMI_PROTOCOL
similarity index 100%
rename from redhat/configs/fedora/generic/arm/CONFIG_ARM_SCMI_PROTOCOL
rename to redhat/configs/common/generic/arm/CONFIG_ARM_SCMI_PROTOCOL
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_COMMON_CLK_SCMI b/redhat/configs/common/generic/arm/CONFIG_COMMON_CLK_SCMI
similarity index 100%
rename from redhat/configs/fedora/generic/arm/CONFIG_COMMON_CLK_SCMI
rename to redhat/configs/common/generic/arm/CONFIG_COMMON_CLK_SCMI
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_RESET_SCMI b/redhat/configs/common/generic/arm/CONFIG_RESET_SCMI
similarity index 100%
rename from redhat/configs/fedora/generic/arm/CONFIG_RESET_SCMI
rename to redhat/configs/common/generic/arm/CONFIG_RESET_SCMI
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_SENSORS_ARM_SCMI b/redhat/configs/common/generic/arm/CONFIG_SENSORS_ARM_SCMI
similarity index 100%
rename from redhat/configs/fedora/generic/arm/CONFIG_SENSORS_ARM_SCMI
rename to redhat/configs/common/generic/arm/CONFIG_SENSORS_ARM_SCMI
--
GitLab
3 years, 1 month
[OS-BUILD PATCH] common: fix WM8804 codec dependencies
by GitLab Bridge on behalf of pbrobinson
From: Peter Robinson <pbrobinson(a)redhat.com>
The WM8804 codec is required for Intel Apollo Lake support so enable it
as it's a supported RHEL for Edge platform.
Some minor cleanups for the WM8804 codec configs while we're at it.
Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com>
---
.../generic/x86/CONFIG_SND_SOC_WM8804_I2C | 0
.../fedora/generic/CONFIG_SND_SOC_WM8804 | 1 -
.../fedora/generic/arm/CONFIG_SND_SOC_WM8804 | 1 -
.../x86/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH | 23 -------------------
.../fedora/generic/x86/CONFIG_SND_SOC_WM8804 | 1 -
5 files changed, 26 deletions(-)
rename redhat/configs/{fedora => common}/generic/x86/CONFIG_SND_SOC_WM8804_I2C (100%)
delete mode 100644 redhat/configs/fedora/generic/CONFIG_SND_SOC_WM8804
delete mode 100644 redhat/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8804
delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH
delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804_I2C b/redhat/configs/common/generic/x86/CONFIG_SND_SOC_WM8804_I2C
similarity index 100%
rename from redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804_I2C
rename to redhat/configs/common/generic/x86/CONFIG_SND_SOC_WM8804_I2C
diff --git a/redhat/configs/fedora/generic/CONFIG_SND_SOC_WM8804 b/redhat/configs/fedora/generic/CONFIG_SND_SOC_WM8804
deleted file mode 100644
index 074702b5ef5e..000000000000
--- a/redhat/configs/fedora/generic/CONFIG_SND_SOC_WM8804
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_WM8804 is not set
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8804 b/redhat/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8804
deleted file mode 100644
index 04b89d9ff78b..000000000000
--- a/redhat/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8804
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_WM8804=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH b/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH
deleted file mode 100644
index bb7ee45866a6..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH
+++ /dev/null
@@ -1,23 +0,0 @@
-# CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH:
-#
-# This adds support for ASoC machine driver for Intel platforms
-# with the Wolfson/Cirrus WM8804 I2S audio codec.
-# Say Y or m if you have such a device. This is a recommended option.
-# If unsure select "N".
-#
-# Symbol: SND_SOC_INTEL_SOF_WM8804_MACH [=n]
-# Type : tristate
-# Defined at sound/soc/intel/boards/Kconfig:329
-# Prompt: SOF with Wolfson/Cirrus WM8804 codec
-# Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_SOC_INTEL_MACH [=y] && SND_SOC_SOF_APOLLOLAKE [=m] && I2C [=y] && ACPI [=y] && (MFD_INTEL_LPSS [=y] || COMPILE_TEST [=n])
-# Location:
-# -> Device Drivers
-# -> Sound card support (SOUND [=m])
-# -> Advanced Linux Sound Architecture (SND [=m])
-# -> ALSA for SoC audio support (SND_SOC [=m])
-# -> Intel Machine drivers (SND_SOC_INTEL_MACH [=y])
-# Selects: SND_SOC_WM8804_I2C [=n]
-#
-#
-#
-CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804 b/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804
deleted file mode 100644
index 04b89d9ff78b..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_SND_SOC_WM8804
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_WM8804=m
--
GitLab
3 years, 1 month
[OS-BUILD PATCH 0/7] Move all x86 legacy input options to that
architecture
by GitLab Bridge on behalf of pbrobinson
From: pbrobinson on gitlab.com
None of the non x86 architectures support PS2, AT keyboards, i8042
controllers and related bits. This cleans up a bunch of those options as
well as syncing some of the Fedora options on non x86 to be the same as
ARK by moving the ARK bits to generic.
Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
3 years, 1 month