move Images to platforms/nuttx

2026-05-31 18:47:21 +08:00 · 2018-01-04 22:50:16 -05:00
parent 2dcd617a8f
commit 62c2fbb443
24 changed files with 9 additions and 9 deletions
@@ -73,7 +73,7 @@ endif()
 if (TARGET parameters_xml AND TARGET airframes_xml)
 	add_custom_command(OUTPUT ${fw_file}
 		COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_mkfw.py
-			--prototype ${PX4_SOURCE_DIR}/Images/${FW_PROTOTYPE}.prototype
+			--prototype ${PX4_SOURCE_DIR}/platforms/nuttx/Images/${FW_PROTOTYPE}.prototype
 			--git_identity ${PX4_SOURCE_DIR}
 			--parameter_xml ${PX4_BINARY_DIR}/parameters.xml
 			--airframe_xml ${PX4_BINARY_DIR}/airframes.xml
@@ -0,0 +1,13 @@
+{
+    "board_id": 98,
+    "magic": "AeroCore2",
+    "description": "Firmware for the Gumstix AeroCore2 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "AEROCORE2",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 1032192,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 65,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the Intel Aero FC board",
+    "image": "",
+    "build_time": 0,
+    "summary": "AEROFCv1",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 999424,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 33,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the AUAV X2.1 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "AUAV X2.1",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 2080768,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 12,
+    "magic": "Crazyflie",
+    "description": "Firmware for the Crazyflie 2.0",
+    "image": "",
+    "build_time": 0,
+    "summary": "CRAZYFLIE",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 1032192,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 27,
+    "magic": "ESC35v1",
+    "description": "Firmware for the ESC35V1 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "ESC35v1",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 229376,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 88,
+    "magic": "MindPX",
+    "description": "Firmware for the MindPXFMUv2 board",
+    "image": "", 
+    "build_time": 0, 
+    "summary": "MindPXFMUv2",
+    "version": "2.1",
+    "image_size": 0,
+    "image_maxsize": 2080768,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 29,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the NXPHLITEv3 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "NXPHLITEv3",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 2096112,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 110,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the SAME70xplained board",
+    "image": "",
+    "build_time": 0,
+    "summary": "PX4/SAME70xplained",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 2097152,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 99, 
+    "magic": "PX4FWv1", 
+    "description": "Firmware for the STM32F4Discovery board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4/STM32F4Discovery",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 1032192,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 22,
+    "magic": "CANNODEFWv1",
+    "description": "Firmware for the PX4CANNODE board",
+    "image": "",
+    "build_time": 0,
+    "summary": "PX4CANNODEv1",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 122880,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 25,
+    "magic": "ESCv1",
+    "description": "Firmware for the PX4ESCV1 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "PX4ESCv1",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 475136,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 24,
+    "magic": "FLOWv1",
+    "description": "Firmware for the PX4FlowV2 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "PX4FLOWv2",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 2080768,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 9, 
+    "magic": "PX4FWv1", 
+    "description": "Firmware for the PX4FMUv2 board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4FMUv2",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 1032192,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 9,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the PX4FMUv3 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "PX4FMUv3",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 2080768,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 11,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the PX4FMUv4 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "PX4FMUv4",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 2080768,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 13,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the PX4FMUv4PRO board, based on STM32F469",
+    "image": "",
+    "build_time": 0,
+    "summary": "PX4FMUv4PRO",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 2080768,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 50,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the PX4FMUv5 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "PX4FMUv5",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 2064384,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 10, 
+    "magic": "PX4FWv2", 
+    "description": "Firmware for the PX4IOv2 board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4IOv2",
+    "version": "2.0",
+    "image_size": 0,
+    "image_maxsize": 61440,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 90,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the ST nucleo-144 with STM32FF767ZI-v1 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "PX4NUCLEOF767ZIv1",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 2097152,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 23,
+    "magic": "S2740VCblv1",
+    "description": "Firmware for the S2740VC board",
+    "image": "",
+    "build_time": 0,
+    "summary": "S2740VCv1",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 65536,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 64,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the TAPv1 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "TAPv1",
+    "version": "0.1",
+    "image_size": 0,
+    "image_maxsize": 999424,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,13 @@
+{
+    "board_id": 26,
+    "magic": "ZUBAXGNSSFWv1",
+    "description": "Firmware for the ZUBAXGNSS board",
+    "image": "",
+    "build_time": 0,
+    "summary": "ZUBAXGNSSv1",
+    "version": "0.0",
+    "image_size": 0,
+    "image_maxsize": 253952,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -51,8 +51,8 @@ done
 echo "PROTOTYPE = \"$oldname\""

 # Does that look like an existing old name?
-if [ ! -f $BASEDIR/Images/$oldname.prototype ]; then
-	fatal "\"$oldname\" doesn't look like an existing board name (there is no $BASEDIR/Images/$oldname.prototype)"
+if [ ! -f $BASEDIR/platforms/nuttx/Images/$oldname.prototype ]; then
+	fatal "\"$oldname\" doesn't look like an existing board name (there is no $BASEDIR/platforms/nuttx/Images/$oldname.prototype)"
 fi
 if [ ! -d $BASEDIR/src/drivers/boards/$oldname ]; then
 	fatal "\"$oldname\" doesn't look like an existing board name (no such directory $BASEDIR/src/drivers/boards/$oldname)"
@@ -75,13 +75,13 @@ fi
 cd "$BASEDIR" || fatal "Could not change directory to $BASEDIR"

 # Make sure we don't accidently overwrite stuff.
-if [ -f Images/$newname.prototype -o \
+if [ -f platforms/nuttx/Images/$newname.prototype -o \
     -f cmake/configs/nuttx_"$newname"_default.cmake -o \
     -f cmake/configs/nuttx_"$newname"_bootloader.cmake -o \
     -d src/drivers/boards/$newname -o \
     -d nuttx-configs/$newname ]; then
  echo "\"$newname\" already exists! Please first delete it with the following command (in $BASEDIR):"
-  echo "rm -rf Images/$newname.prototype cmake/configs/nuttx_"$newname"_default.cmake cmake/configs/nuttx_"$newname"_bootloader.cmake src/drivers/boards/$newname nuttx-configs/$newname"
+  echo "rm -rf platforms/nuttx/Images/$newname.prototype cmake/configs/nuttx_"$newname"_default.cmake cmake/configs/nuttx_"$newname"_bootloader.cmake src/drivers/boards/$newname nuttx-configs/$newname"
  exit 1
 fi

@@ -115,8 +115,8 @@ for k in default bootloader; do
 done

 # Copy remaining files.
-cp Images/${oldname}.prototype Images/${newname}.prototype
-git add Images/${newname}.prototype
+cp platforms/nuttx/Images/${oldname}.prototype platforms/nuttx/Images/${newname}.prototype
+git add platforms/nuttx/Images/${newname}.prototype
 cp -r nuttx-configs/${oldname} nuttx-configs/${newname}
 git add nuttx-configs/${newname}
 cp -r src/drivers/boards/${oldname} src/drivers/boards/${newname}
@@ -164,8 +164,8 @@ if ! grep 'defined('"${newconfig}"')' 'src/modules/gpio_led/gpio_led.c' >/dev/nu
 	sed -i -e 's/\(defined('"${oldconfig}"')$\)/\1 || \\'$'\\n\\t'"defined(${newconfig})/" 'src/modules/gpio_led/gpio_led.c'
 fi

-# Make some changes to Images/$(newname).prototype
-sed -i -r -e 's%("(magic|description|summary)": ")([^"]*)(",).*%\1FIXME (was: \3)\4%' "Images/${newname}.prototype"
+# Make some changes to platforms/nuttx/Images/$(newname).prototype
+sed -i -r -e 's%("(magic|description|summary)": ")([^"]*)(",).*%\1FIXME (was: \3)\4%' "platforms/nuttx/Images/${newname}.prototype"

 echo "*** The following files contain a reference to $oldconfig (this might take a while):"
 find . -path './build/*' -o -path './.git' -o -name 'defconfig' -prune -o -type f -exec grep -l -- "$oldconfig" {} \;