From 3a7277788f2765c33a6b9197779d20608a522f20 Mon Sep 17 00:00:00 2001 From: Jan Pochyla Date: Mon, 7 Aug 2017 12:04:11 +0200 Subject: [PATCH] scons: use in Makefile --- Makefile | 40 +++++++++++++--------------------------- SConscript.bootloader | 13 ++++++++++--- SConscript.firmware | 12 ++++++------ 3 files changed, 29 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index e6f76f552..aacd58e31 100644 --- a/Makefile +++ b/Makefile @@ -2,21 +2,11 @@ JOBS = 4 MAKE = make -j $(JOBS) +SCONS = scons -Q -j $(JOBS) -BOARDLOADER_BUILD_DIR = embed/boardloader/build -BOOTLOADER_BUILD_DIR = embed/bootloader/build -FIRMWARE_BUILD_DIR = embed/firmware/build - -TREZORHAL_PORT_OPTS = FROZEN_MPY_DIR=src DEBUG=1 -CROSS_PORT_OPTS = MICROPY_FORCE_32BIT=1 -UNIX_PORT_OPTS = MICROPY_PY_BTREE=0 MICROPY_PY_TERMIOS=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 MICROPY_SSL_AXTLS=0 DEBUG=1 - -UNAME_S := $(shell uname -s) -ifeq ($(UNAME_S),Darwin) -UNIX_PORT_OPTS += MICROPY_FORCE_32BIT=0 -else -UNIX_PORT_OPTS += MICROPY_FORCE_32BIT=1 -endif +BOARDLOADER_BUILD_DIR = build/boardloader +BOOTLOADER_BUILD_DIR = build/bootloader +FIRMWARE_BUILD_DIR = build/firmware ## help commands: @@ -34,7 +24,7 @@ res: ## update resources ## emulator commands: run: ## run unix port - cd src ; ../vendor/micropython/unix/micropython + cd src ; ../build/unix/micropython emu: ## run emulator ./emu.sh @@ -58,18 +48,16 @@ style: ## run code style check on application sources build: build_boardloader build_bootloader build_firmware build_unix build_cross ## build all build_boardloader: ## build boardloader - $(MAKE) -f Makefile.boardloader $(TREZORHAL_PORT_OPTS) + $(SCONS) build/boardloader/boardloader.bin build_bootloader: ## build bootloader - $(MAKE) -f Makefile.bootloader $(TREZORHAL_PORT_OPTS) - ./tools/binctl $(BOOTLOADER_BUILD_DIR)/bootloader.bin -s 1 4141414141414141414141414141414141414141414141414141414141414141 + $(SCONS) build/bootloader/bootloader.bin build_firmware: res build_cross ## build firmware with frozen modules - $(MAKE) -f Makefile.firmware $(TREZORHAL_PORT_OPTS) - ./tools/binctl $(FIRMWARE_BUILD_DIR)/firmware.bin -s 1 4141414141414141414141414141414141414141414141414141414141414141 + $(SCONS) build/firmware/firmware.bin build_unix: ## build unix port - $(MAKE) -f ../../../embed/unix/Makefile -C vendor/micropython/unix $(UNIX_PORT_OPTS) + $(SCONS) build/unix/micropython build_cross: ## build mpy-cross port $(MAKE) -C vendor/micropython/mpy-cross $(CROSS_PORT_OPTS) @@ -79,18 +67,16 @@ build_cross: ## build mpy-cross port clean: clean_boardloader clean_bootloader clean_firmware clean_unix clean_cross ## clean all clean_boardloader: ## clean boardloader build - $(MAKE) -f Makefile.boardloader clean $(TREZORHAL_PORT_OPTS) + rm -rf build/boardloader clean_bootloader: ## clean bootloader build - $(MAKE) -f Makefile.bootloader clean $(TREZORHAL_PORT_OPTS) + rm -rf build/bootloader clean_firmware: ## clean firmware build - $(MAKE) -f Makefile.firmware clean $(TREZORHAL_PORT_OPTS) + rm -rf build/firmware clean_unix: ## clean unix build - $(MAKE) -f ../../../embed/unix/Makefile -C vendor/micropython/unix clean $(UNIX_PORT_OPTS) - # workaround for relative paths containing ../.. in unix Makefile - rm -rf vendor/micropython/micropython + rm -rf build/unix clean_cross: ## clean mpy-cross build $(MAKE) -C vendor/micropython/mpy-cross clean $(CROSS_PORT_OPTS) diff --git a/SConscript.bootloader b/SConscript.bootloader index 488606ccf..739215f31 100644 --- a/SConscript.bootloader +++ b/SConscript.bootloader @@ -1,5 +1,7 @@ # pylint: disable=E0602 +import os + CCFLAGS_MOD = '' CPPPATH_MOD = [] CPPDEFINES_MOD = [] @@ -100,7 +102,7 @@ SOURCE_TREZORHAL = [ 'embed/trezorhal/hal/stm32f4xx_ll_fsmc.c', ] -env = Environment() +env = Environment(ENV=os.environ) env.Replace( AS='arm-none-eabi-as', @@ -142,6 +144,9 @@ env.Replace( ] + CPPDEFINES_MOD, ASPPFLAGS='$CFLAGS $CCFLAGS', ) +env.Replace( + BINCTL='tools/binctl', ) + # # Program objects # @@ -163,5 +168,7 @@ program_elf = env.Command( program_bin = env.Command( target='bootloader.bin', source=program_elf, - action='$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET', -) + action=[ + '$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET', + '$BINCTL $TARGET -s 1 4141414141414141414141414141414141414141414141414141414141414141', + ], ) \ No newline at end of file diff --git a/SConscript.firmware b/SConscript.firmware index 9890cd5ec..ccf23314f 100644 --- a/SConscript.firmware +++ b/SConscript.firmware @@ -347,13 +347,11 @@ env.Replace( env.Replace( PYTHON='python', - PYTHONPATH='vendor/micropython/py', - MAKEQSTRDEFS='$PYTHON vendor/micropython/py/makeqstrdefs.py', MAKEQSTRDATA='$PYTHON vendor/micropython/py/makeqstrdata.py', MAKEVERSIONHDR='$PYTHON vendor/micropython/py/makeversionhdr.py', - MPY_CROSS='vendor/micropython/mpy-cross/mpy-cross', MPY_TOOL='$PYTHON vendor/micropython/tools/mpy-tool.py', - MAKE_FROZEN='$PYTHON vendor/micropython/tools/make-frozen.py', ) + MPY_CROSS='vendor/micropython/mpy-cross/mpy-cross', + BINCTL='tools/binctl', ) # # Micropython version @@ -425,5 +423,7 @@ program_elf = env.Command( program_bin = env.Command( target='firmware.bin', source=program_elf, - action='$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET', -) + action=[ + '$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET', + '$BINCTL $TARGET -s 1 4141414141414141414141414141414141414141414141414141414141414141', + ], )