Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Change how UARTs are enabled for i.MX, M16C, and ez80 to make them compatible with other chips

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5374 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-11-20 19:59:40 +00:00
parent 3d96b5eb07
commit c2a5d13fb7
28 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/eagle100/httpd/defconfig
+2 -2
View File
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6918 specific serial device driver settings # LM3S6918 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=256 CONFIG_UART0_TXBUFSIZE=256
configs/eagle100/nettest/defconfig
+2 -2
View File
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6918 specific serial device driver settings # LM3S6918 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=256 CONFIG_UART0_TXBUFSIZE=256
configs/eagle100/nsh/defconfig
+2 -2
View File
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6918 specific serial device driver settings # LM3S6918 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=256 CONFIG_UART0_TXBUFSIZE=256
configs/eagle100/nxflat/defconfig
+2 -2
View File
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6918 specific serial device driver settings # LM3S6918 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=256 CONFIG_UART0_TXBUFSIZE=256
configs/eagle100/ostest/defconfig
+2 -2
View File
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6918 specific serial device driver settings # LM3S6918 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=256 CONFIG_UART0_TXBUFSIZE=256
configs/eagle100/thttpd/defconfig
+2 -2
View File
@@ -69,8 +69,8 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6918 specific serial device driver settings # LM3S6918 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=256 CONFIG_UART0_TXBUFSIZE=256
configs/ekk-lm3s9b96/nsh/defconfig
+3 -3
View File
@@ -78,9 +78,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6B96 specific serial device driver settings # LM3S6B96 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART2_DISABLE=y CONFIG_LM3S_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/ekk-lm3s9b96/ostest/defconfig
+3 -3
View File
@@ -78,9 +78,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6B96 specific serial device driver settings # LM3S6B96 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART2_DISABLE=y CONFIG_LM3S_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/ez80f910200kitg/ostest/defconfig
+2 -2
View File
@@ -56,8 +56,8 @@ CONFIG_ARCH_TIMERHOOK=n
# #
# eZ80 specific device driver settings # eZ80 specific device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_EZ80_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_EZ80_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=0 CONFIG_UART0_TXBUFSIZE=0
configs/ez80f910200zco/dhcpd/defconfig
+2 -2
View File
@@ -57,8 +57,8 @@ CONFIG_ARCH_STACKDUMP=n
# #
# eZ80 specific device driver settings # eZ80 specific device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_EZ80_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_EZ80_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=0 CONFIG_UART0_TXBUFSIZE=0
configs/ez80f910200zco/httpd/defconfig
+2 -2
View File
@@ -57,8 +57,8 @@ CONFIG_ARCH_STACKDUMP=n
# #
# eZ80 specific device driver settings # eZ80 specific device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_EZ80_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_EZ80_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=0 CONFIG_UART0_TXBUFSIZE=0
configs/ez80f910200zco/nettest/defconfig
+2 -2
View File
@@ -57,8 +57,8 @@ CONFIG_ARCH_STACKDUMP=n
# #
# eZ80 specific device driver settings # eZ80 specific device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_EZ80_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_EZ80_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=0 CONFIG_UART0_TXBUFSIZE=0
configs/ez80f910200zco/nsh/defconfig
+2 -2
View File
@@ -57,8 +57,8 @@ CONFIG_ARCH_STACKDUMP=n
# #
# eZ80 specific device driver settings # eZ80 specific device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_EZ80_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_EZ80_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=64 CONFIG_UART0_TXBUFSIZE=64
configs/ez80f910200zco/ostest/defconfig
+2 -2
View File
@@ -56,8 +56,8 @@ CONFIG_ARCH_TIMERHOOK=y
# #
# eZ80 specific device driver settings # eZ80 specific device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_EZ80_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_EZ80_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=64 CONFIG_UART0_TXBUFSIZE=64
configs/ez80f910200zco/poll/defconfig
+2 -2
View File
@@ -57,8 +57,8 @@ CONFIG_ARCH_STACKDUMP=n
# #
# eZ80 specific device driver settings # eZ80 specific device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_EZ80_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_EZ80_UART1=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=0 CONFIG_UART0_TXBUFSIZE=0
configs/lm3s6432-s2e/nsh/defconfig
+3 -3
View File
@@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6432 specific serial device driver settings # LM3S6432 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=n CONFIG_LM3S_UART1=y
CONFIG_UART2_DISABLE=y CONFIG_LM3S_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=n CONFIG_UART0_SERIAL_CONSOLE=n
CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/lm3s6432-s2e/ostest/defconfig
+3 -3
View File
@@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6432 specific serial device driver settings # LM3S6432 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=n CONFIG_LM3S_UART1=y
CONFIG_UART2_DISABLE=y CONFIG_LM3S_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=n CONFIG_UART0_SERIAL_CONSOLE=n
CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/lm3s6432-s2e/src/up_boot.c
+1 -1
View File
@@ -54,7 +54,7 @@
* Definitions * Definitions
************************************************************************************/ ************************************************************************************/
#if !defined(CONFIG_UART1_DISABLE) && !defined(CONFIG_SSI0_DISABLE) #if defined(CONFIG_LM3S_UART1) && !defined(CONFIG_SSI0_DISABLE)
# error Only one of UART1 and SSI0 can be enabled on this board. # error Only one of UART1 and SSI0 can be enabled on this board.
#endif #endif
configs/lm3s6965-ek/nsh/defconfig
+3 -3
View File
@@ -78,9 +78,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6965 specific serial device driver settings # LM3S6965 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART2_DISABLE=y CONFIG_LM3S_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/lm3s6965-ek/nx/defconfig
+3 -3
View File
@@ -78,9 +78,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6965 specific serial device driver settings # LM3S6965 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART2_DISABLE=y CONFIG_LM3S_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/lm3s6965-ek/ostest/defconfig
+3 -3
View File
@@ -78,9 +78,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S6965 specific serial device driver settings # LM3S6965 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART2_DISABLE=y CONFIG_LM3S_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/lm3s8962-ek/nsh/defconfig
+3 -3
View File
@@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S8962 specific serial device driver settings # LM3S8962 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART2_DISABLE=y CONFIG_LM3S_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/lm3s8962-ek/nx/defconfig
+3 -3
View File
@@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S8962 specific serial device driver settings # LM3S8962 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART2_DISABLE=y CONFIG_LM3S_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/lm3s8962-ek/ostest/defconfig
+3 -3
View File
@@ -77,9 +77,9 @@ CONFIG_LM3S_DISABLE_GPIOJ_IRQS=y
# #
# LM3S8962 specific serial device driver settings # LM3S8962 specific serial device driver settings
# #
CONFIG_UART0_DISABLE=n CONFIG_LM3S_UART0=y
CONFIG_UART1_DISABLE=y CONFIG_LM3S_UART1=n
CONFIG_UART2_DISABLE=y CONFIG_LM3S_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/mx1ads/ostest/defconfig
+3 -3
View File
@@ -59,9 +59,9 @@ CONFIG_ARCH_ROMPGTABLE=n
# #
# IMX specific serial device driver settings # IMX specific serial device driver settings
# #
CONFIG_UART1_DISABLE=n CONFIG_IMX_UART1=y
CONFIG_UART2_DISABLE=y CONFIG_IMX_UART2=n
CONFIG_UART3_DISABLE=y CONFIG_IMX_UART3=n
CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
CONFIG_UART3_SERIAL_CONSOLE=n CONFIG_UART3_SERIAL_CONSOLE=n
configs/skp16c26/include/board.h
+1 -1
View File
@@ -57,7 +57,7 @@
* To be safe, we will error out on either selection: * To be safe, we will error out on either selection:
*/ */
#if !defined(CONFIG_UART1_DISABLE) || !defined(CONFIG_UART2_DISABLE) #if defined(CONFIG_M16C_UART1) || defined(CONFIG_M16C_UART2)
# error "UART1/2 should not be used on SKP16C26" # error "UART1/2 should not be used on SKP16C26"
#endif #endif
configs/skp16c26/ostest/defconfig
+3 -3
View File
@@ -57,9 +57,9 @@ CONFIG_ARCH_LCD=y
# #
# M16C specific device driver settings # M16C specific device driver settings
# #
CONFIG_UART0_DISABLE=y CONFIG_M16C_UART0=n
CONFIG_UART1_DISABLE=y CONFIG_M16C_UART1=n
CONFIG_UART2_DISABLE=y CONFIG_M16C_UART2=n
CONFIG_UART0_SERIAL_CONSOLE=n CONFIG_UART0_SERIAL_CONSOLE=n
CONFIG_UART1_SERIAL_CONSOLE=n CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART2_SERIAL_CONSOLE=n CONFIG_UART2_SERIAL_CONSOLE=n
configs/skp16c26/src/up_lcdconsole.c
+3 -3
View File
@@ -46,11 +46,11 @@
/* Only use the LCD as a console if there are is no serial console */ /* Only use the LCD as a console if there are is no serial console */
#if defined(CONFIG_UART0_SERIAL_CONSOLE) && !defined(CONFIG_UART0_DISABLE) #if defined(CONFIG_UART0_SERIAL_CONSOLE) && defined(CONFIG_M16C_UART0)
# define HAVE_SERIALCONSOLE 1 # define HAVE_SERIALCONSOLE 1
#elif defined(CONFIG_UART1_SERIAL_CONSOLE) && !defined(CONFIG_UART1_DISABLE) #elif defined(CONFIG_UART1_SERIAL_CONSOLE) && defined(CONFIG_M16C_UART1)
# define HAVE_SERIALCONSOLE 1 # define HAVE_SERIALCONSOLE 1
#elif defined(CONFIG_UART2_SERIAL_CONSOLE) && !defined(CONFIG_UART2_DISABLE) #elif defined(CONFIG_UART2_SERIAL_CONSOLE) && defined(CONFIG_M16C_UART2)
# define HAVE_SERIALCONSOLE 1 # define HAVE_SERIALCONSOLE 1
#else #else
# undef HAVE_SERIALCONSOLE # undef HAVE_SERIALCONSOLE