diff options
author | David Sidrane <david_s5@nscdg.com> | 2015-02-25 08:09:24 -1000 |
---|---|---|
committer | David Sidrane <david_s5@nscdg.com> | 2015-02-25 08:09:24 -1000 |
commit | 329731c2693ebcdd64bed72f92bdfdd14562eb7b (patch) | |
tree | ce52ef4b66f807d669a0529914f24c73ad1996a3 | |
parent | 1062748facfc4dc31e34b050295d9b080fa908b9 (diff) | |
parent | e97528bdd0076b14f02a4edaacf28bf0ebfe01bb (diff) | |
download | px4-firmware-329731c2693ebcdd64bed72f92bdfdd14562eb7b.tar.gz px4-firmware-329731c2693ebcdd64bed72f92bdfdd14562eb7b.tar.bz2 px4-firmware-329731c2693ebcdd64bed72f92bdfdd14562eb7b.zip |
Merge branch 'nuttx_next' of https://github.com/PX4/Firmware into nuttx_next
-rwxr-xr-x | nuttx-configs/mavstation/scripts/ld.script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx-configs/mavstation/scripts/ld.script b/nuttx-configs/mavstation/scripts/ld.script index 5986eebf0..fe993ee7b 100755 --- a/nuttx-configs/mavstation/scripts/ld.script +++ b/nuttx-configs/mavstation/scripts/ld.script @@ -42,7 +42,7 @@ MEMORY { - flash (rx) : ORIGIN = 0x08002000, LENGTH = 120K + flash (rx) : ORIGIN = 0x08003000, LENGTH = 116K sram (rwx) : ORIGIN = 0x20000000, LENGTH = 16K } |