On Isn, 2017-05-08 at 11:57 +0200, Marek Vasut wrote:
On 05/08/2017 05:02 AM, Chee, Tien Fong wrote:
On Jum, 2017-05-05 at 13:11 +0200, Marek Vasut wrote:
On 05/05/2017 12:26 PM, tien.fong.chee@intel.com wrote:
From: Tien Fong Chee tien.fong.chee@intel.com
Convert Macro #define configuration to Kconfig method. All FPGA devices enable configuration based on CONFIG_FPGA_ALTERA.
Signed-off-by: Tien Fong Chee tien.fong.chee@intel.com
drivers/fpga/Kconfig | 5 ++++- drivers/fpga/Makefile | 3 +-- include/altera.h | 2 +- include/configs/socfpga_common.h | 3 --- 4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index a760944..fc4ea0d 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -2,12 +2,15 @@ menu "FPGA support" config FPGA bool
- help
- Enable FPGA driver build.
Separate patch please , also this is not driver, but framework . There's not just drivers here IMO.
ohh...okay, so you prefer i revert the changes, or better explanation in separate patch? if for later,what is your suggestion? Thanks.
Turning this whole FPGA subsystem into Kconfig should be a separat patch. There's a script for that too and you need to convert and build test all the boards which define CONFIG_FPGA .
Okay, this patch is specific for turning whole FPGA sybsytem into Kconfig. I will use moveconfig.py for this. thanks.
config FPGA_ALTERA bool "Enable Altera FPGA drivers"
- default y if TARGET_SOCFPGA_GEN5 && CMD_FPGA
Should be selected by arch code, drop this.
just for clarity, are you means defconfig == "selected by arch code"?
I mean arch/arm/mach-socfpga/Kconfig
With moveconfig.py, i think this change is not required.
select FPGA help
- Say Y here to enable the Altera FPGA driver
- Default Y here to enable the Altera FPGA driver
Keep as is, it's up to user to decide.
I found that all users enable it, so that is why i set this as default,
You set it as default in arch/arm/mach-socfpga/Kconfig , no need to modify the text.
otherwise i have to add this into their defconfig one by one. Users who don't want enable it, they can set "N" in their defconfig. What do you think?
This provides basic infrastructure to support Altera FPGA devices. Enable Altera FPGA specific functions which includes bitstream diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index 777706f..84e7605 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile @@ -14,10 +14,9 @@ obj-$(CONFIG_FPGA_ZYNQMPPL) += zynqmppl.o obj-$(CONFIG_FPGA_XILINX) += xilinx.o obj-$(CONFIG_FPGA_LATTICE) += ivm_core.o lattice.o ifdef CONFIG_FPGA_ALTERA -obj-y += altera.o +obj-y += altera.o socfpga.o
Now all the ancient systems which had the ancient Altera FPGAs will build-in the socfpga stuff too . That cannot work.
Okay, i will revert the changes.
obj-$(CONFIG_FPGA_ACEX1K) += ACEX1K.o obj-$(CONFIG_FPGA_CYCLON2) += cyclon2.o obj-$(CONFIG_FPGA_STRATIX_II) += stratixII.o obj-$(CONFIG_FPGA_STRATIX_V) += stratixv.o -obj-$(CONFIG_FPGA_SOCFPGA) += socfpga.o endif diff --git a/include/altera.h b/include/altera.h index 48d3eb7..a627b37 100644 --- a/include/altera.h +++ b/include/altera.h @@ -109,7 +109,7 @@ typedef struct { Altera_post_fn post; } altera_board_specific_func; -#ifdef CONFIG_FPGA_SOCFPGA +#ifdef CONFIG_FPGA_ALTERA int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size); #endif 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