diff options
| author |   Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> | 2021-03-11 16:25:38 +0100 |
|---|---|---|
| committer |   Dinh Nguyen <dinguyen@kernel.org> | 2021-03-23 11:03:36 -0500 |
| commit | 4a9a1a5602d82c079325bf37466af0b67d6c0b9e (patch) | |
| tree | 61d56f59ed766797247b0fcde819c3ca1fa47ecd /arch/arm64/boot/dts/intel/Makefile | |
| parent | EDAC: altera: merge ARCH_SOCFPGA and ARCH_STRATIX10 (diff) | |
| download | linux-dev-4a9a1a5602d82c079325bf37466af0b67d6c0b9e.tar.xz linux-dev-4a9a1a5602d82c079325bf37466af0b67d6c0b9e.zip | |
arm64: socfpga: merge Agilex and N5X into ARCH_INTEL_SOCFPGA
Agilex, N5X and Stratix 10 share all quite similar arm64 hard cores and
SoC-part. Up to a point that N5X uses the same DTSI as Agilex. From
the Linux kernel point of view these are flavors of the same
architecture so there is no need for three top-level arm64
architectures. Simplify this by merging all three architectures into
ARCH_INTEL_SOCFPGA and dropping the other ARCH* arm64 Kconfig entries.
The side effect is that the INTEL_STRATIX10_SERVICE will now be
available for both 32-bit and 64-bit Intel SoCFPGA, even though it is
used only for 64-bit.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Diffstat (limited to 'arch/arm64/boot/dts/intel/Makefile')
| -rw-r--r-- | arch/arm64/boot/dts/intel/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/intel/Makefile b/arch/arm64/boot/dts/intel/Makefile index 3a052540605b..0b5477442263 100644 --- a/arch/arm64/boot/dts/intel/Makefile +++ b/arch/arm64/boot/dts/intel/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -dtb-$(CONFIG_ARCH_AGILEX) += socfpga_agilex_socdk.dtb \ - socfpga_agilex_socdk_nand.dtb +dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga_agilex_socdk.dtb \ + socfpga_agilex_socdk_nand.dtb \ + socfpga_n5x_socdk.dtb dtb-$(CONFIG_ARCH_KEEMBAY) += keembay-evm.dtb -dtb-$(CONFIG_ARCH_N5X) += socfpga_n5x_socdk.dtb |