From b0de32c07cb0c6fdc270056c1e5a0856817d76c2 Mon Sep 17 00:00:00 2001 From: Russ Butler Date: Fri, 5 Jul 2019 15:07:27 -0500 Subject: [PATCH] FPGA test shield: Allow any defined form factor Build in the FPGA tests if either MBED_CONF_TARGET_DEFAULT_FORM_FACTOR or TARGET_FF_ARDUINO is defined. --- TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp | 2 +- TESTS/mbed_hal_fpga_ci_test_shield/analogout/main.cpp | 2 +- TESTS/mbed_hal_fpga_ci_test_shield/gpio/main.cpp | 2 +- TESTS/mbed_hal_fpga_ci_test_shield/gpio_irq/main.cpp | 2 +- TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp | 2 +- TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp | 2 +- TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp | 2 +- TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp b/TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp index 005d8fdb63..0add62b502 100644 --- a/TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp +++ b/TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] Analog in not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !TARGET_FF_ARDUINO +#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/TESTS/mbed_hal_fpga_ci_test_shield/analogout/main.cpp b/TESTS/mbed_hal_fpga_ci_test_shield/analogout/main.cpp index df1f1033cd..98e0321749 100644 --- a/TESTS/mbed_hal_fpga_ci_test_shield/analogout/main.cpp +++ b/TESTS/mbed_hal_fpga_ci_test_shield/analogout/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] Analog out not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !TARGET_FF_ARDUINO +#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/TESTS/mbed_hal_fpga_ci_test_shield/gpio/main.cpp b/TESTS/mbed_hal_fpga_ci_test_shield/gpio/main.cpp index fba6cfde54..8ee66fc3a8 100644 --- a/TESTS/mbed_hal_fpga_ci_test_shield/gpio/main.cpp +++ b/TESTS/mbed_hal_fpga_ci_test_shield/gpio/main.cpp @@ -17,7 +17,7 @@ #if !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !TARGET_FF_ARDUINO +#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/TESTS/mbed_hal_fpga_ci_test_shield/gpio_irq/main.cpp b/TESTS/mbed_hal_fpga_ci_test_shield/gpio_irq/main.cpp index 4d807b1f35..7f9b6da15b 100644 --- a/TESTS/mbed_hal_fpga_ci_test_shield/gpio_irq/main.cpp +++ b/TESTS/mbed_hal_fpga_ci_test_shield/gpio_irq/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] test not supported #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !TARGET_FF_ARDUINO +#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp b/TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp index f348e192ce..99fcec499a 100644 --- a/TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp +++ b/TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] I2C not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !TARGET_FF_ARDUINO +#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp b/TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp index ad85320d87..31bf5a7915 100644 --- a/TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp +++ b/TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] PWM not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !TARGET_FF_ARDUINO +#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp b/TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp index 55ff34ffda..a1dca25a95 100644 --- a/TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp +++ b/TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] SPI not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !TARGET_FF_ARDUINO +#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else diff --git a/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp b/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp index 1187f6bb1d..6b81a7652f 100644 --- a/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp +++ b/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp @@ -19,7 +19,7 @@ #error [NOT_SUPPORTED] SERIAL not supported for this target #elif !COMPONENT_FPGA_CI_TEST_SHIELD #error [NOT_SUPPORTED] FPGA CI Test Shield is needed to run this test -#elif !TARGET_FF_ARDUINO +#elif !defined(TARGET_FF_ARDUINO) && !defined(MBED_CONF_TARGET_DEFAULT_FORM_FACTOR) #error [NOT_SUPPORTED] Test not supported for this form factor #else @@ -340,4 +340,4 @@ int main() Harness::run(specification); } -#endif /* !DEVICE_SERIAL */ \ No newline at end of file +#endif /* !DEVICE_SERIAL */