From: Mark Salter on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2172
RHEL needs support for tegra194 and tegra234 SoCs, so move some configs from redhat/configs/fedora to redhat/configs/common where they can be shared.
Signed-off-by: Mark Salter msalter@redhat.com
--- redhat/configs/ark/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC | 1 - redhat/configs/ark/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC | 1 - redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_TEGRA186_CPUFREQ | 1 + redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA_IVC | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC => redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC => redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM_TEGRA194_CPUFREQ => redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_TEGRA194_CPUFREQ | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186 => redhat/configs/common/generic/arm/aarch64/CONFIG_GPIO_TEGRA186 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST => redhat/configs/common/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U => redhat/configs/common/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU => redhat/configs/common/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU_CONSOLE => redhat/configs/common/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU_CONSOLE | 0 redhat/configs/common/generic/arm/aarch64/CONFIG_SOC_TEGRA_CBB | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL => redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX => redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX | 0 redhat/configs/fedora/generic/arm/CONFIG_I2C_TEGRA_BPMP => redhat/configs/common/generic/arm/CONFIG_I2C_TEGRA_BPMP | 0 redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX => redhat/configs/common/generic/arm/CONFIG_TEGRA_HSP_MBOX | 0 redhat/configs/fedora/generic/arm/CONFIG_TEGRA_IVC => redhat/configs/common/generic/arm/CONFIG_TEGRA_IVC | 0 redhat/configs/fedora/generic/arm/CONFIG_ARM_TEGRA194_CPUFREQ | 1 - redhat/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX | 1 - redhat/configs/pending-fedora/generic/CONFIG_SOC_TEGRA_CBB | 13 ---------- 21 files changed, 2 insertions(+), 18 deletions(-)
From: Mark Salter msalter@redhat.com
redhat/configs: aarch64: reorganize tegra configs to common dir
RHEL needs support for tegra194 and tegra234 SoCs, so move some configs from redhat.configs/fedora to redhat/configs/common where they can be shared.
Signed-off-by: Mark Salter msalter@redhat.com
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC b/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ARCH_TEGRA_194_SOC is not set diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC b/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ARCH_TEGRA_234_SOC is not set diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_TEGRA186_CPUFREQ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_TEGRA186_CPUFREQ new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_ARM_TEGRA186_CPUFREQ @@ -0,0 +1 @@ +# CONFIG_ARM_TEGRA186_CPUFREQ is not set diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA_IVC b/redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA_IVC deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA_IVC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_TEGRA_IVC is not set diff --git a/redhat/configs/fedora/generic/arm/CONFIG_I2C_TEGRA_BPMP b/redhat/configs/common/generic/arm/CONFIG_I2C_TEGRA_BPMP rename from redhat/configs/fedora/generic/arm/CONFIG_I2C_TEGRA_BPMP rename to redhat/configs/common/generic/arm/CONFIG_I2C_TEGRA_BPMP index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/CONFIG_I2C_TEGRA_BPMP +++ b/redhat/configs/common/generic/arm/CONFIG_I2C_TEGRA_BPMP diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX b/redhat/configs/common/generic/arm/CONFIG_TEGRA_HSP_MBOX rename from redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX rename to redhat/configs/common/generic/arm/CONFIG_TEGRA_HSP_MBOX index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX +++ b/redhat/configs/common/generic/arm/CONFIG_TEGRA_HSP_MBOX diff --git a/redhat/configs/fedora/generic/arm/CONFIG_TEGRA_IVC b/redhat/configs/common/generic/arm/CONFIG_TEGRA_IVC rename from redhat/configs/fedora/generic/arm/CONFIG_TEGRA_IVC rename to redhat/configs/common/generic/arm/CONFIG_TEGRA_IVC index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/CONFIG_TEGRA_IVC +++ b/redhat/configs/common/generic/arm/CONFIG_TEGRA_IVC diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC rename to redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_TEGRA_194_SOC diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC rename to redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_TEGRA_234_SOC diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM_TEGRA194_CPUFREQ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_TEGRA194_CPUFREQ rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM_TEGRA194_CPUFREQ rename to redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_TEGRA194_CPUFREQ index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM_TEGRA194_CPUFREQ +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_TEGRA194_CPUFREQ diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186 b/redhat/configs/common/generic/arm/aarch64/CONFIG_GPIO_TEGRA186 rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186 rename to redhat/configs/common/generic/arm/aarch64/CONFIG_GPIO_TEGRA186 index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TEGRA186 +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_GPIO_TEGRA186 diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST b/redhat/configs/common/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST rename to redhat/configs/common/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U b/redhat/configs/common/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U rename to redhat/configs/common/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU b/redhat/configs/common/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU rename to redhat/configs/common/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU_CONSOLE b/redhat/configs/common/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU_CONSOLE rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU_CONSOLE rename to redhat/configs/common/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU_CONSOLE index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU_CONSOLE +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_SERIAL_TEGRA_TCU_CONSOLE diff --git a/redhat/configs/pending-fedora/generic/CONFIG_SOC_TEGRA_CBB b/redhat/configs/common/generic/arm/aarch64/CONFIG_SOC_TEGRA_CBB rename from redhat/configs/pending-fedora/generic/CONFIG_SOC_TEGRA_CBB rename to redhat/configs/common/generic/arm/aarch64/CONFIG_SOC_TEGRA_CBB index blahblah..blahblah 100644 --- a/redhat/configs/pending-fedora/generic/CONFIG_SOC_TEGRA_CBB +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_SOC_TEGRA_CBB diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL b/redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL rename to redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX b/redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX rename to redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX diff --git a/redhat/configs/fedora/generic/arm/CONFIG_ARM_TEGRA194_CPUFREQ b/redhat/configs/fedora/generic/arm/CONFIG_ARM_TEGRA194_CPUFREQ deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/arm/CONFIG_ARM_TEGRA194_CPUFREQ +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ARM_TEGRA194_CPUFREQ=y diff --git a/redhat/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX b/redhat/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_TEGRA_HSP_MBOX is not set
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2172
From: Mark Salter msalter@redhat.com
redhat/configs: make SOC_TEGRA_CBB a module
There's no need to build in SOC_TEGRA_CBB so make it a module.
Signed-off-by: Mark Salter msalter@redhat.com
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_SOC_TEGRA_CBB b/redhat/configs/common/generic/arm/aarch64/CONFIG_SOC_TEGRA_CBB index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/arm/aarch64/CONFIG_SOC_TEGRA_CBB +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_SOC_TEGRA_CBB @@ -1,13 +1 @@ -# Symbol: SOC_TEGRA_CBB [=y] -# Type : tristate -# Defined at drivers/soc/tegra/Kconfig:165 -# Prompt: Tegra driver to handle error from CBB -# Depends on: ARCH_TEGRA_194_SOC [=y] || ARCH_TEGRA_234_SOC [=y] -# Location: -# Main menu -# -> Device Drivers -# -> SOC (System On Chip) specific Drivers -# -# -# -CONFIG_SOC_TEGRA_CBB=y +CONFIG_SOC_TEGRA_CBB=m
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2172
From: pbrobinson on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2172#note_1201655...
LGTM
kernel@lists.fedoraproject.org