diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-22 13:25:52 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-22 13:25:52 +0200 |
| commit | 05648d80d25febd220bac503aad3756d6dc5401b (patch) | |
| tree | 0442a564409a6aeecea80d07bdc1802f48b9fc63 /src/systemcmds/mtd/mtd.c | |
| parent | a6a2efb651d875171aaec698a836f26b548ca0d6 (diff) | |
| parent | 9ea0b2189992830f2698c7d4703ff472072a61b1 (diff) | |
| download | px4-firmware-05648d80d25febd220bac503aad3756d6dc5401b.tar.gz px4-firmware-05648d80d25febd220bac503aad3756d6dc5401b.tar.bz2 px4-firmware-05648d80d25febd220bac503aad3756d6dc5401b.zip | |
Merge remote-tracking branch 'upstream/master' into geo
Conflicts:
src/modules/commander/commander.cpp
src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
Diffstat (limited to 'src/systemcmds/mtd/mtd.c')
| -rw-r--r-- | src/systemcmds/mtd/mtd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/systemcmds/mtd/mtd.c b/src/systemcmds/mtd/mtd.c index 0a88d40f3..a57eaafe7 100644 --- a/src/systemcmds/mtd/mtd.c +++ b/src/systemcmds/mtd/mtd.c @@ -160,7 +160,11 @@ static void ramtron_attach(void) { /* find the right spi */ +#ifdef CONFIG_ARCH_BOARD_AEROCORE + struct spi_dev_s *spi = up_spiinitialize(4); +#else struct spi_dev_s *spi = up_spiinitialize(2); +#endif /* this resets the spi bus, set correct bus speed again */ SPI_SETFREQUENCY(spi, 10 * 1000 * 1000); SPI_SETBITS(spi, 8); |