Corrected default serial port for EDK2638.

darcs-hash:20051116154949-5f899-4499bac2144f231b2301bccfda06fc192c618946.gz

diff --git a/board/h8300/edk2638/config.edk2638 b/board/h8300/edk2638/config.edk2638
index 0367052e6feac03f83fbcf2fd7319b71a91eb5a9..5af5d59c14c3742ae50e7a02a79f5d4eb2c6f3fa 100644 (file)
--- a/board/h8300/edk2638/config.edk2638
+++ b/board/h8300/edk2638/config.edk2638
@@ -33,3 +33,7 @@ LD_SCRIPT = edk2638
 DEFAULT_LD_SCRIPT_VARIANT = ram
 
 OUTPUT_FORMATS = bin
+
+CONFIG_USB_BASE=n
+CONFIG_USB_PDIUSB=n
+CONFIG_USB_MORE=n

diff --git a/board/h8300/edk2638/defines/system_def_edk2638.h b/board/h8300/edk2638/defines/system_def_edk2638.h
index 4c7260d67a3610c1261103e3611c676c2e4f918a..a90ff770cad36e766ceb3931a45c8b4fa6af103b 100644 (file)
--- a/board/h8300/edk2638/defines/system_def_edk2638.h
+++ b/board/h8300/edk2638/defines/system_def_edk2638.h
@@ -26,97 +26,13 @@ unsigned long cpu_sys_hz;   /* actual system clock frequency  */
 
 volatile unsigned long msec_time;
 
-/* Keyboard KL41 (CS6) */
-#define KL41_LCD_INST  (volatile __u8 * const)(0xc00000)
-#define KL41_LCD_STAT  (volatile __u8 * const)(0xc00001)
-#define KL41_LCD_WDATA (volatile __u8 * const)(0xc00002)
-#define KL41_LCD_RDATA (volatile __u8 * const)(0xc00003)
-#define KL41_LED_WR    (volatile __u8 * const)(0xc00001)
-#define KL41_KBD_WR    (volatile __u8 * const)(0xc00003)
-#define KL41_KBD_RD    (volatile __u8 * const)(0xc00004)
+#define SCI_RS232_CHAN_DEFAULT 1
 
-#define KL41_SUPPORT_ENABLED
-
-
-
-/* SGM Small graphics module (CS2) */
-#define SGM_LCD_DATA  (volatile __u8 * const)(0x400000)
-#define SGM_LCD_CMD   (volatile __u8 * const)(0x400001)
-#define SGM_LCD_STAT  (volatile __u8 * const)(0x400001)
-
-#define SGM_SUPPORT_ENABLED
-
-
-
-/* XRAM 1 MB (CS1) */
-#define XRAM_START    (volatile __u8 * const)(0x200000)
+/* XRAM 0.5 MB (CS0) */
+#define XRAM_START    (volatile __u8 * const)(0x040000)
 
 #define XRAM_SUPPORT_ENABLED
 
-
-
-/* LED color mask         LED1 msb .. LED2 lsb*/
-#define   SGM_LED_G_MASK       0x9249
-#define   SGM_LED_Y_MASK       0x4924
-#define   SGM_LED_R_MASK       0x2492
-
-/* Peripherals (CS3) decoded from A13 to A15 */
-#define SGM_LED       (volatile __u8 * const)(0x600000)
-#define SGM_LED1      (volatile __u8 * const)(0x600000)
-#define SGM_LED2      (volatile __u8 * const)(0x602000)
-#define SGM_KBDI      (volatile __u8 * const)(0x604000)
-#define SGM_KBDO      (volatile __u8 * const)(0x606000)
-
-/* SRAM 32 kB (CS3) */
-#define SRAM_START    (volatile __u8 * const)(0x610000)
-
-#if 1
-#define ISR_USB_INTV           EXCPTVEC_IRQ6   /* pin IRQ6 on PG.0 */
-#define PDIUSB_READ_DATA_ADDR   (volatile __u8 * const)(0x600000)
-#define PDIUSB_WRITE_DATA_ADDR  (volatile __u8 * const)(0x600000)
-#define PDIUSB_COMMAND_ADDR     (volatile __u8 * const)(0x600001)
-
-/* P1.0 .. DACK_N/DMACK0, P7.0 .. DMREQ/DREQ0, P7.2 .. EOT_N/TEND0 */
-#undef  PDIUSB_WITH_ADD_IRQ_HANDLER
-#define PDIUSB_WITH_EXCPTVECT_SET
-#define PDIUSB_SUPPORT_ENABLED
-#endif 
-
-
-
-/* IDE (CS4) (CS5) powered by PF2 */
-#define SIDE_START1   (volatile __u8 * const)(0x800000)
-#define SIDE_START2   (volatile __u8 * const)(0xA00000)
-#define IDE0_DATA     (volatile __u16 * const)(SIDE_START1+0) /* DATA */
-#define IDE0_ERROR     (SIDE_START1+2) /* Error/Features RO/WO */
-#define IDE0_NSECTOR   (SIDE_START1+4) /* Sector Count R/W */
-#define IDE0_SECTOR    (SIDE_START1+6) /* SN, LBA 0-7 */
-#define IDE0_LCYL      (SIDE_START1+8) /* CL, LBA 8-15 */
-#define IDE0_HCYL      (SIDE_START1+10)        /* CH, LBA 16-23 */
-#define IDE0_CURRENT   (SIDE_START1+12)        /* 1L1DHHHH , LBA 24-27 */
-#define IDE0_STATUS    (SIDE_START1+14)        /* Status */
-#define IDE0_SELECT  IDE0_CURRENT
-#define IDE0_FEATURE IDE0_ERROR
-#define IDE0_COMMAND IDE0_STATUS       /* Command */
-
-#define IDE0_DEVCTRL   (SIDE_START2+12)        /* used for resets */
-#define IDE0_ALTSTATUS (SIDE_START2+14)        /* IDE0_STATUS - no clear irq */
-
-#define IDE0_SETPWR(pwr) do{ \
-                       if(pwr) atomic_clear_mask_b1(4,DIO_PFDR); \
-                       else atomic_set_mask_b1(4,DIO_PFDR); \
-               }while(0)
-
-#define IDE0_PRESENT_M() ((*DIO_PORT9)&0x20)
-
-#if (HW_VER_MAJOR == 0) && (HW_VER_MINOR == 2)
-  #define IDE_SWAP_BYTES
-#endif
-
-#define IDE0_SUPPORT_ENABLED
-
-
-
 /* IRAM 16 kB of on-chip memory */
 /* 0xffb000-0xffcfff .. 8 kB free */
 /* 0xffd000-0xffdfff .. 4 kB for Flash emulation */
@@ -126,15 +42,15 @@ volatile unsigned long msec_time;
 #define IRAM_START1   (volatile __u8 * const)(0xffe000)
 #define FRAM_START    (volatile __u8 * const)(0xffffc0)
 
-/* SCI0 - IrDA */
-/* SCI1 - IIC0 (P34, P35) */
-/* SCI2 - Boot */
-/* SCI3 - SPI */
-/* SCI4 - RS232/485 */
+/* SCI0 - RS232 */
+/* SCI1 - RS232 / Boot */
+/* SCI2 - x */
+/* SCI3 - x */
+/* SCI4 - x */
 
-/* IRQ0 - RTC */
-/* IRQ1 - Index mark */
-/* IRQ6 - IDE */
+/* IRQ0 - x */
+/* IRQ1 - x */
+/* IRQ6 - x */
 
 /* Some registers are read only on H8S processors */
 /* We use shadow registers for some of them */