hwdef: add MT29FXX WSPI NAND support to DATAFLASH directive

Support 'littlefs:mt29fxx' in DATAFLASH directive for WSPI-connected
Micron MT29F SPI NAND flash chips.

Author: andyp1per

libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py

@@ -744,6 +744,13 @@ def has_dataflash_spi(self):
                 return True
         return False
 
+    def has_dataflash_wspi(self):
+        '''check for dataflash connected to wspi (quadspi/octospi) bus'''
+        for dev in self.wspidev:
+            if dev[0] == 'dataflash':
+                return True
+        return False
+
     def has_sdcard_spi(self):
         '''check for sdcard connected to spi bus'''
         for dev in self.spidev:
@@ -888,8 +895,10 @@ def write_mcu_config(self, f):
             f.write('#define HAL_STDOUT_SERIAL %s\n\n' % self.get_config('STDOUT_SERIAL'))
             f.write('// baudrate used for stdout (printf)\n')
             f.write('#define HAL_STDOUT_BAUDRATE %u\n\n' % self.get_config('STDOUT_BAUDRATE', type=int))
-        if len(self.dataflash_list) > 0:
-            # we only support dataflash OR sdcard, so prioritize dataflash if its been explicitly configured
+        # Check if any dataflash uses block-based logging (not littlefs)
+        has_block_dataflash = any(d[0].startswith('block') for d in self.dataflash_list)
+        if has_block_dataflash:
+            # block-based dataflash conflicts with FATFS, so disable it
             f.write('#define HAL_USE_FATFS FALSE\n\n')
             f.write('#define HAL_USE_SDC FALSE\n')
             self.build_flags.append('USE_FATFS=no')
@@ -1548,10 +1557,13 @@ def write_WSPI_table(self, f):
     def write_WSPI_config(self, f):
         '''write SPI config defines'''
         # only the bootloader must run the hal lld (and QSPI clock) otherwise it is not possible to
-        # bootstrap into external flash
-        for t in list(self.bytype.keys()) + list(self.alttype.keys()):
-            if (t.startswith('QUADSPI') or t.startswith('OCTOSPI')) and not self.is_bootloader_fw():
-                f.write('#define HAL_XIP_ENABLED TRUE\n')
+        # bootstrap into external flash. Skip if HAL_XIP_ENABLED is explicitly defined in hwdef.
+        xip_already_defined = any('HAL_XIP_ENABLED' in line for line in self.all_lines)
+        if not xip_already_defined:
+            for t in list(self.bytype.keys()) + list(self.alttype.keys()):
+                if (t.startswith('QUADSPI') or t.startswith('OCTOSPI')) and not self.is_bootloader_fw():
+                    f.write('#define HAL_XIP_ENABLED TRUE\n')
+                    break
 
         if len(self.wspidev) == 0:
             # nothing else to do
@@ -1615,10 +1627,10 @@ def write_AIRSPEED_config(self, f):
 
     def write_DATAFLASH_config(self, f):
         '''write dataflash config defines'''
-        # DATAFLASH block|littlefs:<w25nxx|jedec_nor>
+        # DATAFLASH block|littlefs:<w25nxx|jedec_nor|wspi_nand|mt29f1>
         seen = set()
         for dev in self.dataflash_list:
-            if not self.has_dataflash_spi():
+            if not self.has_dataflash_spi() and not self.has_dataflash_wspi():
                 self.error("Missing DATAFLASH device: %s" % self.seen_str(dev))
             if self.seen_str(dev) in seen:
                 self.error("Duplicate DATAFLASH: %s" % self.seen_str(dev))
@@ -1638,7 +1650,14 @@ def write_DATAFLASH_config(self, f):
                     f.write('#define AP_FILESYSTEM_LITTLEFS_FLASH_TYPE AP_FILESYSTEM_FLASH_W25NXX\n')
                 elif len(a) > 1 and a[1].startswith('jedec_nor'):
                     f.write('#define AP_FILESYSTEM_LITTLEFS_FLASH_TYPE AP_FILESYSTEM_FLASH_JEDEC_NOR\n')
-                self.build_flags.append('USE_FATFS=no')
+                elif len(a) > 1 and (a[1].startswith('wspi_nand') or a[1].startswith('mt29fxx')):
+                    # WSPI-connected NAND flash (Micron MT29F family: 1G/2G/4G/8G)
+                    f.write('#define AP_FILESYSTEM_LITTLEFS_FLASH_TYPE AP_FILESYSTEM_FLASH_WSPI_NAND\n')
+                    f.write('#define AP_FILESYSTEM_LITTLEFS_MT29FXX_ENABLED 1\n')
+                # Only disable FATFS if there's no SDMMC or SPI-connected SD card
+                has_sdmmc = any(k.startswith('SDMMC') for k in self.bytype)
+                if not self.has_sdcard_spi() and not has_sdmmc:
+                    self.build_flags.append('USE_FATFS=no')
                 self.env_vars['WITH_LITTLEFS'] = "1"
 
     def write_board_validate_macro(self, f):