Port the Vybrid code to PLATFORM to help move it into GENERIC.

This commit is contained in:
andrew 2017-06-03 20:14:46 +00:00
parent beb87f4e51
commit 9c95212151
4 changed files with 39 additions and 91 deletions

View File

@ -25,6 +25,7 @@ include "../freescale/vybrid/std.vybrid"
makeoptions WERROR="-Werror"
options SCHED_4BSD # 4BSD scheduler
options PLATFORM # Platform based SoC
#options NANDFS # NAND Filesystem
#options SMP # Enable multiple cores

View File

@ -3,7 +3,6 @@
kern/kern_clocksource.c standard
arm/freescale/vybrid/vf_machdep.c standard
arm/freescale/vybrid/vf_common.c standard
arm/freescale/vybrid/vf_ccm.c standard
arm/freescale/vybrid/vf_anadig.c standard
arm/freescale/vybrid/vf_iomuxc.c standard

View File

@ -1,61 +0,0 @@
/*-
* Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/kernel.h>
#include <dev/ofw/openfirm.h>
#include <machine/bus.h>
#include <machine/fdt.h>
#include <arm/freescale/vybrid/vf_src.h>
void
cpu_reset(void)
{
phandle_t src;
uint32_t paddr;
bus_addr_t vaddr;
if (src_swreset() == 0)
goto end;
src = OF_finddevice("src");
if ((src != 0) && (OF_getencprop(src, "reg", &paddr, sizeof(paddr))) > 0) {
if (bus_space_map(fdtbus_bs_tag, paddr, 0x10, 0, &vaddr) == 0) {
bus_space_write_4(fdtbus_bs_tag, vaddr, 0x00, SW_RST);
}
}
end:
while (1);
}

View File

@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
#include "opt_ddb.h"
#include "opt_platform.h"
#include <sys/cdefs.h>
@ -32,46 +31,56 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/devmap.h>
#include <vm/vm.h>
#include <machine/armreg.h>
#include <dev/ofw/openfirm.h>
#include <machine/bus.h>
#include <machine/machdep.h>
#include <machine/fdt.h>
#include <machine/platform.h>
#include <machine/platformvar.h>
vm_offset_t
platform_lastaddr(void)
{
#include <arm/freescale/vybrid/vf_src.h>
return (devmap_lastaddr());
}
#include "platform_if.h"
void
platform_probe_and_attach(void)
{
}
void
platform_gpio_init(void)
{
}
void
platform_late_init(void)
{
}
int
platform_devmap_init(void)
static int
vf_devmap_init(platform_t plat)
{
devmap_add_entry(0x40000000, 0x100000);
return (0);
}
static void
vf_cpu_reset(platform_t plat)
{
phandle_t src;
uint32_t paddr;
bus_addr_t vaddr;
if (src_swreset() == 0)
goto end;
src = OF_finddevice("src");
if ((src != 0) && (OF_getencprop(src, "reg", &paddr, sizeof(paddr))) > 0) {
if (bus_space_map(fdtbus_bs_tag, paddr, 0x10, 0, &vaddr) == 0) {
bus_space_write_4(fdtbus_bs_tag, vaddr, 0x00, SW_RST);
}
}
end:
while (1);
}
static platform_method_t vf_methods[] = {
PLATFORMMETHOD(platform_devmap_init, vf_devmap_init),
PLATFORMMETHOD(platform_cpu_reset, vf_cpu_reset),
PLATFORMMETHOD_END,
};
FDT_PLATFORM_DEF(vf, "vybrid", 0, "freescale,vybrid", 0);