Oleg Semyonov
|
406339eb49
|
Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3
Conflicts:
flight/Libraries/inc/op_dfu.h
flight/Libraries/op_dfu.c
flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
flight/targets/Bootloaders/OSD/op_dfu.c
flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h
flight/targets/boards/coptercontrol/bootloader/op_dfu.c
flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h
flight/targets/boards/oplinkmini/bootloader/op_dfu.c
flight/targets/boards/osd/bootloader/inc/op_dfu.h
flight/targets/boards/osd/bootloader/op_dfu.c
flight/targets/boards/revolution/bootloader/inc/op_dfu.h
flight/targets/boards/revolution/bootloader/op_dfu.c
flight/targets/boards/sensortest/bootloader/inc/op_dfu.h
flight/targets/boards/sensortest/bootloader/op_dfu.c
make/boot-defs.mk
|
2013-04-24 00:37:39 +03:00 |
|
Oleg Semyonov
|
f7332f6905
|
OP-899: remove extra copy of pios_usb_data.c and move it level up
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
1dd20eca33
|
OP-899: move board_hw_defs.c under board directories and fix some includes
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
393b37fa7a
|
OP-899: move board-info.mk from make/boards to board directories
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
fce12662bc
|
OP-899: move bootloaders under board directories
|
2013-04-24 00:07:06 +03:00 |
|