firmware: include HACKRF1_OG, HACKRF1_R9 in Praline's SUPPORTED_PLATFORM

Author: antoinevg

firmware/common/firmware_info.c

@@ -34,7 +34,8 @@
 #elif RAD1O
 	#define SUPPORTED_PLATFORM PLATFORM_RAD1O
 #elif PRALINE
-	#define SUPPORTED_PLATFORM PLATFORM_PRALINE
+	#define SUPPORTED_PLATFORM \
+		(PLATFORM_PRALINE | PLATFORM_HACKRF1_OG | PLATFORM_HACKRF1_R9)
 #else
 	#define SUPPORTED_PLATFORM 0
 #endif

firmware/hackrf-common.cmake

@@ -210,26 +210,6 @@ macro(DeclareTargets)
 		${PATH_HACKRF_FIRMWARE_COMMON}/ice40_spi.c
 		)
 
-	if(BOARD STREQUAL "RAD1O")
-		SET(SRC_M4
-			${SRC_M4}
-		)
-	else()
-		SET(SRC_M4
-			${SRC_M4}
-		)
-	endif()
-
-	if(BOARD STREQUAL "PRALINE")
-		SET(SRC_M4
-			${SRC_M4}
-		)
-	else()
-		SET(SRC_M4
-			${SRC_M4}
-		)
-	endif()
-
 	link_directories(
 		"${PATH_HACKRF_FIRMWARE_COMMON}"
 		"${LIBOPENCM3}/lib"

firmware/hackrf_usb/hackrf_usb.c

@@ -217,7 +217,6 @@ void usb_set_descriptor_by_serial_number(void)
 	}
 }
 
-//#ifndef PRALINE
 static bool cpld_jtag_sram_load(jtag_t* const jtag)
 {
 	cpld_jtag_take(jtag);
@@ -230,8 +229,6 @@ static bool cpld_jtag_sram_load(jtag_t* const jtag)
 	return success;
 }
 
-//#endif
-
 static void m0_rom_to_ram(void)
 {
 	uint32_t* dest = &__ram_m0_start__;
@@ -309,7 +306,7 @@ int main(void)
 	}
 
 	if (board_id == BOARD_ID_HACKRF1_OG || board_id == BOARD_ID_HACKRF1_R9 ||
-	    board_id == BOARD_ID_RAD1O) {
+	    board_id == BOARD_ID_PRALINE) {
 		portapack_init();
 	}