Merge pull request #145 from tmobile/cfspdk-1202-dfu-modem-library

Cfspdk 1202/1203 DFU library

Author: johnlange2

CMakeLists.txt

@@ -6,4 +6,4 @@ cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
-add_subdirectory(dfu_gecko)
+add_subdirectory(libs)

Kconfig

@@ -1,2 +1,2 @@
 
-rsource "dfu_gecko/Kconfig.dfu_gecko"
+rsource "libs/dfu_gecko/Kconfig.dfu_gecko"

libs/CMakeLists.txt

@@ -0,0 +1,7 @@
+# libs/CMakeLists.txt
+
+target_include_directories(app PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/dfu_gecko)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/dfu_murata_1sc)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/dfu_rs9116w)

libs/dfu_common.h

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2023 T-Mobile USA, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __DFU_COMMON_H__
+#define __DFU_COMMON_H__
+
+#define DFU_DESC_LEN 64
+#define DFU_FILE_LEN 64
+#define DFU_SHA1_LEN 20
+#define DFU_URL_LEN  256
+
+struct dfu_file_t {
+	char desc[DFU_DESC_LEN];
+	char lfile[DFU_FILE_LEN];
+	char rfile[DFU_FILE_LEN];
+	char sha1[DFU_SHA1_LEN];
+};
+
+#endif

dfu_gecko/CMakeLists.txt renamed to libs/dfu_gecko/CMakeLists.txt

@@ -7,26 +7,12 @@
 #ifndef DFU_GECKO_H
 #define DFU_GECKO_H
 
-#define DFU_IMAGE_HDR_LEN 32
+#include "dfu_common.h"
+
+#define DFU_IMAGE_HDR_LEN    32
 #define DFU_SLOT0_FLASH_ADDR 0x10000
 #define DFU_SLOT1_FLASH_ADDR 0x80000
-#define DFU_IMAGE_MAGIC 0x96f3b83d
-
-#ifndef __DFU_FILE__
-#define __DFU_FILE__
-
-#define DFU_DESC_LEN 64
-#define DFU_FILE_LEN 64
-#define DFU_SHA1_LEN 20
-#define DFU_URL_LEN  256
-
-struct dfu_file_t {
-	char desc[DFU_DESC_LEN];
-	char lfile[DFU_FILE_LEN];
-	char rfile[DFU_FILE_LEN];
-	char sha1[DFU_SHA1_LEN];
-};
-#endif /* __DFU_FILE__ */
+#define DFU_IMAGE_MAGIC	     0x96f3b83d
 
 #ifdef BOOT_SLOT
 int is_bootloader_running(void);

dfu_gecko/Kconfig.dfu_gecko renamed to libs/dfu_gecko/Kconfig.dfu_gecko

@@ -0,0 +1,2 @@
+target_sources(app PRIVATE dfu_murata_1sc.c)
+target_include_directories(app PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})