Index: sys/mips/conf/TP-WN1043ND
===================================================================
--- sys/mips/conf/TP-WN1043ND   (revision 255478)
+++ sys/mips/conf/TP-WN1043ND   (working copy)
@@ -34,12 +34,28 @@
 # redboot stuff.
 options                AR71XX_ENV_UBOOT
 
-# uzip - to boot natively from flash
-device         geom_uzip
-options                GEOM_UZIP
+# uncompress - to boot natively from flash
+device         geom_uncompress
+options                GEOM_UNCOMPRESS
 
 # 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                ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
+
+
+# We bite the performance overhead for now; the kernel won't
+# fit if the mutexes are inlined.
+options        MUTEX_NOINLINE
+options        RWLOCK_NOINLINE
+options        SX_NOINLINE
+
+# Remove everything we don't need.  We need a _really_ small kernel!
+nooptions      INVARIANTS
+nooptions      INVARIANT_SUPPORT
+nooptions      WITNESS
+nooptions      WITNESS_SKIPSPIN
+nooptions      DEBUG_REDZONE
+nooptions      DEBUG_MEMGUARD
+