diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-18 22:27:55 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-18 22:27:55 +0200 |
| commit | 94084ec22abd3c08cdd06783483e827ed8b7fd66 (patch) | |
| tree | 3343972fe47028824428861a12b796576fe8f9d9 /nuttx | |
| parent | 5f2601836524055c3eb046535d53a38b0749ca52 (diff) | |
| download | px4-firmware-94084ec22abd3c08cdd06783483e827ed8b7fd66.tar.gz px4-firmware-94084ec22abd3c08cdd06783483e827ed8b7fd66.tar.bz2 px4-firmware-94084ec22abd3c08cdd06783483e827ed8b7fd66.zip | |
Enable support for RAMTRON, enable support for EEPROM on FMU 1.x
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/configs/px4fmu/nsh/appconfig | 1 | ||||
| -rw-r--r-- | nuttx/configs/px4fmuv2/nsh/appconfig | 6 | ||||
| -rwxr-xr-x | nuttx/configs/px4fmuv2/nsh/defconfig | 4 | ||||
| -rw-r--r-- | nuttx/drivers/mtd/ramtron.c | 8 |
4 files changed, 13 insertions, 6 deletions
diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig index d642b4692..9092e9541 100644 --- a/nuttx/configs/px4fmu/nsh/appconfig +++ b/nuttx/configs/px4fmu/nsh/appconfig @@ -65,7 +65,6 @@ CONFIGURED_APPS += systemcmds/perf CONFIGURED_APPS += systemcmds/top CONFIGURED_APPS += systemcmds/boardinfo CONFIGURED_APPS += systemcmds/mixer -CONFIGURED_APPS += systemcmds/eeprom CONFIGURED_APPS += systemcmds/param CONFIGURED_APPS += systemcmds/pwm CONFIGURED_APPS += systemcmds/bl_update diff --git a/nuttx/configs/px4fmuv2/nsh/appconfig b/nuttx/configs/px4fmuv2/nsh/appconfig index fff140673..9e3f50a13 100644 --- a/nuttx/configs/px4fmuv2/nsh/appconfig +++ b/nuttx/configs/px4fmuv2/nsh/appconfig @@ -65,9 +65,7 @@ CONFIGURED_APPS += systemcmds/perf CONFIGURED_APPS += systemcmds/top CONFIGURED_APPS += systemcmds/boardinfo CONFIGURED_APPS += systemcmds/mixer -# No I2C EEPROM - need new param interface -#CONFIGURED_APPS += systemcmds/eeprom -#CONFIGURED_APPS += systemcmds/param +CONFIGURED_APPS += systemcmds/param CONFIGURED_APPS += systemcmds/pwm CONFIGURED_APPS += systemcmds/bl_update CONFIGURED_APPS += systemcmds/preflight_check @@ -95,10 +93,8 @@ CONFIGURED_APPS += sdlog CONFIGURED_APPS += sensors ifneq ($(CONFIG_APM),y) -#CONFIGURED_APPS += ardrone_interface CONFIGURED_APPS += multirotor_att_control CONFIGURED_APPS += multirotor_pos_control -#CONFIGURED_APPS += fixedwing_control CONFIGURED_APPS += fixedwing_att_control CONFIGURED_APPS += fixedwing_pos_control CONFIGURED_APPS += position_estimator diff --git a/nuttx/configs/px4fmuv2/nsh/defconfig b/nuttx/configs/px4fmuv2/nsh/defconfig index beeb47551..d10309580 100755 --- a/nuttx/configs/px4fmuv2/nsh/defconfig +++ b/nuttx/configs/px4fmuv2/nsh/defconfig @@ -365,6 +365,10 @@ CONFIG_I2C_RESET=y # XXX fixed per-transaction timeout CONFIG_STM32_I2CTIMEOMS=10 +# +# MTD support +# +CONFIG_MTD=y # XXX re-enable after integration testing diff --git a/nuttx/drivers/mtd/ramtron.c b/nuttx/drivers/mtd/ramtron.c index 34273bccf..45aff59cc 100644 --- a/nuttx/drivers/mtd/ramtron.c +++ b/nuttx/drivers/mtd/ramtron.c @@ -162,6 +162,14 @@ struct ramtron_dev_s static struct ramtron_parts_s ramtron_parts[] = { { + "FM25V01", /* name */ + 0x21, /* id1 */ + 0x00, /* id2 */ + 16L*1024L, /* size */ + 2, /* addr_len */ + 40000000 /* speed */ + }, + { "FM25V02", /* name */ 0x22, /* id1 */ 0x00, /* id2 */ |