svn commit: r238785 - head/sys/arm/conf

[Warner Losh]

Author: imp
Date: Thu Jul 26 05:35:10 2012
New Revision: 238785
URL: http://svn.freebsd.org/changeset/base/238785

Log:
  Update partitions to reflect "sam9 demo" defaults.
  Update i2c devices to just include the eeprom.
  Update dataflash chip select to be CS 1 (this doesn't work yet and
  	needs changes to at91_spi and the spibus infrastructure).
  Fix typo in comment.

Modified:
  head/sys/arm/conf/SAM9260EK
  head/sys/arm/conf/SAM9260EK.hints

Modified: head/sys/arm/conf/SAM9260EK
==============================================================================
--- head/sys/arm/conf/SAM9260EK	Thu Jul 26 04:05:08 2012	(r238784)
+++ head/sys/arm/conf/SAM9260EK	Thu Jul 26 05:35:10 2012	(r238785)
@@ -17,12 +17,12 @@
 #
 # $FreeBSD$
 
-ident		ETHERNUT5
+ident		SAM9260EK
 
-include "../at91/std.ethernut5"
+include "../at91/std.sam9260ek"
 
 # To statically compile in device wiring instead of /boot/device.hints
-hints		"ETHERNUT5.hints"
+hints		"SAM9260EK.hints"
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
@@ -103,13 +103,13 @@ device		bpf		# Berkeley packet filter
 
 # Ethernet
 device		mii		# Minimal MII support
-device		ate		# Atmel AT91 Ethernet friver
+device		ate		# Atmel AT91 Ethernet driver
 
 # I2C
 device		at91_twi	# Atmel AT91 Two-wire Interface
 device		iic		# I2C generic I/O device driver
 device		iicbus		# I2C bus system
-device		pcf8563		# NXP PCF8563 clock/calendar
+device		icee		# I2C eeprom
 
 # MMC/SD
 device		at91_mci	# Atmel AT91 Multimedia Card Interface

Modified: head/sys/arm/conf/SAM9260EK.hints
==============================================================================
--- head/sys/arm/conf/SAM9260EK.hints	Thu Jul 26 04:05:08 2012	(r238784)
+++ head/sys/arm/conf/SAM9260EK.hints	Thu Jul 26 05:35:10 2012	(r238785)
@@ -2,50 +2,48 @@
 
 # Atmel AT45DB21D
 hint.at45d.0.at="spibus0"
-hint.at45d.0.addr=0x00
-# user 132 kbytes
+hint.at45d.0.cs=1
+# Area 0:	00000000 to 000041FF (RO) Bootstrap
+# Area 1:	00004200 to 000083FF      Environment
+# Area 2:	00008400 to 00041FFF (RO) U-Boot
+# Area 3:	00042000 to 00251FFF      Kernel
+# Area 4:	00252000 to 0083FFFF      FS
+# bootstrap
 hint.map.0.at="flash/spi0"
 hint.map.0.start=0x00000000
-hint.map.0.end=0x00020fff
-hint.map.0.name="user"
+hint.map.0.end=0x000041ff
+hint.map.0.name="bootstrap"
 hint.map.0.readonly=1
-# setup 132 kbytes
+# uboot environment
 hint.map.1.at="flash/spi0"
-hint.map.1.start=0x00021000
-hint.map.1.end=0x00041fff
-hint.map.1.name="setup"
-hint.map.1.readonly=1
-# uboot 528 kbytes
+hint.map.1.start=0x00004200
+hint.map.1.end=0x00083ff
+hint.map.1.name="uboot-env"
+#hint.map.1.readonly=1
+# uboot
 hint.map.2.at="flash/spi0"
-hint.map.2.start=0x00042000
-hint.map.2.end=0x000c5fff
+hint.map.2.start=0x00008400
+hint.map.2.end=0x00041fff
 hint.map.2.name="uboot"
 hint.map.2.readonly=1
-# kernel 2640 kbytes
+# kernel
 hint.map.3.at="flash/spi0"
-hint.map.3.start=0x000c6000
-hint.map.3.end=0x00359fff
-hint.map.3.name="kernel"
+hint.map.3.start=0x00042000
+hint.map.3.end=0x00251fff
+hint.map.3.name="fs"
 #hint.map.3.readonly=1
-# nutos 528 kbytes
+# fs
 hint.map.4.at="flash/spi0"
-hint.map.4.start=0x0035a000
-hint.map.4.end=0x003ddfff
-hint.map.4.name="nutos"
-hint.map.4.readonly=1
-# env 132 kbytes
-hint.map.5.at="flash/spi0"
-hint.map.5.start=0x003de000
-hint.map.5.end=0x003fefff
-hint.map.5.name="env"
-hint.map.5.readonly=1
-# env 132 kbytes
-hint.map.6.at="flash/spi0"
-hint.map.6.start=0x003ff000
-hint.map.6.end=0x0041ffff
-hint.map.6.name="nutoscfg"
-hint.map.6.readonly=1
+hint.map.4.start=0x00252000
+hint.map.4.end=0x0083ffff
+hint.map.4.name="fs"
+#hint.map.4.readonly=1
+
+# EEPROM
+hint.icee.0.at="iicbus0"
+hint.icee.0.addr=0xa0
+hint.icee.0.type=16
+hint.icee.0.size=65536
+hint.icee.0.rd_sz=256
+hint.icee.0.wr_sz=256
 
-# NXP PCF8563 clock/calendar
-hint.pcf8563_rtc.0.at="iicbus0"
-hint.pcf8563_rtc.0.addr=0xa2