Re: CVS commit: src/sys/arch

[KIYOHARA Takashi <kiyohara%kk.iij4u.or.jp@localhost>]

Hi!
# Add cc: port-powerpc@, and remove source-chenges@

From: Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>
Date: Tue, 17 Oct 2006 18:46:15 +0900

> Also could you please change explora/machdep.c to use a proper
> macro as hannken@ suggested?
> http://mail-index.netbsd.org/port-powerpc/2006/09/24/0005.html

Oops...

I'm going to commit this patch next week end.

Thanks,
--
kiyohara

? compile/WORLD
? conf/WORLD
? conf/WORLD.diff
Index: explora/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/explora/machdep.c,v
retrieving revision 1.14
diff -u -r1.14 machdep.c
--- explora/machdep.c   16 Oct 2006 18:14:35 -0000      1.14
+++ explora/machdep.c   18 Oct 2006 17:30:13 -0000
@@ -197,7 +197,7 @@
                ppc4xx_tlb_reserve(maddr, maddr, TLB_PG_SIZE, TLB_EX);
 
        /* Map PCKBC, PCKBC2, COM, LPT. */
-       ppc4xx_tlb_reserve(0x74000000, 0x74000000, TLB_PG_SIZE, TLB_I | TLB_G);
+       ppc4xx_tlb_reserve(BASE_ISA, BASE_ISA, TLB_PG_SIZE, TLB_I | TLB_G);
 
 #ifndef COM_IS_CONSOLE
        ppc4xx_tlb_reserve(BASE_FB,  BASE_FB,  TLB_PG_SIZE, TLB_I | TLB_G);
Index: include/explora.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/include/explora.h,v
retrieving revision 1.2
diff -u -r1.2 explora.h
--- include/explora.h   25 Jul 2003 11:44:20 -0000      1.2
+++ include/explora.h   18 Oct 2006 17:30:13 -0000
@@ -5,13 +5,14 @@
 /*
  * Base addresses of external peripherals
  */
-#define BASE_PCKBC     0x740000c0
-#define BASE_PCKBC2    0x740000c8
-#define BASE_COM       0x740005f0
-#define BASE_LPT       0x740006f0
 #define BASE_FB                0x70000000
-#define BASE_FB2       0x71000000
 #define BASE_LE                0x70800000
+#define BASE_FB2       0x71000000
+#define BASE_ISA       0x74000000
+#define BASE_PCKBC             0x740000c0
+#define BASE_PCKBC2            0x740000c8
+#define BASE_COM               0x740005f0
+#define BASE_LPT               0x740006f0
 
 #define SIZE_FB                (2*1024*1024)