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

Use UART1 for the console on the SAM4S-Xplained not USART0

Browse Source
This commit is contained in:
Gregory Nutt 2013-06-11 19:24:47 -06:00
parent ea776434ba
commit a42a382b70
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/sam34/Kconfig
View File

@ -243,7 +243,7 @@ config SAM34_UART0
depends on ARCH_CHIP_SAM3U || ARCH_CHIP_SAM4S depends on ARCH_CHIP_SAM3U || ARCH_CHIP_SAM4S
select ARCH_HAVE_UART0 select ARCH_HAVE_UART0
config SAM43_UART1 config SAM34_UART1
bool "UART 1" bool "UART 1"
default n default n
depends on ARCH_CHIP_SAM4S depends on ARCH_CHIP_SAM4S

9
arch/arm/src/sam34/chip/sam3u_pmc.h
View File

@ -181,7 +181,7 @@
* Peripheral Clock Status Register common bit-field definitions. * Peripheral Clock Status Register common bit-field definitions.
*/ */
#define PMC_PID(n) (1 << (n)) #define PMC_PIDL(n) (1 << (n))
#define PMC_PID2 (1 << 2) /* Bit 2: Peripheral Clock 2 Enable */ #define PMC_PID2 (1 << 2) /* Bit 2: Peripheral Clock 2 Enable */
#define PMC_PID3 (1 << 3) /* Bit 3: Peripheral Clock 3 Enable */ #define PMC_PID3 (1 << 3) /* Bit 3: Peripheral Clock 3 Enable */
#define PMC_PID4 (1 << 4) /* Bit 4: Peripheral Clock 4 Enable */ #define PMC_PID4 (1 << 4) /* Bit 4: Peripheral Clock 4 Enable */
@ -443,9 +443,10 @@
/* Peripheral Clock Status Register 1 */ /* Peripheral Clock Status Register 1 */
#if defined(CONFIG_ARCH_CHIP_SAM4S) #if defined(CONFIG_ARCH_CHIP_SAM4S)
# define PMC_PIC32 (1 << 0) /* Bit 0: PID32 */ # define PMC_PIDH(n) (1 << ((n) - 32))
# define PMC_PIC33 (1 << 1) /* Bit 1: PID33 */ # define PMC_PID32 (1 << 0) /* Bit 0: PID32 */
# define PMC_PIC34 (1 << 2) /* Bit 2: PID34 */ # define PMC_PID33 (1 << 1) /* Bit 1: PID33 */
# define PMC_PID34 (1 << 2) /* Bit 2: PID34 */
#endif #endif
/* Oscillator Calibration Register */ /* Oscillator Calibration Register */