Author: andrew
Date: Sat Jun 3 20:14:46 2017
New Revision: 319554
URL: https://svnweb.freebsd.org/changeset/base/319554
Log:
Port the Vybrid code to PLATFORM to help move it into GENERIC.
Deleted:
head/sys/arm/freescale/vybrid/vf_common.c
Modified:
head/sys/arm/conf/VYBRID
head/sys/arm/freescale/vybrid/files.vybrid
head/sys/arm/freescale/vybrid/vf_machdep.c
Modified: head/sys/arm/conf/VYBRID
==============================================================================
--- head/sys/arm/conf/VYBRID Sat Jun 3 20:02:12 2017 (r319553)
+++ head/sys/arm/conf/VYBRID Sat Jun 3 20:14:46 2017 (r319554)
@@ -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
Modified: head/sys/arm/freescale/vybrid/files.vybrid
==============================================================================
--- head/sys/arm/freescale/vybrid/files.vybrid Sat Jun 3 20:02:12 2017
(r319553)
+++ head/sys/arm/freescale/vybrid/files.vybrid Sat Jun 3 20:14:46 2017
(r319554)
@@ -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
Modified: head/sys/arm/freescale/vybrid/vf_machdep.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_machdep.c Sat Jun 3 20:02:12 2017
(r319553)
+++ head/sys/arm/freescale/vybrid/vf_machdep.c Sat Jun 3 20:14:46 2017
(r319554)
@@ -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)
+static int
+vf_devmap_init(platform_t plat)
{
+ devmap_add_entry(0x40000000, 0x100000);
+
+ return (0);
}
-void
-platform_gpio_init(void)
+static void
+vf_cpu_reset(platform_t plat)
{
+ phandle_t src;
+ uint32_t paddr;
+ bus_addr_t vaddr;
-}
+ if (src_swreset() == 0)
+ goto end;
-void
-platform_late_init(void)
-{
+ 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);
}
-int
-platform_devmap_init(void)
-{
+static platform_method_t vf_methods[] = {
+ PLATFORMMETHOD(platform_devmap_init, vf_devmap_init),
+ PLATFORMMETHOD(platform_cpu_reset, vf_cpu_reset),
- devmap_add_entry(0x40000000, 0x100000);
+ PLATFORMMETHOD_END,
+};
- return (0);
-}
+FDT_PLATFORM_DEF(vf, "vybrid", 0, "freescale,vybrid", 0);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
