Refactor CPPDEFINES to tuple style
This commit is contained in:
parent
da60f9dec0
commit
15bb9e7db2
|
@ -48,11 +48,11 @@ env.Append(
|
|||
],
|
||||
|
||||
CPPDEFINES=[
|
||||
"ARDUINO=10611",
|
||||
("ARDUINO", 10610),
|
||||
"BOARD_%s" % board.get("build.variant"),
|
||||
"ERROR_LED_PORT=GPIOB",
|
||||
"ERROR_LED_PIN=1",
|
||||
"DEBUG_LEVEL=DEBUG_NONE",
|
||||
("ERROR_LED_PORT", "GPIOB"),
|
||||
("ERROR_LED_PIN", 1),
|
||||
("DEBUG_LEVEL", "DEBUG_NONE"),
|
||||
"__STM32F1__",
|
||||
"ARDUINO_ARCH_STM32F1"
|
||||
],
|
||||
|
@ -80,17 +80,17 @@ for item in ("-nostartfiles", "-nostdlib"):
|
|||
|
||||
if env.subst("$UPLOAD_PROTOCOL") == "dfu":
|
||||
if board.id in ("maple", "maple_mini_origin"):
|
||||
env.Append(CPPDEFINES=["VECT_TAB_ADDR=0x8005000", "SERIAL_USB"])
|
||||
env.Append(CPPDEFINES=[("VECT_TAB_ADDR", 0x8005000), "SERIAL_USB"])
|
||||
else:
|
||||
env.Append(CPPDEFINES=[
|
||||
"VECT_TAB_ADDR=0x8002000", "SERIAL_USB", "GENERIC_BOOTLOADER"])
|
||||
("VECT_TAB_ADDR", 0x8002000), "SERIAL_USB", "GENERIC_BOOTLOADER"])
|
||||
|
||||
if "stm32f103r" in board.get("build.mcu", ""):
|
||||
env.Replace(LDSCRIPT_PATH="bootloader.ld")
|
||||
elif board.get("upload.boot_version", 0) == 2:
|
||||
env.Replace(LDSCRIPT_PATH="bootloader_20.ld")
|
||||
else:
|
||||
env.Append(CPPDEFINES=["VECT_TAB_ADDR=0x8000000"])
|
||||
env.Append(CPPDEFINES=[("VECT_TAB_ADDR", 0x8000000)])
|
||||
|
||||
#
|
||||
# Lookup for specific core's libraries
|
||||
|
|
|
@ -49,7 +49,7 @@ env.Replace(
|
|||
],
|
||||
|
||||
CPPDEFINES=[
|
||||
"F_CPU=$BOARD_F_CPU"
|
||||
("F_CPU", "$BOARD_F_CPU")
|
||||
],
|
||||
|
||||
LINKFLAGS=[
|
||||
|
|
Loading…
Reference in New Issue