On Tue, Jul 14, 2009 at 1:41 PM, Sylvestre Gallon<[email protected]> wrote:
> Hi tech@,
>
> Moko does not seem to compile on current.
>
> I've tried to fix some compilation issues to compile a
> working kernel. The diff is in attach :)
>
> About the LCD part I think that someone has forgotten
> to commit a file, so I have filled this file with a dummy
> one in my diff.
>
> Cheers,
>
matthieu@ just notify me that attachments are not
supported by tech .
I will also send this diff to drahn@ following matthieu@
advices.
Sorry for the spam...
Cheers,
diff :
Index: arch/arm/arm/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/pmap.c,v
retrieving revision 1.23
diff -N -u -p arch/arm/arm/pmap.c
--- arch/arm/arm/pmap.c 24 May 2009 04:56:19 -0000 1.23
+++ arch/arm/arm/pmap.c 14 Jul 2009 11:19:53 -0000
@@ -4692,7 +4692,7 @@ pmap_pte_init_generic(void)
pte_l1_c_proto = L1_C_PROTO_generic;
pte_l2_s_proto = L2_S_PROTO_generic;
- pmap_copy_page_func = pmap_copy_page_v7;
+ pmap_copy_page_func = pmap_copy_page_generic;
pmap_zero_page_func = pmap_zero_page_generic;
}
Index: arch/arm/arm/softintr.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/softintr.c,v
retrieving revision 1.6
diff -N -u -p arch/arm/arm/softintr.c
--- arch/arm/arm/softintr.c 19 Apr 2009 18:54:06 -0000 1.6
+++ arch/arm/arm/softintr.c 14 Jul 2009 11:19:53 -0000
@@ -133,9 +133,13 @@ softintr_establish(int ipl, void (*func)(void *), void
si = SI_SOFTNET;
break;
- case IPL_TTY:
+/* case IPL_TTY: */
case IPL_SOFTTTY:
si = SI_SOFTTTY;
+ break;
+
+ case IPL_SOFTSERIAL:
+ si = SI_SOFTSERIAL;
break;
default:
Index: arch/arm/include/softintr.h
===================================================================
RCS file: /cvs/src/sys/arch/arm/include/softintr.h,v
retrieving revision 1.4
diff -N -u -p arch/arm/include/softintr.h
--- arch/arm/include/softintr.h 19 Apr 2009 18:54:06 -0000 1.4
+++ arch/arm/include/softintr.h 14 Jul 2009 11:19:53 -0000
@@ -54,8 +54,9 @@
#define SI_SOFTCLOCK 1 /* for IPL_SOFTCLOCK */
#define SI_SOFTNET 2 /* for IPL_SOFTNET */
#define SI_SOFTTTY 3 /* for IPL_SOFTTTY */
+#define SI_SOFTSERIAL 4 /* for IPL_SOFSERIAL */
-#define SI_NQUEUES 4
+#define SI_NQUEUES 5
struct soft_intrhand {
TAILQ_ENTRY(soft_intrhand) sih_list;
? arch/arm/s3c2xx0/.files.s3c2410.swp
Index: arch/arm/s3c2xx0/s3c2xx0_intr.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c,v
retrieving revision 1.2
diff -N -u -p arch/arm/s3c2xx0/s3c2xx0_intr.c
--- arch/arm/s3c2xx0/s3c2xx0_intr.c 8 Dec 2008 20:50:20 -0000 1.2
+++ arch/arm/s3c2xx0/s3c2xx0_intr.c 14 Jul 2009 11:19:53 -0000
@@ -85,6 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2xx0_intr.c,v 1.13 2008
#include <machine/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
+#include <arm/softintr.h>
#include <arm/s3c2xx0/s3c2xx0reg.h>
#include <arm/s3c2xx0/s3c2xx0var.h>
? arch/moko/conf/.RAMDISK.swp
? arch/moko/conf/.files.moko.swp
Index: arch/moko/conf/files.moko
===================================================================
RCS file: /cvs/src/sys/arch/moko/conf/files.moko,v
retrieving revision 1.2
diff -N -u -p arch/moko/conf/files.moko
--- arch/moko/conf/files.moko 2 Jan 2009 06:38:24 -0000 1.2
+++ arch/moko/conf/files.moko 14 Jul 2009 11:19:54 -0000
@@ -24,8 +24,6 @@ include "../../../dev/atapiscsi/files.atapiscsi"
include "arch/arm/s3c2xx0/files.s3c2410"
-
-
#
# Machine-independent ATA drivers
#
Index: arch/moko/dev/moko_lcd.c
===================================================================
RCS file: arch/moko/dev/moko_lcd.c
diff -N -u -p arch/moko/dev/moko_lcd.c
--- /dev/null 14 Jul 2009 11:20:00 -0000
+++ arch/moko/dev/moko_lcd.c 14 Jul 2009 11:19:54 -0000
@@ -0,0 +1,39 @@
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/ioctl.h>
+#include <sys/device.h>
+#include <sys/proc.h>
+#include <sys/malloc.h>
+
+#include <machine/cpu.h>
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+struct lcd_softc {
+ struct device sc_dev;
+};
+
+static int lcd_match(struct device *, void *, void *);
+static void lcd_attach(struct device *, struct device *, void *);
+
+struct cfattach lcd_ssio_ca = {
+ sizeof(struct lcd_softc), lcd_match, lcd_attach
+};
+
+struct cfdriver lcd_cd = {
+ NULL, "lcd", DV_DULL
+};
+
+static int
+lcd_match(struct device *parent, void *match, void *aux)
+{
+ return 0;
+}
+
+static void
+lcd_attach(struct device *parent, struct device *self, void *aux)
+{
+ return ;
+}
+
Index: arch/moko/include/intr.h
===================================================================
RCS file: /cvs/src/sys/arch/moko/include/intr.h,v
retrieving revision 1.1
diff -N -u -p arch/moko/include/intr.h
--- arch/moko/include/intr.h 26 Nov 2008 14:47:50 -0000 1.1
+++ arch/moko/include/intr.h 14 Jul 2009 11:19:54 -0000
@@ -51,6 +51,7 @@
#define IPL_NET 5 /* network */
#define IPL_SOFTSERIAL 6 /* software serial interrupt */
#define IPL_TTY 7 /* terminals */
+#define IPL_SOFTTTY IPL_TTY
#define IPL_VM 8 /* memory allocation */
#define IPL_AUDIO 9 /* audio device */
#define IPL_CLOCK 10 /* clock interrupt */
