socsvn commit: r269662 - in soc2014/astarasikov/head/sys/arm: conf goldfish

[Andrew Turner]

On Mon, 16 Jun 2014 23:38:42 GMT
astarasikov at 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