diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-01-09 18:15:02 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-01-09 18:15:02 +0000 |
| commit | 4a6b5ec135f4a952fbe23640c01b9b0f3f90bf2b (patch) | |
| tree | 1b4d1241dd040eb89cb7451ba59448a0ca600797 /nuttx/configs/lm3s8962-ek/src | |
| parent | 25f65f6524fe5c6508de38300796e1183051ab3b (diff) | |
| download | px4-nuttx-4a6b5ec135f4a952fbe23640c01b9b0f3f90bf2b.tar.gz px4-nuttx-4a6b5ec135f4a952fbe23640c01b9b0f3f90bf2b.tar.bz2 px4-nuttx-4a6b5ec135f4a952fbe23640c01b9b0f3f90bf2b.zip | |
Change naming of all Stellaris pre-processor symbols from LM3S_ to LM_ to make room in the namespace for LM4F
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5498 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/lm3s8962-ek/src')
| -rw-r--r-- | nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h | 4 | ||||
| -rw-r--r-- | nuttx/configs/lm3s8962-ek/src/up_boot.c | 7 | ||||
| -rw-r--r-- | nuttx/configs/lm3s8962-ek/src/up_ethernet.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h b/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h index 7fc8fa331..3f989bc13 100644 --- a/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h +++ b/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h @@ -56,12 +56,12 @@ * expanded). */ -#if LM3S_NSSI == 0 +#if LM_NSSI == 0 # undef CONFIG_SSI0_DISABLE # define CONFIG_SSI0_DISABLE 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 -#elif LM3S_NSSI == 1 +#elif LM_NSSI == 1 # undef CONFIG_SSI1_DISABLE # define CONFIG_SSI1_DISABLE 1 #endif diff --git a/nuttx/configs/lm3s8962-ek/src/up_boot.c b/nuttx/configs/lm3s8962-ek/src/up_boot.c index 8dc5b81cc..655aa6993 100644 --- a/nuttx/configs/lm3s8962-ek/src/up_boot.c +++ b/nuttx/configs/lm3s8962-ek/src/up_boot.c @@ -64,9 +64,10 @@ * Name: lm_boardinitialize * * Description: - * All LM3S architectures must provide the following entry point. This entry point - * is called early in the intitialization -- after all memory has been configured - * and mapped but before any devices have been initialized. + * All Stellaris architectures must provide the following entry point. This entry + * point is called early in the intitialization -- after all memory has been + * configured and mapped but before any devices have been initialized. + * ************************************************************************************/ void lm_boardinitialize(void) diff --git a/nuttx/configs/lm3s8962-ek/src/up_ethernet.c b/nuttx/configs/lm3s8962-ek/src/up_ethernet.c index 0d73233a4..63c681af9 100644 --- a/nuttx/configs/lm3s8962-ek/src/up_ethernet.c +++ b/nuttx/configs/lm3s8962-ek/src/up_ethernet.c @@ -80,8 +80,8 @@ void lm_ethernetmac(struct ether_addr *ethaddr) /* Get the current value of the user registers */ - user0 = getreg32(LM3S_FLASH_USERREG0); - user1 = getreg32(LM3S_FLASH_USERREG1); + user0 = getreg32(LM_FLASH_USERREG0); + user1 = getreg32(LM_FLASH_USERREG1); nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); |