MFhead @ r289132

3 files changed, 34 insertions, 31 deletions

diff --git a/sys/mips/conf/AP135.hints b/sys/mips/conf/AP135.hints
index 3db44d0..ec7761e 100644
--- a/sys/mips/conf/AP135.hints
+++ b/sys/mips/conf/AP135.hints
@@ -127,6 +127,17 @@ hint.ath.0.eepromsize=16384
 #
 # bootargs=console=ttyS0,115200 root=31:02 rootfstype=jffs2 init=/sbin/init mtdparts=ath-nor0:256k(u-boot),64k(u-boot-env),6336k(rootfs),1408k(uImage),8256k(mib0),64k(ART)
 
+# The default flash layout isn't enough to fit a freebsd kernel
+# now, so the layout has been shuffled around.
+#
+# By default it's set to:
+# 256KB uboot, 64KB uboot-env, 6336KB rootfs, 1344KB kernel, 64KB cfg, 8256MB mib0, 64KB ART
+# With 'bootcmd=bootm 0x9f680000' in the environment.
+#
+# Instead, now let's make it:
+# 256KB uboot, 64KB uboot-env, 2048MB kernel, 6144MB rootfs, 7644KB mib0, 64KB cfg, 64KB ART
+# .. and then you change the boot env to be:
+# 'bootcmd=bootm 0x9f050000'
 
 # 256KiB u-boot
 hint.map.0.at="flash/spi0"
@@ -142,37 +153,37 @@ hint.map.1.end=0x00050000	# 64k u-boot-env
 hint.map.1.name="u-boot-env"
 hint.map.1.readonly=1
 
-# 6336KiB rootfs
+# 2048KiB kernel
 hint.map.2.at="flash/spi0"
 hint.map.2.start=0x00050000
-hint.map.2.end=0x00680000	# 6336k rootfs
-hint.map.2.name="rootfs"
+hint.map.2.end=0x00250000	# 2048k rootfs
+hint.map.2.name="kernel"
 hint.map.2.readonly=1
 
-# 1344KiB uImage
+# 6144KiB rootfs
 hint.map.3.at="flash/spi0"
-hint.map.3.start=0x00680000
-hint.map.3.end=0x007d0000	# 1408k uImage, 64k off the end..
-hint.map.3.name="uImage"
+hint.map.3.start=0x00250000
+hint.map.3.end=0x00850000
+hint.map.3.name="rootfs"
 hint.map.3.readonly=1
 
-# 64KiB cfg
+# 7644KiB mib0
 hint.map.4.at="flash/spi0"
-hint.map.4.start=0x007d0000
-hint.map.4.end=0x007e0000
-hint.map.4.name="cfg"
+hint.map.4.start=0x00850000
+hint.map.4.end=0x00fe0000
+hint.map.4.name="mib0"
 hint.map.4.readonly=0
 
-# 8256 KiB mib0
+# 64KiB cfg
 hint.map.5.at="flash/spi0"
-hint.map.5.start=0x007e0000
-hint.map.5.end=0x00ff0000	# 64k mib0
-hint.map.5.name="mib0"
-hint.map.5.readonly=1
+hint.map.5.start=0x00fe0000
+hint.map.5.end=0x00ff0000
+hint.map.5.name="cfg"
+hint.map.5.readonly=0
 
 # 64KiB ART
 hint.map.6.at="flash/spi0"
-hint.map.6.start=0x007f0000
+hint.map.6.start=0x00ff0000
 hint.map.6.end=0x01000000	# 64k ART
 hint.map.6.name="ART"
 hint.map.6.readonly=1
diff --git a/sys/mips/conf/TP-MR3020 b/sys/mips/conf/TP-MR3020
index f0ecb4b..a19f41b 100644
--- a/sys/mips/conf/TP-MR3020
+++ b/sys/mips/conf/TP-MR3020
@@ -50,16 +50,6 @@ device	geom_uncompress
 # Used for the static uboot partition map
 device	geom_map
 
-# Boot off of the rootfs, as defined in the geom_map setup.
-# Probably, this should be a USB device as the memory available
-# compressed rootfs is simply too small for FreeBSD
-#options	ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
-
-# Boot off of a uboot tftp ramdisk kernel image.  Because the flash
-# on this unit is so small, this is the only way to do dev work.
-# For full deployment, you will *have* to use a usb storage device
-# as a rootfs and use the flash to hold the kernel only.
-options		MD_ROOT         # md device usable as a potential root device
-options		MD_ROOT_SIZE=10240
-#makeoptions	MFS_IMAGE=/tftpboot/mfsroot-tl-mr3020.img.ulzma
-options		ROOTDEVNAME=\"ufs:md0.uncompress\"
+# With only 4MB of flash, we are stuck using USB
+# for the rootfs.
+options		ROOTDEVNAME=\"ufs:da0\"
diff --git a/sys/mips/conf/TP-MR3020.hints b/sys/mips/conf/TP-MR3020.hints
index dfabb42..e346a22 100644
--- a/sys/mips/conf/TP-MR3020.hints
+++ b/sys/mips/conf/TP-MR3020.hints
@@ -34,8 +34,10 @@ hint.arge.1.fduplex=1
 
 # Where the ART is - last 64k in the flash
 # 0x9fff1000 ?
-hint.ath.0.eepromaddr=0x1fff0000
+hint.ath.0.eepromaddr=0x1fff1000
 hint.ath.0.eepromsize=16384
+ 
+hint.ar71xx.0.eeprom_mac_addr=0x1f01fc00
 
 # The board 16MiB flash layout in uboot env:
 #