[esomx] rebase artifacts

particle-iot · Jun 7, 2022 · eebc331 · eebc331
1 parent 070c757
commit eebc331
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -472,11 +472,7 @@ workflows:
             - particle-ci-private
           matrix:
             parameters:
-<<<<<<< HEAD
               platform: ["argon", "boron", "esomx", "bsom", "b5som", "tracker", "unit-test newhal gcc"]
-=======
-              platform: ["photon", "p1", "electron", "argon", "boron", "esomx", "bsom", "b5som", "tracker", "unit-test newhal gcc"]
->>>>>>> add esomx platform to CI checks
       - combine-binaries:
           requires:
             - build-and-test

diff --git a/build/platform-id.mk b/build/platform-id.mk
@@ -126,7 +126,7 @@ PLATFORM_GEN=3
 PLATFORM_MCU=nRF52840
 PLATFORM_NET=UBLOXSARA
 PLATFORM_WIZNET=W5500
-STM32_DEVICE=nRF52840
+MCU_DEVICE=nRF52840
 PRODUCT_DESC=Production E SoM X
 USBD_VID_SPARK=0x2B04
 USBD_PID_DFU=0xD00F