Module Name: src Committed By: skrll Date: Fri Sep 14 11:58:38 UTC 2018
Modified Files: src/sys/arch/arm/samsung: exynos_platform.c exynos_soc.c exynos_var.h Log Message: exynos_bootstrap doesn't need an argument To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/samsung/exynos_platform.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/samsung/exynos_soc.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/samsung/exynos_var.h 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_platform.c diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.15 src/sys/arch/arm/samsung/exynos_platform.c:1.16 --- src/sys/arch/arm/samsung/exynos_platform.c:1.15 Tue Sep 11 10:06:53 2018 +++ src/sys/arch/arm/samsung/exynos_platform.c Fri Sep 14 11:58:38 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: exynos_platform.c,v 1.15 2018/09/11 10:06:53 jmcneill Exp $ */ +/* $NetBSD: exynos_platform.c,v 1.16 2018/09/14 11:58:38 skrll Exp $ */ /*- * Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca> @@ -34,7 +34,7 @@ #include "ukbd.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.15 2018/09/11 10:06:53 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.16 2018/09/14 11:58:38 skrll Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -123,7 +123,7 @@ static void exynos_platform_bootstrap(void) { - exynos_bootstrap(EXYNOS_CORE_VBASE); + exynos_bootstrap(); void (*mp_bootstrap)(void) = NULL; const struct of_compat_data *cd = of_search_compatible(OF_finddevice("/"), mp_compat_data); Index: src/sys/arch/arm/samsung/exynos_soc.c diff -u src/sys/arch/arm/samsung/exynos_soc.c:1.35 src/sys/arch/arm/samsung/exynos_soc.c:1.36 --- src/sys/arch/arm/samsung/exynos_soc.c:1.35 Sun Aug 19 07:27:33 2018 +++ src/sys/arch/arm/samsung/exynos_soc.c Fri Sep 14 11:58:38 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: exynos_soc.c,v 1.35 2018/08/19 07:27:33 skrll Exp $ */ +/* $NetBSD: exynos_soc.c,v 1.36 2018/09/14 11:58:38 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include "opt_exynos.h" #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.35 2018/08/19 07:27:33 skrll Exp $"); +__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.36 2018/09/14 11:58:38 skrll Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -475,7 +475,7 @@ exynos_clocks_bootstrap(void) void -exynos_bootstrap(vaddr_t iobase) +exynos_bootstrap(void) { int error; size_t core_size, audiocore_size; @@ -485,6 +485,7 @@ exynos_bootstrap(vaddr_t iobase) bus_addr_t exynos_pmu_offset; bus_addr_t exynos_sysreg_offset; bus_addr_t exynos_cmu_apll_offset; + const vaddr_t iobase = EXYNOS_CORE_VBASE; #ifdef SOC_EXYNOS4 core_size = EXYNOS4_CORE_SIZE; Index: src/sys/arch/arm/samsung/exynos_var.h diff -u src/sys/arch/arm/samsung/exynos_var.h:1.25 src/sys/arch/arm/samsung/exynos_var.h:1.26 --- src/sys/arch/arm/samsung/exynos_var.h:1.25 Sun Aug 19 07:27:33 2018 +++ src/sys/arch/arm/samsung/exynos_var.h Fri Sep 14 11:58:38 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: exynos_var.h,v 1.25 2018/08/19 07:27:33 skrll Exp $ */ +/* $NetBSD: exynos_var.h,v 1.26 2018/09/14 11:58:38 skrll Exp $ */ /*- * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc. @@ -143,7 +143,7 @@ extern bus_space_handle_t exynos_pmu_bsh extern bus_space_handle_t exynos_cmu_bsh; extern bus_space_handle_t exynos_sysreg_bsh; -extern void exynos_bootstrap(vaddr_t); +extern void exynos_bootstrap(void); extern void exynos_dma_bootstrap(psize_t memsize); struct exynos_pinctrl_softc;