hwdef: use common include for network bootloader

This commit is contained in:
Andrew Tridgell 2024-01-17 11:19:49 +11:00
parent e18abc3a9b
commit f225d797d2
4 changed files with 32 additions and 44 deletions

View File

@ -14,22 +14,7 @@ PA1 ETH_RMII_REF_CLK ETH1
define BOARD_PHY_ID MII_LAN8720_ID
define BOARD_PHY_RMII
define CH_CFG_USE_EVENTS 1
undef CH_CFG_USE_SEMAPHORES
define CH_CFG_USE_SEMAPHORES 1
undef CH_CFG_USE_MUTEXES
define CH_CFG_USE_MUTEXES 1
undef CH_CFG_USE_HEAP
define CH_CFG_USE_MEMCORE 1
define CH_CFG_USE_HEAP 1
define CH_CFG_USE_REGISTRY 1
define CH_CFG_USE_DYNAMIC 1
define CH_CFG_USE_WAITEXIT 1
include ../include/network_bootloader.inc
define AP_NETWORKING_ENABLED 1
undef SERIAL_ORDER
SERIAL_ORDER
ROMFS_WILDCARD Tools/AP_Bootloader/Web/*.html
env ROMFS_UNCOMPRESSED True
# allow USB bootloader too
SERIAL_ORDER OTG1

View File

@ -32,22 +32,9 @@ define BOARD_PHY_RMII
# Refer to https://maclookup.app/vendors/cubepilot-pty-ltd
# Note, lower 3 bytes (ADDR3,4,5) will be replaced with the platform UUID
define AP_NETWORKING_DEFAULT_MAC_ADDR "A8:B0:28:00:00:00"
define AP_NETWORKING_BOOTLOADER_DEFAULT_MAC_ADDR "A8:B0:28:00:00:00"
define CH_CFG_USE_EVENTS 1
undef CH_CFG_USE_SEMAPHORES
define CH_CFG_USE_SEMAPHORES 1
define AP_NETWORKING_ENABLED 1
# allow load from USB too
SERIAL_ORDER OTG1
define CH_CFG_USE_MEMCORE 1
define CH_CFG_USE_HEAP 1
define CH_CFG_USE_MUTEXES 1
define CH_CFG_USE_DYNAMIC 1
define CH_CFG_USE_WAITEXIT 1
define CH_CFG_USE_REGISTRY 1
undef SERIAL_ORDER
SERIAL_ORDER
ROMFS_WILDCARD Tools/AP_Bootloader/Web/*.html
env ROMFS_UNCOMPRESSED True
include ../include/network_bootloader.inc

View File

@ -1,5 +1,9 @@
include ../Pixhawk6X/hwdef-bl.dat
undef UART7
undef UART2
undef UART3
# setup build for a peripheral bootloader
env AP_PERIPH 1
@ -10,9 +14,6 @@ APJ_BOARD_ID AP_HW_PIXHAWK6X_PERIPH
PD0 CAN1_RX CAN1
PD1 CAN1_TX CAN1
PB12 CAN2_RX CAN2
PB13 CAN2_TX CAN2
PC1 ETH_MDC ETH1
PA2 ETH_MDIO ETH1
PC4 ETH_RMII_RXD0 ETH1
@ -28,11 +29,7 @@ PG15 Ethernet_PWR_EN OUTPUT HIGH # disable power on ethernet
define BOARD_PHY_ID MII_LAN8742A_ID
define BOARD_PHY_RMII
define CH_CFG_USE_EVENTS 1
undef CH_CFG_USE_SEMAPHORES
define CH_CFG_USE_SEMAPHORES 1
include ../include/network_bootloader.inc
# allow load from USB
SERIAL_ORDER OTG1
ROMFS_WILDCARD Tools/AP_Bootloader/Web/*.html
env ROMFS_UNCOMPRESSED True

View File

@ -0,0 +1,19 @@
define CH_CFG_USE_EVENTS 1
undef CH_CFG_USE_SEMAPHORES
define CH_CFG_USE_SEMAPHORES 1
undef CH_CFG_USE_MUTEXES
define CH_CFG_USE_MUTEXES 1
undef CH_CFG_USE_HEAP
define CH_CFG_USE_MEMCORE 1
define CH_CFG_USE_HEAP 1
define CH_CFG_USE_REGISTRY 1
define CH_CFG_USE_DYNAMIC 1
define CH_CFG_USE_WAITEXIT 1
define AP_NETWORKING_ENABLED 1
ROMFS_WILDCARD Tools/AP_Bootloader/Web/*.html
env ROMFS_UNCOMPRESSED True
# don't combine sdcard bl and network bl
undef AP_BOOTLOADER_FLASH_FROM_SD_ENABLED