- remove CONSPEED from libsa.h

- remove unused define

diff --git a/sys/arch/octeon/stand/boot/Makefile b/sys/arch/octeon/stand/boot/Makefile
index c4fc6e0..4c5d041 100644 (file)
--- a/sys/arch/octeon/stand/boot/Makefile
+++ b/sys/arch/octeon/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.1 2013/06/05 01:02:29 jasper Exp $
+#      $OpenBSD: Makefile,v 1.2 2014/07/12 23:45:33 jasper Exp $
 
 NOMAN=
 #MAN=          boot.8
@@ -11,7 +11,7 @@ PROG=         boot
 NOPROG=
 .endif
 
-CFLAGS+=-fno-pie
+CFLAGS+=-fno-pie -DCONSPEED=15200
 AFLAGS+=-fno-pie
 LDFLAGS+=-nopie
 

diff --git a/sys/arch/octeon/stand/boot/libsa.h b/sys/arch/octeon/stand/boot/libsa.h
index 28b282c..1d50caa 100644 (file)
--- a/sys/arch/octeon/stand/boot/libsa.h
+++ b/sys/arch/octeon/stand/boot/libsa.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: libsa.h,v 1.2 2014/07/12 20:36:52 jasper Exp $        */
+/*     $OpenBSD: libsa.h,v 1.3 2014/07/12 23:45:33 jasper Exp $        */
 
 /*
  * Copyright (c) 2013 Jasper Lievisse Adriaanse <jasper@openbsd.org>
@@ -19,8 +19,6 @@
 #include <lib/libsa/stand.h>
 
 #define DEFAULT_KERNEL_ADDRESS 0
-#define INITRD_BASE            PHYS_TO_CKSEG0(0x04000000)
-#define CONSPEED               115200
 
 extern char *kernelfile;