From 7bbfba1ac0b276cf45dbf667a64d7ebd74650320 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 8 Oct 2017 23:55:05 +0200 Subject: [PATCH] boardloader, bootloader: moving embed/common/* to embed/trezorhal/* --- SConscript.boardloader | 4 ++-- SConscript.bootloader | 2 +- embed/{common => trezorhal}/util.s | 0 embed/{common => trezorhal}/vectortable.s | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename embed/{common => trezorhal}/util.s (100%) rename embed/{common => trezorhal}/vectortable.s (100%) diff --git a/SConscript.boardloader b/SConscript.boardloader index 65447a0d..ce0a2a9c 100644 --- a/SConscript.boardloader +++ b/SConscript.boardloader @@ -70,8 +70,6 @@ SOURCE_STMHAL = [ ] SOURCE_BOARDLOADER = [ - 'embed/common/vectortable.s', - 'embed/common/util.s', 'embed/boardloader/startup.s', 'embed/boardloader/main.c', ] @@ -85,6 +83,8 @@ SOURCE_TREZORHAL = [ 'embed/trezorhal/stm32_it.c', 'embed/trezorhal/stm32_system.c', 'embed/trezorhal/rng.c', + 'embed/trezorhal/util.s', + 'embed/trezorhal/vectortable.s', ] env = Environment(ENV=os.environ, CFLAGS=ARGUMENTS.get('CFLAGS', '')) diff --git a/SConscript.bootloader b/SConscript.bootloader index 34931d17..81199ebc 100644 --- a/SConscript.bootloader +++ b/SConscript.bootloader @@ -76,7 +76,6 @@ SOURCE_STMHAL = [ ] SOURCE_BOOTLOADER = [ - 'embed/common/util.s', 'embed/bootloader/startup.S', 'embed/bootloader/header.S', 'embed/bootloader/main.c', @@ -101,6 +100,7 @@ SOURCE_TREZORHAL = [ 'embed/trezorhal/usbd_core.c', 'embed/trezorhal/usbd_ctlreq.c', 'embed/trezorhal/usbd_ioreq.c', + 'embed/trezorhal/util.s', ] env = Environment(ENV=os.environ, CFLAGS=ARGUMENTS.get('CFLAGS', '')) diff --git a/embed/common/util.s b/embed/trezorhal/util.s similarity index 100% rename from embed/common/util.s rename to embed/trezorhal/util.s diff --git a/embed/common/vectortable.s b/embed/trezorhal/vectortable.s similarity index 100% rename from embed/common/vectortable.s rename to embed/trezorhal/vectortable.s