From 142ad22a2f984ef06fda17529a2ddc72016b7e1f Mon Sep 17 00:00:00 2001 From: Bogdan Marinescu Date: Thu, 6 Nov 2014 13:47:43 +0000 Subject: [PATCH] [RZ_A1H] Remove target-specific check from build system --- .../USBDevice/USBDevice/USBHAL_RZ_A1H.cpp | 2 +- .../TARGET_RZ_A1H/inc/iodefine.h | 78 +++++++++---------- .../TARGET_RZ_A1H/inc/rza_io_regrw.h | 22 +++--- workspace_tools/toolchains/__init__.py | 4 - 4 files changed, 51 insertions(+), 55 deletions(-) diff --git a/libraries/USBDevice/USBDevice/USBHAL_RZ_A1H.cpp b/libraries/USBDevice/USBDevice/USBHAL_RZ_A1H.cpp index 7b557bf174..04ae139095 100644 --- a/libraries/USBDevice/USBDevice/USBHAL_RZ_A1H.cpp +++ b/libraries/USBDevice/USBDevice/USBHAL_RZ_A1H.cpp @@ -32,7 +32,7 @@ extern "C" #include "USBHAL.h" #include "devdrv_usb_function_api.h" #include "usb0_function.h" -#include "iobitmasks/usb_iobitmask.h" +#include "usb_iobitmask.h" #include "rza_io_regrw.h" #include "USBDevice_Types.h" diff --git a/libraries/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/iodefine.h b/libraries/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/iodefine.h index 2bb23881a2..2d18559982 100644 --- a/libraries/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/iodefine.h +++ b/libraries/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/iodefine.h @@ -94,43 +94,43 @@ union iodefine_reg16_8_t -#include "iodefines/adc_iodefine.h" /* (V1.00a) */ -#include "iodefines/bsc_iodefine.h" /* (V1.00a) */ -#include "iodefines/ceu_iodefine.h" /* (V1.00a) */ -#include "iodefines/cpg_iodefine.h" /* (V1.00a) */ -#include "iodefines/disc_iodefine.h" /* (V1.00a) */ -#include "iodefines/dmac_iodefine.h" /* (V1.00a) */ -#include "iodefines/dvdec_iodefine.h" /* (V1.00a) */ -#include "iodefines/ether_iodefine.h" /* (V1.00a) */ -#include "iodefines/flctl_iodefine.h" /* (V1.00a) */ -#include "iodefines/gpio_iodefine.h" /* (V1.00a) */ -#include "iodefines/ieb_iodefine.h" /* (V1.00a) */ -#include "iodefines/inb_iodefine.h" /* (V1.00a) */ -#include "iodefines/intc_iodefine.h" /* (V1.00a) */ -#include "iodefines/irda_iodefine.h" /* (V1.00a) */ -#include "iodefines/jcu_iodefine.h" /* (V1.00a) */ -#include "iodefines/l2c_iodefine.h" /* (V1.00a) */ -#include "iodefines/lin_iodefine.h" /* (V1.00a) */ -#include "iodefines/lvds_iodefine.h" /* (V1.00a) */ -#include "iodefines/mlb_iodefine.h" /* (V1.00a) */ -#include "iodefines/mmc_iodefine.h" /* (V1.00a) */ -#include "iodefines/mtu2_iodefine.h" /* (V1.00a) */ -#include "iodefines/ostm_iodefine.h" /* (V1.00a) */ -#include "iodefines/pfv_iodefine.h" /* (V1.00a) */ -#include "iodefines/pwm_iodefine.h" /* (V1.00a) */ -#include "iodefines/riic_iodefine.h" /* (V1.00a) */ -#include "iodefines/romdec_iodefine.h" /* (V1.00a) */ -#include "iodefines/rscan0_iodefine.h" /* (V1.00a) */ -#include "iodefines/rspi_iodefine.h" /* (V1.00a) */ -#include "iodefines/rtc_iodefine.h" /* (V1.00a) */ -#include "iodefines/scif_iodefine.h" /* (V1.00a) */ -#include "iodefines/scim_iodefine.h" /* (V1.00a) */ -#include "iodefines/scux_iodefine.h" /* (V1.00a) */ -#include "iodefines/sdg_iodefine.h" /* (V1.00a) */ -#include "iodefines/spdif_iodefine.h" /* (V1.00a) */ -#include "iodefines/spibsc_iodefine.h" /* (V1.00a) */ -#include "iodefines/ssif_iodefine.h" /* (V1.00a) */ -#include "iodefines/usb20_iodefine.h" /* (V1.00a) */ -#include "iodefines/vdc5_iodefine.h" /* (V1.00a) */ -#include "iodefines/wdt_iodefine.h" /* (V1.00a) */ +#include "adc_iodefine.h" /* (V1.00a) */ +#include "bsc_iodefine.h" /* (V1.00a) */ +#include "ceu_iodefine.h" /* (V1.00a) */ +#include "cpg_iodefine.h" /* (V1.00a) */ +#include "disc_iodefine.h" /* (V1.00a) */ +#include "dmac_iodefine.h" /* (V1.00a) */ +#include "dvdec_iodefine.h" /* (V1.00a) */ +#include "ether_iodefine.h" /* (V1.00a) */ +#include "flctl_iodefine.h" /* (V1.00a) */ +#include "gpio_iodefine.h" /* (V1.00a) */ +#include "ieb_iodefine.h" /* (V1.00a) */ +#include "inb_iodefine.h" /* (V1.00a) */ +#include "intc_iodefine.h" /* (V1.00a) */ +#include "irda_iodefine.h" /* (V1.00a) */ +#include "jcu_iodefine.h" /* (V1.00a) */ +#include "l2c_iodefine.h" /* (V1.00a) */ +#include "lin_iodefine.h" /* (V1.00a) */ +#include "lvds_iodefine.h" /* (V1.00a) */ +#include "mlb_iodefine.h" /* (V1.00a) */ +#include "mmc_iodefine.h" /* (V1.00a) */ +#include "mtu2_iodefine.h" /* (V1.00a) */ +#include "ostm_iodefine.h" /* (V1.00a) */ +#include "pfv_iodefine.h" /* (V1.00a) */ +#include "pwm_iodefine.h" /* (V1.00a) */ +#include "riic_iodefine.h" /* (V1.00a) */ +#include "romdec_iodefine.h" /* (V1.00a) */ +#include "rscan0_iodefine.h" /* (V1.00a) */ +#include "rspi_iodefine.h" /* (V1.00a) */ +#include "rtc_iodefine.h" /* (V1.00a) */ +#include "scif_iodefine.h" /* (V1.00a) */ +#include "scim_iodefine.h" /* (V1.00a) */ +#include "scux_iodefine.h" /* (V1.00a) */ +#include "sdg_iodefine.h" /* (V1.00a) */ +#include "spdif_iodefine.h" /* (V1.00a) */ +#include "spibsc_iodefine.h" /* (V1.00a) */ +#include "ssif_iodefine.h" /* (V1.00a) */ +#include "usb20_iodefine.h" /* (V1.00a) */ +#include "vdc5_iodefine.h" /* (V1.00a) */ +#include "wdt_iodefine.h" /* (V1.00a) */ #endif diff --git a/libraries/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/rza_io_regrw.h b/libraries/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/rza_io_regrw.h index ac3aba3866..5f0fec64dd 100644 --- a/libraries/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/rza_io_regrw.h +++ b/libraries/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/rza_io_regrw.h @@ -33,17 +33,17 @@ Includes , "Project Includes" ******************************************************************************/ /* ==== includes each bit mask header ==== */ -#include "iobitmasks/cpg_iobitmask.h" -#include "iobitmasks/intc_iobitmask.h" -#include "iobitmasks/bsc_iobitmask.h" -#include "iobitmasks/dmac_iobitmask.h" -#include "iobitmasks/mtu2_iobitmask.h" -#include "iobitmasks/ostm_iobitmask.h" -#include "iobitmasks/scif_iobitmask.h" -#include "iobitmasks/rspi_iobitmask.h" -#include "iobitmasks/riic_iobitmask.h" -#include "iobitmasks/usb_iobitmask.h" -#include "iobitmasks/gpio_iobitmask.h" +#include "cpg_iobitmask.h" +#include "intc_iobitmask.h" +#include "bsc_iobitmask.h" +#include "dmac_iobitmask.h" +#include "mtu2_iobitmask.h" +#include "ostm_iobitmask.h" +#include "scif_iobitmask.h" +#include "rspi_iobitmask.h" +#include "riic_iobitmask.h" +#include "usb_iobitmask.h" +#include "gpio_iobitmask.h" #ifdef __cplusplus extern "C" { diff --git a/workspace_tools/toolchains/__init__.py b/workspace_tools/toolchains/__init__.py index 730fc50955..daaa09c617 100644 --- a/workspace_tools/toolchains/__init__.py +++ b/workspace_tools/toolchains/__init__.py @@ -414,10 +414,6 @@ class mbedToolchain: for source in files_paths: if rel_path is not None: relative_path = relpath(source, rel_path) - elif "RZ_A1H" in source and "iobitmasks" in source: - relative_path = source[source.rindex("iobitmasks"):] - elif "RZ_A1H" in source and "iodefines" in source: - relative_path = source[source.rindex("iodefines"):] else: _, relative_path = split(source)