Updates to make/build scripts ; Partial fixes to @colinoflynn\'s notes in emsec#313 (success with \'hf mfdes info -- Still debugging auth exchanges)

maxieds · maxieds · commit f9c1dabf3c8d · 2022-06-02T00:40:53.000-04:00
diff --git a/Firmware/Chameleon-Mini/Application/DESFire/DESFireISO14443Support.c b/Firmware/Chameleon-Mini/Application/DESFire/DESFireISO14443Support.c
@@ -420,8 +420,9 @@ uint16_t ISO144433APiccProcess(uint8_t *Buffer, uint16_t BitCount) {
                 const char *logMsg = PSTR("ISO14443-3/4: EXPECTING RATS");
                 LogDebuggingMsg(logMsg);
             } else if (Cmd == ISO14443A_CMD_SELECT_CL3) {
-                Buffer[0] = 0x00;
-                return 1 * BITS_PER_BYTE;
+                Buffer[0] = ISO14443A_SAK_COMPLETE_NOT_COMPLIANT;
+                ISO14443AAppendCRCA(Buffer, 1);
+                return ISO14443A_SAK_FRAME_SIZE;
             }
             /* Forward to ISO/IEC 14443-4 processing code */
             uint16_t ByteCount = (BitCount + BITS_PER_BYTE - 1) / BITS_PER_BYTE;
diff --git a/Firmware/Chameleon-Mini/Application/DESFire/DESFirePICCHeaderLayout.h b/Firmware/Chameleon-Mini/Application/DESFire/DESFirePICCHeaderLayout.h
@@ -49,9 +49,13 @@ This notice must be retained at the top of all source files where indicated.
 
 /* Anticollision parameters */
 #define ATQA_VALUE              0x0344
+#ifndef FORCE_SAK_NOT_COMPLIANT
 #define SAK_CL1_VALUE           (ISO14443A_SAK_INCOMPLETE)
 #define SAK_CL2_VALUE           (ISO14443A_SAK_COMPLETE_COMPLIANT)
-#define SAK_UID_NOT_FINISHED    0x04
+#else
+#define SAK_CL1_VALUE           (ISO14443A_SAK_INCOMPLETE_NOT_COMPLIANT)
+#define SAK_CL2_VALUE           (ISO14443A_SAK_COMPLETE_NOT_COMPLIANT)
+#endif
 
 #define STATUS_FRAME_SIZE       (1 * 8) /* Bits */
 
diff --git a/Firmware/Chameleon-Mini/Application/ISO14443-3A.c b/Firmware/Chameleon-Mini/Application/ISO14443-3A.c
@@ -1,26 +1,22 @@
 /*
- * ISO14443A.c
+ *  ISO14443A.c
  *
  *  Created on: 19.03.2013
- *      Author: skuser
+ *  Author: skuser
  */
 
 #include "ISO14443-3A.h"
 
-#define CRC_INIT		0x6363
-#define CRC_INIT_R		0xC6C6 /* Bit reversed */
-
 #ifdef CONFIG_MF_DESFIRE_SUPPORT
-
 #include "DESFire/DESFireISO14443Support.h"
 
 bool ISO14443ASelectDesfire(void *Buffer, uint16_t *BitCount, uint8_t *UidCL, uint8_t SAKValue) {
+
     uint8_t *DataPtr = (uint8_t *) Buffer;
     uint8_t NVB = DataPtr[1];
 
     switch (NVB) {
-        case 0x00:
-        case ISO14443A_CMD_HLTA:
+
         case ISO14443A_NVB_AC_START:
             /* Start of anticollision procedure.
              * Send whole UID CLn + BCC          */
@@ -31,7 +27,6 @@ bool ISO14443ASelectDesfire(void *Buffer, uint16_t *BitCount, uint8_t *UidCL, ui
             DataPtr[ISO14443A_CL_BCC_OFFSET] = ISO14443A_CALC_BCC(DataPtr);
             *BitCount = ISO14443A_CL_FRAME_SIZE;
             return false;
-
         case ISO14443A_NVB_AC_END:
             /* End of anticollision procedure.
              * Send SAK CLn if we are selected. */
@@ -40,47 +35,21 @@ bool ISO14443ASelectDesfire(void *Buffer, uint16_t *BitCount, uint8_t *UidCL, ui
                     (DataPtr[4] == UidCL[2]) &&
                     (DataPtr[5] == UidCL[3])) {
                 DataPtr[0] = SAKValue;
-                ISO14443AUpdateCRCA(Buffer, 1, ISO14443A_CRCA_INIT);
-                *BitCount = 3 * BITS_PER_BYTE;
+                ISO14443AAppendCRCA(Buffer, 1);
+                *BitCount = ISO14443A_SAK_FRAME_SIZE;
                 return true;
             } else {
                 /* We have not been selected. Don't send anything. */
                 *BitCount = 0;
                 return false;
             }
-        default: {
-            uint8_t CollisionByteCount = ((NVB >> 4) & 0x0f) - 2;
-            uint8_t CollisionBitCount  = (NVB >> 0) & 0x0f;
-            uint8_t mask = 0xFF >> (8 - CollisionBitCount);
-            // Since the UidCL does not contain the BCC, we have to distinguish here
-            if (
-                ((CollisionByteCount == 5 || (CollisionByteCount == 4 && CollisionBitCount > 0)) &&
-                 memcmp(UidCL, &DataPtr[2], 4) == 0 && (ISO14443A_CALC_BCC(UidCL) & mask) == (DataPtr[6] & mask))
-                ||
-                (CollisionByteCount == 4 && CollisionBitCount == 0 && memcmp(UidCL, &DataPtr[2], 4) == 0)
-                ||
-                (CollisionByteCount < 4 && memcmp(UidCL, &DataPtr[2], CollisionByteCount) == 0 &&
-                 (UidCL[CollisionByteCount] & mask) == (DataPtr[CollisionByteCount + 2] & mask))
-            ) {
-                DataPtr[0] = UidCL[0];
-                DataPtr[1] = UidCL[1];
-                DataPtr[2] = UidCL[2];
-                DataPtr[3] = UidCL[3];
-                DataPtr[4] = ISO14443A_CALC_BCC(DataPtr);
-
-                *BitCount = ISO14443A_CL_FRAME_SIZE;
-            } else {
-                *BitCount = 0;
-            }
-            return false;
-        }
+        default:
             /* No anticollision supported */
-        *BitCount = 0;
-        return false;
+            *BitCount = 0;
+            return false;
     }
 }
-
-#endif
+#endif /* CONFIG_MF_DESFIRE_SUPPORT */
 
 #define USE_HW_CRC
 #ifdef USE_HW_CRC
@@ -157,65 +126,3 @@ bool ISO14443ACheckCRCA(const void *Buffer, uint16_t ByteCount) {
     return (DataPtr[0] == ((Checksum >> 0) & 0xFF)) && (DataPtr[1] == ((Checksum >> 8) & 0xFF));
 }
 #endif
-
-#if 0
-bool ISO14443ASelect(void *Buffer, uint16_t *BitCount, uint8_t *UidCL, uint8_t SAKValue) {
-    uint8_t *DataPtr = (uint8_t *) Buffer;
-    uint8_t NVB = DataPtr[1];
-
-    switch (NVB) {
-        case ISO14443A_NVB_AC_START:
-            /* Start of anticollision procedure.
-            * Send whole UID CLn + BCC */
-            DataPtr[0] = UidCL[0];
-            DataPtr[1] = UidCL[1];
-            DataPtr[2] = UidCL[2];
-            DataPtr[3] = UidCL[3];
-            DataPtr[4] = ISO14443A_CALC_BCC(DataPtr);
-
-            *BitCount = ISO14443A_CL_FRAME_SIZE;
-
-            return false;
-
-        case ISO14443A_NVB_AC_END:
-            /* End of anticollision procedure.
-            * Send SAK CLn if we are selected. */
-            if ((DataPtr[2] == UidCL[0]) &&
-                    (DataPtr[3] == UidCL[1]) &&
-                    (DataPtr[4] == UidCL[2]) &&
-                    (DataPtr[5] == UidCL[3])) {
-
-                DataPtr[0] = SAKValue;
-                ISO14443AAppendCRCA(Buffer, 1);
-
-                *BitCount = ISO14443A_SAK_FRAME_SIZE;
-                return true;
-            } else {
-                /* We have not been selected. Don't send anything. */
-                *BitCount = 0;
-                return false;
-            }
-        default:
-            /* TODO: No anticollision supported */
-            *BitCount = 0;
-            return false;
-    }
-}
-
-bool ISO14443AWakeUp(void *Buffer, uint16_t *BitCount, uint16_t ATQAValue, bool FromHalt) {
-    uint8_t *DataPtr = (uint8_t *) Buffer;
-
-    if (((! FromHalt) && (DataPtr[0] == ISO14443A_CMD_REQA)) ||
-            (DataPtr[0] == ISO14443A_CMD_WUPA)) {
-        DataPtr[0] = (ATQAValue >> 0) & 0x00FF;
-        DataPtr[1] = (ATQAValue >> 8) & 0x00FF;
-
-        *BitCount = ISO14443A_ATQA_FRAME_SIZE;
-
-        return true;
-    } else {
-        return false;
-    }
-}
-
-#endif
diff --git a/Firmware/Chameleon-Mini/Application/ISO14443-3A.h b/Firmware/Chameleon-Mini/Application/ISO14443-3A.h
@@ -30,7 +30,8 @@
 #define ISO14443A_CL_BCC_OFFSET     4
 #define ISO14443A_CL_BCC_SIZE       1 /* Byte */
 #define ISO14443A_CL_FRAME_SIZE     ((ISO14443A_CL_UID_SIZE + ISO14443A_CL_BCC_SIZE) * 8)    /* UID[N...N+3] || BCCN */
-#define ISO14443A_SAK_INCOMPLETE                0x24        // 0x04
+#define ISO14443A_SAK_INCOMPLETE                0x24
+#define ISO14443A_SAK_INCOMPLETE_NOT_COMPLIANT  0x04
 #define ISO14443A_SAK_COMPLETE_COMPLIANT        0x20
 #define ISO14443A_SAK_COMPLETE_NOT_COMPLIANT    0x00
 
@@ -39,17 +40,20 @@
 #define ISO14443A_SAK_FRAME_SIZE          (3 * BITS_PER_BYTE) /* in Bits */
 #define ISO14443A_HLTA_FRAME_SIZE         (2 * BITS_PER_BYTE) /* in Bits */
 
-#define ISO14443A_UID0_RANDOM       0x08
-#define ISO14443A_UID0_CT           0x88
-
 #define ISO14443A_CRCA_SIZE         2
 
+#define CRC_INIT                0x6363
+#define CRC_INIT_R              0xC6C6 /* Bit reversed */
+
 #define ISO14443A_CALC_BCC(ByteBuffer) \
     ( ByteBuffer[0] ^ ByteBuffer[1] ^ ByteBuffer[2] ^ ByteBuffer[3] )
 
 void ISO14443AAppendCRCA(void *Buffer, uint16_t ByteCount);
 bool ISO14443ACheckCRCA(const void *Buffer, uint16_t ByteCount);
 
+#define ISO14443A_UID0_RANDOM       0x08
+#define ISO14443A_UID0_CT           0x88
+
 INLINE bool ISO14443ASelect(void *Buffer, uint16_t *BitCount, uint8_t *UidCL, uint8_t SAKValue);
 INLINE bool ISO14443AWakeUp(void *Buffer, uint16_t *BitCount, uint16_t ATQAValue, bool FromHalt);
 
diff --git a/Firmware/Chameleon-Mini/Application/MifareDESFire.c b/Firmware/Chameleon-Mini/Application/MifareDESFire.c
@@ -179,9 +179,21 @@ uint16_t MifareDesfireProcess(uint8_t *Buffer, uint16_t BitCount) {
     if (BitCount == 0) {
         LogEntry(LOG_INFO_DESFIRE_INCOMING_DATA, Buffer, ByteCount);
         return ISO14443A_APP_NO_RESPONSE;
+    } else if (ByteCount >= 2 && Buffer[1] == STATUS_ADDITIONAL_FRAME &&
+               DesfireCLA(Buffer[0])) {
+        ByteCount -= 1;
+        memmove(&Buffer[0], &Buffer[1], ByteCount);
+        uint16_t ProcessedByteCount = MifareDesfireProcessCommand(Buffer, ByteCount);
+        if (ProcessedByteCount != 0) {
+            /* Re-wrap into padded APDU form */
+            Buffer[ProcessedByteCount] = Buffer[0];
+            memmove(&Buffer[0], &Buffer[1], ProcessedByteCount - 1);
+            Buffer[ProcessedByteCount - 1] = 0x91;
+            ++ProcessedByteCount;
+        }
+        return ProcessedByteCount * BITS_PER_BYTE;
     } else if (((ByteCount >= 8 && Buffer[4] == ByteCount - 8) ||
-                (ByteCount >= 5 && Buffer[4] == ByteCount - 5) ||
-                (ByteCount >= 5 && Buffer[1] == STATUS_ADDITIONAL_FRAME)) &&
+                (ByteCount >= 5 && Buffer[4] == ByteCount - 5)) &&
                DesfireCLA(Buffer[0]) && Buffer[2] == 0x00 &&
                Buffer[3] == 0x00 || Iso7816CLA(DesfireCmdCLA)) {
         /* Wrapped native command structure or ISO7816: */
@@ -234,12 +246,17 @@ uint16_t MifareDesfireAppProcess(uint8_t *Buffer, uint16_t BitCount) {
         return ISO14443AStoreLastDataFrameAndReturn(Buffer, ProcessedByteCount * BITS_PER_BYTE);
     } else if (ByteCount >= 8 && DesfireCLA(Buffer[1]) && Buffer[3] == 0x00 &&
                Buffer[4] == 0x00 && Buffer[5] == ByteCount - 8) {
+        uint8_t hf14AScanPrologue = Buffer[0];
         DesfireCmdCLA = Buffer[1];
         uint16_t IncomingByteCount = MAX(0, (BitCount + BITS_PER_BYTE - 1) / BITS_PER_BYTE - 1);
         memmove(&Buffer[0], &Buffer[1], IncomingByteCount);
         uint16_t UnwrappedBitCount = DesfirePreprocessAPDU(ActiveCommMode, Buffer, IncomingByteCount) * BITS_PER_BYTE;
         uint16_t ProcessedBitCount = MifareDesfireProcess(Buffer, UnwrappedBitCount);
         uint16_t ProcessedByteCount = (ProcessedBitCount + BITS_PER_BYTE - 1) / BITS_PER_BYTE;
+        if (ProcessedByteCount++ > 0) {
+            memmove(&Buffer[1], &Buffer[0], ProcessedByteCount);
+        }
+        Buffer[0] = hf14AScanPrologue;
         ProcessedByteCount = DesfirePostprocessAPDU(ActiveCommMode, Buffer, ProcessedByteCount);
         LogEntry(LOG_INFO_DESFIRE_OUTGOING_DATA, Buffer, ProcessedByteCount);
         return ISO14443AStoreLastDataFrameAndReturn(Buffer, ProcessedByteCount * BITS_PER_BYTE);
diff --git a/Firmware/Chameleon-Mini/BuildScripts/custom_build_targets.mk b/Firmware/Chameleon-Mini/BuildScripts/custom_build_targets.mk
@@ -1,16 +1,13 @@
-SHELL := $(if $(SHELL), $(SHELL), /bin/sh)
-BASH  := $(if $(shell which bash), $(shell which bash), /bin/bash)
+.PHONY:     mifare mifare-classic desfire desfire-dev iso-modes ntag215 vicinity sl2s2002 tagatit em4233
+.SECONDARY: custom-build
 
 TARGET_CUSTOM_BUILD_NAME     =
-TARGET_CUSTOM_BUILD          = $(TARGET)-$(strip $(if $(TARGET_CUSTOM_BUILD_NAME), "CustomBuild_$(TARGET_CUSTOM_BUILD_NAME)", "DefaultBuild"))
 DEFAULT_TAG_SUPPORT_BASE     = -DCONFIG_ISO14443A_SNIFF_SUPPORT \
                                -DCONFIG_ISO14443A_READER_SUPPORT
-SUPPORTED_TAGS              ?=
-SUPPORTED_TAGS_BUILD        := $(SUPPORTED_TAGS)
-CUSTOM_CONFIG_SETTINGS_BASE := $(DEFAULT_TAG_SUPPORT) $(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE
+SUPPORTED_TAGS_BUILD         =
+EXTRA_CONFIG_SETTINGS        =
 
-## : Include several standardized custom build target variants:
-custom-build: CONFIG_SETTINGS:=$(CUSTOM_CONFIG_SETTINGS_BASE)
+custom-build: TARGET_CUSTOM_BUILD:=$(TARGET)-$(strip $(if $(TARGET_CUSTOM_BUILD_NAME), "CustomBuild_$(TARGET_CUSTOM_BUILD_NAME)", "DefaultBuild"))
 custom-build: local-clean $(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).bin check_size
 	@cp $(TARGET).hex $(TARGET_CUSTOM_BUILD).hex
 	@cp $(TARGET).eep $(TARGET_CUSTOM_BUILD).eep
@@ -26,12 +23,9 @@ custom-build: local-clean $(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).bi
 	@echo $(FMT_ANSIC_BOLD)$(FMT_ANSIC_EXCLAIM)"[!!!]"$(FMT_ANSIC_END) \
 		$(FMT_ANSIC_BOLD)$(FMT_ANSIC_UNDERLINE)"SUCCESS BUILDING CUSTOM FIRMWARE:"$(FMT_ANSIC_END)
 	@echo $(FMT_ANSIC_BOLD)$(FMT_ANSIC_EXCLAIM)"[!!!]"$(FMT_ANSIC_END) \
-		$(FMT_ANSIC_BOLD)"$(TARGET_CUSTOM_BUILD).{hex/eep/elf/bin}"$(FMT_ANSIC_END)
+		$(FMT_ANSIC_BOLD)"$(TARGET_CUSTOM_BUILD).(HEX|EEP|ELF|BIN)"$(FMT_ANSIC_END)
 	@echo "\n"
 
-default_config_support:   DEFAULT_TAG_SUPPORT:=$(DEFAULT_TAG_SUPPORT_BASE)
-nodefault_config_support: DEFAULT_TAG_SUPPORT:= 
-
 mifare: SUPPORTED_TAGS_BUILD:=\
                 -DCONFIG_MF_CLASSIC_MINI_4B_SUPPORT \
                 -DCONFIG_MF_CLASSIC_1K_SUPPORT \
@@ -40,63 +34,72 @@ mifare: SUPPORTED_TAGS_BUILD:=\
                 -DCONFIG_MF_CLASSIC_4K_7B_SUPPORT \
                 -DCONFIG_MF_ULTRALIGHT_SUPPORT
 mifare: TARGET_CUSTOM_BUILD_NAME:=MifareDefaultSupport
+mifare: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS)
 mifare: custom-build
 
-mifare-classic: nodefault_config_support
 mifare-classic: SUPPORTED_TAGS_BUILD:=\
                 -DCONFIG_MF_CLASSIC_MINI_4B_SUPPORT \
                 -DCONFIG_MF_CLASSIC_1K_SUPPORT \
                 -DCONFIG_MF_CLASSIC_1K_7B_SUPPORT \
                 -DCONFIG_MF_CLASSIC_4K_SUPPORT \
                 -DCONFIG_MF_CLASSIC_4K_7B_SUPPORT
 mifare-classic: TARGET_CUSTOM_BUILD_NAME:=MifareClassicSupport
+mifare-classic: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS)
 mifare-classic: custom-build
 
-desfire: CONFIG_SETTINGS:=$(DESFIRE_CONFIG_SETTINGS_BASE) \
-		-fno-inline-small-functions
+desfire: FLASH_DATA_SIZE:=0x0E000
+desfire: SUPPORTED_TAGS_BUILD:=-DCONFIG_MF_DESFIRE_SUPPORT
+desfire: EXTRA_CONFIG_SETTINGS:=-DMEMORY_LIMITED_TESTING \
+                                -DDESFIRE_CRYPTO1_SAVE_SPACE \
+				-f-inline-small-functions
 desfire: TARGET_CUSTOM_BUILD_NAME:=DESFire
+desfire: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS)
 desfire: custom-build
 
-desfire-dev: CONFIG_SETTINGS:=$(DESFIRE_CONFIG_SETTINGS_BASE) \
-		-fno-inline-small-functions \
-		-DDESFIRE_MIN_OUTGOING_LOGSIZE=0 \
-		-DDESFIRE_MIN_INCOMING_LOGSIZE=0 \
-		-DDESFIRE_DEFAULT_LOGGING_MODE=DEBUGGING \
-		-DDESFIRE_DEFAULT_TESTING_MODE=1
+desfire-dev: FLASH_DATA_SIZE:=0x0E000
+desfire-dev: SUPPORTED_TAGS_BUILD:=-DCONFIG_MF_DESFIRE_SUPPORT
+desfire-dev: EXTRA_CONFIG_SETTINGS:=-DMEMORY_LIMITED_TESTING \
+                                -DDESFIRE_CRYPTO1_SAVE_SPACE \
+				-finline-small-functions \
+                		-DDESFIRE_MIN_OUTGOING_LOGSIZE=0 \
+                		-DDESFIRE_MIN_INCOMING_LOGSIZE=0 \
+                		-DDESFIRE_DEFAULT_LOGGING_MODE=DEBUGGING \
+                		-DDESFIRE_DEFAULT_TESTING_MODE=1
 desfire-dev: TARGET_CUSTOM_BUILD_NAME:=DESFire_DEV
+desfire-dev: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS)
 desfire-dev: custom-build
 
-iso-modes: nodefault_config_support
 iso-modes: SUPPORTED_TAGS_BUILD:=\
                 -DCONFIG_ISO14443A_SNIFF_SUPPORT \
                 -DCONFIG_ISO14443A_READER_SUPPORT \
                 -DCONFIG_ISO15693_SNIFF_SUPPORT
 iso-modes: TARGET_CUSTOM_BUILD_NAME:=ISOSniffReaderModeSupport
+iso-modes: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS)
 iso-modes: custom-build
 
-ntag215: default_config_support
-ntag215: SUPPORTED_TAGS_BUILD:=-DCONFIG_NTAG215_SUPPORT
+ntag215: SUPPORTED_TAGS_BUILD:=$(DEFAULT_TAG_SUPPORT_BASE) -DCONFIG_NTAG215_SUPPORT
 ntag215: TARGET_CUSTOM_BUILD_NAME:=NTAG215Support
+ntag215: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS)
 ntag215: custom-build
 
-vicinity: default_config_support
-vicinity: SUPPORTED_TAGS_BUILD:=-DCONFIG_VICINITY_SUPPORT
+vicinity: SUPPORTED_TAGS_BUILD:=$(DEFAULT_TAG_SUPPORT_BASE) -DCONFIG_VICINITY_SUPPORT
 vicinity: TARGET_CUSTOM_BUILD_NAME:=VicinitySupport
+vicinity: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS)
 vicinity: custom-build
 
-sl2s2002: default_config_support
-sl2s2002: SUPPORTED_TAGS_BUILD:=-DCONFIG_SL2S2002_SUPPORT
+sl2s2002: SUPPORTED_TAGS_BUILD:=$(DEFAULT_TAG_SUPPORT_BASE) -DCONFIG_SL2S2002_SUPPORT
 sl2s2002: TARGET_CUSTOM_BUILD_NAME:=SL2S2002Support
+sl2s2002: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS)
 sl2s2002: custom-build
 
-tagatit: default_config_support
-tagatit: SUPPORTED_TAGS_BUILD:=\
+tagatit: SUPPORTED_TAGS_BUILD:=$(DEFAULT_TAG_SUPPORT_BASE) \
                 -DCONFIG_TITAGITSTANDARD_SUPPORT \
                 -DCONFIG_TITAGITPLUS_SUPPORT
 tagatit: TARGET_CUSTOM_BUILD_NAME:=TagatitSupport
+tagatit: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS)
 tagatit: custom-build
 
-em4233: default_config_support
-em4233: SUPPORTED_TAGS_BUILD:=-DCONFIG_EM4233_SUPPORT
+em4233: SUPPORTED_TAGS_BUILD:=$(DEFAULT_TAG_SUPPORT_BASE) -DCONFIG_EM4233_SUPPORT
 em4233: TARGET_CUSTOM_BUILD_NAME:=EM4233Support
+em4233: CONFIG_SETTINGS:=$(SUPPORTED_TAGS_BUILD) -DDEFAULT_CONFIGURATION=CONFIG_NONE $(EXTRA_CONFIG_SETTINGS)
 em4233: custom-build
diff --git a/Firmware/Chameleon-Mini/Makefile b/Firmware/Chameleon-Mini/Makefile
