diff options
| author | px4dev <px4@purgatory.org> | 2014-02-09 20:46:50 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2014-02-09 20:46:50 -0800 |
| commit | c757a6fde2d12b067d63984d542a375781919687 (patch) | |
| tree | b3941f0cad6b135f1f0b65b353946175c7d750c8 | |
| parent | f47510e8897ccf42790b4ce492f5917b8e40b137 (diff) | |
| download | px4-firmware-romfs-compression.tar.gz px4-firmware-romfs-compression.tar.bz2 px4-firmware-romfs-compression.zip | |
Back out the ~extras changes. With the chunked compression the hack isn't needed, and it would have confused everyone no end.romfs-compression
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 8 | ||||
| -rw-r--r-- | ROMFS/px4fmu_test/init.d/rcS | 6 | ||||
| -rw-r--r-- | makefiles/firmware.mk | 6 | ||||
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index e14c46fa1..6f4e1f3b5 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -10,7 +10,7 @@ set MODE autostart set RC_FILE /fs/microsd/etc/rc.txt set CONFIG_FILE /fs/microsd/etc/config.txt -set EXTRAS_FILE /fs/microsd/etc/~extras.txt +set EXTRAS_FILE /fs/microsd/etc/extras.txt set TUNE_OUT_ERROR ML<<CP4CP4CP4CP4CP4 @@ -167,11 +167,11 @@ then # # Check if PX4IO present and update firmware if needed # - if [ -f /etc/~extras/px4io-v2_default.bin ] + if [ -f /etc/extras/px4io-v2_default.bin ] then - set IO_FILE /etc/~extras/px4io-v2_default.bin + set IO_FILE /etc/extras/px4io-v2_default.bin else - set IO_FILE /etc/~extras/px4io-v1_default.bin + set IO_FILE /etc/extras/px4io-v1_default.bin fi if px4io checkcrc $IO_FILE diff --git a/ROMFS/px4fmu_test/init.d/rcS b/ROMFS/px4fmu_test/init.d/rcS index 913f9f637..56482d140 100644 --- a/ROMFS/px4fmu_test/init.d/rcS +++ b/ROMFS/px4fmu_test/init.d/rcS @@ -31,11 +31,11 @@ fi # Start a minimal system # -if [ -f /etc/~extras/px4io-v2_default.bin ] +if [ -f /etc/extras/px4io-v2_default.bin ] then - set io_file /etc/~extras/px4io-v2_default.bin + set io_file /etc/extras/px4io-v2_default.bin else - set io_file /etc/~extras/px4io-v1_default.bin + set io_file /etc/extras/px4io-v1_default.bin fi if px4io start diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index ff9b54dbc..fe08bc473 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -343,7 +343,7 @@ $(error ROMFS_ROOT $(ROMFS_ROOT) specifies a directory containing no files) endif ROMFS_DEPS += $(ROMFS_FILES) -# Extra files that may be copied into the ROMFS /~extras directory +# Extra files that may be copied into the ROMFS /extras directory # ROMFS_EXTRA_FILES are required, ROMFS_OPTIONAL_FILES are optional ROMFS_EXTRA_FILES += $(wildcard $(ROMFS_OPTIONAL_FILES)) ROMFS_DEPS += $(ROMFS_EXTRA_FILES) @@ -389,8 +389,8 @@ $(ROMFS_SCRATCH): $(ROMFS_DEPS) $(GLOBAL_DEPS) $(Q) $(MKDIR) -p $(ROMFS_SCRATCH) $(Q) $(COPYDIR) $(ROMFS_ROOT)/* $(ROMFS_SCRATCH) ifneq ($(ROMFS_EXTRA_FILES),) - $(Q) $(MKDIR) -p $(ROMFS_SCRATCH)/~extras - $(Q) $(COPY) $(ROMFS_EXTRA_FILES) $(ROMFS_SCRATCH)/~extras + $(Q) $(MKDIR) -p $(ROMFS_SCRATCH)/extras + $(Q) $(COPY) $(ROMFS_EXTRA_FILES) $(ROMFS_SCRATCH)/extras endif EXTRA_CLEANS += $(ROMGS_OBJ) $(ROMFS_IMG) diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 437b2484e..efcf4d12b 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -2874,12 +2874,12 @@ px4io_main(int argc, char *argv[]) } else { #if defined(CONFIG_ARCH_BOARD_PX4FMU_V1) - fn[0] = "/etc/~extras/px4io-v1_default.bin"; + fn[0] = "/etc/extras/px4io-v1_default.bin"; fn[1] = "/fs/microsd/px4io1.bin"; fn[2] = "/fs/microsd/px4io.bin"; fn[3] = nullptr; #elif defined(CONFIG_ARCH_BOARD_PX4FMU_V2) - fn[0] = "/etc/~extras/px4io-v2_default.bin"; + fn[0] = "/etc/extras/px4io-v2_default.bin"; fn[1] = "/fs/microsd/px4io2.bin"; fn[2] = "/fs/microsd/px4io.bin"; fn[3] = nullptr; |