sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PIC32MZ: Correct a few more DEVCFG issues

Browse Source
This commit is contained in:
Gregory Nutt 2015-02-27 16:20:28 -06:00
parent 98d34e4cf8
commit 55e21bf045
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/mips/src/pic32mz/Kconfig
View File

@ -340,8 +340,8 @@ menu "Device Configuration 0 (DEVCFG0)"
config PIC32MZ_DEBUGGER_ENABLE config PIC32MZ_DEBUGGER_ENABLE
bool "Background debugger enable" bool "Background debugger enable"
default y if CONFIG_DEBUG default y if DEBUG
default n if !CONFIG_DEBUG default n if !DEBUG
---help--- ---help---
Background Debugger Enable Background Debugger Enable
@ -359,8 +359,8 @@ config PIC32MZ_ICESEL_CH2
config PIC32MZ_TRACE_ENABLE config PIC32MZ_TRACE_ENABLE
bool "Trace enable" bool "Trace enable"
default y if CONFIG_DEBUG default y if DEBUG
default n if !CONFIG_DEBUG default n if !DEBUG
---help--- ---help---
Trace Enable Trace Enable
@ -368,7 +368,7 @@ endmenu
menu "Device Configuration 1 (DEVCFG1)" menu "Device Configuration 1 (DEVCFG1)"
config CONFIG_PIC32MZ_OSCIOFNC config PIC32MZ_OSCIOFNC
int "CLKO Enable" int "CLKO Enable"
default 1 default 1
range 0 1 range 0 1
@ -434,7 +434,8 @@ config PIC32MZ_FETHIO
config PIC32MZ_FUSBIDIO config PIC32MZ_FUSBIDIO
int "USB USBID selection" int "USB USBID selection"
default 1 default 0 if !PIC32MZ_ETHERNET
default 1 if PIC32MZ_ETHERNET
range 0 1 range 0 1
---help--- ---help---
USB USBID selection USB USBID selection

6
arch/mips/src/pic32mz/pic32mz-config.h
View File

@ -176,9 +176,9 @@
#ifndef CONFIG_PIC32MZ_FUSBIDIO /* USB USBID selection: 0=GPIO 1=USB */ #ifndef CONFIG_PIC32MZ_FUSBIDIO /* USB USBID selection: 0=GPIO 1=USB */
# ifdef CONFIG_PIC32MZ_USB # ifdef CONFIG_PIC32MZ_USB
# define CONFIG_PIC32MZ_FUSBIDIO 0 /* USBID pin is controlled by the IOPORT configuration */
# else
# define CONFIG_PIC32MZ_FUSBIDIO 1 /* USBID pin is controlled by the USB module */ # define CONFIG_PIC32MZ_FUSBIDIO 1 /* USBID pin is controlled by the USB module */
# else
# define CONFIG_PIC32MZ_FUSBIDIO 0 /* USBID pin is controlled by the IOPORT configuration */
# endif # endif
#endif #endif
@ -230,7 +230,7 @@
#undef CONFIG_PIC32MZ_PLLMULT #undef CONFIG_PIC32MZ_PLLMULT
#if BOARD_PLL_MULT >= 1 && BOARD_PLL_MULT <= 128 #if BOARD_PLL_MULT >= 1 && BOARD_PLL_MULT <= 128
# define CONFIG_PIC32MZ_PLLMULT ((BOARD_PLL_MULT-1) << DEVCFG2_FPLLIDIV_SHIFT) # define CONFIG_PIC32MZ_PLLMULT ((BOARD_PLL_MULT-1) << DEVCFG2_FPLLMULT_SHIFT)
#else #else
# error "Unsupported BOARD_PLL_MULT" # error "Unsupported BOARD_PLL_MULT"
#endif #endif

2
audio/Kconfig
View File

@ -215,7 +215,7 @@ endif
# These are here as placeholders of what could be added # These are here as placeholders of what could be added
if CONFIG_AUDIO_PLANNED if AUDIO_PLANNED
config AUDIO_MIXER config AUDIO_MIXER
bool "Planned - Enable support for the software based Audio Mixer" bool "Planned - Enable support for the software based Audio Mixer"

8
configs/pic32mz-starterkit/nsh/defconfig
View File

@ -159,19 +159,19 @@ CONFIG_PIC32MZ_ICESEL_CH2=y
# #
# Device Configuration 1 (DEVCFG1) # Device Configuration 1 (DEVCFG1)
# #
CONFIG_CONFIG_PIC32MZ_OSCIOFNC=1 CONFIG_PIC32MZ_OSCIOFNC=1
# CONFIG_PIC32MZ_WDTENABLE is not set # CONFIG_PIC32MZ_WDTENABLE is not set
# #
# Device Configuration 3 (DEVCFG3) # Device Configuration 3 (DEVCFG3)
# #
CONFIG_PIC32MZ_USERID=0x584e CONFIG_PIC32MZ_USERID=0x584e
CONFIG_PIC32MZ_FMIIEN=0 CONFIG_PIC32MZ_FMIIEN=1
CONFIG_PIC32MZ_PGL1WAY=0 CONFIG_PIC32MZ_PGL1WAY=0
CONFIG_PIC32MZ_PMDL1WAY=0 CONFIG_PIC32MZ_PMDL1WAY=0
CONFIG_PIC32MZ_IOL1WAY=0 CONFIG_PIC32MZ_IOL1WAY=0
CONFIG_PIC32MZ_FETHIO=0 CONFIG_PIC32MZ_FETHIO=1
CONFIG_PIC32MZ_FUSBIDIO=1 CONFIG_PIC32MZ_FUSBIDIO=0
# #
# Architecture Options # Architecture Options