summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorhathach <[email protected]>2019-03-20 01:23:49 +0700
committerhathach <[email protected]>2019-03-20 01:23:49 +0700
commite6612ab82c162dea245dbbcdd2da6a744eca3ac2 (patch)
treeca07cf2d5aa0fc7c2f488fc8e503fa7291f3ecf3 /hw
parentd22dea49762df008bfece3a34061375b75cca5e4 (diff)
move -nostdlib (-nostartfiles) into board.mk
since nrf5x require the use of std startup. Add verbose mode to makefile
Diffstat (limited to 'hw')
-rw-r--r--hw/bsp/metro_m0_express/board.mk3
-rw-r--r--hw/bsp/metro_m4_express/board.mk3
-rw-r--r--hw/bsp/pca10056/board.mk9
-rw-r--r--hw/bsp/stm32f407g_disc1/board.mk3
4 files changed, 13 insertions, 5 deletions
diff --git a/hw/bsp/metro_m0_express/board.mk b/hw/bsp/metro_m0_express/board.mk
index 559d50ad1..49b3d575b 100644
--- a/hw/bsp/metro_m0_express/board.mk
+++ b/hw/bsp/metro_m0_express/board.mk
@@ -6,7 +6,8 @@ CFLAGS = \
-mabi=aapcs-linux \
-mcpu=cortex-m0plus \
-msoft-float \
- -mfloat-abi=soft
+ -mfloat-abi=soft \
+ -nostdlib
# All source paths should be relative to the top level.
LD_FILE = hw/bsp/metro_m0_express/samd21g18a_flash.ld
diff --git a/hw/bsp/metro_m4_express/board.mk b/hw/bsp/metro_m4_express/board.mk
index b0938c7b5..6e324c5aa 100644
--- a/hw/bsp/metro_m4_express/board.mk
+++ b/hw/bsp/metro_m4_express/board.mk
@@ -5,7 +5,8 @@ CFLAGS = \
-mabi=aapcs-linux \
-mcpu=cortex-m4 \
-mfloat-abi=hard \
- -mfpu=fpv4-sp-d16
+ -mfpu=fpv4-sp-d16 \
+ -nostdlib
# 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 709b0063f..402a295bb 100644
--- a/hw/bsp/pca10056/board.mk
+++ b/hw/bsp/pca10056/board.mk
@@ -2,8 +2,6 @@ CFLAGS += \
-DCFG_TUSB_MCU=OPT_MCU_NRF5X \
-DNRF52840_XXAA \
-mthumb \
- -Wno-error=undef \
- -Wno-error=cast-align \
-mabi=aapcs \
-mcpu=cortex-m4 \
-mfloat-abi=hard \
@@ -18,6 +16,9 @@ SRC_C += \
hw/mcu/nordic/nrfx/drivers/src/nrfx_power.c \
hw/mcu/nordic/nrfx/mdk/system_nrf52840.c \
+# TODO remove later
+SRC_C += src/portable/$(VENDOR)/$(CHIP_FAMILY)/hal_$(CHIP_FAMILY).c
+
INC += \
-I$(TOP)/hw/cmsis/Include \
-I$(TOP)/hw/mcu/nordic \
@@ -38,3 +39,7 @@ ASFLAGS += -DNRF52840_XXAA
VENDOR = nordic
CHIP_FAMILY = nrf5x
+JLINK_DEVICE = nRF52840_xxAA
+
+# flash using jlink
+flash: flash-jlink
diff --git a/hw/bsp/stm32f407g_disc1/board.mk b/hw/bsp/stm32f407g_disc1/board.mk
index ddf280c61..d09dc5bc7 100644
--- a/hw/bsp/stm32f407g_disc1/board.mk
+++ b/hw/bsp/stm32f407g_disc1/board.mk
@@ -6,7 +6,8 @@ CFLAGS = \
-mabi=aapcs-linux \
-mcpu=cortex-m4 \
-mfloat-abi=hard \
- -mfpu=fpv4-sp-d16
+ -mfpu=fpv4-sp-d16 \
+ -nostdlib
# All source paths should be relative to the top level.
LD_FILE = hw/bsp/stm32f407g_disc1/STM32F407VGTx_FLASH.ld