Deleted Added
full compact
mv_machdep.c (300694) mv_machdep.c (301220)
1/*-
2 * Copyright (c) 1994-1998 Mark Brinicombe.
3 * Copyright (c) 1994 Brini.
4 * All rights reserved.
5 *
6 * This code is derived from software written for Brini by Mark Brinicombe
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 25 unchanged lines hidden (view full) ---

34 *
35 * from: FreeBSD: //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c, rev 45
36 */
37
38#include "opt_ddb.h"
39#include "opt_platform.h"
40
41#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1994-1998 Mark Brinicombe.
3 * Copyright (c) 1994 Brini.
4 * All rights reserved.
5 *
6 * This code is derived from software written for Brini by Mark Brinicombe
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 25 unchanged lines hidden (view full) ---

34 *
35 * from: FreeBSD: //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c, rev 45
36 */
37
38#include "opt_ddb.h"
39#include "opt_platform.h"
40
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: head/sys/arm/mv/mv_machdep.c 300694 2016-05-25 19:44:26Z ian $");
42__FBSDID("$FreeBSD: head/sys/arm/mv/mv_machdep.c 301220 2016-06-02 18:31:36Z zbb $");
43
44#define _ARM32_BUS_DMA_PRIVATE
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/bus.h>
48#include <sys/devmap.h>
49
50#include <vm/vm.h>

--- 227 unchanged lines hidden (view full) ---

278#define FDT_DEVMAP_MAX (MV_WIN_CPU_MAX + 2)
279static struct devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
280 { 0, 0, 0, }
281};
282
283static int
284platform_sram_devmap(struct devmap_entry *map)
285{
43
44#define _ARM32_BUS_DMA_PRIVATE
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/bus.h>
48#include <sys/devmap.h>
49
50#include <vm/vm.h>

--- 227 unchanged lines hidden (view full) ---

278#define FDT_DEVMAP_MAX (MV_WIN_CPU_MAX + 2)
279static struct devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
280 { 0, 0, 0, }
281};
282
283static int
284platform_sram_devmap(struct devmap_entry *map)
285{
286#if !defined(SOC_MV_ARMADAXP)
286#if !defined(SOC_MV_ARMADAXP) && !defined(SOC_MV_ARMADA38X)
287 phandle_t child, root;
288 u_long base, size;
289 /*
290 * SRAM range.
291 */
292 if ((child = OF_finddevice("/sram")) != 0)
293 if (fdt_is_compatible(child, "mrvl,cesa-sram") ||
294 fdt_is_compatible(child, "mrvl,scratchpad"))

--- 212 unchanged lines hidden ---
287 phandle_t child, root;
288 u_long base, size;
289 /*
290 * SRAM range.
291 */
292 if ((child = OF_finddevice("/sram")) != 0)
293 if (fdt_is_compatible(child, "mrvl,cesa-sram") ||
294 fdt_is_compatible(child, "mrvl,scratchpad"))

--- 212 unchanged lines hidden ---