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 /drivers/fpga | |
| parent | 098da961d8b8c279d34a8f7cd26ff0317f718df6 (diff) | |
| download | linux-4a9a1a5602d82c079325bf37466af0b67d6c0b9e.tar.gz linux-4a9a1a5602d82c079325bf37466af0b67d6c0b9e.tar.bz2 linux-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 'drivers/fpga')
| -rw-r--r-- | drivers/fpga/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index 5ff9438b7b46..fd325e9c5ce6 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -60,7 +60,7 @@ config FPGA_MGR_ZYNQ_FPGA config FPGA_MGR_STRATIX10_SOC tristate "Intel Stratix10 SoC FPGA Manager" - depends on (ARCH_STRATIX10 && INTEL_STRATIX10_SERVICE) + depends on (ARCH_INTEL_SOCFPGA && INTEL_STRATIX10_SERVICE) help FPGA manager driver support for the Intel Stratix10 SoC. |