diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-06-20 22:29:32 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-06-20 22:29:32 +0000 |
| commit | 9131505b5107e586eb50f8eb6db0acc6abd82cb8 (patch) | |
| tree | da37de7c8b11db07eef02a465e133c5286d9dd2f /nuttx/arch/mips/src/pic32mx/pic32mx-head.S | |
| parent | 1254530bf9521a70e5d43994e35ba911f25a6955 (diff) | |
| download | nuttx-9131505b5107e586eb50f8eb6db0acc6abd82cb8.tar.gz nuttx-9131505b5107e586eb50f8eb6db0acc6abd82cb8.tar.bz2 nuttx-9131505b5107e586eb50f8eb6db0acc6abd82cb8.zip | |
More updates for PIC32 MX1/2 device configuration bits
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4857 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/mips/src/pic32mx/pic32mx-head.S')
| -rw-r--r-- | nuttx/arch/mips/src/pic32mx/pic32mx-head.S | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-head.S b/nuttx/arch/mips/src/pic32mx/pic32mx-head.S index 3e9cfeb46..7224ee122 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-head.S +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-head.S @@ -614,21 +614,41 @@ devconfig3: devconfig2: .long CONFIG_PIC32MX_PLLIDIV | CONFIG_PIC32MX_PLLMULT | \ CONFIG_PIC32MX_UPLLIDIV | CONFIG_PIC32MX_PLLODIV | \ - DEVCFG2_UNUSED + CONFIG_PIC32MX_FUPLLEN << 15 | DEVCFG2_UNUSED devconfig1: +#if defined(CHIP_PIC32MX1) || defined(CHIP_PIC32MX2) + .long CONFIG_PIC32MX_FNOSC | CONFIG_PIC32MX_FSOSCEN | \ + CONFIG_PIC32MX_IESO | CONFIG_PIC32MX_POSCMOD | \ + CONFIG_PIC32MX_OSCOUT << 10 | \ + CONFIG_PIC32MX_PBDIV | CONFIG_PIC32MX_FCKSM | \ + DEVCFG1_WINDIS | CONFIG_PIC32MX_WDENABLE | \ + DEVCFG1_FWDTWINSZ_75 | DEVCFG1_UNUSED +#else .long CONFIG_PIC32MX_FNOSC | CONFIG_PIC32MX_FSOSCEN | \ CONFIG_PIC32MX_IESO | CONFIG_PIC32MX_POSCMOD | \ + CONFIG_PIC32MX_OSCOUT << 10 | \ CONFIG_PIC32MX_PBDIV | CONFIG_PIC32MX_FCKSM | \ CONFIG_PIC32MX_WDENABLE | DEVCFG1_UNUSED +#endif devconfig0: +#if defined(CHIP_PIC32MX1) || defined(CHIP_PIC32MX2) + .long CONFIG_PIC32MX_DEBUGGER << DEVCFG0_DEBUG_SHIFT | \ + DEVCFG0_JTAGEN | \ + CONFIG_PIC32MX_ICESEL << DEVCFG0_ICESEL_SHIFT | \ + CONFIG_PIC32MX_PROGFLASHWP << DEVCFG0_PWP_SHIFT | \ + CONFIG_PIC32MX_BOOTFLASHWP << 24 | \ + CONFIG_PIC32MX_CODEWP << 28 | \ + DEVCFG0_UNUSED +#else .long CONFIG_PIC32MX_DEBUGGER << DEVCFG0_DEBUG_SHIFT | \ CONFIG_PIC32MX_ICESEL << 3 | \ CONFIG_PIC32MX_PROGFLASHWP << DEVCFG0_PWP_SHIFT | \ CONFIG_PIC32MX_BOOTFLASHWP << 24 | \ CONFIG_PIC32MX_CODEWP << 28 | \ DEVCFG0_UNUSED +#endif .size devconfig, .-devconfig /**************************************************************************** |