Module Name: src
Committed By: jakllsch
Date: Mon Oct 23 19:36:01 UTC 2017
Modified Files:
src/sys/arch/arm/sunxi: sunxi_platform.c
src/sys/arch/evbarm/conf: mk.sunxi
Log Message:
A couple small adjustments to make big endian (BE8) SUNXI work.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/sunxi/sunxi_platform.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.sunxi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.13 src/sys/arch/arm/sunxi/sunxi_platform.c:1.14
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.13 Sun Oct 22 20:35:32 2017
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Mon Oct 23 19:36:01 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.13 2017/10/22 20:35:32 skrll Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.14 2017/10/23 19:36:01 jakllsch Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -31,7 +31,7 @@
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.13 2017/10/22 20:35:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.14 2017/10/23 19:36:01 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -121,10 +121,10 @@ sunxi_platform_early_putchar(char c)
#define CONSADDR_VA ((CONSADDR - SUNXI_CORE_PBASE) + SUNXI_CORE_VBASE)
volatile uint32_t *uartaddr = (volatile uint32_t *)CONSADDR_VA;
- while ((uartaddr[com_lsr] & LSR_TXRDY) == 0)
+ while ((le32toh(uartaddr[com_lsr]) & LSR_TXRDY) == 0)
;
- uartaddr[com_data] = c;
+ uartaddr[com_data] = htole32(c);
#endif
}
Index: src/sys/arch/evbarm/conf/mk.sunxi
diff -u src/sys/arch/evbarm/conf/mk.sunxi:1.2 src/sys/arch/evbarm/conf/mk.sunxi:1.3
--- src/sys/arch/evbarm/conf/mk.sunxi:1.2 Mon Jul 24 19:37:41 2017
+++ src/sys/arch/evbarm/conf/mk.sunxi Mon Oct 23 19:36:01 2017
@@ -1,4 +1,8 @@
-# $NetBSD: mk.sunxi,v 1.2 2017/07/24 19:37:41 joerg Exp $
+# $NetBSD: mk.sunxi,v 1.3 2017/10/23 19:36:01 jakllsch Exp $
+
+.if !empty(MACHINE_ARCH:M*eb)
+EXTRA_LINKFLAGS+= --be8
+.endif
SYSTEM_FIRST_OBJ= sunxi_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/sunxi/sunxi_start.S
