Wed Mar 14 06:35:31 2018 UTC ()
fix compile error on evbarm/EXYNOS. platform.h may be included from *.S


(ryo)
diff -r1.2 -r1.3 src/sys/arch/evbarm/fdt/platform.h
cvs diff -r1.2 -r1.3 src/sys/arch/evbarm/fdt/platform.h (expand / switch to unified diff)

--- src/sys/arch/evbarm/fdt/platform.h 2017/12/10 21:38:27 1.2
+++ src/sys/arch/evbarm/fdt/platform.h 2018/03/14 06:35:31 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: platform.h,v 1.2 2017/12/10 21:38:27 skrll Exp $ */ 1/* $NetBSD: platform.h,v 1.3 2018/03/14 06:35:31 ryo Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2015-2017 Jared McNeill <jmcneill@invisible.ca> 4 * Copyright (c) 2015-2017 Jared McNeill <jmcneill@invisible.ca>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -19,24 +19,26 @@ @@ -19,24 +19,26 @@
19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#ifndef _EVBARM_FDT_PLATFORM_H 29#ifndef _EVBARM_FDT_PLATFORM_H
30#define _EVBARM_FDT_PLATFORM_H 30#define _EVBARM_FDT_PLATFORM_H
31 31
 32#ifndef _LOCORE
32void fdt_add_reserved_memory_range(uint64_t, uint64_t); 33void fdt_add_reserved_memory_range(uint64_t, uint64_t);
 34#endif
33 35
34#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS 36#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
35#define KERNEL_VM_BASE 0xc0000000 37#define KERNEL_VM_BASE 0xc0000000
36#define KERNEL_VM_SIZE 0x20000000 /* 0x20000000 = 512MB */ 38#define KERNEL_VM_SIZE 0x20000000 /* 0x20000000 = 512MB */
37#else 39#else
38#define KERNEL_VM_BASE 0x90000000 40#define KERNEL_VM_BASE 0x90000000
39#define KERNEL_VM_SIZE 0x50000000 /* 0x50000000 = 1.25GB */ 41#define KERNEL_VM_SIZE 0x50000000 /* 0x50000000 = 1.25GB */
40#endif 42#endif
41 43
42#endif /* _EVBARM_FDT_PLATFORM_H */ 44#endif /* _EVBARM_FDT_PLATFORM_H */