Module Name: src
Committed By: reinoud
Date: Wed May 21 12:16:17 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: exynos_soc.c
Log Message:
Make ODROID (-XU) compile again
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/samsung/exynos_soc.c
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/samsung/exynos_soc.c
diff -u src/sys/arch/arm/samsung/exynos_soc.c:1.11 src/sys/arch/arm/samsung/exynos_soc.c:1.12
--- src/sys/arch/arm/samsung/exynos_soc.c:1.11 Wed May 14 09:03:09 2014
+++ src/sys/arch/arm/samsung/exynos_soc.c Wed May 21 12:16:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_soc.c,v 1.11 2014/05/14 09:03:09 reinoud Exp $ */
+/* $NetBSD: exynos_soc.c,v 1.12 2014/05/21 12:16:17 reinoud Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.11 2014/05/14 09:03:09 reinoud Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.12 2014/05/21 12:16:17 reinoud Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -211,13 +211,14 @@ exynos_bootstrap(vaddr_t iobase, vaddr_t
{
int error;
size_t core_size, audiocore_size;
- size_t audiocore_pbase;
+ size_t audiocore_pbase, audiocore_vbase;
#ifdef EXYNOS4
if (IS_EXYNOS4_P()) {
core_size = EXYNOS4_CORE_SIZE;
audiocore_size = EXYNOS4_AUDIOCORE_SIZE;
audiocore_pbase = EXYNOS4_AUDIOCORE_PBASE;
+ audiocore_vbase = EXYNOS4_AUDIOCORE_VBASE;
}
#endif
@@ -226,6 +227,7 @@ exynos_bootstrap(vaddr_t iobase, vaddr_t
core_size = EXYNOS5_CORE_SIZE;
audiocore_size = EXYNOS5_AUDIOCORE_SIZE;
audiocore_pbase = EXYNOS5_AUDIOCORE_PBASE;
+ audiocore_vbase = EXYNOS5_AUDIOCORE_VBASE;
}
#endif
@@ -248,7 +250,7 @@ exynos_bootstrap(vaddr_t iobase, vaddr_t
if (error)
panic("%s: failed to map in Exynos audio SFR registers: %d",
__func__, error);
- KASSERT(exynos_audiocore_bsh == EXYNOS4_AUDIOCORE_VBASE);
+ KASSERT(exynos_audiocore_bsh == audiocore_vbase);
/* init bus dma tags */
exynos_dma_bootstrap(physmem * PAGE_SIZE);
@@ -278,7 +280,6 @@ exynos_device_register(device_t self, vo
* The Exynos4420 armgic is located at a different location!
*/
- struct mpcore_attach_args * const mpcaa = aux;
extern uint32_t exynos_soc_id;
switch (EXYNOS_PRODUCT_ID(exynos_soc_id)) {
@@ -294,11 +295,14 @@ exynos_device_register(device_t self, vo
#endif
#if defined(EXYNOS4)
case 0xe4410:
- case 0xe4412:
+ case 0xe4412: {
+ struct mpcore_attach_args * const mpcaa = aux;
+
mpcaa->mpcaa_memh = EXYNOS_CORE_VBASE;
mpcaa->mpcaa_off1 = EXYNOS4_GIC_DISTRIBUTOR_OFFSET;
mpcaa->mpcaa_off2 = EXYNOS4_GIC_CNTR_OFFSET;
break;
+ }
#endif
default:
panic("%s: unknown SoC product id %#x", __func__,
