From owner-svn-src-projects@FreeBSD.ORG Mon Feb 24 09:40:04 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B4F38BE6; Mon, 24 Feb 2014 09:40:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A0FF51C6E; Mon, 24 Feb 2014 09:40:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1O9e4tk034147; Mon, 24 Feb 2014 09:40:04 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1O9e4Cp034145; Mon, 24 Feb 2014 09:40:04 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201402240940.s1O9e4Cp034145@svn.freebsd.org> From: Andrew Turner Date: Mon, 24 Feb 2014 09:40:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r262438 - in projects/arm64/sys/arm64: arm64 conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2014 09:40:04 -0000 Author: andrew Date: Mon Feb 24 09:40:03 2014 New Revision: 262438 URL: http://svnweb.freebsd.org/changeset/base/262438 Log: Add EARLY_PRINTF support for the ARM foundation model. Modified: projects/arm64/sys/arm64/arm64/machdep.c projects/arm64/sys/arm64/conf/GENERIC Modified: projects/arm64/sys/arm64/arm64/machdep.c ============================================================================== --- projects/arm64/sys/arm64/arm64/machdep.c Mon Feb 24 09:30:50 2014 (r262437) +++ projects/arm64/sys/arm64/arm64/machdep.c Mon Feb 24 09:40:03 2014 (r262438) @@ -255,6 +255,19 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, void initarm(void); +#ifdef EARLY_PRINTF +static void +foundation_early_putc(int c) +{ + volatile uint32_t *uart = (uint32_t*)0x1c090000; + + /* TODO: Wait for space in the fifo */ + uart[0] = c; +} + +early_putc_t *early_putc = foundation_early_putc; +#endif + void initarm(void) { @@ -266,5 +279,7 @@ initarm(void) for (i = 0; i < sizeof(str); i++) { *uart = str[i]; } + + printf("In initarm on arm64\n"); } Modified: projects/arm64/sys/arm64/conf/GENERIC ============================================================================== --- projects/arm64/sys/arm64/conf/GENERIC Mon Feb 24 09:30:50 2014 (r262437) +++ projects/arm64/sys/arm64/conf/GENERIC Mon Feb 24 09:40:03 2014 (r262438) @@ -79,6 +79,7 @@ options INCLUDE_CONFIG_FILE # Inclu #options WITNESS # Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones +options EARLY_PRINTF # Serial (COM) ports #device uart # Generic UART driver