treewide: improve Obelix board build strategy

gmarull · gmarull · commit 9916a1ad210d · 2025-11-04T12:47:53.000+01:00
Add 4 board variants:

- EVT and BB
- DVT and BB2

Each variant will report a different code in firmware metadata. In the
release process (or CI), only EVT/DVT are built.

Signed-off-by: Gerard Marull-Paretas &lt;gerard@teslabs.com&gt;
diff --git a/.github/workflows/build-firmware.yml b/.github/workflows/build-firmware.yml
@@ -26,7 +26,7 @@ jobs:
 
     strategy:
       matrix:
-        board: ["snowy_bb2", "spalding_bb2", "silk_bb2", "asterix", "obelix", "obelix_bb", "obelix_bb2"]
+        board: ["snowy_bb2", "spalding_bb2", "silk_bb2", "asterix", "obelix_evt", "obelix_dvt"]
 
     steps:
       - name: Mark Github workspace as safe
diff --git a/.github/workflows/build-prf.yml b/.github/workflows/build-prf.yml
@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        board: ["asterix", "obelix", "obelix_bb", "obelix_bb2"]
+        board: ["asterix", "obelix_evt", "obelix_dvt"]
         mode: ["normal", "mfg"]
 
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -87,7 +87,7 @@ jobs:
 
     strategy:
       matrix:
-        board: ["asterix", "obelix", "obelix_bb2"]
+        board: ["asterix", "obelix_evt", "obelix_dvt"]
 
     steps:
       - name: Mark Github workspace as safe
@@ -169,7 +169,7 @@ jobs:
 
     strategy:
       matrix:
-        board: ["asterix", "obelix", "obelix_bb2"]
+        board: ["asterix", "obelix_evt", "obelix_dvt"]
         slot: [0, 1]
 
         exclude:
@@ -211,7 +211,7 @@ jobs:
       - name: Set slot suffix
         id: slot_suffix
         run: |
-          NEEDS_SUFFIX="obelix obelix_bb2"
+          NEEDS_SUFFIX="obelix_evt obelix_dvt"
 
           if echo $NEEDS_SUFFIX | grep -wq "${{ matrix.board }}"; then
             echo "SLOT_SUFFIX=_slot${{ matrix.slot }}" >> "$GITHUB_OUTPUT"
@@ -292,7 +292,7 @@ jobs:
 
       - name: Merge slot-specific pbz files
         run: |
-          NEEDS_MERGE="obelix obelix_bb2"
+          NEEDS_MERGE="obelix_evt obelix_dvt"
 
           mkdir artifacts-merged
           for board in $NEEDS_MERGE; do
diff --git a/platform/platform_capabilities.py b/platform/platform_capabilities.py
@@ -341,7 +341,7 @@
         },
     },
     {
-        'boards': [ 'obelix', 'obelix_bb', 'obelix_bb2' ],
+        'boards': [ 'obelix_evt', 'obelix_dvt', 'obelix_bb', 'obelix_bb2' ],
         'capabilities':
         {
             'HAS_APP_GLANCES',
diff --git a/platform/wscript b/platform/wscript
@@ -47,6 +47,10 @@ def is_asterix(ctx):
 def is_obelix(ctx):
     return ctx.get_board().startswith('obelix')
 
+@conf
+def is_obelix_dvt(ctx):
+    return ctx.get_board().startswith('obelix_dvt')
+
 @conf
 def is_obelix_bb2(ctx):
     return ctx.get_board().startswith('obelix_bb2')
diff --git a/src/fw/board/board_definitions.h b/src/fw/board/board_definitions.h
@@ -65,7 +65,7 @@
 #include "boards/board_robert.h" // prototypes for Robert EVT
 #elif BOARD_ASTERIX
 #include "boards/board_asterix.h"
-#elif BOARD_OBELIX || BOARD_OBELIX_BB || BOARD_OBELIX_BB2
+#elif BOARD_OBELIX_EVT || BOARD_OBELIX_DVT || BOARD_OBELIX_BB || BOARD_OBELIX_BB2
 #include "boards/board_obelix.h"
 #else
 #error "Unknown board definition"
diff --git a/src/fw/board/boards/board_obelix.c b/src/fw/board/boards/board_obelix.c
@@ -115,7 +115,7 @@ static PwmState s_pwm1_ch3_state = {
     .channel = 3,
 };
 
-#if !BOARD_OBELIX_BB2
+#if !BOARD_OBELIX_DVT && !BOARD_OBELIX_BB2
 const LedControllerPwm LED_CONTROLLER_PWM = {
     .pwm = {
         [0] = {
@@ -233,7 +233,7 @@ static DisplayJDIDevice s_display = {
             .flags = PIN_NOPULL,
         },
     },
-#if BOARD_OBELIX_BB2
+#if BOARD_OBELIX_DVT || BOARD_OBELIX_BB2
     .vddp = {hwp_gpio1, 28, true},
     .vlcd = {hwp_gpio1, 29, true},
 #endif
diff --git a/src/fw/board/boards/board_obelix.h b/src/fw/board/boards/board_obelix.h
@@ -40,7 +40,7 @@ extern I2CSlavePort *const I2C_W1160;
 extern I2CSlavePort *const I2C_AW2016;
 extern const Npm1300Config NPM1300_CONFIG;
 extern const BoardConfigActuator BOARD_CONFIG_VIBE;
-#if !BOARD_OBELIX_BB2
+#if !BOARD_OBELIX_DVT && !BOARD_OBELIX_BB2
 extern const LedControllerPwm LED_CONTROLLER_PWM;
 #endif
 extern PwmConfig *const PWM1_CH1;
diff --git a/src/fw/board/display.h b/src/fw/board/display.h
@@ -79,7 +79,7 @@ typedef struct {
 #include "displays/display_silk.h"
 #elif BOARD_ASTERIX
 #include "displays/display_silk.h"
-#elif BOARD_OBELIX || BOARD_OBELIX_BB || BOARD_OBELIX_BB2
+#elif BOARD_OBELIX_EVT || BOARD_OBELIX_DVT || BOARD_OBELIX_BB || BOARD_OBELIX_BB2
 #include "displays/display_obelix.h"
 #elif BOARD_CUTTS_BB
 #include "displays/display_snowy.h"
diff --git a/src/fw/board/splash.h b/src/fw/board/splash.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#if BOARD_OBELIX || BOARD_OBELIX_BB || BOARD_OBELIX_BB2
+#if BOARD_OBELIX_EVT || BOARD_OBELIX_DVT || BOARD_OBELIX_BB || BOARD_OBELIX_BB2
 #include "splash/splash_obelix.xbm"
 #else
 #error "Unknown splash definition for board"
-#endif // BOARD_*
+#endif // BOARD_*
diff --git a/src/fw/board/wscript_build b/src/fw/board/wscript_build
@@ -99,7 +99,7 @@ elif board in ('asterix'):
             'drivers',
         ],
     )
-elif board in ('obelix', 'obelix_bb', 'obelix_bb2'):
+elif board in ('obelix_evt', 'obelix_dvt', 'obelix_bb', 'obelix_bb2'):
     bld.objects(
         name='board',
         source=[
diff --git a/src/fw/drivers/wscript_build b/src/fw/drivers/wscript_build
@@ -1096,7 +1096,7 @@ if bld.env.BOARD == "v2_0":
         ],
     )
 elif bld.is_obelix():
-    if not bld.is_obelix_bb2():
+    if not bld.is_obelix_dvt() and not bld.is_obelix_bb2():
         bld.objects(
             name='driver_led_controller',
             source=[
diff --git a/src/include/pebbleos/firmware_metadata.h b/src/include/pebbleos/firmware_metadata.h
@@ -52,7 +52,8 @@ typedef enum FirmwareMetadataPlatform {
   FirmwareMetadataPlatformPebbleRobertEVT = 13,
   FirmwareMetadataPlatformPebbleSilk = 14,
   FirmwareMetadataPlatformPebbleAsterix = 15,
-  FirmwareMetadataPlatformPebbleObelix = 16,
+  FirmwareMetadataPlatformPebbleObelixEVT = 16,
+  FirmwareMetadataPlatformPebbleObelixDVT = 17,
 
   FirmwareMetadataPlatformPebbleOneBigboard = 0xff,
   FirmwareMetadataPlatformPebbleOneBigboard2 = 0xfe,
@@ -65,6 +66,8 @@ typedef enum FirmwareMetadataPlatform {
   FirmwareMetadataPlatformPebbleRobertBigboard2 = 0xf7,
   FirmwareMetadataPlatformPebbleSilkFlint = 0xf6,
   FirmwareMetadataPlatformPebbleSnowyEmery = 0xf5,
+  FirmwareMetadataPlatformPebbleObelixBigboard = 0xf4,
+  FirmwareMetadataPlatformPebbleObelixBigboard2 = 0xf3,
 } FirmwareMetadataPlatform;
 
 // WARNING: changes in this struct must be reflected in:
@@ -141,8 +144,14 @@ _Static_assert(sizeof(struct FirmwareMetadata) == (sizeof(uint32_t) +
   #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleRobertEVT)
 #elif BOARD_ASTERIX
   #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleAsterix)
-#elif BOARD_OBELIX || BOARD_OBELIX_BB || BOARD_OBELIX_BB2
-  #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleObelix)
+#elif BOARD_OBELIX_EVT
+  #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleObelixEVT)
+#elif BOARD_OBELIX_DVT
+  #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleObelixDVT)
+#elif BOARD_OBELIX_BB
+  #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleObelixBigboard)
+#elif BOARD_OBELIX_BB2
+  #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleObelixBigboard2)
 #elif BOARD_SILK_FLINT
   #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleSilkFlint)
 #elif BOARD_SNOWY_EMERY
diff --git a/wscript b/wscript
@@ -52,7 +52,8 @@ RUNNERS = {
     'robert_evt': ['openocd'],
     'robert_es': ['openocd'],
     'asterix': ['openocd', 'nrfutil'],
-    'obelix': ['sftool'],
+    'obelix_evt': ['sftool'],
+    'obelix_dvt': ['sftool'],
     'obelix_bb': ['sftool'],
     'obelix_bb2': ['sftool'],
 }
@@ -116,7 +117,8 @@ def options(opt):
                              'robert_evt',
                              'robert_es',
                              'asterix',
-                             'obelix',
+                             'obelix_evt',
+                             'obelix_dvt',
                              'obelix_bb',
                              'obelix_bb2',
                             ],

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@`
`341`	`341`	`},`
`342`	`342`	`},`
`343`	`343`	`{`
`344`		`- 'boards': [ 'obelix', 'obelix_bb', 'obelix_bb2' ],`
	`344`	`+ 'boards': [ 'obelix_evt', 'obelix_dvt', 'obelix_bb', 'obelix_bb2' ],`
`345`	`345`	`'capabilities':`
`346`	`346`	`{`
`347`	`347`	`'HAS_APP_GLANCES',`