[U-Boot] [PATCH v8 3/7] arm: socfpga: Convert all Intel related FPGA configuration to Kconfig

Marek Vasut
2017-06-06T08:53:21Z

On 06/06/2017 10:48 AM, Chee, Tien Fong wrote:
> On Sel, 2017-06-06 at 10:32 +0200, Marek Vasut wrote:
>> On 06/06/2017 10:16 AM, Chee, Tien Fong wrote:
>>>
>>> On Sel, 2017-06-06 at 09:57 +0200, Marek Vasut wrote:
>>>>
>>>> On 06/06/2017 08:35 AM, tien.fong.chee at intel.com wrote:
>>>>>
>>>>>
>>>>> From: Tien Fong Chee <tien.fong.chee@intel.com>
>>>>>
>>>>> This converts the following to Kconfig:
>>>>> CONFIG_FPGA
>>>>> CONFIG_FPGA_ALTERA
>>>>> CONFIG_FPGA_SOCFPGA
>>>>>
>>>>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com>
>>>>> ---
>>>>> configs/astro_mcf5373l_defconfig | 1 +
>>>>> configs/socfpga_arria5_defconfig | 1 +
>>>>> configs/socfpga_cyclone5_defconfig | 1 +
>>>>> configs/socfpga_de0_nano_soc_defconfig | 1 +
>>>>> configs/socfpga_de10_nano_defconfig | 1 +
>>>>> configs/socfpga_de1_soc_defconfig | 1 +
>>>>> configs/socfpga_is1_defconfig | 1 +
>>>>> configs/socfpga_mcvevk_defconfig | 1 +
>>>>> configs/socfpga_sockit_defconfig | 1 +
>>>>> configs/socfpga_socrates_defconfig | 1 +
>>>>> configs/socfpga_sr1500_defconfig | 1 +
>>>>> configs/socfpga_vining_fpga_defconfig | 1 +
>>>>> configs/theadorable_debug_defconfig | 1 +
>>>>> configs/theadorable_defconfig | 1 +
>>>>> drivers/fpga/Kconfig | 8 ++++++++
>>>>> include/configs/astro_mcf5373l.h | 2 --
>>>>> include/configs/socfpga_common.h | 3 ---
>>>>> include/configs/theadorable.h | 2 --
>>>>> 18 files changed, 22 insertions(+), 7 deletions(-)
>>>>>
>>>>> diff --git a/configs/astro_mcf5373l_defconfig
>>>>> b/configs/astro_mcf5373l_defconfig
>>>>> index d5e8430..80fb1fa 100644
>>>>> --- a/configs/astro_mcf5373l_defconfig
>>>>> +++ b/configs/astro_mcf5373l_defconfig
>>>>> @@ -10,4 +10,5 @@ CONFIG_CMD_I2C=y
>>>>> # CONFIG_CMD_NFS is not set
>>>>> CONFIG_CMD_CACHE=y
>>>>> CONFIG_CMD_DATE=y
>>>>> +CONFIG_FPGA_ALTERA=y
>>>> This MCF should be in separate patch, otherwise looks OK.
>>>>
>>> Sorry, i am still not catching your point. Why MCF should be in
>>> separate patch, because CONFIG_FPGA_ALTERA? If so, that means
>>> all defconfigs which contain CONFIG_FPGA_ALTERA should be in
>>> separate
>>> patch?
>> Yes. It's only this one which contains FPGA_ALTERA , no ?
>>
> no, a few contain FPGA_ALTERA such
> as theadorable_defconfig, theadorable_debug_defconfig...

Then split them please.

>>>
>>>>
>>>>>
>>>>>
>>>>> CONFIG_MTD_NOR_FLASH=y
>>>>> diff --git a/configs/socfpga_arria5_defconfig
>>>>> b/configs/socfpga_arria5_defconfig
>>>>> index a565384..6f2a06f 100644
>>>>> --- a/configs/socfpga_arria5_defconfig
>>>>> +++ b/configs/socfpga_arria5_defconfig
>>>>> @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y
>>>>> CONFIG_SPL_DM=y
>>>>> CONFIG_SPL_DM_SEQ_ALIAS=y
>>>>> CONFIG_DFU_MMC=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_SYS_I2C_DW=y
>>>>> diff --git a/configs/socfpga_cyclone5_defconfig
>>>>> b/configs/socfpga_cyclone5_defconfig
>>>>> index 06fc82c..1047657 100644
>>>>> --- a/configs/socfpga_cyclone5_defconfig
>>>>> +++ b/configs/socfpga_cyclone5_defconfig
>>>>> @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y
>>>>> CONFIG_SPL_DM=y
>>>>> CONFIG_SPL_DM_SEQ_ALIAS=y
>>>>> CONFIG_DFU_MMC=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_SYS_I2C_DW=y
>>>>> diff --git a/configs/socfpga_de0_nano_soc_defconfig
>>>>> b/configs/socfpga_de0_nano_soc_defconfig
>>>>> index 0697e2e..72a9e5d 100644
>>>>> --- a/configs/socfpga_de0_nano_soc_defconfig
>>>>> +++ b/configs/socfpga_de0_nano_soc_defconfig
>>>>> @@ -39,6 +39,7 @@ CONFIG_CMD_FS_GENERIC=y
>>>>> CONFIG_CMD_UBI=y
>>>>> CONFIG_SPL_DM=y
>>>>> CONFIG_DFU_MMC=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_SYS_I2C_DW=y
>>>>> diff --git a/configs/socfpga_de10_nano_defconfig
>>>>> b/configs/socfpga_de10_nano_defconfig
>>>>> index cd64fb9..67864cf 100644
>>>>> --- a/configs/socfpga_de10_nano_defconfig
>>>>> +++ b/configs/socfpga_de10_nano_defconfig
>>>>> @@ -37,6 +37,7 @@ CONFIG_CMD_FAT=y
>>>>> CONFIG_CMD_FS_GENERIC=y
>>>>> CONFIG_SPL_DM=y
>>>>> CONFIG_DFU_MMC=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_SYS_I2C_DW=y
>>>>> diff --git a/configs/socfpga_de1_soc_defconfig
>>>>> b/configs/socfpga_de1_soc_defconfig
>>>>> index bba90be..35c4484 100644
>>>>> --- a/configs/socfpga_de1_soc_defconfig
>>>>> +++ b/configs/socfpga_de1_soc_defconfig
>>>>> @@ -38,6 +38,7 @@ CONFIG_CMD_EXT4_WRITE=y
>>>>> CONFIG_CMD_FAT=y
>>>>> CONFIG_CMD_FS_GENERIC=y
>>>>> CONFIG_SPL_DM=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_SYS_I2C_DW=y
>>>>> diff --git a/configs/socfpga_is1_defconfig
>>>>> b/configs/socfpga_is1_defconfig
>>>>> index 058791e..ae688f8 100644
>>>>> --- a/configs/socfpga_is1_defconfig
>>>>> +++ b/configs/socfpga_is1_defconfig
>>>>> @@ -34,6 +34,7 @@ CONFIG_CMD_FS_GENERIC=y
>>>>> CONFIG_CMD_UBI=y
>>>>> CONFIG_SPL_DM=y
>>>>> CONFIG_SPL_DM_SEQ_ALIAS=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_SYS_I2C_DW=y
>>>>> diff --git a/configs/socfpga_mcvevk_defconfig
>>>>> b/configs/socfpga_mcvevk_defconfig
>>>>> index 627b90f..c5e3b7b 100644
>>>>> --- a/configs/socfpga_mcvevk_defconfig
>>>>> +++ b/configs/socfpga_mcvevk_defconfig
>>>>> @@ -38,6 +38,7 @@ CONFIG_CMD_FS_GENERIC=y
>>>>> CONFIG_CMD_UBI=y
>>>>> CONFIG_SPL_DM=y
>>>>> CONFIG_DFU_MMC=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_SYS_I2C_DW=y
>>>>> diff --git a/configs/socfpga_sockit_defconfig
>>>>> b/configs/socfpga_sockit_defconfig
>>>>> index bf5d63d..3ff7bb7 100644
>>>>> --- a/configs/socfpga_sockit_defconfig
>>>>> +++ b/configs/socfpga_sockit_defconfig
>>>>> @@ -40,6 +40,7 @@ CONFIG_CMD_UBI=y
>>>>> CONFIG_SPL_DM=y
>>>>> CONFIG_SPL_DM_SEQ_ALIAS=y
>>>>> CONFIG_DFU_MMC=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_SYS_I2C_DW=y
>>>>> diff --git a/configs/socfpga_socrates_defconfig
>>>>> b/configs/socfpga_socrates_defconfig
>>>>> index 5915faf..fb9c13f 100644
>>>>> --- a/configs/socfpga_socrates_defconfig
>>>>> +++ b/configs/socfpga_socrates_defconfig
>>>>> @@ -41,6 +41,7 @@ CONFIG_CMD_UBI=y
>>>>> CONFIG_SPL_DM=y
>>>>> CONFIG_SPL_DM_SEQ_ALIAS=y
>>>>> CONFIG_DFU_MMC=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_SYS_I2C_DW=y
>>>>> diff --git a/configs/socfpga_sr1500_defconfig
>>>>> b/configs/socfpga_sr1500_defconfig
>>>>> index 4468d3b..d90d6a1 100644
>>>>> --- a/configs/socfpga_sr1500_defconfig
>>>>> +++ b/configs/socfpga_sr1500_defconfig
>>>>> @@ -40,6 +40,7 @@ CONFIG_CMD_FS_GENERIC=y
>>>>> CONFIG_CMD_UBI=y
>>>>> CONFIG_SPL_DM=y
>>>>> CONFIG_SPL_DM_SEQ_ALIAS=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_SYS_I2C_DW=y
>>>>> diff --git a/configs/socfpga_vining_fpga_defconfig
>>>>> b/configs/socfpga_vining_fpga_defconfig
>>>>> index fb9bae4..c3fbe40 100644
>>>>> --- a/configs/socfpga_vining_fpga_defconfig
>>>>> +++ b/configs/socfpga_vining_fpga_defconfig
>>>>> @@ -44,6 +44,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
>>>>> CONFIG_DFU_MMC=y
>>>>> CONFIG_DFU_RAM=y
>>>>> CONFIG_DFU_SF=y
>>>>> +CONFIG_FPGA_SOCFPGA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> CONFIG_DWAPB_GPIO=y
>>>>> CONFIG_LED_STATUS=y
>>>>> diff --git a/configs/theadorable_debug_defconfig
>>>>> b/configs/theadorable_debug_defconfig
>>>>> index 2164237..e07b7b6 100644
>>>>> --- a/configs/theadorable_debug_defconfig
>>>>> +++ b/configs/theadorable_debug_defconfig
>>>>> @@ -43,6 +43,7 @@ CONFIG_EFI_PARTITION=y
>>>>> # CONFIG_SPL_PARTITION_UUIDS is not set
>>>>> CONFIG_NET_RANDOM_ETHADDR=y
>>>>> CONFIG_SPL_OF_TRANSLATE=y
>>>>> +CONFIG_FPGA_ALTERA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> # CONFIG_MMC is not set
>>>>> CONFIG_SPI_FLASH=y
>>>>> diff --git a/configs/theadorable_defconfig
>>>>> b/configs/theadorable_defconfig
>>>>> index d5eef70..3d2977c 100644
>>>>> --- a/configs/theadorable_defconfig
>>>>> +++ b/configs/theadorable_defconfig
>>>>> @@ -37,6 +37,7 @@ CONFIG_EFI_PARTITION=y
>>>>> # CONFIG_PARTITION_UUIDS is not set
>>>>> # CONFIG_SPL_PARTITION_UUIDS is not set
>>>>> CONFIG_SPL_OF_TRANSLATE=y
>>>>> +CONFIG_FPGA_ALTERA=y
>>>>> CONFIG_DM_GPIO=y
>>>>> # CONFIG_MMC is not set
>>>>> CONFIG_SPI_FLASH=y
>>>>> diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
>>>>> index a760944..6b2c866 100644
>>>>> --- a/drivers/fpga/Kconfig
>>>>> +++ b/drivers/fpga/Kconfig
>>>>> @@ -13,6 +13,14 @@ config FPGA_ALTERA
>>>>> Enable Altera FPGA specific functions which includes
>>>>> bitstream
>>>>> (in BIT format), fpga and device validation.
>>>>>
>>>>> +config FPGA_SOCFPGA
>>>>> + bool "Enable Gen5 and Arria10 common FPGA drivers"
>>>>> + select FPGA_ALTERA
>>>>> + help
>>>>> + Say Y here to enable the Gen5 and Arria10 common
>>>>> FPGA
>>>>> driver
>>>>> +
>>>>> + This provides common functionality for Gen5 and
>>>>> Arria10
>>>>> devices.
>>>>> +
>>>>> config FPGA_CYCLON2
>>>>> bool "Enable Altera FPGA driver for Cyclone II"
>>>>> depends on FPGA_ALTERA
>>>>> diff --git a/include/configs/astro_mcf5373l.h
>>>>> b/include/configs/astro_mcf5373l.h
>>>>> index 8899579..f4acea1 100644
>>>>> --- a/include/configs/astro_mcf5373l.h
>>>>> +++ b/include/configs/astro_mcf5373l.h
>>>>> @@ -201,10 +201,8 @@
>>>>> #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
>>>>>
>>>>> #define CONFIG_FPGA_COUNT 1
>>>>> -#define CONFIG_FPGA
>>>>> #define CONFIG_FPGA_XILINX
>>>>> #define CONFIG_FPGA_SPARTAN3
>>>>> -#define CONFIG_FPGA_ALTERA
>>>>> #define CONFIG_FPGA_CYCLON2
>>>>> #define CONFIG_SYS_FPGA_PROG_FEEDBACK
>>>>> #define CONFIG_SYS_FPGA_WAIT 1000
>>>>> diff --git a/include/configs/socfpga_common.h
>>>>> b/include/configs/socfpga_common.h
>>>>> index da7e4ad..1b79c03 100644
>>>>> --- a/include/configs/socfpga_common.h
>>>>> +++ b/include/configs/socfpga_common.h
>>>>> @@ -107,9 +107,6 @@
>>>>> */
>>>>> #ifdef CONFIG_TARGET_SOCFPGA_GEN5
>>>>> #ifdef CONFIG_CMD_FPGA
>>>>> -#define CONFIG_FPGA
>>>>> -#define CONFIG_FPGA_ALTERA
>>>>> -#define CONFIG_FPGA_SOCFPGA
>>>>> #define CONFIG_FPGA_COUNT 1
>>>>> #endif
>>>>> #endif
>>>>> diff --git a/include/configs/theadorable.h
>>>>> b/include/configs/theadorable.h
>>>>> index 2a671e8..5459f4f 100644
>>>>> --- a/include/configs/theadorable.h
>>>>> +++ b/include/configs/theadorable.h
>>>>> @@ -89,8 +89,6 @@
>>>>> #define CONFIG_SYS_MEM_TOP_HIDE 0x80000
>>>>>
>>>>> /* FPGA programming support */
>>>>> -#define CONFIG_FPGA
>>>>> -#define CONFIG_FPGA_ALTERA
>>>>> #define CONFIG_FPGA_STRATIX_V
>>>>>
>>>>> /*
>>>>>

--
Best regards,
Marek Vasut