From 85c304dff82cd4ea11d888827af1ccd5f12097d5 Mon Sep 17 00:00:00 2001 From: Ariel Mendelzon Date: Fri, 9 Aug 2024 02:54:59 +1200 Subject: [PATCH] Improving HAL directory structure (#191) To accomodate for testing different platform implementations of same-name units. Also updated corresponding makefiles and workflow definitions. --- .github/workflows/run-tests.yml | 2 +- firmware/src/hal/common/.gitkeep | 0 firmware/src/hal/{src/common => common/src}/communication.c | 0 firmware/src/hal/{src/common => common/src}/sha256.c | 0 firmware/src/hal/{src/common => common/src}/sha256.h | 0 firmware/src/hal/ledger/src/communication.c | 1 + firmware/src/hal/{src/ledger => ledger/src}/endorsement.c | 0 firmware/src/hal/{src/ledger => ledger/src}/hash.c | 0 firmware/src/hal/{src/ledger => ledger/src}/nvmem.c | 0 firmware/src/hal/{src/ledger => ledger/src}/platform.c | 0 firmware/src/hal/{src/ledger => ledger/src}/seed.c | 0 firmware/src/hal/ledger/src/sha256.c | 1 + firmware/src/hal/ledger/src/sha256.h | 1 + firmware/src/hal/ledger/test/.gitkeep | 0 firmware/src/hal/src/ledger/communication.c | 1 - firmware/src/hal/src/ledger/sha256.c | 1 - firmware/src/hal/src/ledger/sha256.h | 1 - firmware/src/hal/src/x86/communication.c | 1 - firmware/src/hal/src/x86/sha256.c | 1 - firmware/src/hal/src/x86/sha256.h | 1 - firmware/src/hal/{src/x86 => x86/src}/bip32.c | 0 firmware/src/hal/{src/x86 => x86/src}/bip32.h | 0 firmware/src/hal/{src/x86 => x86/src}/cJSON.c | 0 firmware/src/hal/{src/x86 => x86/src}/cJSON.h | 0 firmware/src/hal/x86/src/communication.c | 1 + firmware/src/hal/{src/x86 => x86/src}/endorsement.c | 0 firmware/src/hal/{src/x86 => x86/src}/exceptions.c | 0 firmware/src/hal/{src/x86 => x86/src}/explicit_bzero.c | 0 firmware/src/hal/{src/x86 => x86/src}/explicit_bzero.h | 0 firmware/src/hal/{src/x86 => x86/src}/hash.c | 0 firmware/src/hal/{src/x86 => x86/src}/hex_reader.c | 0 firmware/src/hal/{src/x86 => x86/src}/hex_reader.h | 0 firmware/src/hal/{src/x86 => x86/src}/hmac_sha256.c | 0 firmware/src/hal/{src/x86 => x86/src}/hmac_sha256.h | 0 firmware/src/hal/{src/x86 => x86/src}/json.c | 0 firmware/src/hal/{src/x86 => x86/src}/json.h | 0 firmware/src/hal/{src/x86 => x86/src}/keccak256.c | 0 firmware/src/hal/{src/x86 => x86/src}/keccak256.h | 0 firmware/src/hal/{src/x86 => x86/src}/log.c | 0 firmware/src/hal/{src/x86 => x86/src}/nvmem.c | 0 firmware/src/hal/{src/x86 => x86/src}/platform.c | 0 firmware/src/hal/{src/x86 => x86/src}/random.c | 0 firmware/src/hal/{src/x86 => x86/src}/random.h | 0 firmware/src/hal/{src/x86 => x86/src}/seed.c | 0 firmware/src/hal/x86/src/sha256.c | 1 + firmware/src/hal/x86/src/sha256.h | 1 + firmware/src/hal/{ => x86}/test/bip32/Makefile | 0 firmware/src/hal/{ => x86}/test/bip32/test_bip32.c | 0 firmware/src/hal/{ => x86}/test/common.mk | 6 +++--- firmware/src/hal/{ => x86}/test/hmac_sha256/Makefile | 0 .../src/hal/{ => x86}/test/hmac_sha256/test_hmac_sha256.c | 0 firmware/src/hal/{ => x86}/test/run-all.sh | 0 firmware/src/ledger/signer/Makefile | 2 +- firmware/src/ledger/ui/test/mock/common.mk | 2 +- firmware/src/powhsm/test/common/common.mk | 2 +- firmware/src/tcpsigner/Makefile | 2 +- 56 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 firmware/src/hal/common/.gitkeep rename firmware/src/hal/{src/common => common/src}/communication.c (100%) rename firmware/src/hal/{src/common => common/src}/sha256.c (100%) rename firmware/src/hal/{src/common => common/src}/sha256.h (100%) create mode 120000 firmware/src/hal/ledger/src/communication.c rename firmware/src/hal/{src/ledger => ledger/src}/endorsement.c (100%) rename firmware/src/hal/{src/ledger => ledger/src}/hash.c (100%) rename firmware/src/hal/{src/ledger => ledger/src}/nvmem.c (100%) rename firmware/src/hal/{src/ledger => ledger/src}/platform.c (100%) rename firmware/src/hal/{src/ledger => ledger/src}/seed.c (100%) create mode 120000 firmware/src/hal/ledger/src/sha256.c create mode 120000 firmware/src/hal/ledger/src/sha256.h create mode 100644 firmware/src/hal/ledger/test/.gitkeep delete mode 120000 firmware/src/hal/src/ledger/communication.c delete mode 120000 firmware/src/hal/src/ledger/sha256.c delete mode 120000 firmware/src/hal/src/ledger/sha256.h delete mode 120000 firmware/src/hal/src/x86/communication.c delete mode 120000 firmware/src/hal/src/x86/sha256.c delete mode 120000 firmware/src/hal/src/x86/sha256.h rename firmware/src/hal/{src/x86 => x86/src}/bip32.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/bip32.h (100%) rename firmware/src/hal/{src/x86 => x86/src}/cJSON.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/cJSON.h (100%) create mode 120000 firmware/src/hal/x86/src/communication.c rename firmware/src/hal/{src/x86 => x86/src}/endorsement.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/exceptions.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/explicit_bzero.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/explicit_bzero.h (100%) rename firmware/src/hal/{src/x86 => x86/src}/hash.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/hex_reader.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/hex_reader.h (100%) rename firmware/src/hal/{src/x86 => x86/src}/hmac_sha256.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/hmac_sha256.h (100%) rename firmware/src/hal/{src/x86 => x86/src}/json.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/json.h (100%) rename firmware/src/hal/{src/x86 => x86/src}/keccak256.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/keccak256.h (100%) rename firmware/src/hal/{src/x86 => x86/src}/log.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/nvmem.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/platform.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/random.c (100%) rename firmware/src/hal/{src/x86 => x86/src}/random.h (100%) rename firmware/src/hal/{src/x86 => x86/src}/seed.c (100%) create mode 120000 firmware/src/hal/x86/src/sha256.c create mode 120000 firmware/src/hal/x86/src/sha256.h rename firmware/src/hal/{ => x86}/test/bip32/Makefile (100%) rename firmware/src/hal/{ => x86}/test/bip32/test_bip32.c (100%) rename firmware/src/hal/{ => x86}/test/common.mk (93%) rename firmware/src/hal/{ => x86}/test/hmac_sha256/Makefile (100%) rename firmware/src/hal/{ => x86}/test/hmac_sha256/test_hmac_sha256.c (100%) rename firmware/src/hal/{ => x86}/test/run-all.sh (100%) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 3c2b28b1..90c441bb 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -24,7 +24,7 @@ jobs: run: firmware/test/test-all - name: Firmware HAL's unit tests - run: firmware/src/hal/test/run-all.sh + run: firmware/src/hal/x86/test/run-all.sh - name: Firmware common lib unit tests run: firmware/src/common/test/run-all.sh diff --git a/firmware/src/hal/common/.gitkeep b/firmware/src/hal/common/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/firmware/src/hal/src/common/communication.c b/firmware/src/hal/common/src/communication.c similarity index 100% rename from firmware/src/hal/src/common/communication.c rename to firmware/src/hal/common/src/communication.c diff --git a/firmware/src/hal/src/common/sha256.c b/firmware/src/hal/common/src/sha256.c similarity index 100% rename from firmware/src/hal/src/common/sha256.c rename to firmware/src/hal/common/src/sha256.c diff --git a/firmware/src/hal/src/common/sha256.h b/firmware/src/hal/common/src/sha256.h similarity index 100% rename from firmware/src/hal/src/common/sha256.h rename to firmware/src/hal/common/src/sha256.h diff --git a/firmware/src/hal/ledger/src/communication.c b/firmware/src/hal/ledger/src/communication.c new file mode 120000 index 00000000..2bf128f3 --- /dev/null +++ b/firmware/src/hal/ledger/src/communication.c @@ -0,0 +1 @@ +../../common/src/communication.c \ No newline at end of file diff --git a/firmware/src/hal/src/ledger/endorsement.c b/firmware/src/hal/ledger/src/endorsement.c similarity index 100% rename from firmware/src/hal/src/ledger/endorsement.c rename to firmware/src/hal/ledger/src/endorsement.c diff --git a/firmware/src/hal/src/ledger/hash.c b/firmware/src/hal/ledger/src/hash.c similarity index 100% rename from firmware/src/hal/src/ledger/hash.c rename to firmware/src/hal/ledger/src/hash.c diff --git a/firmware/src/hal/src/ledger/nvmem.c b/firmware/src/hal/ledger/src/nvmem.c similarity index 100% rename from firmware/src/hal/src/ledger/nvmem.c rename to firmware/src/hal/ledger/src/nvmem.c diff --git a/firmware/src/hal/src/ledger/platform.c b/firmware/src/hal/ledger/src/platform.c similarity index 100% rename from firmware/src/hal/src/ledger/platform.c rename to firmware/src/hal/ledger/src/platform.c diff --git a/firmware/src/hal/src/ledger/seed.c b/firmware/src/hal/ledger/src/seed.c similarity index 100% rename from firmware/src/hal/src/ledger/seed.c rename to firmware/src/hal/ledger/src/seed.c diff --git a/firmware/src/hal/ledger/src/sha256.c b/firmware/src/hal/ledger/src/sha256.c new file mode 120000 index 00000000..ceea83a9 --- /dev/null +++ b/firmware/src/hal/ledger/src/sha256.c @@ -0,0 +1 @@ +../../common/src/sha256.c \ No newline at end of file diff --git a/firmware/src/hal/ledger/src/sha256.h b/firmware/src/hal/ledger/src/sha256.h new file mode 120000 index 00000000..acd90f89 --- /dev/null +++ b/firmware/src/hal/ledger/src/sha256.h @@ -0,0 +1 @@ +../../common/src/sha256.h \ No newline at end of file diff --git a/firmware/src/hal/ledger/test/.gitkeep b/firmware/src/hal/ledger/test/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/firmware/src/hal/src/ledger/communication.c b/firmware/src/hal/src/ledger/communication.c deleted file mode 120000 index 78676300..00000000 --- a/firmware/src/hal/src/ledger/communication.c +++ /dev/null @@ -1 +0,0 @@ -../common/communication.c \ No newline at end of file diff --git a/firmware/src/hal/src/ledger/sha256.c b/firmware/src/hal/src/ledger/sha256.c deleted file mode 120000 index a21d1a59..00000000 --- a/firmware/src/hal/src/ledger/sha256.c +++ /dev/null @@ -1 +0,0 @@ -../common/sha256.c \ No newline at end of file diff --git a/firmware/src/hal/src/ledger/sha256.h b/firmware/src/hal/src/ledger/sha256.h deleted file mode 120000 index 65492ab2..00000000 --- a/firmware/src/hal/src/ledger/sha256.h +++ /dev/null @@ -1 +0,0 @@ -../common/sha256.h \ No newline at end of file diff --git a/firmware/src/hal/src/x86/communication.c b/firmware/src/hal/src/x86/communication.c deleted file mode 120000 index 78676300..00000000 --- a/firmware/src/hal/src/x86/communication.c +++ /dev/null @@ -1 +0,0 @@ -../common/communication.c \ No newline at end of file diff --git a/firmware/src/hal/src/x86/sha256.c b/firmware/src/hal/src/x86/sha256.c deleted file mode 120000 index a21d1a59..00000000 --- a/firmware/src/hal/src/x86/sha256.c +++ /dev/null @@ -1 +0,0 @@ -../common/sha256.c \ No newline at end of file diff --git a/firmware/src/hal/src/x86/sha256.h b/firmware/src/hal/src/x86/sha256.h deleted file mode 120000 index 65492ab2..00000000 --- a/firmware/src/hal/src/x86/sha256.h +++ /dev/null @@ -1 +0,0 @@ -../common/sha256.h \ No newline at end of file diff --git a/firmware/src/hal/src/x86/bip32.c b/firmware/src/hal/x86/src/bip32.c similarity index 100% rename from firmware/src/hal/src/x86/bip32.c rename to firmware/src/hal/x86/src/bip32.c diff --git a/firmware/src/hal/src/x86/bip32.h b/firmware/src/hal/x86/src/bip32.h similarity index 100% rename from firmware/src/hal/src/x86/bip32.h rename to firmware/src/hal/x86/src/bip32.h diff --git a/firmware/src/hal/src/x86/cJSON.c b/firmware/src/hal/x86/src/cJSON.c similarity index 100% rename from firmware/src/hal/src/x86/cJSON.c rename to firmware/src/hal/x86/src/cJSON.c diff --git a/firmware/src/hal/src/x86/cJSON.h b/firmware/src/hal/x86/src/cJSON.h similarity index 100% rename from firmware/src/hal/src/x86/cJSON.h rename to firmware/src/hal/x86/src/cJSON.h diff --git a/firmware/src/hal/x86/src/communication.c b/firmware/src/hal/x86/src/communication.c new file mode 120000 index 00000000..2bf128f3 --- /dev/null +++ b/firmware/src/hal/x86/src/communication.c @@ -0,0 +1 @@ +../../common/src/communication.c \ No newline at end of file diff --git a/firmware/src/hal/src/x86/endorsement.c b/firmware/src/hal/x86/src/endorsement.c similarity index 100% rename from firmware/src/hal/src/x86/endorsement.c rename to firmware/src/hal/x86/src/endorsement.c diff --git a/firmware/src/hal/src/x86/exceptions.c b/firmware/src/hal/x86/src/exceptions.c similarity index 100% rename from firmware/src/hal/src/x86/exceptions.c rename to firmware/src/hal/x86/src/exceptions.c diff --git a/firmware/src/hal/src/x86/explicit_bzero.c b/firmware/src/hal/x86/src/explicit_bzero.c similarity index 100% rename from firmware/src/hal/src/x86/explicit_bzero.c rename to firmware/src/hal/x86/src/explicit_bzero.c diff --git a/firmware/src/hal/src/x86/explicit_bzero.h b/firmware/src/hal/x86/src/explicit_bzero.h similarity index 100% rename from firmware/src/hal/src/x86/explicit_bzero.h rename to firmware/src/hal/x86/src/explicit_bzero.h diff --git a/firmware/src/hal/src/x86/hash.c b/firmware/src/hal/x86/src/hash.c similarity index 100% rename from firmware/src/hal/src/x86/hash.c rename to firmware/src/hal/x86/src/hash.c diff --git a/firmware/src/hal/src/x86/hex_reader.c b/firmware/src/hal/x86/src/hex_reader.c similarity index 100% rename from firmware/src/hal/src/x86/hex_reader.c rename to firmware/src/hal/x86/src/hex_reader.c diff --git a/firmware/src/hal/src/x86/hex_reader.h b/firmware/src/hal/x86/src/hex_reader.h similarity index 100% rename from firmware/src/hal/src/x86/hex_reader.h rename to firmware/src/hal/x86/src/hex_reader.h diff --git a/firmware/src/hal/src/x86/hmac_sha256.c b/firmware/src/hal/x86/src/hmac_sha256.c similarity index 100% rename from firmware/src/hal/src/x86/hmac_sha256.c rename to firmware/src/hal/x86/src/hmac_sha256.c diff --git a/firmware/src/hal/src/x86/hmac_sha256.h b/firmware/src/hal/x86/src/hmac_sha256.h similarity index 100% rename from firmware/src/hal/src/x86/hmac_sha256.h rename to firmware/src/hal/x86/src/hmac_sha256.h diff --git a/firmware/src/hal/src/x86/json.c b/firmware/src/hal/x86/src/json.c similarity index 100% rename from firmware/src/hal/src/x86/json.c rename to firmware/src/hal/x86/src/json.c diff --git a/firmware/src/hal/src/x86/json.h b/firmware/src/hal/x86/src/json.h similarity index 100% rename from firmware/src/hal/src/x86/json.h rename to firmware/src/hal/x86/src/json.h diff --git a/firmware/src/hal/src/x86/keccak256.c b/firmware/src/hal/x86/src/keccak256.c similarity index 100% rename from firmware/src/hal/src/x86/keccak256.c rename to firmware/src/hal/x86/src/keccak256.c diff --git a/firmware/src/hal/src/x86/keccak256.h b/firmware/src/hal/x86/src/keccak256.h similarity index 100% rename from firmware/src/hal/src/x86/keccak256.h rename to firmware/src/hal/x86/src/keccak256.h diff --git a/firmware/src/hal/src/x86/log.c b/firmware/src/hal/x86/src/log.c similarity index 100% rename from firmware/src/hal/src/x86/log.c rename to firmware/src/hal/x86/src/log.c diff --git a/firmware/src/hal/src/x86/nvmem.c b/firmware/src/hal/x86/src/nvmem.c similarity index 100% rename from firmware/src/hal/src/x86/nvmem.c rename to firmware/src/hal/x86/src/nvmem.c diff --git a/firmware/src/hal/src/x86/platform.c b/firmware/src/hal/x86/src/platform.c similarity index 100% rename from firmware/src/hal/src/x86/platform.c rename to firmware/src/hal/x86/src/platform.c diff --git a/firmware/src/hal/src/x86/random.c b/firmware/src/hal/x86/src/random.c similarity index 100% rename from firmware/src/hal/src/x86/random.c rename to firmware/src/hal/x86/src/random.c diff --git a/firmware/src/hal/src/x86/random.h b/firmware/src/hal/x86/src/random.h similarity index 100% rename from firmware/src/hal/src/x86/random.h rename to firmware/src/hal/x86/src/random.h diff --git a/firmware/src/hal/src/x86/seed.c b/firmware/src/hal/x86/src/seed.c similarity index 100% rename from firmware/src/hal/src/x86/seed.c rename to firmware/src/hal/x86/src/seed.c diff --git a/firmware/src/hal/x86/src/sha256.c b/firmware/src/hal/x86/src/sha256.c new file mode 120000 index 00000000..ceea83a9 --- /dev/null +++ b/firmware/src/hal/x86/src/sha256.c @@ -0,0 +1 @@ +../../common/src/sha256.c \ No newline at end of file diff --git a/firmware/src/hal/x86/src/sha256.h b/firmware/src/hal/x86/src/sha256.h new file mode 120000 index 00000000..acd90f89 --- /dev/null +++ b/firmware/src/hal/x86/src/sha256.h @@ -0,0 +1 @@ +../../common/src/sha256.h \ No newline at end of file diff --git a/firmware/src/hal/test/bip32/Makefile b/firmware/src/hal/x86/test/bip32/Makefile similarity index 100% rename from firmware/src/hal/test/bip32/Makefile rename to firmware/src/hal/x86/test/bip32/Makefile diff --git a/firmware/src/hal/test/bip32/test_bip32.c b/firmware/src/hal/x86/test/bip32/test_bip32.c similarity index 100% rename from firmware/src/hal/test/bip32/test_bip32.c rename to firmware/src/hal/x86/test/bip32/test_bip32.c diff --git a/firmware/src/hal/test/common.mk b/firmware/src/hal/x86/test/common.mk similarity index 93% rename from firmware/src/hal/test/common.mk rename to firmware/src/hal/x86/test/common.mk index 4d2a8ea3..412e9cac 100644 --- a/firmware/src/hal/test/common.mk +++ b/firmware/src/hal/x86/test/common.mk @@ -20,12 +20,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -INCDIR = ../../include -SRCDIR = ../../src/x86 +INCDIR = ../../../include +SRCDIR = ../../src CFLAGS = -iquote $(INCDIR) -iquote $(SRCDIR) CFLAGS += -DHSM_PLATFORM_X86 -include ../../../../coverage/coverage.mk +include ../../../../../coverage/coverage.mk CFLAGS += $(COVFLAGS) diff --git a/firmware/src/hal/test/hmac_sha256/Makefile b/firmware/src/hal/x86/test/hmac_sha256/Makefile similarity index 100% rename from firmware/src/hal/test/hmac_sha256/Makefile rename to firmware/src/hal/x86/test/hmac_sha256/Makefile diff --git a/firmware/src/hal/test/hmac_sha256/test_hmac_sha256.c b/firmware/src/hal/x86/test/hmac_sha256/test_hmac_sha256.c similarity index 100% rename from firmware/src/hal/test/hmac_sha256/test_hmac_sha256.c rename to firmware/src/hal/x86/test/hmac_sha256/test_hmac_sha256.c diff --git a/firmware/src/hal/test/run-all.sh b/firmware/src/hal/x86/test/run-all.sh similarity index 100% rename from firmware/src/hal/test/run-all.sh rename to firmware/src/hal/x86/test/run-all.sh diff --git a/firmware/src/ledger/signer/Makefile b/firmware/src/ledger/signer/Makefile index 1a7150b9..380a4c87 100755 --- a/firmware/src/ledger/signer/Makefile +++ b/firmware/src/ledger/signer/Makefile @@ -50,7 +50,7 @@ APPFLAGS = 0x00 PROG = "app" # Build configuration -APP_SOURCE_PATH += src ../../powhsm/src ../../common/src ../../hal/src/ledger +APP_SOURCE_PATH += src ../../powhsm/src ../../common/src ../../hal/ledger/src SDK_SOURCE_PATH += lib_stusb lib_stusb_impl DEFINES += APPVERSION=\"$(APPVERSION)\" diff --git a/firmware/src/ledger/ui/test/mock/common.mk b/firmware/src/ledger/ui/test/mock/common.mk index 6e7f396c..a5c07c6b 100644 --- a/firmware/src/ledger/ui/test/mock/common.mk +++ b/firmware/src/ledger/ui/test/mock/common.mk @@ -25,7 +25,7 @@ COMMONDIR = ../../../../common/src MOCKDIR = ../mock THISMOCKDIR = ./mock HALINCDIR = ../../../../hal/include -HALSRCDIR = ../../../../hal/src/x86 +HALSRCDIR = ../../../../hal/x86/src CFLAGS = -iquote $(THISMOCKDIR) -iquote $(COMMONDIR) -iquote $(MOCKDIR) CFLAGS += -iquote $(SRCDIR) -iquote $(HALINCDIR) -iquote $(HALSRCDIR) CFLAGS += -DHSM_PLATFORM_X86 diff --git a/firmware/src/powhsm/test/common/common.mk b/firmware/src/powhsm/test/common/common.mk index a451158f..72b356fa 100644 --- a/firmware/src/powhsm/test/common/common.mk +++ b/firmware/src/powhsm/test/common/common.mk @@ -1,7 +1,7 @@ TESTCOMMONDIR = ../common SRCDIR = ../../src HALINCDIR = ../../../hal/include -HALSRCDIR = ../../../hal/src/x86 +HALSRCDIR = ../../../hal/x86/src COMMONDIR = ../../../common/src CFLAGS = -iquote $(SRCDIR) -iquote $(HALINCDIR) -iquote $(HALSRCDIR) CFLAGS += -iquote $(TESTCOMMONDIR) -iquote $(COMMONDIR) diff --git a/firmware/src/tcpsigner/Makefile b/firmware/src/tcpsigner/Makefile index f6529efc..248ab31b 100644 --- a/firmware/src/tcpsigner/Makefile +++ b/firmware/src/tcpsigner/Makefile @@ -23,7 +23,7 @@ SRCPATH = ./src POWHSMSRCPATH = ../powhsm/src COMMONPATH = ../common/src -HALSRCPATH = ../hal/src/x86 +HALSRCPATH = ../hal/x86/src HALINCPATH = ../hal/include HALPATH = $(HALINCPATH):$(HALSRCPATH) VPATH = $(SRCPATH):$(POWHSMSRCPATH):$(COMMONPATH):$(HALPATH)