diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-14 15:45:49 +0100 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-14 15:45:49 +0100 |
| commit | 97e4522c76c7859f893c7159f7a86f586fd0789b (patch) | |
| tree | 32a06f61c67bad4e4b574c0f6bb5d03cc58100bb /ROMFS | |
| parent | 7bcddd192fba723d165957043163762b2e08d802 (diff) | |
| parent | b529e112b8ffaa92274f9dc5d94a1fce581a358e (diff) | |
| download | px4-firmware-97e4522c76c7859f893c7159f7a86f586fd0789b.tar.gz px4-firmware-97e4522c76c7859f893c7159f7a86f586fd0789b.tar.bz2 px4-firmware-97e4522c76c7859f893c7159f7a86f586fd0789b.zip | |
Merge branch 'master' into navigator_new_vector
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 90f2e2b17..d66c2c54c 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -75,14 +75,15 @@ then # # Load microSD params # - #if ramtron start - #then - # param select /ramtron/params - # if [ -f /ramtron/params ] - # then - # param load /ramtron/params - # fi - #else + if mtd start + then + param select /fs/mtd_params + if param load /fs/mtd_params + then + else + echo "FAILED LOADING PARAMS" + fi + else param select /fs/microsd/params if [ -f /fs/microsd/params ] then @@ -93,7 +94,7 @@ then echo "Parameter file corrupt - ignoring" fi fi - #fi + fi # # Start system state indicator |