diff options
| author | bz <bz@FreeBSD.org> | 2008-12-28 11:04:24 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2008-12-28 11:04:24 +0000 |
| commit | 4d655f6e02578d79d31d868c18e2e2c4e1fd5285 (patch) | |
| tree | 3cad3f77b255ebb1e39a09c7f2ad31ed233f0bfb | |
| parent | 2207460cee95d965aa49abeb406f1ce11850d8fd (diff) | |
| download | FreeBSD-src-4d655f6e02578d79d31d868c18e2e2c4e1fd5285.zip FreeBSD-src-4d655f6e02578d79d31d868c18e2e2c4e1fd5285.tar.gz | |
Include std.ixp425 for "cpu" and comment out duplicate memory map
options. Using the already included std.avila is not considered
to be entirely right (and the options slightly differ) but the best
match we currently have. Upcoming work should fit better.
Reorder another variable to match the layout of other configs.
Reviewed by: sam, warner (earlier version with options removed)
| -rw-r--r-- | sys/arm/conf/NSLU | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU index f22319b2..85b2e2f 100644 --- a/sys/arm/conf/NSLU +++ b/sys/arm/conf/NSLU @@ -19,14 +19,18 @@ ident NSLU -options PHYSADDR=0x10000000 -options KERNPHYSADDR=0x10200000 -options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm -options FLASHADDR=0x50000000 -options LOADERRAMADDR=0x00000000 -options STARTUP_PAGETABLE_ADDR=0x10000000 +# XXX What is defined in std.avila does not exactly match the following: +#options PHYSADDR=0x10000000 +#options KERNPHYSADDR=0x10200000 +#options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +#options FLASHADDR=0x50000000 +#options LOADERRAMADDR=0x00000000 +#options STARTUP_PAGETABLE_ADDR=0x10000000 +include "../xscale/ixp425/std.ixp425" +# NB: memory mapping is defined in std.avila (see also comment above) include "../xscale/ixp425/std.avila" +options XSCALE_CACHE_READ_WRITE_ALLOCATE #To statically compile in device wiring instead of /boot/device.hints hints "NSLU.hints" #Default places to look for devices. makeoptions MODULES_OVERRIDE="" @@ -99,7 +103,6 @@ device bpf device pty device loop -options XSCALE_CACHE_READ_WRITE_ALLOCATE device md device random # Entropy device |
