Flesh out the rest of the AP96 board/config.

2 files changed, 64 insertions, 8 deletions

diff --git a/sys/mips/conf/AP96 b/sys/mips/conf/AP96
index f94a011..8b5fb9f 100644
--- a/sys/mips/conf/AP96
+++ b/sys/mips/conf/AP96
@@ -17,19 +17,26 @@ include		"AR71XX_BASE"
 ident		"AP96"
 hints		"AP96.hints"
 
-# GEOM modules
-device		geom_redboot	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
-options		GEOM_UZIP
-
-options		ROOTDEVNAME=\"ufs:md0.uzip\"
 options		AR71XX_REALMEM=64*1024*1024
 
 options		AR71XX_ENV_UBOOT
 
-# options		MD_ROOT
-# options		MD_ROOT_SIZE="6144"
+# For DOS - enable if required
+options 	GEOM_PART_BSD
+options 	GEOM_PART_MBR
+options 	MSDOSFS
+
+# uncompress - to boot read-only lzma natively from flash
+device		geom_uzip
+options 	GEOM_UZIP
+
+# Used for the static uboot partition map
+device          geom_map
+
+# Boot off of the rootfs, as defined in the geom_map setup.
+options         ROOTDEVNAME=\"ufs:map/rootfs.uzip\"
 
+# Options needed for the EEPROM based calibration/PCI configuration data.
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
diff --git a/sys/mips/conf/AP96.hints b/sys/mips/conf/AP96.hints
index 1abc8e7..b69330a 100644
--- a/sys/mips/conf/AP96.hints
+++ b/sys/mips/conf/AP96.hints
@@ -26,3 +26,52 @@ hint.pcib.0.bus.0.18.0.ath_fixup_size=4096
 hint.ath.0.eeprom_firmware="pcib.0.bus.0.17.0.eeprom_firmware"
 hint.ath.1.eeprom_firmware="pcib.0.bus.0.18.0.eeprom_firmware"
 
+# The default flash layout:
+# uboot: 192k
+# env: 64k
+# rootfs: 6144k
+# uimage (kernel): 1728k
+# caldata: 64k
+#
+# bootargs=console=ttyS0,115200 root=31:02 rootfstype=jffs2 init=/sbin/init
+#    mtdparts=ar7100-nor0:192k(uboot),64k(env),6144k(rootfs),1728k(uImage),64k(caldata) mem=64M
+
+#
+# We steal 64k from the end of rootfs to store the local config.
+
+hint.map.0.at="flash/spi0"
+hint.map.0.start=0x00000000
+hint.map.0.end=0x000030000
+hint.map.0.name="uboot"
+hint.map.0.readonly=1
+
+hint.map.1.at="flash/spi0"
+hint.map.1.start=0x00030000
+hint.map.1.end=0x00040000
+hint.map.1.name="uboot-env"
+hint.map.1.readonly=1
+
+hint.map.2.at="flash/spi0"
+hint.map.2.start=0x00040000
+hint.map.2.end=0x00630000
+hint.map.2.name="rootfs"
+hint.map.2.readonly=1
+
+hint.map.3.at="flash/spi0"
+hint.map.3.start=0x00630000
+hint.map.3.end=0x00640000
+hint.map.3.name="cfg"
+hint.map.3.readonly=0
+
+hint.map.4.at="flash/spi0"
+hint.map.4.start=0x00640000
+hint.map.4.end=0x007f0000
+hint.map.4.name="kernel"
+hint.map.4.readonly=1
+
+hint.map.5.at="flash/spi0"
+hint.map.5.start=0x007f0000
+hint.map.5.end=0x00800000
+hint.map.5.name="art"
+hint.map.5.readonly=1
+