From d3057540465a61b4aecdc4bc70f6108b1f170c39 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 17 Apr 2018 14:27:36 +0100 Subject: [PATCH] Tegra TX fixes attempt 2 --- configs/fedora/generic/arm/CONFIG_TEGRA_BPMP | 1 + configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX | 2 +- configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX | 1 + configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_IVC | 1 - configs/fedora/generic/arm/armv7/CONFIG_TEGRA_IVC | 1 - kernel-armv7hl-debug.config | 3 ++- kernel-armv7hl-lpae-debug.config | 3 ++- kernel-armv7hl-lpae.config | 3 ++- kernel-armv7hl.config | 3 ++- 9 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 configs/fedora/generic/arm/CONFIG_TEGRA_BPMP create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX delete mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_IVC delete mode 100644 configs/fedora/generic/arm/armv7/CONFIG_TEGRA_IVC diff --git a/configs/fedora/generic/arm/CONFIG_TEGRA_BPMP b/configs/fedora/generic/arm/CONFIG_TEGRA_BPMP new file mode 100644 index 000000000..9127d3c57 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_TEGRA_BPMP @@ -0,0 +1 @@ +# CONFIG_TEGRA_BPMP is not set diff --git a/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX b/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX index 3d46b7c93..54f071b05 100644 --- a/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX +++ b/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX @@ -1 +1 @@ -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX new file mode 100644 index 000000000..3d46b7c93 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX @@ -0,0 +1 @@ +CONFIG_TEGRA_HSP_MBOX=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_IVC b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_IVC deleted file mode 100644 index cdcacbec2..000000000 --- a/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_IVC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TEGRA_IVC=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_TEGRA_IVC b/configs/fedora/generic/arm/armv7/CONFIG_TEGRA_IVC deleted file mode 100644 index cdcacbec2..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_TEGRA_IVC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_TEGRA_IVC=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 3a9873bf1..09b1cbdd6 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -6272,10 +6272,11 @@ CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA20_MC=y CONFIG_TEGRA_AHB=y +# CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_TEGRA_HOST1X=m -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_TEGRA_IVC=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 0e9a73185..51a051874 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -5872,10 +5872,11 @@ CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y # CONFIG_TEGRA20_MC is not set CONFIG_TEGRA_AHB=y +# CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_TEGRA_HOST1X=m -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set # CONFIG_TEGRA_IOMMU_GART is not set CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_TEGRA_IVC=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 308dfdce4..0d2417745 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -5848,10 +5848,11 @@ CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y # CONFIG_TEGRA20_MC is not set CONFIG_TEGRA_AHB=y +# CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_TEGRA_HOST1X=m -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set # CONFIG_TEGRA_IOMMU_GART is not set CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_TEGRA_IVC=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index b5784c526..33d140d78 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -6248,10 +6248,11 @@ CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA20_MC=y CONFIG_TEGRA_AHB=y +# CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_TEGRA_HOST1X=m -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_TEGRA_IVC=y