Author: br
Date: Wed Nov 13 16:17:05 2013
New Revision: 258096
URL: http://svnweb.freebsd.org/changeset/base/258096
Log:
o Use common ARMv6/v7 bus_space tag.
o Use new helper routines for arm static device mapping.
o style(9) tweaks.
Deleted:
head/sys/arm/samsung/exynos/bus_space.c
Modified:
head/sys/arm/samsung/exynos/exynos5_machdep.c
head/sys/arm/samsung/exynos/files.exynos5
Modified: head/sys/arm/samsung/exynos/exynos5_machdep.c
==============================================================================
--- head/sys/arm/samsung/exynos/exynos5_machdep.c Wed Nov 13 15:10:32
2013 (r258095)
+++ head/sys/arm/samsung/exynos/exynos5_machdep.c Wed Nov 13 16:17:05
2013 (r258096)
@@ -30,27 +30,25 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#define _ARM32_BUS_DMA_PRIVATE
+#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
+#include <machine/armreg.h>
#include <machine/bus.h>
#include <machine/devmap.h>
#include <machine/machdep.h>
#include <dev/fdt/fdt_common.h>
-#define DEVMAP_BOOTSTRAP_MAP_START 0xF0000000
-
vm_offset_t
initarm_lastaddr(void)
{
- return (DEVMAP_BOOTSTRAP_MAP_START);
+ return (arm_devmap_lastaddr());
}
void
@@ -62,35 +60,22 @@ initarm_early_init(void)
void
initarm_gpio_init(void)
{
+
}
void
initarm_late_init(void)
{
+
}
-#define FDT_DEVMAP_MAX (1 + 2 + 1 + 1) /* FIXME */
-static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
- { 0, 0, 0, 0, 0, }
-};
-
-/*
- * Construct pmap_devmap[] with DT-derived config data.
- */
int
initarm_devmap_init(void)
{
- int i;
- i = 0;
- fdt_devmap[i].pd_va = 0xf2C00000;
- fdt_devmap[i].pd_pa = 0x12C00000;
- fdt_devmap[i].pd_size = 0x100000;
- fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
- fdt_devmap[i].pd_cache = PTE_NOCACHE;
- i++;
+ /* UART */
+ arm_devmap_add_entry(0x12C00000, 0x100000);
- arm_devmap_register_table(&fdt_devmap[0]);
return (0);
}
Modified: head/sys/arm/samsung/exynos/files.exynos5
==============================================================================
--- head/sys/arm/samsung/exynos/files.exynos5 Wed Nov 13 15:10:32 2013
(r258095)
+++ head/sys/arm/samsung/exynos/files.exynos5 Wed Nov 13 16:17:05 2013
(r258096)
@@ -10,12 +10,12 @@ arm/arm/cpufunc_asm_arm11.S standard
arm/arm/cpufunc_asm_armv7.S standard
arm/arm/irq_dispatch.S standard
+arm/arm/bus_space-v6.c standard
arm/arm/gic.c standard
arm/arm/generic_timer.c standard
arm/samsung/exynos/arch_timer.c standard
arm/samsung/exynos/exynos5_mp.c optional smp
-arm/samsung/exynos/bus_space.c standard
arm/samsung/exynos/common.c standard
arm/samsung/exynos/exynos5_machdep.c standard
arm/samsung/exynos/uart.c optional uart
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
