Merge tag 'fpga-for-6.11-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next
Xu writes: FPGA Manager changes for 6.11-rc1 FPGA unit test: - Macro's change re-enables FPGA KUnit test suites been configured as loadable module. Altera: - David's change removes unused structure definition. All patches have been reviewed on the mailing list, and have been in the last linux-next releases (as part of our for-next branch). Signed-off-by: Xu Yilun <yilun.xu@intel.com> * tag 'fpga-for-6.11-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga: fpga: altera-fpga2sdram: remove unused struct 'prop_map' Revert "fpga: disable KUnit test suites when module support is enabled"
This commit is contained in:
@@ -75,12 +75,6 @@ static int alt_fpga2sdram_enable_set(struct fpga_bridge *bridge, bool enable)
|
||||
return _alt_fpga2sdram_enable_set(bridge->priv, enable);
|
||||
}
|
||||
|
||||
struct prop_map {
|
||||
char *prop_name;
|
||||
u32 *prop_value;
|
||||
u32 prop_max;
|
||||
};
|
||||
|
||||
static const struct fpga_bridge_ops altera_fpga2sdram_br_ops = {
|
||||
.enable_set = alt_fpga2sdram_enable_set,
|
||||
.enable_show = alt_fpga2sdram_enable_show,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
config FPGA_KUNIT_TESTS
|
||||
bool "KUnit test for the FPGA subsystem" if !KUNIT_ALL_TESTS
|
||||
depends on FPGA=y && FPGA_REGION=y && FPGA_BRIDGE=y && KUNIT=y && MODULES=n
|
||||
tristate "KUnit test for the FPGA subsystem" if !KUNIT_ALL_TESTS
|
||||
depends on FPGA && FPGA_REGION && FPGA_BRIDGE && KUNIT=y
|
||||
default KUNIT_ALL_TESTS
|
||||
help
|
||||
This builds unit tests for the FPGA subsystem
|
||||
|
||||
Reference in New Issue
Block a user