From 1bf17fa50f6eeb772480ce498240c3e6a65a5139 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Thu, 26 Jan 2017 16:05:51 -0800 Subject: [PATCH] build: remove version that is not required anymore Now bootloader, board name and px4io pass the name directly to the PX4 build system so we don't need to keep the version. --- Tools/ardupilotwaf/boards.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py index 7b90da4689..26e73b7ed9 100644 --- a/Tools/ardupilotwaf/boards.py +++ b/Tools/ardupilotwaf/boards.py @@ -418,15 +418,12 @@ class px4(Board): toolchain = 'arm-none-eabi' def __init__(self): - self.version = None self.bootloader_name = None self.board_name = None self.px4io_name = None self.ROMFS_EXCLUDE = [] def configure(self, cfg): - if not self.version: - cfg.fatal('configure: px4: version required') if not self.bootloader_name: cfg.fatal('configure: px4: bootloader name is required') if not self.board_name: @@ -463,7 +460,6 @@ class px4(Board): ] env.ROMFS_EXCLUDE = self.ROMFS_EXCLUDE - env.PX4_VERSION = self.version env.PX4_BOOTLOADER_NAME = self.bootloader_name env.PX4_BOARD_NAME = self.board_name env.PX4_PX4IO_NAME = self.px4io_name @@ -483,7 +479,6 @@ class px4_v1(px4): name = 'px4-v1' def __init__(self): super(px4_v1, self).__init__() - self.version = '1' self.bootloader_name = 'px4fmu_bl.bin' self.board_name = 'px4fmu-v1' self.px4io_name = 'px4io-v1' @@ -493,7 +488,6 @@ class px4_v2(px4): name = 'px4-v2' def __init__(self): super(px4_v2, self).__init__() - self.version = '2' self.bootloader_name = 'px4fmuv2_bl.bin' self.board_name = 'px4fmu-v2' self.px4io_name = 'px4io-v2' @@ -503,7 +497,6 @@ class px4_v3(px4): name = 'px4-v3' def __init__(self): super(px4_v3, self).__init__() - self.version = '3' self.bootloader_name = 'px4fmuv2_bl.bin' self.board_name = 'px4fmu-v3' self.px4io_name = 'px4io-v2' @@ -512,7 +505,6 @@ class px4_v4(px4): name = 'px4-v4' def __init__(self): super(px4_v4, self).__init__() - self.version = '4' self.bootloader_name = 'px4fmuv4_bl.bin' self.board_name = 'px4fmu-v4' self.romfs_exclude(['oreoled.bin'])