diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2019-07-22 13:27:49 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2019-07-22 13:27:49 +0100 |
| commit | 1c98607f418b4e3014a9f386f9398b4a1bd61d38 (patch) | |
| tree | 08868d83ffd266cfb24de16f0005c8b416ec9403 /configs | |
| parent | c7dd95a6bb07795d500fb288a61f7974447ed514 (diff) | |
| download | kernel-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')
| -rw-r--r-- | configs/fedora/generic/CONFIG_DPAA2_CONSOLE | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_FSL_ENETC | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_FSL_ENETC_VF | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/CONFIG_IMX_SCU_SOC | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR (renamed from configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR) | 0 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC | 1 | ||||
| -rw-r--r-- | configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR | 1 |
12 files changed, 5 insertions, 6 deletions
diff --git a/configs/fedora/generic/CONFIG_DPAA2_CONSOLE b/configs/fedora/generic/CONFIG_DPAA2_CONSOLE deleted file mode 100644 index 474de46bf..000000000 --- a/configs/fedora/generic/CONFIG_DPAA2_CONSOLE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DPAA2_CONSOLE is not set diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC b/configs/fedora/generic/CONFIG_FSL_ENETC deleted file mode 100644 index cbb37c22c..000000000 --- a/configs/fedora/generic/CONFIG_FSL_ENETC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FSL_ENETC is not set diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING b/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING deleted file mode 100644 index 21018ddd5..000000000 --- a/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK b/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK deleted file mode 100644 index bbc51f2b6..000000000 --- a/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FSL_ENETC_PTP_CLOCK is not set diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_VF b/configs/fedora/generic/CONFIG_FSL_ENETC_VF deleted file mode 100644 index 3501beeab..000000000 --- a/configs/fedora/generic/CONFIG_FSL_ENETC_VF +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FSL_ENETC_VF is not set diff --git a/configs/fedora/generic/CONFIG_IMX_SCU_SOC b/configs/fedora/generic/CONFIG_IMX_SCU_SOC deleted file mode 100644 index 88890780b..000000000 --- a/configs/fedora/generic/CONFIG_IMX_SCU_SOC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_IMX_SCU_SOC is not set diff --git a/configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR index be81f38c4..be81f38c4 100644 --- a/configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR +++ b/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR 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 |