Module Name: src Committed By: matt Date: Sat Sep 7 02:09:24 UTC 2013
Modified Files: src/sys/arch/arm/allwinner: awin_board.c awin_gpio.c Log Message: Add #ifdef VERBOSE_INIT_ARM To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_board.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_gpio.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/allwinner/awin_board.c diff -u src/sys/arch/arm/allwinner/awin_board.c:1.3 src/sys/arch/arm/allwinner/awin_board.c:1.4 --- src/sys/arch/arm/allwinner/awin_board.c:1.3 Sat Sep 7 00:35:52 2013 +++ src/sys/arch/arm/allwinner/awin_board.c Sat Sep 7 02:09:23 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_board.c,v 1.3 2013/09/07 00:35:52 matt Exp $ */ +/* $NetBSD: awin_board.c,v 1.4 2013/09/07 02:09:23 matt Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -34,7 +34,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.3 2013/09/07 00:35:52 matt Exp $"); +__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.4 2013/09/07 02:09:23 matt Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -146,13 +146,21 @@ awin_bootstrap(vaddr_t iobase, vaddr_t u __func__, "io", error); KASSERT(awin_core_bsh == iobase); +#ifdef VERBOSE_INIT_ARM printf("CPU Speed is"); +#endif awin_cpu_clk(); +#ifdef VERBOSE_INIT_ARM printf(" %"PRIu64"\n", curcpu()->ci_data.cpu_cc_freq); +#endif +#ifdef VERBOSE_INIT_ARM printf("Determining GPIO configuration"); +#endif awin_gpio_init(); +#ifdef VERBOSE_INIT_ARM printf("\n"); +#endif } #ifdef MULTIPROCESSOR Index: src/sys/arch/arm/allwinner/awin_gpio.c diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.2 src/sys/arch/arm/allwinner/awin_gpio.c:1.3 --- src/sys/arch/arm/allwinner/awin_gpio.c:1.2 Sat Sep 7 00:35:52 2013 +++ src/sys/arch/arm/allwinner/awin_gpio.c Sat Sep 7 02:09:23 2013 @@ -31,7 +31,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.2 2013/09/07 00:35:52 matt Exp $"); +__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.3 2013/09/07 02:09:23 matt Exp $"); #include <sys/bus.h> #include <sys/device.h> @@ -162,7 +162,9 @@ awin_gpio_init(void) struct awin_gpio_softc * const sc = &awin_gpio_sc; bus_size_t offset = AWIN_PIO_OFFSET; +#ifdef VERBOSE_INIT_ARM printf(" free"); +#endif for (u_int i = 0; i < __arraycount(pin_groups); i++, offset += AWIN_PIO_GRP_SIZE) { @@ -183,8 +185,10 @@ awin_gpio_init(void) grp->grp_pin_inuse_mask |= mask; } } +#ifdef VERBOSE_INIT_ARM printf(" P%c=%d", 'A' + i, popcount32(grp->grp_pin_mask & ~grp->grp_pin_inuse_mask)); +#endif } }