diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
index c039dc191..4855009a6 100644
--- a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://${DIGI_EULA_FILE};md5=4c0991cfde5c8a92338cbfe0f4f9a5c
 FW_ATH6KL = " \
     file://athtcmd_ram.bin \
     file://athwlan.bin \
+    file://Digi_6203_2_ANT-US.bin \
+    file://Digi_6203_2_ANT-World.bin \
     file://Digi_6203-6233-US.bin \
     file://Digi_6203-6233-World.bin \
     file://fw-4.bin \
@@ -15,11 +17,6 @@ FW_ATH6KL = " \
     file://utf.bin \
 "
 
-FW_ATH6KL_append_ccimx6 = " \
-    file://Digi_6203_2_ANT-US.bin \
-    file://Digi_6203_2_ANT-World.bin \
-"
-
 FW_AR3K = " \
     file://PS_ASIC_class_1.pst \
     file://PS_ASIC_class_2.pst \
@@ -49,6 +46,8 @@ do_install() {
 	install -m 0644 \
 		athtcmd_ram.bin \
 		athwlan.bin \
+		Digi_6203_2_ANT-US.bin \
+		Digi_6203_2_ANT-World.bin \
 		Digi_6203-6233-US.bin \
 		Digi_6203-6233-World.bin \
 		fw-4.bin \
@@ -63,13 +62,6 @@ do_install() {
 	ln -sf Digi_6203-6233-US.bin ${D}${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.0x0.bin
 	ln -sf Digi_6203-6233-World.bin ${D}${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.0x1.bin
 	ln -sf Digi_6203-6233-World.bin ${D}${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.0x2.bin
-}
-
-do_install_append_ccimx6() {
-	install -m 0644 \
-		Digi_6203_2_ANT-US.bin \
-		Digi_6203_2_ANT-World.bin \
-		${D}${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/
 	ln -sf Digi_6203_2_ANT-US.bin ${D}${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.ANT-0x0.bin
 	ln -sf Digi_6203_2_ANT-World.bin ${D}${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.ANT-0x1.bin
 	ln -sf Digi_6203_2_ANT-World.bin ${D}${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.ANT-0x2.bin
@@ -82,4 +74,4 @@ FILES_${PN}-ar3k = "/lib/firmware/ar3k"
 FILES_${PN}-ath6kl = "/lib/firmware/ath6k"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccardimx28|ccimx6$)"
+COMPATIBLE_MACHINE = "(ccimx6$)"
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/Digi_6203-6233-US.bin b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203-6233-US.bin
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/Digi_6203-6233-US.bin
rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203-6233-US.bin
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/Digi_6203_2_ANT-US.bin b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203_2_ANT-US.bin
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/Digi_6203_2_ANT-US.bin
rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203_2_ANT-US.bin
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/Digi_6203_2_ANT-World.bin b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203_2_ANT-World.bin
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/Digi_6203_2_ANT-World.bin
rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203_2_ANT-World.bin
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/PS_ASIC_class_1.pst b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/PS_ASIC_class_1.pst
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccimx6/PS_ASIC_class_1.pst
rename to meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/PS_ASIC_class_1.pst
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccardimx28/Digi_6203-6233-US.bin b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccardimx28/Digi_6203-6233-US.bin
deleted file mode 100644
index 74e7f50fe..000000000
Binary files a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccardimx28/Digi_6203-6233-US.bin and /dev/null differ
diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccardimx28/PS_ASIC_class_1.pst b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccardimx28/PS_ASIC_class_1.pst
deleted file mode 100644
index 4ad2e1f52..000000000
--- a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/ccardimx28/PS_ASIC_class_1.pst
+++ /dev/null
@@ -1,126 +0,0 @@
-
-// Radio table TAG
-#
-[H:S]012C
-[H:S]00EE
-[H:A]B1 B1 12 00 B8 08 FE FE 7D 00 17 00 00 20 02 00
-     0C 09 00 14 00 00 8C 08 00 00 00 40 80 08 78 00
-     00 01 84 08 AD AC 80 5F 88 08 20 3F 00 41 8C 08
-     00 00 00 40 94 08 54 25 64 92 98 08 C8 4E 2C 2E
-     9C 08 C0 20 DA 2C C0 08 B6 0D 01 00 C4 08 6C DB
-     B6 6D C8 08 DB 36 D3 6D CC 08 60 DB B6 6D 00 09
-     50 00 92 04 04 09 20 49 00 80 08 09 E0 6F 5B E5
-     0C 09 00 14 00 00 10 09 81 03 30 F0 14 09 80 80
-     43 00 18 09 00 00 00 80 1C 09 00 00 00 00 20 09
-     02 00 00 00 88 0A 00 60 77 58 61 00 00 60 02 00
-     04 07 C4 C1 8B 00 1C 00 00 05 90 01 0C 07 00 0D
-     00 00 30 00 D8 70 EF 4A 7C 00 B0 D2 5A B1 78 00
-     DE 7A 58 00 5C 00 01 00 14 01 44 00 00 00 10 E4
-     84 00 3F F0 E7 04 C0 00 90 01 2C 00 C4 00 80 D6
-     82 03 DC 00 D8 40 06 00 88 00 52 6C 3D 0E
-// Radio table TAG
-#
-[H:S]012D
-[H:S]00F0
-[H:A]94 00 41 06 00 00 80 00 20 9C C8 00 90 00 DD DD
-     97 06 54 00 E0 A6 09 00 10 07 3D A0 00 3D 14 07
-     A0 80 01 00 18 07 17 55 D1 0C 1C 07 6D 23 00 00
-     C0 07 65 A8 0C 0B E4 07 27 CA 54 00 C4 07 FF FF
-     FF 3F C8 07 FF FF E3 3F CC 07 FF FF FF 3F D0 07
-     FF FF FF 3F D4 07 3F FE FF 3F D8 07 FF FF FF 3F
-     DC 07 FF FF FF 38 E0 07 FF FF FF 3F BC 07 D8 05
-     00 00 B8 07 42 00 0B 00 00 05 4A 1C 00 00 04 05
-     8A 1C 00 00 08 05 CA 1C 00 00 0C 05 0A 1D 00 00
-     10 05 4A 1D 00 00 14 05 1A 1C 00 00 18 05 5A 1C
-     00 00 1C 05 9A 1C 00 00 20 05 DA 1C 00 00 24 05
-     1A 1D 00 00 28 05 5A 1D 00 00 2C 05 2A 1C 00 00
-     30 05 6A 1C 00 00 34 05 AA 1C 00 00 38 05 EA 1C
-     00 00 3C 05 2A 1D 00 00 40 05 6A 1D 00 00 44 05
-     3A 1C 00 00 48 05 2B 1C 00 00 4C 05 6B 1C 00 00
-
-// Radio table TAG
-#
-[H:S]012E
-[H:S]00F0
-[H:A]50 05 AB 1C 00 00 54 05 EB 1C 00 00 58 05 2B 1D
-     00 00 5C 05 5C 1D 00 00 60 05 2C 1C 00 00 64 05
-     6C 1C 00 00 68 05 AC 1C 00 00 6C 05 1D 1D 00 00
-     70 05 2D 1C 00 00 74 05 6D 1C 00 00 78 05 AD 1C
-     00 00 7C 05 ED 1C 00 00 80 05 2D 1D 00 00 84 05
-     6D 1D 00 00 88 05 3D 1C 00 00 8C 05 7D 1C 00 00
-     90 05 AE 1C 00 00 94 05 EE 1C 00 00 98 05 2E 1D
-     00 00 9C 05 6E 1D 00 00 A0 05 3E 1C 00 00 A4 05
-     7E 1C 00 00 A8 05 BE 1C 00 00 AC 05 2F 1C 00 00
-     B0 05 6F 1C 00 00 B4 05 AF 1C 00 00 B8 05 EF 1C
-     00 00 BC 05 2F 1D 00 00 C0 05 6F 1D 00 00 C4 05
-     AF 1D 00 00 C8 05 BF 00 00 00 CC 05 FF 1C 00 00
-     D0 05 3F 01 00 00 D4 05 7F 01 00 00 D8 05 BF 01
-     00 00 DC 05 FF 01 00 00 E0 05 3F 02 00 00 E4 05
-     7F 12 00 00 E8 05 BF 02 00 00 EC 05 FF 02 00 00
-
-// Radio table TAG
-#
-[H:S]012F
-[H:S]0044
-[H:A]F0 05 3F 03 00 00 F4 05 7F 03 00 00 F8 05 BF 03
-     00 00 FC 05 FF 03 00 00 04 00 00 00 02 00 10 00
-     01 CE C0 10 14 00 07 04 00 00 A0 04 00 E9 FF 03
-     BC 04 FF 41 00 00 01 00 00 C0 02 00 B8 01 01 00
-     00 00 B2 B2
-
-// System config TAG
-#
-[H:S]0013
-[H:S]00F0
-[H:A]C1 C1 20 02 BD 08 FE FE C9 00 00 CC B1 01 20 00
-     FF CC 02 CC 04 00 B6 FB A9 90 00 21 00 E0 FF CC
-     08 CC 1E 00 80 84 00 07 DB 05 93 11 FF CC 0E CC
-     0B 00 E4 FF 61 47 00 00 4D FD 61 47 00 00 58 FD
-     E8 FF 41 27 04 00 6F FD 41 27 04 00 6C FD EC FF
-     A0 A7 00 00 2F FD A0 A7 00 00 6D FD F0 FF 60 27
-     01 00 50 FD 60 27 01 00 6F FD F4 FF A0 C7 04 00
-     3A FD A0 C7 04 00 89 FD F8 FF 80 C7 08 00 12 FD
-     80 C7 08 00 58 FD FC FF 40 47 09 00 66 FD 40 47
-     09 00 0B FD 00 00 80 C7 0D 00 09 FD 80 C7 0D 00
-     09 FD 04 00 20 47 0E 40 58 FD 20 47 0E 40 58 FD
-     08 00 60 47 13 40 58 FD 60 47 13 40 58 FD 0C 00
-     00 E7 13 40 58 FD 00 E7 13 40 58 FD FF CC 0F CC
-     01 01 01 01 07 04 03 33 00 0A 00 04 00 00 60 6D
-     F0 00 66 01 00 00 00 00 00 00 FF CC 10 CC 22 81
-
-// System config TAG
-#
-[H:S]0014
-[H:S]00AE
-[H:A]A0 0F A0 00 32 00 02 08 0A 64 20 20 0A FF 20 20
-     FF CC 11 CC 01 01 FF CC 12 CC 09 01 FF 03 00 FF
-     FF 03 FF CC 13 CC 02 19 B8 0B 17 0F E0 FD E0 FD
-     E0 FD E0 FD 58 FD 14 FD 58 FD 14 FD 54 25 11 A0
-     92 24 00 00 00 00 00 00 00 00 00 00 00 00 02 64
-     04 02 03 FF 04 03 FF CC 1A CC 0C 02 08 00 60 47
-     13 40 58 FD 0C 00 00 E7 13 40 58 FD FF CC 18 CC
-     01 00 05 05 14 0A FF CC 17 CC 20 01 FF CC 16 CC
-     07 00 C9 B0 B4 00 FF CC 14 CC 01 01 FF CC 15 CC
-     01 00 08 00 FF CC 1D CC 01 00 00 00 00 00 FB 00
-     16 F5 08 00 24 24 07 00 1C 1C FF CC C2 C2
-// Coex Configuration
-#
-[H:S]0017
-[H:S]0026
-[H:A]D1 D1 20 00 02 01 02 09 0C 00 24 1F 12 00 00 01
-     00 01 00 00 01 01 01 01 01 00 00 00 01 00 01 01
-     01 01 01 00 D2 D2
-
-//Audio - Audio main config
-#
-[H:S]0041
-[H:S]0004
-[H:A]01 00 00 00
-
-//TLPM
-//HOST TLPM 6W (GPIO14) Enable Active low No ack, Target TLPM 4W Enable Active low, No ack
-#
-[H:S]0023
-[H:S]0018
-[H:A]06 0E 06 0F 08 08 00 0E 05 00 05 00 2C 01 00 00
-      E8 03 00 00 C8 00 00 00
\ No newline at end of file