From 54dc67e2a94ea2b3d3d1833c81ff822ee824b9a6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 28 Jun 2018 09:35:43 +1000 Subject: [PATCH] HAL_ChibiOS: default bootloader product string to XX-BL --- libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat | 2 -- libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py | 5 ++++- libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat | 2 -- 12 files changed, 4 insertions(+), 24 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat index f6cf1f97c2..3cacb8280c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat @@ -12,8 +12,6 @@ STM32_PLLM_VALUE 8 FLASH_SIZE_KB 1024 -USB_STRING_PRODUCT "ArduPilot-KakuteF4-BL" - # bootloader is installed at zero offset FLASH_RESERVE_START_KB 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat index 46e6d11861..5d9552c319 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat @@ -7,8 +7,6 @@ MCU STM32F4xx STM32F405xx # board ID for firmware load APJ_BOARD_ID 127 -USB_STRING_PRODUCT "MatekF405Wing-BL" - # crystal frequency OSCILLATOR_HZ 8000000 STM32_PLLM_VALUE 8 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat index 04c04ba28b..f423d637b2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat @@ -13,8 +13,6 @@ STM32_PLLM_VALUE 8 FLASH_SIZE_KB 1024 -USB_STRING_PRODUCT "MatekF405-BL" - # bootloader is installed at zero offset FLASH_RESERVE_START_KB 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat index 00e0ba3a7e..df71167291 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat @@ -21,8 +21,6 @@ define STM32_PLLQ_VALUE 9 FLASH_SIZE_KB 1024 -USB_STRING_PRODUCT "OmnibusF7V2-BL" - # bootloader is installed at zero offset FLASH_RESERVE_START_KB 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat index 309eb3751c..5265ad9b52 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat @@ -16,8 +16,6 @@ FLASH_SIZE_KB 1024 # don't allow bootloader to use more than 16k FLASH_USE_MAX_KB 16 -USB_STRING_PRODUCT "ArduPilot-airbotf4-BL" - # bootloader is installed at zero offset FLASH_RESERVE_START_KB 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat index f4ac965f36..656603e778 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat @@ -29,7 +29,6 @@ FLASH_RESERVE_START_KB 0 USB_VENDOR 0x0483 # ST USB_PRODUCT 0x5740 USB_STRING_MANUFACTURER "ArduPilot" -USB_STRING_PRODUCT "fmuv3-BL" USB_STRING_SERIAL "%SERIAL%" # baudrate to run bootloader at on uarts diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef-bl.dat index 59e2509e3e..9550ba6ff9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef-bl.dat @@ -7,9 +7,6 @@ MCU STM32F4xx STM32F427xx # board ID for firmware load APJ_BOARD_ID 11 -# USB setup -USB_STRING_PRODUCT "fmuv4-BL" - # crystal frequency OSCILLATOR_HZ 24000000 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat index cfd11f8b1c..c21e687b51 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat @@ -18,9 +18,6 @@ define STM32_PLLQ_VALUE 9 # board ID for firmware load APJ_BOARD_ID 50 -# USB setup -USB_STRING_PRODUCT "fmuv5-BL" - FLASH_SIZE_KB 2048 # bootloader is installed at zero offset diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat index 7f492dcc00..74bbcd33c5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat @@ -16,8 +16,6 @@ FLASH_SIZE_KB 1024 # don't allow bootloader to use more than 16k FLASH_USE_MAX_KB 16 -USB_STRING_PRODUCT "ArduPilot-omnibusf4pro-BL" - # bootloader is installed at zero offset FLASH_RESERVE_START_KB 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat index 73497e0589..a035b9ab7e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat @@ -16,8 +16,6 @@ FLASH_SIZE_KB 1024 # don't allow bootloader to use more than 16k FLASH_USE_MAX_KB 16 -USB_STRING_PRODUCT "ArduPilot-revo-BL" - # bootloader is installed at zero offset FLASH_RESERVE_START_KB 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py index 61b6904cff..9f4764dfb0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py +++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py @@ -513,7 +513,10 @@ def write_USB_config(f): f.write('#define HAL_USB_VENDOR_ID %s\n' % get_config('USB_VENDOR', default=0x0483)) # default to ST f.write('#define HAL_USB_PRODUCT_ID %s\n' % get_config('USB_PRODUCT', default=0x5740)) f.write('#define HAL_USB_STRING_MANUFACTURER "%s"\n' % get_config("USB_STRING_MANUFACTURER", default="ArduPilot")) - f.write('#define HAL_USB_STRING_PRODUCT "%s"\n' % get_config("USB_STRING_PRODUCT", default="%BOARD%")) + default_product = "%BOARD%" + if args.bootloader: + default_product += "-BL" + f.write('#define HAL_USB_STRING_PRODUCT "%s"\n' % get_config("USB_STRING_PRODUCT", default=default_product)) f.write('#define HAL_USB_STRING_SERIAL "%s"\n' % get_config("USB_STRING_SERIAL", default="%SERIAL%")) f.write('\n\n') diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat index 1622726541..841e70e17f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat @@ -16,8 +16,6 @@ FLASH_SIZE_KB 1024 # don't allow bootloader to use more than 16k FLASH_USE_MAX_KB 16 -USB_STRING_PRODUCT "ArduPilot-sparky2-BL" - # bootloader is installed at zero offset FLASH_RESERVE_START_KB 0