From owner-svn-soc-all@FreeBSD.ORG  Tue Jun 17 08:31:03 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@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 D9EFCF68;
 Tue, 17 Jun 2014 08:31:03 +0000 (UTC)
Received: from nibbler.fubar.geek.nz (nibbler.fubar.geek.nz [199.48.134.198])
 by mx1.freebsd.org (Postfix) with ESMTP id A3325236B;
 Tue, 17 Jun 2014 08:30:57 +0000 (UTC)
Received: from bender.Home (97e07ba1.skybroadband.com [151.224.123.161])
 by nibbler.fubar.geek.nz (Postfix) with ESMTPSA id 735765DEBC;
 Tue, 17 Jun 2014 08:30:50 +0000 (UTC)
Date: Tue, 17 Jun 2014 09:30:41 +0100
From: Andrew Turner <andrew@fubar.geek.nz>
To: astarasikov@FreeBSD.org
Subject: Re: socsvn commit: r269662 - in soc2014/astarasikov/head/sys/arm:
 conf goldfish
Message-ID: <20140617093041.5967135d@bender.Home>
In-Reply-To: <201406162338.s5GNcgsV030168@socsvn.freebsd.org>
References: <201406162338.s5GNcgsV030168@socsvn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: svn-soc-all@FreeBSD.org
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jun 2014 08:31:03 -0000

On Mon, 16 Jun 2014 23:38:42 GMT
astarasikov@FreeBSD.org wrote:

> Author: astarasikov
> Date: Mon Jun 16 23:38:41 2014
> New Revision: 269662
> URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269662
> 
> Log:
>   arm: fix GOLDFISH compilation for HEAD
>   
> 
> Modified:
>   soc2014/astarasikov/head/sys/arm/conf/GOLDFISH
>   soc2014/astarasikov/head/sys/arm/goldfish/files.goldfish
>   soc2014/astarasikov/head/sys/arm/goldfish/goldfish_fb.c
>   soc2014/astarasikov/head/sys/arm/goldfish/goldfish_machdep.c
>   soc2014/astarasikov/head/sys/arm/goldfish/if_smc_fdt.c
> 

...

> Modified: soc2014/astarasikov/head/sys/arm/goldfish/goldfish_machdep.c
> ==============================================================================
> ---
> soc2014/astarasikov/head/sys/arm/goldfish/goldfish_machdep.c
> Mon Jun 16 22:59:18 2014	(r269661) +++
> soc2014/astarasikov/head/sys/arm/goldfish/goldfish_machdep.c
> Mon Jun 16 23:38:41 2014	(r269662) @@ -47,56 +47,30 @@
> #include <vm/pmap.h> #include <machine/bus.h>
> -#include <machine/frame.h> /* For trapframe_t, used in
> <machine/machdep.h> */ +#include <machine/devmap.h>
>  #include <machine/machdep.h>
> -#include <machine/pmap.h>
> +#include <machine/platform.h>
> +#include <machine/platformvar.h>
>  
>  #include <dev/fdt/fdt_common.h>
>  
> -/* Start of address space used for bootstrap map */
> -#define DEVMAP_BOOTSTRAP_MAP_START	0xF0000000
> +#include "platform_if.h"
>  
> -vm_offset_t
> -initarm_lastaddr(void)
> +static void
> +goldfish_late_init(platform_t plat)
>  {
> -
> -	return (DEVMAP_BOOTSTRAP_MAP_START - ARM_NOCACHE_KVA_SIZE);
>  }

You don't need to implement platform_late_init if it's empty. The
default is to do nothing in this case.

Andrew