diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-09-11 03:24:26 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-09-11 03:24:26 +0000 |
commit | 933bdd7122738de72b79110af1093f679dd2c15d (patch) | |
tree | fb5b80986e892f50ae7113413ff9a8f5599247e3 /nuttx | |
parent | 49df4c8bc3e19225c22f34b1290be89c2518e184 (diff) | |
download | px4-nuttx-933bdd7122738de72b79110af1093f679dd2c15d.tar.gz px4-nuttx-933bdd7122738de72b79110af1093f679dd2c15d.tar.bz2 px4-nuttx-933bdd7122738de72b79110af1093f679dd2c15d.zip |
Back out M25P support -- its not ready yet
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2939 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/Documentation/NuttxPortingGuide.html | 2 | ||||
-rw-r--r-- | nuttx/ReleaseNotes | 2 | ||||
-rw-r--r-- | nuttx/configs/README.txt | 2 | ||||
-rwxr-xr-x | nuttx/configs/ea3131/pgnsh/defconfig | 4 | ||||
-rwxr-xr-x | nuttx/configs/ea3131/src/up_fillpage.c | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index ed94849e7..63b2dc864 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -2596,7 +2596,7 @@ build <li> <code>CONFIG_PAGING_M25PX</code>: Use the m25px.c FLASH driver. - If this is selected, then the MTD interface to the MP25x device will be used to support paging. + If this is selected, then the MTD interface to the M25Px device will be used to support paging. </li> <li> <code>CONFIG_PAGING_M25PX_BINOFFSET</code>: diff --git a/nuttx/ReleaseNotes b/nuttx/ReleaseNotes index dbfda36bb..8120cf14f 100644 --- a/nuttx/ReleaseNotes +++ b/nuttx/ReleaseNotes @@ -1265,7 +1265,7 @@ for existing NuttX ports: 4-bpp greyscale support was integrated into the NX graphics sub-system and verified using the TI/Luminary LP3S6965 Ethernet Evaluation Kit. - * The MP25Px driver was extended for the M24P1 FLASH part (see NOTE). + * The M25Px driver was extended for the M24P1 FLASH part (see NOTE). * An I2C driver and (basic) SPI driver were added for the NXP LPC313x port. The I2C interface definition was extended to efficiently handle multiple I2C diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 1216de9d9..66111d791 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -421,7 +421,7 @@ defconfig -- This is a configuration file similar to the Linux CONFIG_PAGING_SDSLOT will instruct certain board-specific logic to initialize the media in this SD slot. CONFIG_PAGING_M25PX - Use the m25px.c FLASH driver. If this is selected, - then the MTD interface to the MP25x device will be used to support + then the MTD interface to the M25Px device will be used to support paging. CONFIG_PAGING_M25PX_BINOFFSET - If CONFIG_PAGING_M25PX is defined then CONFIG_PAGING_M25PX_BINOFFSET will be used to specify the offset diff --git a/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig index 87e06dc36..17e8ae075 100755 --- a/nuttx/configs/ea3131/pgnsh/defconfig +++ b/nuttx/configs/ea3131/pgnsh/defconfig @@ -425,7 +425,7 @@ CONFIG_SIG_SIGWORK=4 # CONFIG_PAGING_SDSLOT will instruct certain board-specific logic to # initialize the media in this SD slot. # CONFIG_PAGING_M25PX - Use the m25px.c FLASH driver. If this is selected, -# then the MTD interface to the MP25x device will be used to support +# then the MTD interface to the M25Px device will be used to support # paging. # CONFIG_PAGING_M25PX_BINOFFSET - If CONFIG_PAGING_M25PX is defined then # CONFIG_PAGING_M25PX_BINOFFSET will be used to specify the offset @@ -456,7 +456,7 @@ CONFIG_PAGING_BLOCKINGFILL=y CONFIG_PAGING_MOUNTPT="/mnt/pgsrc" CONFIG_PAGING_MINOR=0 CONFIG_PAGING_SDSLOT=0 -CONFIG_PAGING_M25PX=y +CONFIG_PAGING_M25PX=n CONFIG_PAGING_M25PX_BINOFFSET=0 CONFIG_PAGING_M25PX_SPIPORT=0 diff --git a/nuttx/configs/ea3131/src/up_fillpage.c b/nuttx/configs/ea3131/src/up_fillpage.c index 6aa7b7602..6058095d3 100755 --- a/nuttx/configs/ea3131/src/up_fillpage.c +++ b/nuttx/configs/ea3131/src/up_fillpage.c @@ -188,7 +188,7 @@ struct pg_source_s bool initialized; /* TRUE: we are initialized */ #endif - /* This is the MP25P* device state structure */ + /* This is the M25P* device state structure */ FAR struct mtd_dev_s *mtd; @@ -435,7 +435,7 @@ int up_fillpage(FAR _TCB *tcb, FAR void *vpage) #elif defined(CONFIG_PAGING_M25PX) /* !CONFIG_PAGING_BINPATH */ /* If CONFIG_PAGING_M25PX is defined, use the m25px.c FLASH driver. If this - * is selected, then the MTD interface to the MP25x device will be used to + * is selected, then the MTD interface to the M25Px device will be used to * support paging. * * If the driver is configured to use interrupts or DMA, then it must be @@ -524,7 +524,7 @@ void weak_function lpc313x_pginitialize(void) #elif defined(CONFIG_PAGING_M25PX) /* If CONFIG_PAGING_M25PX is defined, use the m25px.c FLASH driver. If this - * is selected, then the MTD interface to the MP25x device will be used to + * is selected, then the MTD interface to the M25Px device will be used to * support paging. * * If the driver is not configured to use interrupts or DMA, then it is |