diff options
| author | ian <ian@FreeBSD.org> | 2014-05-15 02:41:23 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-05-15 02:41:23 +0000 |
| commit | 25ba02d795dd37d50898996cf19659d1da1659a5 (patch) | |
| tree | af11a63cc5a0d26b2e708bd24e28a5015c4714df /sys/arm/allwinner | |
| parent | fa1497d7f781e064f21c3688b3d51c5571812a00 (diff) | |
| download | FreeBSD-src-25ba02d795dd37d50898996cf19659d1da1659a5.zip FreeBSD-src-25ba02d795dd37d50898996cf19659d1da1659a5.tar.gz | |
MFC r261252, r261279, r261304, r261305, r261322, r261336, r261337, r261338,
r261353
Fix the name of the dts file for the HL201...
When mapping an address, the bsh needs the same offset we do for other things.
Add explicit depends on bus_if.h and device_if.h to avoid a
chicken and egg problem in some compilation environments.
Switch to using PAs rather than VAs for the addresses we map for
devices. This is a nop, except for what's reported by atmelbus for the
resources.
Comment cleanups. Move things around for diff reduction against FDT work.
Diffstat (limited to 'sys/arm/allwinner')
| -rw-r--r-- | sys/arm/allwinner/a20/std.a20 | 2 | ||||
| -rw-r--r-- | sys/arm/allwinner/std.a10 | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/sys/arm/allwinner/a20/std.a20 b/sys/arm/allwinner/a20/std.a20 index 851308c..f582e91 100644 --- a/sys/arm/allwinner/a20/std.a20 +++ b/sys/arm/allwinner/a20/std.a20 @@ -16,8 +16,6 @@ options KERNPHYSADDR=0x40200000 makeoptions KERNVIRTADDR=0xc0200000 options KERNVIRTADDR=0xc0200000 -options STARTUP_PAGETABLE_ADDR=0x48000000 - options ARM_L2_PIPT options IPI_IRQ_START=0 diff --git a/sys/arm/allwinner/std.a10 b/sys/arm/allwinner/std.a10 index f698b34..11ef732 100644 --- a/sys/arm/allwinner/std.a10 +++ b/sys/arm/allwinner/std.a10 @@ -16,6 +16,4 @@ options KERNPHYSADDR=0x40200000 makeoptions KERNVIRTADDR=0xc0200000 options KERNVIRTADDR=0xc0200000 -options STARTUP_PAGETABLE_ADDR=0x48000000 - files "../allwinner/files.a10" |
