Makefile indentation and rationalization

LedgerHQ · Oct 26, 2023 · 2946910 · 2946910
1 parent 379ccc0
commit 2946910
Showing 1 changed file with 116 additions and 113 deletions.
diff --git a/Makefile b/Makefile
@@ -16,13 +16,13 @@
 #*******************************************************************************
 
 ifeq ($(BOLOS_SDK),)
-$(error Environment variable BOLOS_SDK is not set)
+    $(error Environment variable BOLOS_SDK is not set)
 endif
 
 include $(BOLOS_SDK)/Makefile.defines
 
 DEFINES_LIB = USE_LIB_ETHEREUM
-APP_LOAD_PARAMS= --curve secp256k1 $(COMMON_LOAD_PARAMS)
+APP_LOAD_PARAMS = --curve secp256k1 $(COMMON_LOAD_PARAMS)
 # Allow the app to use path 45 for multi-sig (see BIP45).
 APP_LOAD_PARAMS += --path "45'"
 # Samsung temporary implementation for wallet ID on 0xda7aba5e/0xc1a551c5
@@ -32,27 +32,27 @@ APP_LOAD_PARAMS += --path "1517992542'/1101353413'"
 # Define Version #
 ##################
 
-APPVERSION_M=1
-APPVERSION_N=10
-APPVERSION_P=4
-APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)-dev
-APP_LOAD_FLAGS= --appFlags 0xa40 --dep Ethereum:$(APPVERSION)
+APPVERSION_M = 1
+APPVERSION_N = 10
+APPVERSION_P = 4
+APPVERSION = $(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)-dev
+APP_LOAD_FLAGS = --appFlags 0xa40 --dep Ethereum:$(APPVERSION)
 
 ###########################
 # Set Chain environnement #
 ###########################
 
 ifeq ($(CHAIN),)
-CHAIN=ethereum
+    CHAIN = ethereum
 endif
 
-SUPPORTED_CHAINS=$(shell find makefile_conf/chain/ -type f -name '*.mk'| sed 's/.*\/\(.*\).mk/\1/g' | sort)
+SUPPORTED_CHAINS = $(shell find makefile_conf/chain/ -type f -name '*.mk'| sed 's/.*\/\(.*\).mk/\1/g' | sort)
 
 # Check if chain is available
 ifeq ($(shell test -s ./makefile_conf/chain/$(CHAIN).mk && echo -n yes), yes)
-include ./makefile_conf/chain/$(CHAIN).mk
+    include ./makefile_conf/chain/$(CHAIN).mk
 else
-$(error Unsupported CHAIN - use $(SUPPORTED_CHAINS))
+    $(error Unsupported CHAIN - use $(SUPPORTED_CHAINS))
 endif
 CFLAGS += -DAPPNAME=\"$(APPNAME)\"
 DEFINES += CHAINID_COINNAME=\"$(TICKER)\" CHAIN_ID=$(CHAIN_ID)
@@ -66,15 +66,15 @@ DEFINES += $(DEFINES_LIB)
 
 #prepare hsm generation
 ifeq ($(TARGET_NAME),TARGET_NANOS)
-ICONNAME=icons/nanos_app_chain_$(CHAIN_ID).gif
+    ICONNAME = icons/nanos_app_chain_$(CHAIN_ID).gif
 else ifeq ($(TARGET_NAME),TARGET_STAX)
-ICONNAME=icons/stax_app_chain_$(CHAIN_ID).gif
-DEFINES += ICONGLYPH=C_stax_chain_$(CHAIN_ID)_64px
-DEFINES += ICONBITMAP=C_stax_chain_$(CHAIN_ID)_64px_bitmap
-DEFINES += ICONGLYPH_SMALL=C_stax_chain_$(CHAIN_ID)
-GLYPH_FILES += $(ICONNAME)
+    ICONNAME = icons/stax_app_chain_$(CHAIN_ID).gif
+    DEFINES += ICONGLYPH=C_stax_chain_$(CHAIN_ID)_64px
+    DEFINES += ICONBITMAP=C_stax_chain_$(CHAIN_ID)_64px_bitmap
+    DEFINES += ICONGLYPH_SMALL=C_stax_chain_$(CHAIN_ID)
+    GLYPH_FILES += $(ICONNAME)
 else
-ICONNAME=icons/nanox_app_chain_$(CHAIN_ID).gif
+    ICONNAME = icons/nanox_app_chain_$(CHAIN_ID).gif
 endif
 
 ################
@@ -86,82 +86,85 @@ all: default
 # Platform #
 ############
 
-DEFINES   += OS_IO_SEPROXYHAL
-DEFINES   += HAVE_SPRINTF HAVE_SNPRINTF_FORMAT_U
-DEFINES   += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=4 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
-DEFINES   += LEDGER_MAJOR_VERSION=$(APPVERSION_M) LEDGER_MINOR_VERSION=$(APPVERSION_N) LEDGER_PATCH_VERSION=$(APPVERSION_P)
-DEFINES   += BUILD_YEAR=\"$(shell date +%Y)\"
+DEFINES += OS_IO_SEPROXYHAL
+DEFINES += HAVE_SPRINTF HAVE_SNPRINTF_FORMAT_U
+DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=4 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
+DEFINES += LEDGER_MAJOR_VERSION=$(APPVERSION_M) LEDGER_MINOR_VERSION=$(APPVERSION_N) LEDGER_PATCH_VERSION=$(APPVERSION_P)
+DEFINES += BUILD_YEAR=\"$(shell date +%Y)\"
 
 # U2F
-DEFINES   += HAVE_U2F HAVE_IO_U2F
-DEFINES   += U2F_PROXY_MAGIC=\"w0w\"
-DEFINES   += USB_SEGMENT_SIZE=64
-DEFINES   += BLE_SEGMENT_SIZE=32 #max MTU, min 20
-DEFINES   += UNUSED\(x\)=\(void\)x
-DEFINES   += APPVERSION=\"$(APPVERSION)\"
+DEFINES += HAVE_U2F HAVE_IO_U2F
+DEFINES += U2F_PROXY_MAGIC=\"w0w\"
+DEFINES += USB_SEGMENT_SIZE=64
+DEFINES += BLE_SEGMENT_SIZE=32 #max MTU, min 20
+DEFINES += APPVERSION=\"$(APPVERSION)\"
 
-#WEBUSB_URL     = www.ledgerwallet.com
-#DEFINES       += HAVE_WEBUSB WEBUSB_URL_SIZE_B=$(shell echo -n $(WEBUSB_URL) | wc -c) WEBUSB_URL=$(shell echo -n $(WEBUSB_URL) | sed -e "s/./\\\'\0\\\',/g")
+#WEBUSB_URL = www.ledgerwallet.com
+#DEFINES += HAVE_WEBUSB WEBUSB_URL_SIZE_B=$(shell echo -n $(WEBUSB_URL) | wc -c) WEBUSB_URL=$(shell echo -n $(WEBUSB_URL) | sed -e "s/./\\\'\0\\\',/g")
 
-DEFINES   += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL=""
+DEFINES += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL=""
 
 ifneq (,$(filter $(TARGET_NAME),TARGET_NANOX TARGET_STAX))
-DEFINES   += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
-DEFINES   += HAVE_BLE_APDU # basic ledger apdu transport over BLE
-SDK_SOURCE_PATH  += lib_blewbxx lib_blewbxx_impl
+    DEFINES += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
+    DEFINES += HAVE_BLE_APDU # basic ledger apdu transport over BLE
+    SDK_SOURCE_PATH += lib_blewbxx lib_blewbxx_impl
 endif
 
 ifeq ($(TARGET_NAME),TARGET_NANOS)
-DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=128
+    DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=128
 else
-DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=300
+    DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=300
 endif
 
 ifeq  ($(TARGET_NAME),TARGET_STAX)
-DEFINES   += NBGL_QRCODE
-SDK_SOURCE_PATH += qrcode
+    DEFINES += NBGL_QRCODE
+    SDK_SOURCE_PATH += qrcode
 else
-DEFINES   += HAVE_BAGL
-DEFINES   += HAVE_UX_FLOW
-ifeq ($(TARGET_NAME),TARGET_NANOS)
-DEFINES   += HAVE_WALLET_ID_SDK
-DEFINES   += BAGL_WIDTH=128 BAGL_HEIGHT=32
-else
-DEFINES   += HAVE_GLO096
-DEFINES   += BAGL_WIDTH=128 BAGL_HEIGHT=64
-DEFINES   += HAVE_BAGL_ELLIPSIS # long label truncation feature
-DEFINES   += HAVE_BAGL_FONT_OPEN_SANS_REGULAR_11PX
-DEFINES   += HAVE_BAGL_FONT_OPEN_SANS_EXTRABOLD_11PX
-DEFINES   += HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX
-endif
+    DEFINES += HAVE_BAGL
+    DEFINES += HAVE_UX_FLOW
+    ifeq ($(TARGET_NAME),TARGET_NANOS)
+        DEFINES += HAVE_WALLET_ID_SDK
+        DEFINES += BAGL_WIDTH=128 BAGL_HEIGHT=32
+    else
+        DEFINES += HAVE_GLO096
+        DEFINES += BAGL_WIDTH=128 BAGL_HEIGHT=64
+        DEFINES += HAVE_BAGL_ELLIPSIS # long label truncation feature
+        DEFINES += HAVE_BAGL_FONT_OPEN_SANS_REGULAR_11PX
+        DEFINES += HAVE_BAGL_FONT_OPEN_SANS_EXTRABOLD_11PX
+        DEFINES += HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX
+    endif
 endif
 
+####################
+# Enabled Features #
+####################
+
 # Enables direct data signing without having to specify it in the settings. Useful when testing with speculos.
-ALLOW_DATA?=0
+ALLOW_DATA ?= 0
 ifneq ($(ALLOW_DATA),0)
-DEFINES += HAVE_ALLOW_DATA
+    DEFINES += HAVE_ALLOW_DATA
 endif
 
 # Bypass the signature verification for setExternalPlugin, setPlugin, provideERC20TokenInfo and provideNFTInfo calls
-BYPASS_SIGNATURES?=0
+BYPASS_SIGNATURES ?= 0
 ifneq ($(BYPASS_SIGNATURES),0)
-DEFINES += HAVE_BYPASS_SIGNATURES
+    DEFINES += HAVE_BYPASS_SIGNATURES
 endif
 
 # Enable the SET_PLUGIN test key
-SET_PLUGIN_TEST_KEY?=0
+SET_PLUGIN_TEST_KEY ?= 0
 ifneq ($(SET_PLUGIN_TEST_KEY),0)
-DEFINES += HAVE_SET_PLUGIN_TEST_KEY
+    DEFINES += HAVE_SET_PLUGIN_TEST_KEY
 endif
 
 # NFTs
 ifneq ($(TARGET_NAME),TARGET_NANOS)
     DEFINES	+= HAVE_NFT_SUPPORT
-    NFT_TEST_KEY?=0
+    NFT_TEST_KEY ?= 0
     ifneq ($(NFT_TEST_KEY),0)
         DEFINES += HAVE_NFT_TEST_KEY
     endif
-    NFT_STAGING_KEY?=0
+    NFT_STAGING_KEY ?= 0
     ifneq ($(NFT_STAGING_KEY),0)
         # Key used by the staging backend
         DEFINES += HAVE_NFT_STAGING_KEY
@@ -175,112 +178,112 @@ endif
 
 # Dynamic memory allocator
 ifneq ($(TARGET_NAME),TARGET_NANOS)
-DEFINES += HAVE_DYN_MEM_ALLOC
+    DEFINES += HAVE_DYN_MEM_ALLOC
 endif
 
 # EIP-712
 ifneq ($(TARGET_NAME),TARGET_NANOS)
-DEFINES	+= HAVE_EIP712_FULL_SUPPORT
+    DEFINES	+= HAVE_EIP712_FULL_SUPPORT
 endif
 
 # CryptoAssetsList key
-CAL_TEST_KEY?=0
+CAL_TEST_KEY ?= 0
 ifneq ($(CAL_TEST_KEY),0)
+    # Key used in our test framework
     DEFINES += HAVE_CAL_TEST_KEY
 endif
-CAL_STAGING_KEY?=0
+CAL_STAGING_KEY ?= 0
 ifneq ($(CAL_STAGING_KEY),0)
     # Key used by the staging CAL
     DEFINES += HAVE_CAL_STAGING_KEY
 endif
 ifneq (,$(filter $(DEFINES),HAVE_CAL_TEST_KEY))
     ifneq (, $(filter $(DEFINES),HAVE_CAL_STAGING_KEY))
+        # Can't use both the staging and testing keys
         $(error Multiple alternative CAL keys set at once)
     endif
 endif
 
 # ENS
 ifneq ($(TARGET_NAME),TARGET_NANOS)
-DEFINES += HAVE_DOMAIN_NAME
-DOMAIN_NAME_TEST_KEY?=0
-ifneq ($(DOMAIN_NAME_TEST_KEY),0)
-DEFINES += HAVE_DOMAIN_NAME_TEST_KEY
-endif
+    DEFINES += HAVE_DOMAIN_NAME
+    DOMAIN_NAME_TEST_KEY ?= 0
+    ifneq ($(DOMAIN_NAME_TEST_KEY),0)
+        DEFINES += HAVE_DOMAIN_NAME_TEST_KEY
+    endif
 endif
 
 # Enabling debug PRINTF
 ifneq ($(DEBUG),0)
-DEFINES += HAVE_STACK_OVERFLOW_CHECK
-ifeq ($(TARGET_NAME),TARGET_NANOS)
-DEFINES   += HAVE_PRINTF PRINTF=screen_printf
-else
-DEFINES   += HAVE_PRINTF PRINTF=mcu_usb_printf
-endif
+    DEFINES += HAVE_STACK_OVERFLOW_CHECK
+    ifeq ($(TARGET_NAME),TARGET_NANOS)
+        DEFINES += HAVE_PRINTF PRINTF=screen_printf
+    else
+        DEFINES += HAVE_PRINTF PRINTF=mcu_usb_printf
+    endif
 else
-DEFINES   += PRINTF\(...\)=
+    DEFINES += PRINTF\(...\)=
 endif
 
 ifneq ($(NOCONSENT),)
-DEFINES   += NO_CONSENT
+    DEFINES += NO_CONSENT
 endif
 
 ##############
 #  Compiler  #
 ##############
+
 ifneq ($(BOLOS_ENV),)
-$(info BOLOS_ENV=$(BOLOS_ENV))
-CLANGPATH := $(BOLOS_ENV)/clang-arm-fropi/bin/
-GCCPATH := $(BOLOS_ENV)/gcc-arm-none-eabi-5_3-2016q1/bin/
+    $(info BOLOS_ENV=$(BOLOS_ENV))
+    CLANGPATH := $(BOLOS_ENV)/clang-arm-fropi/bin/
+    GCCPATH := $(BOLOS_ENV)/gcc-arm-none-eabi-5_3-2016q1/bin/
 else
-$(info BOLOS_ENV is not set: falling back to CLANGPATH and GCCPATH)
+    $(info BOLOS_ENV is not set: falling back to CLANGPATH and GCCPATH)
 endif
 ifeq ($(CLANGPATH),)
-$(info CLANGPATH is not set: clang will be used from PATH)
+    $(info CLANGPATH is not set: clang will be used from PATH)
 endif
 ifeq ($(GCCPATH),)
-$(info GCCPATH is not set: arm-none-eabi-* will be used from PATH)
+    $(info GCCPATH is not set: arm-none-eabi-* will be used from PATH)
 endif
 
-CC       := $(CLANGPATH)clang
-
-CFLAGS   += -Wno-format-invalid-specifier -Wno-format-extra-args
-
-AS     := $(GCCPATH)arm-none-eabi-gcc
-
-LD       := $(GCCPATH)arm-none-eabi-gcc
-LDLIBS   += -lm -lgcc -lc
+CC := $(CLANGPATH)clang
+CFLAGS += -Wno-format-invalid-specifier -Wno-format-extra-args
+AS := $(GCCPATH)arm-none-eabi-gcc
+LD := $(GCCPATH)arm-none-eabi-gcc
+LDLIBS += -lm -lgcc -lc
 
 # import rules to compile glyphs(/pone)
 include $(BOLOS_SDK)/Makefile.glyphs
 
 ### variables processed by the common makefile.rules of the SDK to grab source files and include dirs
-APP_SOURCE_PATH  += src_common src src_features src_plugins
-SDK_SOURCE_PATH  += lib_stusb lib_stusb_impl lib_u2f
+APP_SOURCE_PATH += src_common src src_features src_plugins
+SDK_SOURCE_PATH += lib_stusb lib_stusb_impl lib_u2f
 ifeq  ($(TARGET_NAME),TARGET_STAX)
-APP_SOURCE_PATH  += src_nbgl
+    APP_SOURCE_PATH += src_nbgl
 else
-SDK_SOURCE_PATH  += lib_ux
-APP_SOURCE_PATH  += src_bagl
+    SDK_SOURCE_PATH += lib_ux
+    APP_SOURCE_PATH += src_bagl
 endif
 
 ### initialize plugin SDK submodule if needed, rebuild it, and warn if a difference is noticed
 ifeq ($(CHAIN),ethereum)
-ifneq ($(shell git submodule status | grep '^[-+]'),)
-$(info INFO: Need to reinitialize git submodules)
-$(shell git submodule update --init)
-endif
+    ifneq ($(shell git submodule status | grep '^[-+]'),)
+        $(info INFO: Need to reinitialize git submodules)
+        $(shell git submodule update --init)
+    endif
 
-# rebuild SDK
-$(shell python3 tools/build_sdk.py)
+    # rebuild SDK
+    $(shell python3 tools/build_sdk.py)
 
-# check if a difference is noticed (fail if it happens in CI build)
-ifneq ($(shell git status | grep 'ethereum-plugin-sdk'),)
-ifneq ($(JENKINS_URL),)
-$(error ERROR: please update ethereum-plugin-sdk submodule first)
-else
-$(warning WARNING: please update ethereum-plugin-sdk submodule first)
-endif
-endif
+    # check if a difference is noticed (fail if it happens in CI build)
+    ifneq ($(shell git status | grep 'ethereum-plugin-sdk'),)
+        ifneq ($(JENKINS_URL),)
+            $(error ERROR: please update ethereum-plugin-sdk submodule first)
+        else
+            $(warning WARNING: please update ethereum-plugin-sdk submodule first)
+        endif
+    endif
 endif
 
 load: all
@@ -301,13 +304,13 @@ unit-test:
 	make -C tests/unit
 
 ifeq ($(TARGET_NAME),TARGET_STAX)
-    NETWORK_ICONS_FILE = $(GEN_SRC_DIR)/net_icons.gen.c
-    NETWORK_ICONS_DIR = $(shell dirname "$(NETWORK_ICONS_FILE)")
+NETWORK_ICONS_FILE = $(GEN_SRC_DIR)/net_icons.gen.c
+NETWORK_ICONS_DIR = $(shell dirname "$(NETWORK_ICONS_FILE)")
 
 $(NETWORK_ICONS_FILE):
 	$(shell python3 tools/gen_networks.py "$(NETWORK_ICONS_DIR)")
 
-    APP_SOURCE_FILES += $(NETWORK_ICONS_FILE)
+APP_SOURCE_FILES += $(NETWORK_ICONS_FILE)
 endif
 
 # import generic rules from the sdk