qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 11:02:26 +02:00
Code

Corrected dfboot issue with ttyS2 and ttyS3

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7566 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hcg 2007-06-11 14:54:14 +00:00
parent 4e62f97b5c
commit 60e51cd89c
2 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
target/linux/at91-2.6/config/default
View File

@ -242,7 +242,7 @@ CONFIG_PHYLIB=y
# CONFIG_ROMFS_FS is not set # CONFIG_ROMFS_FS is not set
CONFIG_RTC_LIB=y CONFIG_RTC_LIB=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_SCSI is not set # CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SERIAL_8250 is not set # CONFIG_SERIAL_8250 is not set
CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL=y
CONFIG_SERIAL_ATMEL_CONSOLE=y CONFIG_SERIAL_ATMEL_CONSOLE=y
@ -260,8 +260,58 @@ CONFIG_SYSVIPC_SYSCTL=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_UID16=y CONFIG_UID16=y
# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_USB is not set
# CONFIG_USB_ARCH_HAS_EHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set
# CONFIG_USB_ATM is not set
# CONFIG_USB_CATC is not set
# CONFIG_USB_GTCO is not set
# CONFIG_USB_KAWETH is not set
CONFIG_USB_LIBUSUAL=y
CONFIG_USB_MON=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_SERIAL_AIRCABLE is not set
# CONFIG_USB_SERIAL_AIRPRIME is not set
# CONFIG_USB_SERIAL_ARK3116 is not set
# CONFIG_USB_SERIAL_BELKIN is not set
# CONFIG_USB_SERIAL_CP2101 is not set
# CONFIG_USB_SERIAL_CYBERJACK is not set
# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
# CONFIG_USB_SERIAL_EDGEPORT is not set
# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
# CONFIG_USB_SERIAL_EMPEG is not set
# CONFIG_USB_SERIAL_FTDI_SIO is not set
# CONFIG_USB_SERIAL_FUNSOFT is not set
# CONFIG_USB_SERIAL_GARMIN is not set
# CONFIG_USB_SERIAL_HP4X is not set
# CONFIG_USB_SERIAL_IPAQ is not set
# CONFIG_USB_SERIAL_IPW is not set
# CONFIG_USB_SERIAL_IR is not set
# CONFIG_USB_SERIAL_KEYSPAN is not set
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_KOBIL_SCT is not set
# CONFIG_USB_SERIAL_MCT_U232 is not set
# CONFIG_USB_SERIAL_MOS7720 is not set
# CONFIG_USB_SERIAL_MOS7840 is not set
# CONFIG_USB_SERIAL_NAVMAN is not set
# CONFIG_USB_SERIAL_OMNINET is not set
# CONFIG_USB_SERIAL_OPTION is not set
# CONFIG_USB_SERIAL_PL2303 is not set
# CONFIG_USB_SERIAL_SAFE is not set
# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
# CONFIG_USB_SERIAL_TI is not set
# CONFIG_USB_SERIAL_VISOR is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
# CONFIG_USB_SERIAL_XIRCOM is not set
# CONFIG_USB_STORAGE is not set
# CONFIG_USB_USBNET is not set
# CONFIG_USB_USBNET_MII is not set
# CONFIG_USB_YEALINK is not set
CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VECTORS_BASE=0xffff0000
# CONFIG_VGA_CONSOLE is not set # CONFIG_VGA_CONSOLE is not set
CONFIG_VT=y CONFIG_VT=y

11
target/linux/at91-2.6/image/dfboot/src/com.c
View File

@ -21,7 +21,10 @@
static char erase_seq[] = "\b \b"; /* erase sequence */ static char erase_seq[] = "\b \b"; /* erase sequence */
unsigned int usa[2] = {(unsigned int)AT91C_BASE_DBGU, (unsigned int)AT91C_ALTERNATE_USART}; #define MAX_UARTS 1
//unsigned int usa[2] = {(unsigned int)AT91C_BASE_DBGU, (unsigned int)AT91C_ALTERNATE_USART};
unsigned int usa[1] = {(unsigned int)AT91C_BASE_DBGU};
unsigned int us; unsigned int us;
int port_detected; int port_detected;
@ -34,7 +37,7 @@ void at91_init_uarts(void)
AT91F_US0_CfgPIO(); AT91F_US0_CfgPIO();
AT91F_US0_CfgPMC(); AT91F_US0_CfgPMC();
for(i=0; i<2; i++) { for(i=0; i<MAX_UARTS; i++) {
us = usa[i]; us = usa[i];
AT91F_US_ResetRx((AT91PS_USART)us); AT91F_US_ResetRx((AT91PS_USART)us);
AT91F_US_ResetTx((AT91PS_USART)us); AT91F_US_ResetTx((AT91PS_USART)us);
@ -74,6 +77,7 @@ int at91_serial_putc(int ch)
int at91_serial_getc() int at91_serial_getc()
{ {
while(1) { while(1) {
#if 0
if (!port_detected) { if (!port_detected) {
if (us == usa[0]) { if (us == usa[0]) {
us = usa[1]; us = usa[1];
@ -82,8 +86,11 @@ int at91_serial_getc()
us = usa[0]; us = usa[0];
} }
} }
#endif
if(AT91F_US_RxReady((AT91PS_USART)us)) { if(AT91F_US_RxReady((AT91PS_USART)us)) {
#if 0
port_detected = 1; port_detected = 1;
#endif
return((int)AT91F_US_GetChar((AT91PS_USART)us)); return((int)AT91F_US_GetChar((AT91PS_USART)us));
} }
} }