[Kconfig] Toolchain & platform fixes, SITL still broken

This commit is contained in:
Peter van der Perk
2021-08-18 09:45:58 +02:00
committed by Daniel Agar
parent d1e7642b9a
commit 21e6547ac7
68 changed files with 159 additions and 110 deletions
+10
View File
@@ -12,6 +12,8 @@ __location__ = os.path.realpath(
serial_regex = r"(\D\D\D\d):(/dev/ttyS\d+)"
io_regex = r"IO (.*)"
romfs_regex = r"ROMFSROOT (.*)"
arch_regex = r"ARCHITECTURE (.*)"
toolchain_regex = r"TOOLCHAIN (.*)"
@@ -54,6 +56,14 @@ for name in glob.glob(px4_dir + '/boards/*/*/*.cmake'):
print("CONFIG_BOARD_ROMFSROOT=\"" + match.groups()[0] + "\"")
print("CONFIG_BOARD_ROMFSROOT=\"" + match.groups()[0] + "\"", file=w)
romfs_set = True
matches = re.finditer(arch_regex, clean_line, re.MULTILINE)
for matchNum, match in enumerate(matches, start=1):
print("CONFIG_BOARD_ARCHITECTURE=\"" + match.groups()[0] + "\"")
print("CONFIG_BOARD_ARCHITECTURE=\"" + match.groups()[0] + "\"", file=w)
matches = re.finditer(toolchain_regex, clean_line, re.MULTILINE)
for matchNum, match in enumerate(matches, start=1):
print("CONFIG_BOARD_TOOLCHAIN=\"" + match.groups()[0] + "\"")
print("CONFIG_BOARD_TOOLCHAIN=\"" + match.groups()[0] + "\"", file=w)
if(romfs_set == False):
print("CONFIG_BOARD_ROMFSROOT=\"\"", file=w)
+1 -6
View File
@@ -1,11 +1,5 @@
PLATFORM nuttx,CONFIG_PLATFORM_NUTTX=y
PLATFORM posix,CONFIG_PLATFORM_POSIX=y
TOOLCHAIN arm-none-eabi,CONFIG_TOOLCHAIN_ARM_NONE_EABI=y
ARCHITECTURE cortex-m3,CONFIG_ARCHITECTURE_CORTEX_M3=y
ARCHITECTURE cortex-m4,CONFIG_ARCHITECTURE_CORTEX_M4=y
ARCHITECTURE cortex-m7,CONFIG_ARCHITECTURE_CORTEX_M7=y
ARCHITECTURE cortex-a8,CONFIG_ARCHITECTURE_CORTEX_A8=y
ARCHITECTURE cortex-a53,CONFIG_ARCHITECTURE_CORTEX_A53=y
CONSTRAINED_MEMORY,CONFIG_BOARD_CONSTRAINED_MEMORY=y
CONSTRAINED_FLASH,CONFIG_BOARD_CONSTRAINED_FLASH=y
NO_HELP,CONFIG_BOARD_NO_HELP=y
@@ -200,3 +194,4 @@ rover_steering_control,CONFIG_EXAMPLES_ROVER_STEERING_CONTROL=y
uuv_example_app,CONFIG_EXAMPLES_UUV_EXAMPLE_APP=y
work_item,CONFIG_EXAMPLES_WORK_ITEM=y
add_compile_options(-Wno-narrowing),CONFIG_BOARD_COMPILE_DEFINITIONS="-Wno-narrowing"
-D__PX4_LINUX,CONFIG_BOARD_LINUX=y