summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2019-03-20 01:35:52 +0700
committerhathach <[email protected]>2019-03-20 01:35:52 +0700
commitf2f3f5a7723fc10b2dda84d31d1325c30960816b (patch)
treeab2aa9cad8abdfc9a618c9f04b254ac564ebf20d
parent1a0c4fbb9ba37749f8b51b79937a4baf8b5f9176 (diff)
fix pca10056 build error due to nrfx undef usage
-rw-r--r--hw/bsp/metro_m0_express/board.mk2
-rw-r--r--hw/bsp/metro_m4_express/board.mk4
-rw-r--r--hw/bsp/pca10056/board.mk3
-rw-r--r--hw/bsp/stm32f407g_disc1/board.mk2
4 files changed, 8 insertions, 3 deletions
diff --git a/hw/bsp/metro_m0_express/board.mk b/hw/bsp/metro_m0_express/board.mk
index 49b3d575b..1844eeec8 100644
--- a/hw/bsp/metro_m0_express/board.mk
+++ b/hw/bsp/metro_m0_express/board.mk
@@ -1,4 +1,4 @@
-CFLAGS = \
+CFLAGS += \
-DCFG_TUSB_MCU=OPT_MCU_SAMD21 \
-DCONF_DFLL_OVERWRITE_CALIBRATION=0 \
-D__SAMD21G18A__ \
diff --git a/hw/bsp/metro_m4_express/board.mk b/hw/bsp/metro_m4_express/board.mk
index 6e324c5aa..a560c5149 100644
--- a/hw/bsp/metro_m4_express/board.mk
+++ b/hw/bsp/metro_m4_express/board.mk
@@ -1,4 +1,4 @@
-CFLAGS = \
+CFLAGS += \
-DCFG_TUSB_MCU=OPT_MCU_SAMD51 \
-D__SAMD51J19A__ \
-mthumb \
@@ -8,6 +8,8 @@ CFLAGS = \
-mfpu=fpv4-sp-d16 \
-nostdlib
+CFLAGS += -Wno-error=undef
+
# All source paths should be relative to the top level.
LD_FILE = hw/bsp/metro_m4_express/samd51g19a_flash.ld
diff --git a/hw/bsp/pca10056/board.mk b/hw/bsp/pca10056/board.mk
index 402a295bb..c60bf8bef 100644
--- a/hw/bsp/pca10056/board.mk
+++ b/hw/bsp/pca10056/board.mk
@@ -7,6 +7,9 @@ CFLAGS += \
-mfloat-abi=hard \
-mfpu=fpv4-sp-d16
+# nrfx issue undef _ARMCC_VERSION usage https://github.com/NordicSemiconductor/nrfx/issues/49
+CFLAGS += -Wno-error=undef
+
# All source paths should be relative to the top level.
LD_FILE = hw/mcu/nordic/nrfx/mdk/nrf52840_xxaa.ld
diff --git a/hw/bsp/stm32f407g_disc1/board.mk b/hw/bsp/stm32f407g_disc1/board.mk
index d09dc5bc7..73d64a6bd 100644
--- a/hw/bsp/stm32f407g_disc1/board.mk
+++ b/hw/bsp/stm32f407g_disc1/board.mk
@@ -1,4 +1,4 @@
-CFLAGS = \
+CFLAGS += \
-DHSE_VALUE=8000000 \
-DCFG_TUSB_MCU=OPT_MCU_STM32F4 \
-DSTM32F407xx \