OSDN Git Service

arm64: socfpga: merge Agilex and N5X into ARCH_INTEL_SOCFPGA
authorKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Thu, 11 Mar 2021 15:25:38 +0000 (16:25 +0100)
committerDinh Nguyen <dinguyen@kernel.org>
Tue, 23 Mar 2021 16:03:36 +0000 (11:03 -0500)
commit4a9a1a5602d82c079325bf37466af0b67d6c0b9e
tree61d56f59ed766797247b0fcde819c3ca1fa47ecd
parent098da961d8b8c279d34a8f7cd26ff0317f718df6
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>
arch/arm64/Kconfig.platforms
arch/arm64/boot/dts/intel/Makefile
arch/arm64/configs/defconfig
drivers/clk/Makefile
drivers/clk/socfpga/Kconfig
drivers/firmware/Kconfig
drivers/fpga/Kconfig
drivers/reset/Kconfig