r885 - cpu/x86/pc/neptune

Author: wmb
Date: 2008-08-20 10:00:54 +0200 (Wed, 20 Aug 2008)
New Revision: 885

Modified:
   cpu/x86/pc/neptune/gpioinit.fth
   cpu/x86/pc/neptune/msrinit.fth
   cpu/x86/pc/neptune/romreset.bth
   cpu/x86/pc/neptune/vsapci.fth
Log:
Neptune - enable UART2.

Modified: cpu/x86/pc/neptune/gpioinit.fth
===================================================================
--- cpu/x86/pc/neptune/gpioinit.fth	2008-08-20 02:03:20 UTC (rev 884)
+++ cpu/x86/pc/neptune/gpioinit.fth	2008-08-20 08:00:54 UTC (rev 885)
@@ -35,8 +35,8 @@
 : gpio-init  ( -- )
    h# 0000 h# 1090 pl!  h# c802 h# 1010 pl!  \ Output AUX1
    h# 0000 h# 1094 pl!  h#  100 h# 1014 pl!  \ Output AUX2
-   h# 0900 h# 1084 pl!  h# c91a h# 1004 pl!  \ Output Enable
-   h# 1600 h# 10a0 pl!  h# f6f5 h# 1020 pl!  \ Input Enable
+   h# 0900 h# 1084 pl!  h# c912 h# 1004 pl!  \ Output Enable
+   h# 1600 h# 10a0 pl!  h# f6e5 h# 1020 pl!  \ Input Enable
    h# 1200 h# 10b4 pl!  h# c604 h# 1034 pl!  \ Input AUX1

h# 0000 h# 10a4 pl!  h# 3081 h# 1024 pl!  \ Input Invert (Int lines)

Modified: cpu/x86/pc/neptune/msrinit.fth
===================================================================
--- cpu/x86/pc/neptune/msrinit.fth	2008-08-20 02:03:20 UTC (rev 884)
+++ cpu/x86/pc/neptune/msrinit.fth	2008-08-20 08:00:54 UTC (rev 885)
@@ -224,7 +224,7 @@
 \ msr: 5140.001c 00000000.00000777.  \ NANDF_CTL - default
   msr: 5140.001f 00000000.00000011.  \ KEL_CTRL
   msr: 5140.0020 00000000.bb350a00.  \ IRQM_YLOW
-  msr: 5140.0021 00000000.04000000.  \ IRQM_YHIGH
+  msr: 5140.0021 00000000.34000000.  \ IRQM_YHIGH
   msr: 5140.0022 00000000.00002222.  \ IRQM_ZLOW
 \ msr: 5140.0023 00000000.600aa5b2.  \ IRQM_ZHIGH
 \ teo was here

Modified: cpu/x86/pc/neptune/romreset.bth
===================================================================
--- cpu/x86/pc/neptune/romreset.bth	2008-08-20 02:03:20 UTC (rev 884)
+++ cpu/x86/pc/neptune/romreset.bth	2008-08-20 08:00:54 UTC (rev 885)
@@ -67,16 +67,21 @@
     \ enable GPIO 8 to OUT AUX1, 9 to IN_AUX1
     100 dup 1004 port-wl 1010 port-wl \ GPIOL_OUTPUT_ENABLE, GPIOL_OUT_AUX1_SELECT
     200 dup 1020 port-wl 1034 port-wl  \ GPIOL_INPUT_ENABLE, GPIOL_IN_AUX1_SELECT
+    \ enable GPIO 4 to OUT AUX1, 3 to IN_AUX1
+    010 dup 1004 port-wl 1010 port-wl \ GPIOL_OUTPUT_ENABLE, GPIOL_OUT_AUX1_SELECT
+    008 dup 1020 port-wl 1034 port-wl  \ GPIOL_INPUT_ENABLE, GPIOL_IN_AUX1_SELECT

-    \ set address to 3f8
     51400014 rmsr    \ MDD_LEG_IO
-    h# 00007.0000 # ax or
+    h# 00007.0000 # ax or \ set address to 3f8 for COM1
+    h# 00050.0000 # ax or \ set address to 2f8 for COM2
     51400014 wmsr

00000000.00000001. 5140003A set-msr \ SOFTRESET->MDD_UART1_CONF
     00000000.00000012. 5140003A set-msr \ DEVEN | EN_BANKS -> MDD_UART1_CONF

+    00000000.00000001. 5140003E set-msr \ SOFTRESET->MDD_UART2_CONF
+    00000000.00000012. 5140003E set-msr \ DEVEN | EN_BANKS -> MDD_UART2_CONF

\ uart_init,serial.c
    \ This is a garden-variety 8250 UART setup sequence

Modified: cpu/x86/pc/neptune/vsapci.fth
===================================================================
--- cpu/x86/pc/neptune/vsapci.fth	2008-08-20 02:03:20 UTC (rev 884)
+++ cpu/x86/pc/neptune/vsapci.fth	2008-08-20 08:00:54 UTC (rev 885)
@@ -169,7 +169,8 @@
 ;

: preassigned-pci-slot?  ( config-adr -- flag )
-   drop true
+\   drop true
+	d# 11 rshift  h# 1fff and  dup h# f =  swap 1 =  or
 ;

: config-setup  ( a1 -- a2 special? )