boards: s/asterix_evt1/asterix

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        board: ["snowy_bb2", "spalding_bb2", "silk_bb2", "asterix_evt1"]
+        board: ["snowy_bb2", "spalding_bb2", "silk_bb2", "asterix"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -71,11 +71,11 @@ jobs:
         run: ./waf bundle
 
       - name: Build recovery FW
-        if: ${{ matrix.board == 'asterix_evt1' }}
+        if: ${{ matrix.board == 'asterix' }}
         run: ./waf build_prf
 
       - name: Bundle recovery FW
-        if: ${{ matrix.board == 'asterix_evt1' }}
+        if: ${{ matrix.board == 'asterix' }}
         run: ./waf bundle_prf
 
       - name: Store firmware bundles
@@ -94,17 +94,17 @@ jobs:
           echo "platform=$PLATFORM" >> "$GITHUB_OUTPUT"
 
       - name: Configure bootloader
-        if: ${{ matrix.board == 'asterix_evt1' }}
+        if: ${{ matrix.board == 'asterix' }}
         working-directory: platform/${{ steps.get-platform.outputs.platform }}/boot
         run: ./waf configure --board ${{ matrix.board }}
 
       - name: Build bootloader
-        if: ${{ matrix.board == 'asterix_evt1' }}
+        if: ${{ matrix.board == 'asterix' }}
         working-directory: platform/${{ steps.get-platform.outputs.platform }}/boot
         run: ./waf build
 
       - name: Store bootloader images
-        if: ${{ matrix.board == 'asterix_evt1' }}
+        if: ${{ matrix.board == 'asterix' }}
         uses: actions/upload-artifact@v4
         with:
           name: bootloader-${{ matrix.board }}
@@ -112,15 +112,15 @@ jobs:
             platform/${{ steps.get-platform.outputs.platform }}/boot/build/tintin_boot.*
 
       - name: Configure (QEMU)
-        if: ${{ matrix.board != 'asterix_evt1' }}
+        if: ${{ matrix.board != 'asterix' }}
         run: ./waf clean configure --board ${{ matrix.board }} --qemu
 
       - name: Build FW (QEMU)
-        if: ${{ matrix.board != 'asterix_evt1' }}
+        if: ${{ matrix.board != 'asterix' }}
         run: ./waf build qemu_image_micro qemu_image_spi
 
       - name: Store firmware images (QEMU)
-        if: ${{ matrix.board != 'asterix_evt1' }}
+        if: ${{ matrix.board != 'asterix' }}
         uses: actions/upload-artifact@v4
         with:
           name: firmware-${{ matrix.board }}-qemu

docs/getting_started.md

@@ -126,7 +126,7 @@ pip install -r requirements.txt
 ./waf configure --board $BOARD
 ```
 
-where `$BOARD` is any of the supported boards, e.g. `snowy_bb2`, `asterix_evt1`, ...
+where `$BOARD` is any of the supported boards, e.g. `snowy_bb2`, `asterix`, ...
 
 2. Build:
 

platform/asterix/boot/boot-bin-update.sh

@@ -20,7 +20,7 @@ cd "${0%/*}"
 
 reloutdir="../../../bin/boot"
 OUTDIR=`cd "${reloutdir}"; pwd`
-BOARDS=(asterix_evt1)
+BOARDS=(asterix)
 # Use commit timestamp, same as the one compiled into the bootloader binary
 VERSION=`git log -1 --format=%ct HEAD`
 

platform/asterix/boot/wscript

@@ -9,10 +9,10 @@ import gitinfo
 
 def options(opt):
     opt.load('compiler_c')
-    opt.add_option('--board', action='store', default='asterix_evt1',
+    opt.add_option('--board', action='store', default='asterix',
                    help='Which board to build for '
-                   '(asterix_evt1)',
-                   choices=['asterix_evt1'])
+                   '(asterix)',
+                   choices=['asterix'])
     opt.add_option('--nowatchdog', action='store_true',
                    help='Do not enable watchdog timer or reset upon failure')
     opt.add_option('--loglevel', type='int', default=0,

platform/platform_capabilities.py

@@ -255,7 +255,7 @@ board_capability_dicts = [
         }
     },
     {
-        'boards': [ 'asterix_evt1' ],
+        'boards': [ 'asterix' ],
         'capabilities':
         {
             'HAS_APP_GLANCES',

src/fw/board/board_definitions.h

@@ -59,7 +59,7 @@
 #include "boards/board_robert.h" // prototypes for Robert BB2
 #elif BOARD_ROBERT_EVT
 #include "boards/board_robert.h" // prototypes for Robert EVT
-#elif BOARD_ASTERIX_EVT1
+#elif BOARD_ASTERIX
 #include "boards/board_asterix.h"
 #else
 #error "Unknown board definition"

src/fw/board/boards/board_asterix.c

@@ -143,7 +143,7 @@ IRQ_MAP_NRFX(SPI0_SPIM0_SPIS0_TWI0_TWIM0_TWIS0, nrfx_twim_0_irq_handler);
 
 /* sensor SPI bus */
 
-/* asterix_evt1 shares SPI with flash, which we don't support */
+/* asterix shares SPI with flash, which we don't support */
 
 PwmState BACKLIGHT_PWM_STATE;
 IRQ_MAP_NRFX(PWM0, nrfx_pwm_0_irq_handler);

src/fw/board/display.h

@@ -73,7 +73,7 @@ typedef struct {
 #include "displays/display_silk.h"
 #elif BOARD_CALVIN_BB
 #include "displays/display_silk.h"
-#elif BOARD_ASTERIX_EVT1
+#elif BOARD_ASTERIX
 #include "displays/display_silk.h"
 #elif BOARD_CUTTS_BB
 #include "displays/display_snowy.h"

src/fw/board/wscript_build

@@ -87,7 +87,7 @@ elif board in ('cutts_bb','robert_bb','robert_bb2','robert_evt'):
             'drivers',
         ],
     )
-elif board in ('asterix_evt1'):
+elif board in ('asterix'):
     bld.objects(
         name='board',
         source=[

src/include/pebbleos/firmware_metadata.h

@@ -134,7 +134,7 @@ _Static_assert(sizeof(struct FirmwareMetadata) == (sizeof(uint32_t) +
   #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleRobertBigboard2)
 #elif BOARD_ROBERT_EVT
   #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleRobertEVT)
-#elif BOARD_ASTERIX_EVT1
+#elif BOARD_ASTERIX
   #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformPebbleAsterix)
 #else
   #define FIRMWARE_METADATA_HW_PLATFORM (FirmwareMetadataPlatformUnknown)

wscript

@@ -81,7 +81,7 @@ def options(opt):
                              'robert_bb2',
                              'robert_evt',
                              'robert_es',
-                             'asterix_evt1',],
+                             'asterix',],
                    help='Which board we are targeting '
                         'bb2, snowy_dvt, spalding, silk...')
     opt.add_option('--jtag', action='store', default=None, dest='jtag',  # default is bb2 (below)
@@ -214,7 +214,7 @@ def handle_configure_options(conf):
                       'See PBL-10174.')
             conf.env.append_value('DEFINES', 'PBL_NOSLEEP')
 
-    if 'bb' in conf.options.board or conf.options.board in ('asterix_evt1'):
+    if 'bb' in conf.options.board or conf.options.board in ('asterix'):
         conf.env.append_value('DEFINES', 'IS_BIGBOARD')
 
     if conf.options.nosleep:
@@ -428,7 +428,7 @@ def configure(conf):
     elif conf.options.board in ('cutts_bb', 'robert_bb', 'robert_bb2', 'robert_evt',
                                 'silk_evt', 'silk_bb', 'silk_bb2', 'silk'):
         conf.env.JTAG = 'swd_ftdi'
-    elif conf.options.board in ('asterix_evt1'):
+    elif conf.options.board in ('asterix'):
         conf.env.JTAG = 'swd_cmsisdap'
     else:
         # default to bb2