From d431e0b983cd15cc27f66a844f487294f1c57f0f Mon Sep 17 00:00:00 2001 From: Jan Pochyla Date: Fri, 4 Aug 2017 00:45:32 +0200 Subject: [PATCH] scons: boardloader, bootloader, bugfixes --- SConscript.boardloader | 146 +++++++++++++++++++++++++++++++++++ SConscript.bootloader | 167 +++++++++++++++++++++++++++++++++++++++++ SConscript.firmware | 12 ++- SConscript.unix | 3 +- SConstruct | 2 + 5 files changed, 328 insertions(+), 2 deletions(-) create mode 100644 SConscript.boardloader create mode 100644 SConscript.bootloader diff --git a/SConscript.boardloader b/SConscript.boardloader new file mode 100644 index 0000000000..355a3bea70 --- /dev/null +++ b/SConscript.boardloader @@ -0,0 +1,146 @@ +# pylint: disable=E0602 + +CCFLAGS_MOD = '' +CPPPATH_MOD = [] +CPPDEFINES_MOD = [] +SOURCE_MOD = [] + +# modtrezorcrypto +CCFLAGS_MOD += '-Wno-sequence-point ' +CPPPATH_MOD += [ + 'embed/extmod/modtrezorcrypto/trezor-crypto', + 'embed/extmod/modtrezorcrypto/trezor-crypto/aes', + 'embed/extmod/modtrezorcrypto/trezor-crypto/ed25519-donna', +] +CPPDEFINES_MOD += [ + 'AES_128', + 'AES_192', + 'USE_KECCAK', + 'ED25519_NO_PRECOMP', +] +SOURCE_MOD += [ + 'embed/extmod/modtrezorcrypto/trezor-crypto/blake2s.c', + 'embed/extmod/modtrezorcrypto/trezor-crypto/ed25519-donna/ed25519.c', + 'embed/extmod/modtrezorcrypto/trezor-crypto/sha2.c', +] + +# modtrezorui +SOURCE_MOD += [ + 'embed/extmod/modtrezorui/display.c', + 'embed/extmod/modtrezorui/font_bitmap.c', +] + +SOURCE_MICROPYTHON = [ + 'vendor/micropython/lib/libc/string0.c', + 'vendor/micropython/stmhal/startup_stm32.S', +] + +SOURCE_STMHAL = [ + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_adc_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_adc.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_can.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_cortex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_dac_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_dac.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_dma.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_flash_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_flash.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_gpio.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_i2c.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_pcd_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_pcd.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_pwr_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_pwr.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_rcc_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_rcc.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_rng.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_rtc_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_rtc.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_sd.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_spi.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_tim_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_tim.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_uart.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_ll_sdmmc.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_ll_usb.c', +] + +SOURCE_BOARDLOADER = [ + 'embed/boardloader/main.c', +] + +SOURCE_TREZORHAL = [ + 'embed/trezorhal/common.c', + 'embed/trezorhal/image.c', + 'embed/trezorhal/flash.c', + 'embed/trezorhal/mini_printf.c', + 'embed/trezorhal/sdcard.c', + 'embed/trezorhal/stm32_it.c', + 'embed/trezorhal/stm32_system.c', + 'embed/trezorhal/hal/stm32f4xx_hal_sram.c', + 'embed/trezorhal/hal/stm32f4xx_ll_fsmc.c', +] + +env = Environment() + +env.Replace( + AS='arm-none-eabi-as', + AR='arm-none-eabi-ar', + CC='arm-none-eabi-gcc', + LINK='arm-none-eabi-ld', + SIZE='arm-none-eabi-size', + STRIP='arm-none-eabi-strip', + OBJCOPY='arm-none-eabi-objcopy', ) + +env.Replace( + CCFLAGS='-Os ' + '-g3 ' + '-nostdlib ' + '-std=gnu99 -Wall -Werror -Wdouble-promotion -Wpointer-arith ' + '-mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard ' + '-fsingle-precision-constant -fdata-sections -ffunction-sections ' + + CCFLAGS_MOD, + CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB', + LINKFLAGS='-nostdlib -T embed/boardloader/memory.ld --gc-sections', + CPPPATH=[ + 'embed/boardloader', + 'embed/trezorhal', + 'embed/trezorhal/hal', + 'embed/extmod/modtrezorui', + 'vendor/micropython/stmhal', + 'vendor/micropython/stmhal/cmsis', + 'vendor/micropython/stmhal/hal/f4/inc', + 'vendor/micropython/lib/cmsis/inc', + ] + CPPPATH_MOD, + CPPDEFINES=[ + ('STM32_HAL_H', '""'), + 'STM32F405xx', + 'TREZOR_STM32', + 'MCU_SERIES_F4', + ] + CPPDEFINES_MOD, + ASPPFLAGS='$CFLAGS $CCFLAGS', ) + +# +# Program objects +# + +obj_program = [] +obj_program += env.Object(source=SOURCE_MOD) +obj_program += env.Object(source=SOURCE_BOARDLOADER) +obj_program += env.Object(source=SOURCE_MICROPYTHON) +obj_program += env.Object(source=SOURCE_STMHAL) +obj_program += env.Object(source=SOURCE_TREZORHAL) + +program_elf = env.Command( + target='boardloader.elf', + source=obj_program, + action= + '$LINK -o $TARGET $LINKFLAGS $SOURCES `$CC $CFLAGS $CCFLAGS $_CCCOMCOM -print-libgcc-file-name`', +) + +program_bin = env.Command( + target='boardloader.bin', + source=program_elf, + action='$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET', +) diff --git a/SConscript.bootloader b/SConscript.bootloader new file mode 100644 index 0000000000..488606ccfc --- /dev/null +++ b/SConscript.bootloader @@ -0,0 +1,167 @@ +# pylint: disable=E0602 + +CCFLAGS_MOD = '' +CPPPATH_MOD = [] +CPPDEFINES_MOD = [] +SOURCE_MOD = [] + +# modtrezorcrypto +CCFLAGS_MOD += '-Wno-sequence-point ' +CPPPATH_MOD += [ + 'embed/extmod/modtrezorcrypto/trezor-crypto', + 'embed/extmod/modtrezorcrypto/trezor-crypto/aes', + 'embed/extmod/modtrezorcrypto/trezor-crypto/ed25519-donna', +] +CPPDEFINES_MOD += [ + 'AES_128', + 'AES_192', + 'USE_KECCAK', + 'ED25519_NO_PRECOMP', +] +SOURCE_MOD += [ + 'embed/extmod/modtrezorcrypto/trezor-crypto/blake2s.c', + 'embed/extmod/modtrezorcrypto/trezor-crypto/ed25519-donna/ed25519.c', + 'embed/extmod/modtrezorcrypto/trezor-crypto/sha2.c', +] + +# modtrezorui +CPPDEFINES_MOD += [ + 'TREZOR_FONT_MONO_DISABLE', + 'TREZOR_FONT_NORMAL_DISABLE', +] +SOURCE_MOD += [ + 'embed/extmod/modtrezorui/display.c', + 'embed/extmod/modtrezorui/inflate.c', + 'embed/extmod/modtrezorui/font_bitmap.c', + 'embed/extmod/modtrezorui/font_roboto_bold_20.c', +] + +SOURCE_MICROPYTHON = [ + 'vendor/micropython/lib/libc/string0.c', + 'vendor/micropython/stmhal/startup_stm32.S', +] + +SOURCE_STMHAL = [ + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_adc_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_adc.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_can.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_cortex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_dac_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_dac.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_dma.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_flash_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_flash.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_gpio.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_i2c.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_pcd_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_pcd.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_pwr_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_pwr.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_rcc_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_rcc.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_rng.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_rtc_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_rtc.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_sd.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_spi.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_tim_ex.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_tim.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal_uart.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_hal.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_ll_sdmmc.c', + 'vendor/micropython/stmhal/hal/f4/src/stm32f4xx_ll_usb.c', +] + +SOURCE_BOOTLOADER = [ + 'embed/bootloader/header.S', + 'embed/bootloader/main.c', + 'embed/bootloader/messages.c', + 'embed/bootloader/nanopb/pb_common.c', + 'embed/bootloader/nanopb/pb_decode.c', + 'embed/bootloader/nanopb/pb_encode.c', + 'embed/bootloader/protob/messages.pb.c', + 'embed/bootloader/protob/types.pb.c', +] + +SOURCE_TREZORHAL = [ + 'embed/trezorhal/common.c', + 'embed/trezorhal/image.c', + 'embed/trezorhal/flash.c', + 'embed/trezorhal/mini_printf.c', + 'embed/trezorhal/stm32_it.c', + 'embed/trezorhal/stm32_system.c', + 'embed/trezorhal/touch.c', + 'embed/trezorhal/usb.c', + 'embed/trezorhal/usbd_conf.c', + 'embed/trezorhal/usbd_core.c', + 'embed/trezorhal/usbd_ctlreq.c', + 'embed/trezorhal/usbd_ioreq.c', + 'embed/trezorhal/hal/stm32f4xx_hal_sram.c', + 'embed/trezorhal/hal/stm32f4xx_ll_fsmc.c', +] + +env = Environment() + +env.Replace( + AS='arm-none-eabi-as', + AR='arm-none-eabi-ar', + CC='arm-none-eabi-gcc', + LINK='arm-none-eabi-ld', + SIZE='arm-none-eabi-size', + STRIP='arm-none-eabi-strip', + OBJCOPY='arm-none-eabi-objcopy', ) + +env.Replace( + CCFLAGS='-Os ' + '-g3 ' + '-nostdlib ' + '-std=gnu99 -Wall -Werror -Wdouble-promotion -Wpointer-arith ' + '-mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard ' + '-fsingle-precision-constant -fdata-sections -ffunction-sections ' + + CCFLAGS_MOD, + CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB', + LINKFLAGS='-nostdlib -T embed/bootloader/memory.ld --gc-sections', + CPPPATH=[ + 'embed/bootloader', + 'embed/bootloader/nanopb', + 'embed/bootloader/protob', + 'embed/trezorhal', + 'embed/trezorhal/hal', + 'embed/extmod/modtrezorui', + 'vendor/micropython/stmhal', + 'vendor/micropython/stmhal/cmsis', + 'vendor/micropython/stmhal/hal/f4/inc', + 'vendor/micropython/lib/cmsis/inc', + ] + CPPPATH_MOD, + CPPDEFINES=[ + ('STM32_HAL_H', '""'), + 'STM32F405xx', + 'TREZOR_STM32', + 'MCU_SERIES_F4', + 'PB_FIELD_16BIT', + ] + CPPDEFINES_MOD, + ASPPFLAGS='$CFLAGS $CCFLAGS', ) + +# +# Program objects +# + +obj_program = [] +obj_program += env.Object(source=SOURCE_MOD) +obj_program += env.Object(source=SOURCE_BOOTLOADER) +obj_program += env.Object(source=SOURCE_MICROPYTHON) +obj_program += env.Object(source=SOURCE_STMHAL) +obj_program += env.Object(source=SOURCE_TREZORHAL) + +program_elf = env.Command( + target='bootloader.elf', + source=obj_program, + action= + '$LINK -o $TARGET $LINKFLAGS $SOURCES `$CC $CFLAGS $CCFLAGS $_CCCOMCOM -print-libgcc-file-name`', +) + +program_bin = env.Command( + target='bootloader.bin', + source=program_elf, + action='$OBJCOPY -O binary -j .header -j .flash -j .data $SOURCE $TARGET', +) diff --git a/SConscript.firmware b/SConscript.firmware index 5744102e83..bd8b29e545 100644 --- a/SConscript.firmware +++ b/SConscript.firmware @@ -266,6 +266,7 @@ SOURCE_STMHAL = [ ] SOURCE_FIRMWARE = [ + 'embed/firmware/header.S', 'embed/firmware/main.c', 'embed/firmware/mphalport.c', ] @@ -480,6 +481,7 @@ env.Replace( CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB', LINKFLAGS='-nostdlib -T embed/firmware/memory.ld --gc-sections', CPPPATH=[ + '.', 'embed/firmware', 'embed/trezorhal', 'embed/trezorhal/hal', @@ -497,7 +499,8 @@ env.Replace( 'STM32F405xx', 'TREZOR_STM32', 'MCU_SERIES_F4', - ] + CPPDEFINES_MOD, ) + ] + CPPDEFINES_MOD, + ASPPFLAGS='$CFLAGS $CCFLAGS', ) env.Replace( PYTHON='python', @@ -559,6 +562,13 @@ obj_program += env.Object(source=SOURCE_STMHAL) obj_program += env.Object(source=SOURCE_TREZORHAL) obj_program += env.Object(source=source_mpyc) +obj_program += env.Command( + target='embed/firmware/vendorheader.o', + source='embed/firmware/vendorheader.bin', + action='$OBJCOPY -I binary -O elf32-littlearm -B arm' + ' --rename-section .data=.vendorheader,alloc,load,readonly,contents' + ' $SOURCE $TARGET', ) + env.Depends(obj_program, qstr_generated) program_elf = env.Command( diff --git a/SConscript.unix b/SConscript.unix index 6ac8493c82..480343973b 100644 --- a/SConscript.unix +++ b/SConscript.unix @@ -255,7 +255,8 @@ env.Replace( 'TREZOR_UNIX', 'UNIX', ('MP_CONFIGFILE', '\\"embed/unix/mpconfigport.h\\"'), - ] + CPPDEFINES_MOD, ) + ] + CPPDEFINES_MOD, + ASPPFLAGS='$CFLAGS $CCFLAGS', ) env.Replace( PYTHON='python', diff --git a/SConstruct b/SConstruct index 34202f49cc..55ea5dee5b 100644 --- a/SConstruct +++ b/SConstruct @@ -1,4 +1,6 @@ # pylint: disable=E0602 +SConscript('SConscript.boardloader', variant_dir='build/boardloader', duplicate=False) +SConscript('SConscript.bootloader', variant_dir='build/bootloader', duplicate=False) SConscript('SConscript.firmware', variant_dir='build/firmware', duplicate=False) SConscript('SConscript.unix', variant_dir='build/unix', duplicate=False)