From d4daa990f88300fc18662393038ced3d455431d3 Mon Sep 17 00:00:00 2001 From: Iampete1 Date: Sat, 24 Feb 2024 12:34:42 +0000 Subject: [PATCH] AP_HAL_ChibiOS: hwdef.py: define `HAL_HAVE_AP_ROMFS_EMBEDDED_LUA` if lua files in ROMFS --- .../AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py index a9d8521ef3..bb6ca88d78 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py +++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py @@ -2625,6 +2625,11 @@ Please run: Tools/scripts/build_bootloaders.py %s self.embed_bootloader(f) if len(self.romfs) > 0: + # Allow lua to load from ROMFS if any lua files are added + for file in self.romfs.keys(): + if file.startswith("scripts") and file.endswith(".lua"): + f.write('#define HAL_HAVE_AP_ROMFS_EMBEDDED_LUA 1\n') + break f.write('#define HAL_HAVE_AP_ROMFS_EMBEDDED_H 1\n') if self.mcu_series.startswith('STM32F1'): @@ -3204,15 +3209,16 @@ Please run: Tools/scripts/build_bootloaders.py %s # write out hw.dat for ROMFS self.write_all_lines(os.path.join(self.outdir, "hw.dat")) + # Add ROMFS directories + self.romfs_add_dir(['scripts']) + self.romfs_add_dir(['param']) + # write out hwdef.h self.write_hwdef_header(os.path.join(self.outdir, "hwdef.h")) # write out ldscript.ld self.write_ldscript(os.path.join(self.outdir, "ldscript.ld")) - self.romfs_add_dir(['scripts']) - self.romfs_add_dir(['param']) - self.write_ROMFS(self.outdir) # copy the shared linker script into the build directory; it must