From 108d45cf734f1171bce4a5d962ae536a2f17a4e8 Mon Sep 17 00:00:00 2001 From: Tomaspre Date: Thu, 27 Oct 2022 11:39:50 +0100 Subject: [PATCH] Support Gallagher when using make desfire --- .../DESFire/DESFireApplicationDirectory.h | 2 +- .../BuildScripts/custom_build_targets.mk | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Firmware/Chameleon-Mini/Application/DESFire/DESFireApplicationDirectory.h b/Firmware/Chameleon-Mini/Application/DESFire/DESFireApplicationDirectory.h index 3c501617..e9240597 100644 --- a/Firmware/Chameleon-Mini/Application/DESFire/DESFireApplicationDirectory.h +++ b/Firmware/Chameleon-Mini/Application/DESFire/DESFireApplicationDirectory.h @@ -58,7 +58,7 @@ This notice must be retained at the top of all source files where indicated. #endif #ifdef MEMORY_LIMITED_TESTING -#define DESFIRE_MAX_KEYS (2) +#define DESFIRE_MAX_KEYS (3) #else #ifdef DESFIRE_CUSTOM_MAX_KEYS #define DESFIRE_MAX_KEYS (DESFIRE_CUSTOM_MAX_KEYS) diff --git a/Firmware/Chameleon-Mini/BuildScripts/custom_build_targets.mk b/Firmware/Chameleon-Mini/BuildScripts/custom_build_targets.mk index 5632a4a2..754799d4 100644 --- a/Firmware/Chameleon-Mini/BuildScripts/custom_build_targets.mk +++ b/Firmware/Chameleon-Mini/BuildScripts/custom_build_targets.mk @@ -61,20 +61,6 @@ desfire: TARGET_CUSTOM_BUILD_NAME:=DESFire desfire: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS) desfire: custom-build -desfire-gallagher: FLASH_DATA_SIZE_CONST:=0F000 # Eight settings (save some space): 4 * 0x2000 -desfire-gallagher: FLASH_DATA_SIZE:=0x$(FLASH_DATA_SIZE_CONST) -desfire-gallagher: FLASH_DATA_SIZE_UPPER_CONST:=20000 -desfire-gallagher: FLASH_DATA_ADDR:=0x$(shell echo $$(( 0x$(FLASH_DATA_SIZE_UPPER_CONST) - 0x$(FLASH_DATA_SIZE_CONST) )) | xargs -0 printf %X) -desfire-gallagher: SUPPORTED_TAGS_BUILD:=-DCONFIG_MF_DESFIRE_SUPPORT -desfire-gallagher: EXTRA_CONFIG_SETTINGS:=-DDESFIRE_CUSTOM_MAX_APPS=3 - -DDESFIRE_CUSTOM_MAX_FILES=4 \ - -DDESFIRE_CUSTOM_MAX_KEYS=3 \ - -DDESFIRE_CRYPTO1_SAVE_SPACE \ - -finline-small-functions -desfire-gallagher: TARGET_CUSTOM_BUILD_NAME:=DESFire_Gallagher -desfire-gallagher: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS) -desfire-gallagher: custom-build - desfire-dev: FLASH_DATA_SIZE_CONST:=08000 # Four settings (save some space): 4 * 0x2000 desfire-dev: FLASH_DATA_SIZE:=0x$(FLASH_DATA_SIZE_CONST) desfire-dev: FLASH_DATA_SIZE_UPPER_CONST:=20000