diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef-bl.dat index 54a67eb5d6..9b9e383fbc 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef-bl.dat @@ -35,9 +35,6 @@ PA14 JTCK-SWCLK SWD PC13 LED_BOOTLOADER OUTPUT LOW define HAL_LED_ON 0 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PA4 MPU6000_CS CS PA15 FLASH_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef-bl.dat index cb24ef8676..5f16eee959 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef-bl.dat @@ -39,9 +39,6 @@ PA14 JTCK-SWCLK SWD PC13 LED_BOOTLOADER OUTPUT LOW define HAL_LED_ON 0 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PA4 MPU6000_CS CS PA15 FLASH_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat index 5fd155440d..a4aa9c23ce 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat @@ -57,18 +57,11 @@ define HAL_USE_EMPTY_IO TRUE define HAL_NO_TIMER_THREAD define HAL_NO_RCIN_THREAD -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 @@ -78,8 +71,6 @@ define STM32_CAN_USE_CAN1 TRUE define CAN_APP_NODE_NAME "org.ardupilot.birdcandy" -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 @@ -87,5 +78,3 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat index b89f6566b4..48c68f311c 100755 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef-bl.dat @@ -41,9 +41,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - define BOOTLOADER_DEBUG SD7 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef-bl.dat index 6c9b886337..10a0509e71 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7/hwdef-bl.dat @@ -41,9 +41,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - define BOOTLOADER_DEBUG SD7 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat index ba5234a856..efc3545387 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat @@ -59,18 +59,11 @@ define HAL_USE_EMPTY_IO TRUE define HAL_NO_TIMER_THREAD define HAL_NO_RCIN_THREAD -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 @@ -80,8 +73,6 @@ define STM32_CAN_USE_CAN1 TRUE define CAN_APP_NODE_NAME "org.ardupilot.cuav_gps" -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 @@ -89,8 +80,6 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 # Add CS pins to ensure they are high in bootloader PA4 MAG_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef-bl.dat index ee71547530..8d58c67e1f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAVv5Nano/hwdef-bl.dat @@ -43,6 +43,3 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD - -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef-bl.dat index d44883f73d..61cfed1890 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef-bl.dat @@ -40,9 +40,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PC1 MAG_CS CS PC2 MPU_CS CS @@ -61,10 +58,6 @@ PD1 CAN1_TX CAN1 PB6 CAN2_TX CAN2 PB12 CAN2_RX CAN2 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.CubeBlack-periph" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef-bl.dat index 52678ef5ab..0b79d42073 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef-bl.dat @@ -40,9 +40,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PC1 MAG_CS CS PC2 MPU_CS CS @@ -61,10 +58,6 @@ PD1 CAN1_TX CAN1 PB6 CAN2_TX CAN2 PB12 CAN2_RX CAN2 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.CubeOrange-periph" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat index a334a12128..9ad7485cd4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef-bl.dat @@ -42,9 +42,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PC1 MAG_CS CS PC2 MPU_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat index 91abdc479a..20740cb927 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeYellow/hwdef-bl.dat @@ -52,10 +52,6 @@ FLASH_RESERVE_START_KB 0 # start on 4th sector (1st sector for bootloader, 2 for extra storage) FLASH_BOOTLOADER_LOAD_KB 96 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - - # Add CS pins to ensure they are high in bootloader PC1 MAG_CS CS PC2 MPU_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef-bl.dat index 22b4002136..1a042cc666 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/DrotekP3Pro/hwdef-bl.dat @@ -57,7 +57,6 @@ define HAL_LED_ON 1 # we need to tell HAL_ChibiOS/Storage.cpp how much storage is # available (in bytes) -define HAL_STORAGE_SIZE 16384 # Add CS pins to ensure they are high in bootloader PC2 MPU9250_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef-bl.dat index d77ba98c5a..ce08ee462c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef-bl.dat @@ -47,9 +47,6 @@ PA14 JTCK-SWCLK SWD # pullup buzzer for no sound in bootloader PE5 BUZZER OUTPUT LOW PULLDOWN -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PF10 MS5611_CS CS PF2 ICM20689_CS CS SPEED_VERYLOW diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef-bl.dat index 0ea2b37333..d0fc4bc7bd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef-bl.dat @@ -18,10 +18,6 @@ FLASH_SIZE_KB 1024 # the location where the bootloader will put the firmware FLASH_BOOTLOADER_LOAD_KB 64 -define HAL_STORAGE_SIZE 15360 -define STORAGE_FLASH_PAGE 1 - - # order of UARTs SERIAL_ORDER OTG1 USART1 USART2 UART5 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef-bl.dat index 803ebbfca3..db6c8da5a2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F4BY/hwdef-bl.dat @@ -33,9 +33,6 @@ PD6 USART2_RX USART2 FLASH_USE_MAX_KB 16 FLASH_RESERVE_START_KB 0 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # location of application code FLASH_BOOTLOADER_LOAD_KB 16 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef-bl.dat index d382b5df1d..a18b8a3e23 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef-bl.dat @@ -35,9 +35,6 @@ PA14 JTCK-SWCLK SWD PC13 LED_BOOTLOADER OUTPUT LOW define HAL_LED_ON 0 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PE4 MPU6000_CS CS PA4 FLASH_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef-bl.dat index 5a621be285..fac5a6f18d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef-bl.dat @@ -52,18 +52,10 @@ define HAL_USE_EMPTY_IO TRUE define HAL_NO_TIMER_THREAD define HAL_NO_RCIN_THREAD -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE - define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 @@ -73,17 +65,11 @@ define STM32_CAN_USE_CAN1 TRUE define CAN_APP_NODE_NAME "org.ardupilot.FreeflyRTK" -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 - # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 - # Add CS pins to ensure they are high in bootloader PA15 IMU_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat index b4f2810ce7..e7548fce8d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat @@ -19,9 +19,6 @@ env AP_PERIPH 1 STM32_ST_USE_TIMER 5 -# enable watchdog -define HAL_WATCHDOG_ENABLED_DEFAULT true - # crystal frequency OSCILLATOR_HZ 16000000 @@ -110,14 +107,8 @@ define HAL_NO_GPIO_IRQ # avoid RCIN thread to save memory define HAL_NO_RCIN_THREAD -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE - define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE - define HAL_DISABLE_LOOP_DELAY # enable CAN support @@ -133,8 +124,6 @@ define HAL_NO_MONITOR_THREAD define HAL_MINIMIZE_FEATURES 0 -define HAL_BUILD_AP_PERIPH - define HAL_DEVICE_THREAD_STACK 768 # we setup a small defaults.parm @@ -159,12 +148,6 @@ define BARO_MAX_INSTANCES 1 define HAL_PERIPH_GPS_PORT_DEFAULT 2 -# use the app descriptor needed by MissionPlanner for CAN upload -env APP_DESCRIPTOR MissionPlanner - -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 - # listen for reboot command from uploader.py script # undefine to disable. Use -1 to allow on all ports, otherwise serial number index defined in SERIAL_ORDER starting at 0 define HAL_PERIPH_LISTEN_FOR_SERIAL_UART_REBOOT_CMD_PORT 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef-bl.dat index fb6446f0b2..3da9e35f65 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef-bl.dat @@ -45,22 +45,15 @@ define SERIAL_BUFFERS_SIZE 32 define HAL_USE_EMPTY_IO TRUE define PORT_INT_REQUIRED_STACK 64 -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE MAIN_STACK 0x800 PROCESS_STACK 0x800 define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PB5 CAN2_RX CAN2 PB6 CAN2_TX CAN2 @@ -90,11 +83,7 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.G4-ESC" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef-bl.dat index a0c64b386c..0c22b073f4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL/hwdef-bl.dat @@ -58,13 +58,6 @@ PA12 OTG_FS_DP OTG1 # order of UARTs (and USB) SERIAL_ORDER OTG1 USART1 - -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 - # QSPI Flash PF8 QUADSPI_BK1_IO0 QUADSPI1 PF9 QUADSPI_BK1_IO1 QUADSPI1 @@ -78,8 +71,6 @@ QSPIDEV mt25q QUADSPI1 MODE1 120*MHZ 24 8 PB13 VBUS INPUT OPENDRAIN -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.cubepilot.H757" -define BOOTLOADER_DEBUG SD1 \ No newline at end of file +define BOOTLOADER_DEBUG SD1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat index 757c8eed38..b895b51d9a 100755 --- a/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/H757I_EVAL_intf/hwdef-bl.dat @@ -58,13 +58,6 @@ PA12 OTG_FS_DP OTG1 # order of UARTs (and USB) SERIAL_ORDER OTG1 USART1 - -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 - # QSPI Flash PF8 QUADSPI_BK1_IO0 QUADSPI1 PF9 QUADSPI_BK1_IO1 QUADSPI1 @@ -78,8 +71,6 @@ QSPIDEV mt25q QUADSPI1 MODE1 120*MHZ 24 8 PB13 VBUS INPUT OPENDRAIN -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.cubepilot.H757" define BOOTLOADER_DEBUG SD1 \ No newline at end of file diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HereCommon/hwdef-bl.inc b/libraries/AP_HAL_ChibiOS/hwdef/HereCommon/hwdef-bl.inc index dc9b158b2b..f431982350 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HereCommon/hwdef-bl.inc +++ b/libraries/AP_HAL_ChibiOS/hwdef/HereCommon/hwdef-bl.inc @@ -13,7 +13,6 @@ env AP_PERIPH 1 FLASH_SIZE_KB 2048 # reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 # the location where the bootloader will put the firmware # the H743 has 128k sectors @@ -63,6 +62,3 @@ define HAL_LED_ON 0 PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 PC7 SLEEPCAN OUTPUT PUSHPULL SPEED_LOW LOW - -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat index c866a30ab4..97617a3192 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HerePro/hwdef-bl.dat @@ -57,17 +57,9 @@ PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - -########################### -define PERIPH_FW TRUE - define USB_USE_WAIT TRUE define HAL_USE_USB_MSD TRUE -define HAL_BUILD_AP_PERIPH - define HAL_DEVICE_THREAD_STACK 2048 #define AP_PARAM_MAX_EMBEDDED_PARAM 0 @@ -82,9 +74,6 @@ define HAL_COMPASS_MAX_SENSORS 1 define HAL_PERIPH_ENABLE_GPS define HAL_PERIPH_ENABLE_MAG -# use the app descriptor needed by MissionPlanner for CAN upload -env APP_DESCRIPTOR MissionPlanner - # Add MAVLink env FORCE_MAVLINK_INCLUDE 1 @@ -153,11 +142,7 @@ PH13 VDD_33V_SENS INPUT # This defines some input pins, currently unused. PB2 BOOT1 INPUT -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 # passthrough CAN1 define HAL_DEFAULT_CPORT 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef-bl.dat index 76ac68964a..f74d53921f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Hitec-Airspeed/hwdef-bl.dat @@ -45,22 +45,15 @@ define SERIAL_BUFFERS_SIZE 32 define HAL_USE_EMPTY_IO TRUE define PORT_INT_REQUIRED_STACK 64 -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE MAIN_STACK 0x800 PROCESS_STACK 0x800 define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PA11 CAN1_RX CAN1 PA12 CAN1_TX CAN1 @@ -77,11 +70,7 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.Hitec-Airspeed" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat index f6aecda96b..2692910c02 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat @@ -58,20 +58,13 @@ define PORT_INT_REQUIRED_STACK 64 define HAL_NO_TIMER_THREAD define HAL_NO_RCIN_THREAD -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE MAIN_STACK 0x800 PROCESS_STACK 0x800 define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PB8 CAN_RX CAN PB9 CAN_TX CAN @@ -93,13 +86,9 @@ define HAL_BOOTLOADER_TIMEOUT 1000 PA5 STAY_IN_BOOTLOADER INPUT PULLUP define HAL_STAY_IN_BOOTLOADER_VALUE 0 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 # Add CS pins to ensure they are high in bootloader PB1 MAG_CS CS -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.HitecMosaic" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat index 53f03ca225..edd6296d36 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat @@ -57,18 +57,11 @@ define HAL_USE_EMPTY_IO TRUE define HAL_NO_TIMER_THREAD define HAL_NO_RCIN_THREAD -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PA11 CAN1_RX CAN1 @@ -81,8 +74,6 @@ PA4 GPIO_CAN2_SILENT OUTPUT PUSHPULL SPEED_LOW LOW define CAN_APP_NODE_NAME "org.ardupilot.HolybroGPS" -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 # make bl baudrate match debug baudrate for easier debugging define BOOTLOADER_BAUDRATE 57600 @@ -90,8 +81,6 @@ define BOOTLOADER_BAUDRATE 57600 # use a smaller bootloader timeout define HAL_BOOTLOADER_TIMEOUT 2500 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 # Add CS pins to ensure they are high in bootloader PA8 ACC_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat index 3ac5a1c4fd..0acad89903 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef-bl.dat @@ -31,10 +31,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - - # Add CS pins to ensure they are high in bootloader PB14 MAX7456_CS CS PB3 FLASH_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef-bl.dat index 52b191b2b6..ed3f6578e7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef-bl.dat @@ -37,9 +37,6 @@ PD15 BUZZER OUTPUT LOW PULLDOWN PA2 LED_BOOTLOADER OUTPUT LOW define HAL_LED_ON 0 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Motors for esc init PB1 PWMOUT1 OUTPUT LOW PE9 PWMOUT2 OUTPUT LOW diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef-bl.dat index 0fae85c0f9..1933fcc871 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef-bl.dat @@ -36,9 +36,6 @@ PC13 BUZZER OUTPUT LOW PULLDOWN PC2 LED_BOOTLOADER OUTPUT LOW define HAL_LED_ON 1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # default to all pins low to avoid ESD issues DEFAULTGPIO OUTPUT LOW PULLDOWN diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef-bl.dat index d14e3b47ca..929226c259 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef-bl.dat @@ -34,6 +34,3 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 - -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef-bl.dat index 50c708aa7f..820c7e847f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef-bl.dat @@ -34,6 +34,3 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 - -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef-bl.dat index e21cf9cafa..1f19d9056c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef-bl.dat @@ -13,9 +13,6 @@ FLASH_RESERVE_START_KB 0 FLASH_SIZE_KB 1024 FLASH_BOOTLOADER_LOAD_KB 64 -define HAL_STORAGE_SIZE 15360 -define STORAGE_FLASH_PAGE 1 - PA14 LED_BOOTLOADER OUTPUT LOW GPIO(0) # blue PA13 LED_ACTIVITY OUTPUT LOW GPIO(1) # Green define HAL_LED_ON 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 8ab64c6389..0aeb2f3e8c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef-bl.dat @@ -18,10 +18,6 @@ FLASH_SIZE_KB 1024 # the location where the bootloader will put the firmware FLASH_BOOTLOADER_LOAD_KB 64 -define HAL_STORAGE_SIZE 15360 -define STORAGE_FLASH_PAGE 1 - - # order of UARTs SERIAL_ORDER OTG1 USART1 USART3 UART4 UART5 USART6 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat index 7a15dd51e8..1faa4c48b3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef-bl.dat @@ -30,10 +30,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - - # Add CS pins to ensure they are high in bootloader PB10 MAX7456_CS CS PC1 SDCARD_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef-bl.dat index e3a292d068..d3862451d5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef-bl.dat @@ -36,10 +36,6 @@ PA14 JTCK-SWCLK SWD PD10 LED_BOOTLOADER OUTPUT LOW define HAL_LED_ON 0 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - - # Add CS pins to ensure they are high in bootloader PC4 IMU1_CS CS PB12 MAX7456_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef-bl.dat index 33d54d40d0..b763dfe2b3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef-bl.dat @@ -5,9 +5,6 @@ include ../MatekH743/hwdef-bl.dat PD0 CAN1_RX CAN1 PD1 CAN1_TX CAN1 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 +env AP_PERIPH 1 -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.MatekH743-periph" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef-bl.dat index 5a895d1d07..5f970ba771 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743/hwdef-bl.dat @@ -40,9 +40,6 @@ PA14 JTCK-SWCLK SWD PE3 LED_BOOTLOADER OUTPUT LOW define HAL_LED_ON 0 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PC15 IMU1_CS CS PB12 MAX7456_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef-bl.dat index 553cc30fea..ea7f9fe6f6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef-bl.dat @@ -42,6 +42,3 @@ PA14 JTCK-SWCLK SWD PA2 LED_BOOTLOADER OUTPUT LOW define HAL_LED_ON 0 - -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef-bl.dat index 6f0812cdc7..8123d675e8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-G491/hwdef-bl.dat @@ -40,17 +40,11 @@ define HAL_NO_GPIO_IRQ define HAL_USE_EMPTY_IO TRUE define PORT_INT_REQUIRED_STACK 64 -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # debugger support PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef-bl.dat index 51dd230824..6c685fde90 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L476/hwdef-bl.dat @@ -45,22 +45,15 @@ define SERIAL_BUFFERS_SIZE 32 define HAL_USE_EMPTY_IO TRUE define PORT_INT_REQUIRED_STACK 64 -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE MAIN_STACK 0x800 PROCESS_STACK 0x800 define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 @@ -77,10 +70,6 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.Nucleo-L476" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef-bl.dat index e162587334..4a4d40ff2f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef-bl.dat @@ -51,22 +51,15 @@ define SERIAL_BUFFERS_SIZE 32 define HAL_USE_EMPTY_IO TRUE define PORT_INT_REQUIRED_STACK 64 -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE MAIN_STACK 0x800 PROCESS_STACK 0x800 define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PB8 CAN1_RX CAN1 PB9 CAN1_TX CAN1 @@ -83,10 +76,6 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.Nucleo-L496" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef-bl.dat index 9f15330619..8cfd63613a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/NucleoH743/hwdef-bl.dat @@ -44,9 +44,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PA4 MPU_CS CS PC7 BARO_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat index 52763b48da..f2b97378c5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef-bl.dat @@ -31,11 +31,6 @@ PA14 JTCK-SWCLK SWD PA2 LED_BOOTLOADER OUTPUT HIGH define HAL_LED_ON 0 -define HAL_USE_EMPTY_STORAGE - -define HAL_STORAGE_SIZE 16384 -define STORAGE_FLASH_PAGE 1 - # Add CS pins to ensure they are high in bootloader PA4 MPU6000_CS CS PA15 MPU6500_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef-bl.dat index c937c5700f..9753ba3fd6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef-bl.dat @@ -32,10 +32,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - - # Add CS pins to ensure they are high in bootloader PA4 MPU6000_CS CS PB12 FLASH_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef-bl.dat index 79cd804fc3..af225d2434 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef-bl.dat @@ -33,9 +33,6 @@ PA14 JTCK-SWCLK SWD PD5 USART2_TX USART2 PD6 USART2_RX USART2 -define HAL_STORAGE_SIZE 16384 -define HAL_USE_EMPTY_STORAGE 1 - # location of application code FLASH_BOOTLOADER_LOAD_KB 64 @@ -55,10 +52,6 @@ PD1 CAN1_TX CAN1 define CAN_APP_NODE_NAME "org.ardupilot.Pixracer-periph" -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 PB8 STAY_IN_BOOTLOADER INPUT FLOATING # if pulled low stay in bootloader diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer/hwdef-bl.dat index 6c529eb9b5..4f2dc060c2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer/hwdef-bl.dat @@ -38,8 +38,6 @@ PD4 USART2_RTS USART2 PD5 USART2_TX USART2 PD6 USART2_RX USART2 -define HAL_STORAGE_SIZE 16384 - # location of application code FLASH_BOOTLOADER_LOAD_KB 16 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/QioTekZealotF427/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/QioTekZealotF427/hwdef-bl.dat index 4e161bcd6b..938225e662 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/QioTekZealotF427/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/QioTekZealotF427/hwdef-bl.dat @@ -34,9 +34,6 @@ PA14 JTCK-SWCLK SWD PC12 UART5_TX UART5 NODMA PD2 UART5_RX UART5 NODMA -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PA4 ICM20689_CS CS PE10 MAX7456_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef-bl.dat index 7f14f28674..ce0d212264 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef-bl.dat @@ -32,9 +32,6 @@ PA14 JTCK-SWCLK SWD PE0 LED_BOOTLOADER OUTPUT LOW define HAL_LED_ON 0 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PA4 BARO_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef-bl.dat index 37f0dc2ea2..df6cc807d7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-L431/hwdef-bl.dat @@ -52,22 +52,15 @@ define SERIAL_BUFFERS_SIZE 32 define HAL_USE_EMPTY_IO TRUE define PORT_INT_REQUIRED_STACK 64 -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE MAIN_STACK 0x800 PROCESS_STACK 0x800 define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PA11 CAN1_RX CAN1 PA12 CAN1_TX CAN1 @@ -85,11 +78,7 @@ define BOOTLOADER_BAUDRATE 57600 # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.Sierra-L431" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef-bl.dat index 092facce40..bf2e5b3d99 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef-bl.dat @@ -37,9 +37,6 @@ PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - # Add CS pins to ensure they are high in bootloader PA4 ICM20689_1_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef-bl.dat index 5e9ec17024..c1ef2ed5d8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/TBS-Colibri-F7/hwdef-bl.dat @@ -49,6 +49,3 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD - -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef-bl.dat index 93f1515001..48570f8c98 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v51/hwdef-bl.dat @@ -51,6 +51,3 @@ define HAL_LED_ON 0 define HAL_CHIBIOS_ARCH_BRAINV51 1 -define HAL_STORAGE_SIZE 16384 -define HAL_USE_EMPTY_STORAGE 1 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef-bl.dat index f63cc2a6d3..20828f9cf3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v52/hwdef-bl.dat @@ -51,6 +51,3 @@ define HAL_LED_ON 0 define HAL_CHIBIOS_ARCH_BRAINV52 1 -define HAL_STORAGE_SIZE 16384 -define HAL_USE_EMPTY_STORAGE 1 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef-bl.dat index 4c982a44a7..9a945508c2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRBrain-v54/hwdef-bl.dat @@ -52,6 +52,3 @@ define HAL_LED_ON 0 define HAL_CHIBIOS_ARCH_BRAINV54 1 -define HAL_STORAGE_SIZE 16384 -define HAL_USE_EMPTY_STORAGE 1 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef-bl.dat index 7f8055d085..c1645a681e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRCore-v10/hwdef-bl.dat @@ -51,6 +51,3 @@ define HAL_LED_ON 0 define HAL_CHIBIOS_ARCH_COREV10 1 -define HAL_STORAGE_SIZE 16384 -define HAL_USE_EMPTY_STORAGE 1 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef-bl.dat index eb8882a068..cdf9d5e2d0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef-bl.dat @@ -51,6 +51,3 @@ define HAL_LED_ON 0 define HAL_CHIBIOS_ARCH_UBRAINV51 1 -define HAL_STORAGE_SIZE 15360 -define HAL_USE_EMPTY_STORAGE 1 - diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat index 62951ee97b..d7e3738e5e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ZubaxGNSS/hwdef-bl.dat @@ -18,8 +18,6 @@ define HAL_BOARD_AP_PERIPH_ZUBAXGNSS define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_ZubaxGNSS" -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 # crystal frequency OSCILLATOR_HZ 16000000 @@ -31,8 +29,6 @@ FLASH_SIZE_KB 256 # reserve space for params FLASH_RESERVE_END_KB 2 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 # USART3 for debug #STDOUT_SERIAL SD3 @@ -84,19 +80,13 @@ define HAL_NO_RCIN_THREAD #defined to turn off undef warnings define __FPU_PRESENT 0 -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE MAIN_STACK 0x100 PROCESS_STACK 0x600 define HAL_DISABLE_LOOP_DELAY -define HAL_NO_ROMFS_SUPPORT - define HAL_UART_MIN_TX_SIZE 256 define HAL_UART_MIN_RX_SIZE 128 @@ -107,9 +97,6 @@ define HAL_NO_MONITOR_THREAD define HAL_MINIMIZE_FEATURES 0 -define HAL_BUILD_AP_PERIPH -define HAL_USE_EMPTY_STORAGE 1 - define HAL_DEVICE_THREAD_STACK 768 define AP_PARAM_MAX_EMBEDDED_PARAM 0 @@ -120,8 +107,6 @@ PA3 USART2_RX USART2 SPEED_HIGH NODMA SERIAL_ORDER -define HAL_STORAGE_SIZE 800 - # Add CS pins to ensure they are high in bootloader PA15 BARO_CS CS PD2 MAG_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat index 530766766b..a55dc7366d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef-bl.dat @@ -32,10 +32,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - - # Add CS pins to ensure they are high in bootloader PA4 MPU6000_CS CS PB3 FLASH_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef-bl.dat index 42ba2e4a3d..724f9d046d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef-bl.dat @@ -35,10 +35,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - - # Add CS pins to ensure they are high in bootloader PC12 E_CS0 CS PB4 E_CS1 CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat index 14f71bc202..5afebaac58 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-ADSB/hwdef-bl.dat @@ -2,6 +2,4 @@ include ../f103-periph/hwdef-bl.inc define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_adsb" -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef-bl.dat index 45f407aa7b..2caf38d993 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-Airspeed/hwdef-bl.dat @@ -2,6 +2,4 @@ include ../f103-periph/hwdef-bl.inc define CAN_APP_NODE_NAME "org.ardupilot.f103_airspeed" -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat index ca9f9e4c0b..751f46aa65 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-GPS/hwdef-bl.dat @@ -1,6 +1,4 @@ include ../f103-periph/hwdef-bl.inc -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat index 02c9c4da21..7cc46df6fa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-HWESC/hwdef-bl.dat @@ -1,6 +1,5 @@ include ../f103-periph/hwdef-bl.inc # start with a fixed node ID so the board is usable without DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_HWESC" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef-bl.dat index f52d3b0186..6b957507a1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-QiotekPeriph/hwdef-bl.dat @@ -2,6 +2,4 @@ include ../f103-periph/hwdef-bl.inc define CAN_APP_NODE_NAME "org.ardupilot.f103Qiotek_Periph" -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat index b91c55e005..3ec41d6f5a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-RangeFinder/hwdef-bl.dat @@ -2,7 +2,5 @@ include ../f103-periph/hwdef-bl.inc define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_rangefinder" -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat index 1651057471..83eb480cb9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-Trigger/hwdef-bl.dat @@ -1,6 +1,4 @@ include ../f103-periph/hwdef-bl.inc -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_trigger" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.inc b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.inc index 8d72033dae..a9ff771d7d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.inc +++ b/libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.inc @@ -58,20 +58,13 @@ define PORT_INT_REQUIRED_STACK 64 #defined to turn off undef warnings define __FPU_PRESENT 0 -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE MAIN_STACK 0x800 PROCESS_STACK 0x800 define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PA11 CAN_RX CAN PA12 CAN_TX CAN @@ -91,7 +84,6 @@ define HAL_BOOTLOADER_TIMEOUT 1000 PB6 STAY_IN_BOOTLOADER INPUT FLOATING # reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 # Add CS pins to ensure they are high in bootloader PB0 MAG_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat index dec121d22a..ac5591ab64 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-GPS/hwdef-bl.dat @@ -1,6 +1,4 @@ include ../f303-periph/hwdef-bl.inc -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_gps" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat index b8eea51f3e..f0582a1505 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-HWESC/hwdef-bl.dat @@ -1,5 +1,4 @@ include ../f303-periph/hwdef-bl.inc -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_HWESC" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef-bl.dat index 9abacb4709..0ea72cbdaa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10025/hwdef-bl.dat @@ -1,6 +1,5 @@ include ../f303-periph/hwdef-bl.inc # start as DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.mro_m10025" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef-bl.dat index 0d764a5880..da417ac195 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-M10070/hwdef-bl.dat @@ -4,6 +4,5 @@ include ../f303-periph/hwdef-bl.inc # M10084 # start as DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "io.mrobotics.m10070_loc1_BL" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat index 3e459543e8..3b890aa991 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat @@ -59,20 +59,13 @@ define SERIAL_BUFFERS_SIZE 32 define HAL_USE_EMPTY_IO TRUE define PORT_INT_REQUIRED_STACK 64 -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE MAIN_STACK 0x800 PROCESS_STACK 0x800 define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PA11 CAN_RX CAN PA12 CAN_TX CAN @@ -91,10 +84,6 @@ define HAL_BOOTLOADER_TIMEOUT 1000 # want to stay in the bootloader PB6 STAY_IN_BOOTLOADER INPUT FLOATING -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.f303_MatekGPS" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef-bl.dat index 7fed81eacc..fd1e5c332f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef-bl.dat @@ -1,6 +1,4 @@ include ../f303-periph/hwdef-bl.inc -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_PWM" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat index 9d73063c46..bc24ce71f5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-Universal/hwdef-bl.dat @@ -1,6 +1,4 @@ include ../f303-periph/hwdef-bl.inc -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_universal" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.inc b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.inc index fde6c11abf..106a6bbb83 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.inc +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef-bl.inc @@ -55,20 +55,12 @@ define SERIAL_BUFFERS_SIZE 32 define HAL_USE_EMPTY_IO TRUE define PORT_INT_REQUIRED_STACK 64 -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE - define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE MAIN_STACK 0x800 PROCESS_STACK 0x800 define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PA11 CAN_RX CAN PA12 CAN_TX CAN @@ -92,7 +84,6 @@ define HAL_BOOTLOADER_TIMEOUT 1000 PB6 STAY_IN_BOOTLOADER INPUT FLOATING # reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 # Add CS pins to ensure they are high in bootloader PB0 MAG_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc index a6572ba8f5..87581dbef1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc +++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-periph/hwdef.inc @@ -106,7 +106,6 @@ define IO_THD_WA_SIZE 512 define HAL_MINIMIZE_FEATURES 0 -define HAL_BUILD_AP_PERIPH # only one I2C bus I2C_ORDER I2C1 @@ -125,9 +124,6 @@ define GPS_MAX_INSTANCES 1 define HAL_COMPASS_MAX_SENSORS 1 define RANGEFINDER_MAX_INSTANCES 1 -# use the app descriptor needed by MissionPlanner for CAN upload -env APP_DESCRIPTOR MissionPlanner - # reserve 256 bytes for comms between app and bootloader RAM_RESERVE_START 256 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat index 2623e690b9..0dcb6c1973 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef-bl.dat @@ -16,9 +16,6 @@ FLASH_RESERVE_START_KB 0 FLASH_SIZE_KB 1024 FLASH_BOOTLOADER_LOAD_KB 64 -define HAL_STORAGE_SIZE 15360 -define STORAGE_FLASH_PAGE 1 - PA14 LED_BOOTLOADER OUTPUT LOW GPIO(0) # blue define HAL_LED_ON 0 @@ -50,11 +47,8 @@ PB9 CAN1_TX CAN1 define HAL_USE_CAN1 TRUE define STM32_CAN_USE_CAN1 TRUE -# define HAL_CAN_DEFAULT_NODE_ID 0 define CAN_APP_NODE_NAME "org.ardupilot.f405_MatekGPS" -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 # Add CS pins to ensure they are high in bootloader PA4 MPU_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat index aa4d013e74..eee65e240a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef-bl.dat @@ -72,7 +72,6 @@ define HAL_CHIBIOS_ARCH_FMUV3 1 # we need to tell HAL_ChibiOS/Storage.cpp how much storage is # available (in bytes) -define HAL_STORAGE_SIZE 16384 # Add CS pins to ensure they are high in bootloader PC1 MAG_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat index ed3006b34c..348d1666d2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef-bl.dat @@ -41,9 +41,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PF10 MS5611_CS CS PF2 ICM20689_CS CS SPEED_VERYLOW diff --git a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef-bl.dat index 7287e343fc..6c671dfd1c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/hwdef-bl.dat @@ -20,9 +20,6 @@ FLASH_RESERVE_START_KB 0 # the H743 has 128k sectors FLASH_BOOTLOADER_LOAD_KB 128 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # only one I2C bus I2C_ORDER I2C1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef-bl.dat index 29b9ccc71d..5e70fb3b80 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRo-M10095/hwdef-bl.dat @@ -43,19 +43,12 @@ define HAL_NO_GPIO_IRQ define HAL_USE_EMPTY_IO TRUE -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define NO_DATAFLASH TRUE define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE define HAL_DISABLE_LOOP_DELAY -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # enable CAN support PA11 CAN1_RX CAN1 PA12 CAN1_TX CAN1 @@ -67,10 +60,4 @@ PA14 JTCK-SWCLK SWD # use a small bootloader timeout define HAL_BOOTLOADER_TIMEOUT 1000 -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 - -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 - define CAN_APP_NODE_NAME "org.ardupilot.mRo-M10095" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroClassic/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroClassic/hwdef-bl.dat index 9f42a53fda..6a95b708ad 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroClassic/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroClassic/hwdef-bl.dat @@ -50,9 +50,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PD7 BARO_CS CS PD10 FRAM_CS CS SPEED_VERYLOW diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef-bl.dat index e9432613fb..4ea1236ab4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroF7/hwdef-bl.dat @@ -52,9 +52,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PC2 ICM_20602_CS CS PD7 BARO_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroH7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroH7/hwdef-bl.dat index d165118b00..e1ff6dae6b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroH7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroH7/hwdef-bl.dat @@ -52,9 +52,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PC2 ICM_20602_CS CS PD7 BARO_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroOEMH7/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroOEMH7/hwdef-bl.dat index 09f6099bf9..ae10357f04 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroOEMH7/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoControlZeroOEMH7/hwdef-bl.dat @@ -53,9 +53,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PC2 ICM_20602_CS CS PD7 BARO_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef-bl.dat index e6f479c22a..e506d22d9e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoNexus/hwdef-bl.dat @@ -45,9 +45,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PB12 CS_ADIS16470 CS PA15 CS_ICM40609D CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro/hwdef-bl.dat index bb91ff51c9..eb2b70bbb4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro/hwdef-bl.dat @@ -53,9 +53,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PC2 ICM_20602_CS CS PD7 BARO_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef-bl.dat index 56c30ba433..a8684b2d72 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoX21-777/hwdef-bl.dat @@ -58,10 +58,6 @@ FLASH_RESERVE_START_KB 0 # start on 4th sector (1st sector for bootloader, 2 for extra storage) FLASH_BOOTLOADER_LOAD_KB 96 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - - # Add CS pins to ensure they are high in bootloader PC1 MAG_CS CS #Not Connected PC2 MPU_CS CS #MPU9250 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat index 1f0a23d9f7..0a947f8d92 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef-bl.dat @@ -42,7 +42,6 @@ PD6 USART2_RX USART2 PA8 LED_BOOTLOADER OUTPUT define HAL_LED_ON 1 -define HAL_STORAGE_SIZE 16384 # Add CS pins to ensure they are high in bootloader PB2 GYRO_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef-bl.dat index c424c1f2e1..ad20b0770b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef-bl.dat @@ -35,9 +35,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 16384 - # Add CS pins to ensure they are high in bootloader PC2 LPS22HB_CS CS PC15 MPU6500_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/modalai_fc-v1/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/modalai_fc-v1/hwdef-bl.dat index 11a9e49e97..ad8fae7466 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/modalai_fc-v1/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/modalai_fc-v1/hwdef-bl.dat @@ -34,9 +34,6 @@ PA12 OTG_FS_DP OTG1 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 32768 - # UARTs # USART2 is telem3, MSS_SPARE_4W diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat index e939bb9b79..dc584c8ca7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef-bl.dat @@ -33,10 +33,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - - # Add CS pins to ensure they are high in bootloader PA4 MPU6000_CS CS PB12 SDCARD_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef-bl.dat index 9a915219cb..d0c4658e00 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef-bl.dat @@ -32,10 +32,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - - # Add CS pins to ensure they are high in bootloader PB12 FLASH_CS CS PA4 MPU6000_CS CS #SPI1_NSS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef-bl.dat index 078b88a03f..bc33524baa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef-bl.dat @@ -33,10 +33,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - - # Add CS pins to ensure they are high in bootloader PA4 MPU_CS CS PB3 FLASH_CS CS 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 078b88a03f..bc33524baa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef-bl.dat @@ -33,10 +33,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - - # Add CS pins to ensure they are high in bootloader PA4 MPU_CS CS PB3 FLASH_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat index d6dad2cdea..58ce02827a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef-bl.dat @@ -33,9 +33,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - # Add CS pins to ensure they are high in bootloader PC4 MPU_CS CS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef-bl.dat index 59ecaf6ec0..1ba0c9ccb0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef-bl.dat @@ -32,9 +32,6 @@ SERIAL_ORDER OTG1 PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1 -define HAL_USE_EMPTY_STORAGE 1 -define HAL_STORAGE_SIZE 15360 - # Add CS pins to ensure they are high in bootloader PB10 MAX7456_CS CS PC0 FLASH_CS CS