diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-08-21 06:47:48 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-08-21 06:47:48 +0000 |
| commit | 85574c61023b3343d92dff7177411336447c7dd4 (patch) | |
| tree | 0bcf204110b45f7e5aa79c864f19f9983f97a753 /sys/arch | |
| parent | ed7497cd9f5c02073f2d420f62e25843c09ba7ab (diff) | |
Remove the remains of a workaround to get GIC ranges for exynos.
Exynos differed from everything else by not having GIC at fixed offsets
from PERIPHBASE. Now that ampintc/GIC attaches using FDT we get the ranges
out of the FDT instead of using offsets from PERIPHBASE.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm/cortex/ampintc.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/exynos/exynos4.c | 14 | ||||
| -rw-r--r-- | sys/arch/armv7/exynos/exynos5.c | 14 |
3 files changed, 3 insertions, 29 deletions
diff --git a/sys/arch/arm/cortex/ampintc.c b/sys/arch/arm/cortex/ampintc.c index edcbc6d1051..693eb0d6d91 100644 --- a/sys/arch/arm/cortex/ampintc.c +++ b/sys/arch/arm/cortex/ampintc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ampintc.c,v 1.13 2016/08/06 18:18:48 patrick Exp $ */ +/* $OpenBSD: ampintc.c,v 1.14 2016/08/21 06:47:47 jsg Exp $ */ /* * Copyright (c) 2007,2009,2011 Dale Rahn <drahn@openbsd.org> * @@ -207,8 +207,6 @@ ampintc_match(struct device *parent, void *cfdata, void *aux) return (0); } -paddr_t gic_dist_base, gic_cpu_base, gic_dist_size, gic_cpu_size; - void ampintc_attach(struct device *parent, struct device *self, void *aux) { diff --git a/sys/arch/armv7/exynos/exynos4.c b/sys/arch/armv7/exynos/exynos4.c index 986257e8673..24409dbccc9 100644 --- a/sys/arch/armv7/exynos/exynos4.c +++ b/sys/arch/armv7/exynos/exynos4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exynos4.c,v 1.2 2015/07/15 21:09:40 jsg Exp $ */ +/* $OpenBSD: exynos4.c,v 1.3 2016/08/21 06:47:47 jsg Exp $ */ /* * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org> * Copyright (c) 2012 Patrick Wildt <patrick@blueri.se> @@ -42,11 +42,6 @@ #define SYSREG_ADDR 0x10010000 #define SYSREG_SIZE 0x400 -#define GIC_CPU_ADDR 0x10480000 -#define GIC_CPU_SIZE 0x10000 -#define GIC_DIST_ADDR 0x10490000 -#define GIC_DIST_SIZE 0x10000 - #define UARTx_SIZE 0x100 #define UART1_ADDR 0x13800000 #define UART2_ADDR 0x13810000 @@ -321,15 +316,8 @@ struct armv7_dev exynos4_devs[] = { } }; -extern paddr_t gic_dist_base, gic_cpu_base, gic_dist_size, gic_cpu_size; - void exynos4_init(void) { armv7_set_devs(exynos4_devs); - - gic_dist_base = GIC_DIST_ADDR; - gic_dist_size = GIC_DIST_SIZE; - gic_cpu_base = GIC_CPU_ADDR; - gic_cpu_size = GIC_CPU_SIZE; } diff --git a/sys/arch/armv7/exynos/exynos5.c b/sys/arch/armv7/exynos/exynos5.c index a02fcf2c287..2942339e2c0 100644 --- a/sys/arch/armv7/exynos/exynos5.c +++ b/sys/arch/armv7/exynos/exynos5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exynos5.c,v 1.4 2015/07/17 17:33:50 jsg Exp $ */ +/* $OpenBSD: exynos5.c,v 1.5 2016/08/21 06:47:47 jsg Exp $ */ /* * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org> * Copyright (c) 2012 Patrick Wildt <patrick@blueri.se> @@ -42,11 +42,6 @@ #define SYSREG_ADDR 0x10050000 #define SYSREG_SIZE 0x1000 -#define GIC_DIST_ADDR 0x10481000 -#define GIC_DIST_SIZE 0x1000 -#define GIC_CPU_ADDR 0x10482000 -#define GIC_CPU_SIZE 0x1000 - #define UARTx_SIZE 0x100 #define UART1_ADDR 0x12c00000 #define UART2_ADDR 0x12c10000 @@ -330,15 +325,8 @@ struct armv7_dev exynos5_devs[] = { } }; -extern paddr_t gic_dist_base, gic_cpu_base, gic_dist_size, gic_cpu_size; - void exynos5_init(void) { armv7_set_devs(exynos5_devs); - - gic_dist_base = GIC_DIST_ADDR; - gic_dist_size = GIC_DIST_SIZE; - gic_cpu_base = GIC_CPU_ADDR; - gic_cpu_size = GIC_CPU_SIZE; } |