Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Mar 2015 06:18:26 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r280319 - head/sys/mips/conf
Message-ID:  <201503210618.t2L6IQXM014306@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adrian
Date: Sat Mar 21 06:18:25 2015
New Revision: 280319
URL: https://svnweb.freebsd.org/changeset/base/280319

Log:
  Migrate these configs to use the geom map search function.
  
  Now that the search function reliably works, this allows for
  smaller images.

Modified:
  head/sys/mips/conf/CARAMBOLA2.hints
  head/sys/mips/conf/DIR-825B1.hints
  head/sys/mips/conf/DIR-825C1.hints

Modified: head/sys/mips/conf/CARAMBOLA2.hints
==============================================================================
--- head/sys/mips/conf/CARAMBOLA2.hints	Sat Mar 21 06:16:23 2015	(r280318)
+++ head/sys/mips/conf/CARAMBOLA2.hints	Sat Mar 21 06:18:25 2015	(r280319)
@@ -61,12 +61,12 @@ hint.map.1.readonly=0
 
 hint.map.2.at="flash/spi0"
 hint.map.2.start=0x00050000
-hint.map.2.end=0x00250000
+hint.map.2.end="search:0x00050000:0x10000:.!/bin/sh"
 hint.map.2.name="kernel"
 hint.map.2.readonly=0
 
 hint.map.3.at="flash/spi0"
-hint.map.3.start=0x00250000
+hint.map.3.start="search:0x00050000:0x10000:.!/bin/sh"
 hint.map.3.end=0x00fe0000
 hint.map.3.name="rootfs"
 hint.map.3.readonly=0

Modified: head/sys/mips/conf/DIR-825B1.hints
==============================================================================
--- head/sys/mips/conf/DIR-825B1.hints	Sat Mar 21 06:16:23 2015	(r280318)
+++ head/sys/mips/conf/DIR-825B1.hints	Sat Mar 21 06:18:25 2015	(r280319)
@@ -52,12 +52,12 @@ hint.map.1.readonly=0
 
 hint.map.2.at="flash/spi0"
 hint.map.2.start=0x0050000
-hint.map.2.end=0x00150000
+hint.map.2.end="search:0x00050000:0x10000:.!/bin/sh"
 hint.map.2.name="kernel"
 hint.map.2.readonly=1
 
 hint.map.3.at="flash/spi0"
-hint.map.3.start=0x00150000
+hint.map.3.start="search:0x00050000:0x10000:.!/bin/sh"
 hint.map.3.end=0x00660000
 hint.map.3.name="rootfs"
 hint.map.3.readonly=0

Modified: head/sys/mips/conf/DIR-825C1.hints
==============================================================================
--- head/sys/mips/conf/DIR-825C1.hints	Sat Mar 21 06:16:23 2015	(r280318)
+++ head/sys/mips/conf/DIR-825C1.hints	Sat Mar 21 06:18:25 2015	(r280319)
@@ -83,27 +83,27 @@ hint.ath.1.eeprom_firmware="pcib.0.bus.0
 # 64KiB u-boot
 hint.map.0.at="flash/spi0"
 hint.map.0.start=0x00000000
-hint.map.0.end=  0x00010000
+hint.map.0.end=0x00010000
 hint.map.0.name="u-boot"
 hint.map.0.readonly=1
 
 # 64KiB u-boot-env
 hint.map.1.at="flash/spi0"
 hint.map.1.start=0x00010000
-hint.map.1.end=  0x00020000
+hint.map.1.end=0x00020000
 hint.map.1.name="u-boot-env"
 hint.map.1.readonly=1
 
 # 1344KiB kernel 
 hint.map.2.at="flash/spi0"
 hint.map.2.start=0x00020000
-hint.map.2.end="search:0x00100000:0x10000:.!/bin/sh"
+hint.map.2.end="search:0x00020000:0x10000:.!/bin/sh"
 hint.map.2.name="kernel"
 hint.map.2.readonly=1
 
 # 14592KiB rootfs
 hint.map.3.at="flash/spi0"
-hint.map.3.start="search:0x00100000:0x10000:.!/bin/sh"
+hint.map.3.start="search:0x00020000:0x10000:.!/bin/sh"
 hint.map.3.end=0x00fb0000
 hint.map.3.name="rootfs"
 hint.map.3.readonly=1
@@ -111,20 +111,20 @@ hint.map.3.readonly=1
 # 192KiB lang -- remapped to cfg
 hint.map.4.at="flash/spi0"
 hint.map.4.start=0x00fb0000
-hint.map.4.end=  0x00fe0000
+hint.map.4.end=0x00fe0000
 hint.map.4.name="cfg"
 hint.map.4.readonly=0
 
 # 64KiB mac
 hint.map.5.at="flash/spi0"
 hint.map.5.start=0x00fe0000
-hint.map.5.end=  0x00ff0000
+hint.map.5.end=0x00ff0000
 hint.map.5.name="mac"
 hint.map.5.readonly=1
 
 # 64KiB art
 hint.map.6.at="flash/spi0"
 hint.map.6.start=0x00ff0000
-hint.map.6.end=  0x01000000
+hint.map.6.end=0x01000000
 hint.map.6.name="art"
 hint.map.6.readonly=1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503210618.t2L6IQXM014306>