summaryrefslogtreecommitdiffstats
path: root/configs/fedora/generic/arm
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-07-22 13:27:49 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-07-22 13:27:49 +0100
commit1c98607f418b4e3014a9f386f9398b4a1bd61d38 (patch)
tree08868d83ffd266cfb24de16f0005c8b416ec9403 /configs/fedora/generic/arm
parentc7dd95a6bb07795d500fb288a61f7974447ed514 (diff)
downloadkernel-1c98607f418b4e3014a9f386f9398b4a1bd61d38.tar.gz
kernel-1c98607f418b4e3014a9f386f9398b4a1bd61d38.tar.xz
kernel-1c98607f418b4e3014a9f386f9398b4a1bd61d38.zip
arm: part 4 (and the last) of the merge window updates
Diffstat (limited to 'configs/fedora/generic/arm')
-rw-r--r--configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR1
6 files changed, 6 insertions, 0 deletions
diff --git a/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR
new file mode 100644
index 000000000..be81f38c4
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR
@@ -0,0 +1 @@
+# CONFIG_NVMEM_SNVS_LPGPR is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC b/configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC
new file mode 100644
index 000000000..b21161a4e
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC
@@ -0,0 +1 @@
+CONFIG_AL_FIC=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE b/configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE
new file mode 100644
index 000000000..01930567e
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE
@@ -0,0 +1 @@
+CONFIG_DPAA2_CONSOLE=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING
new file mode 100644
index 000000000..3e18eab35
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING
@@ -0,0 +1 @@
+CONFIG_FSL_ENETC_HW_TIMESTAMPING=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC
new file mode 100644
index 000000000..57c96444a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC
@@ -0,0 +1 @@
+CONFIG_IMX_SCU_SOC=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR
new file mode 100644
index 000000000..21803b106
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR
@@ -0,0 +1 @@
+CONFIG_NVMEM_SNVS_LPGPR=m