Module Name: src
Committed By: thorpej
Date: Thu Jun 28 15:21:52 UTC 2018
Modified Files:
src/sys/arch/evbarm/conf: ARMADILLO210 ARMADILLO9 BEAGLEBONE
MMNET_GENERIC MPCSA_GENERIC
src/sys/arch/evbmips/conf: OMSAL400
Log Message:
Use the "flags" config directive modifier to specify seeprom size
(a pre-existing capability in seeprom driver) now that "size" is no
longer a valid locator for i2c.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/conf/ARMADILLO210
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbarm/conf/ARMADILLO9
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/BEAGLEBONE
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/OMSAL400
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/ARMADILLO210
diff -u src/sys/arch/evbarm/conf/ARMADILLO210:1.40 src/sys/arch/evbarm/conf/ARMADILLO210:1.41
--- src/sys/arch/evbarm/conf/ARMADILLO210:1.40 Thu Jun 7 13:36:28 2018
+++ src/sys/arch/evbarm/conf/ARMADILLO210 Thu Jun 28 15:21:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO210,v 1.40 2018/06/07 13:36:28 thorpej Exp $
+# $NetBSD: ARMADILLO210,v 1.41 2018/06/28 15:21:52 thorpej Exp $
#
# ARMADILLO210 -- Atmark Techno, Armadillo-210
#
@@ -156,7 +156,7 @@ epled0 at epgpio0 port 4 bit1 1 bit2 0
# I^2C Controller Unit
armadillo9iic0 at epgpio0 port 1 bit1 4 bit2 5
iic* at armadillo9iic?
-seeprom0 at iic? addr 0x50 size 128
+seeprom0 at iic? addr 0x50 flags 1 # 128 bytes
# MII/PHY support
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
Index: src/sys/arch/evbarm/conf/ARMADILLO9
diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.57 src/sys/arch/evbarm/conf/ARMADILLO9:1.58
--- src/sys/arch/evbarm/conf/ARMADILLO9:1.57 Thu Jun 7 13:36:28 2018
+++ src/sys/arch/evbarm/conf/ARMADILLO9 Thu Jun 28 15:21:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.57 2018/06/07 13:36:28 thorpej Exp $
+# $NetBSD: ARMADILLO9,v 1.58 2018/06/28 15:21:52 thorpej Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -167,7 +167,7 @@ epled0 at epgpio0 port 4 bit1 0 bit2 1
# I^2C Controller Unit
armadillo9iic0 at epgpio0 port 1 bit1 4 bit2 5
iic* at armadillo9iic?
-seeprom0 at iic? addr 0x50 size 128
+seeprom0 at iic? addr 0x50 flags 1 # 128 bytes
#s3531rtc0 at iic? addr 0x30
# PCMCIA bus support
Index: src/sys/arch/evbarm/conf/BEAGLEBONE
diff -u src/sys/arch/evbarm/conf/BEAGLEBONE:1.43 src/sys/arch/evbarm/conf/BEAGLEBONE:1.44
--- src/sys/arch/evbarm/conf/BEAGLEBONE:1.43 Mon Jun 26 03:15:16 2017
+++ src/sys/arch/evbarm/conf/BEAGLEBONE Thu Jun 28 15:21:52 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: BEAGLEBONE,v 1.43 2017/06/26 03:15:16 sevan Exp $
+# $NetBSD: BEAGLEBONE,v 1.44 2018/06/28 15:21:52 thorpej Exp $
#
# BEAGLEBONE -- TI AM335x board Kernel
#
@@ -104,7 +104,7 @@ gpio* at gpiobus?
# I2C Controller
tiiic0 at obio0 addr 0x44e0b000 size 0x1000 intr 70
iic* at tiiic?
-seeprom* at iic0 addr 0x50 size 32768
+seeprom* at iic0 addr 0x50 flags 256 # 32768 bytes
tps65217pmic* at iic0 addr 0x24
# On-board 16550 UARTs
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.37 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.38
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.37 Sat Jun 23 01:23:27 2018
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Thu Jun 28 15:21:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.37 2018/06/23 01:23:27 maya Exp $
+# $NetBSD: MMNET_GENERIC,v 1.38 2018/06/28 15:21:52 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.37 $"
+#ident "GENERIC-$Revision: 1.38 $"
maxusers 32 # estimated number of users
@@ -282,7 +282,7 @@ ohci0 at at91bus0 addr 0x00500000 size
at91twi0 at at91bus0 addr 0xfffac000 size 0x4000 pid 11
iic0 at at91twi?
#ds1672rtc* at iic0 addr 0x68
-#seeprom* at iic0 addr 0x50 size 4096
+#seeprom* at iic0 addr 0x50 flags 32 # 4096 bytes
# Hardware monitors
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.58 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.59
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.58 Sat Jun 23 01:23:27 2018
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Thu Jun 28 15:21:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.58 2018/06/23 01:23:27 maya Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.59 2018/06/28 15:21:52 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.58 $"
+#ident "GENERIC-$Revision: 1.59 $"
maxusers 32 # estimated number of users
@@ -287,7 +287,7 @@ gpio* at mpcsa_leds?
at91twi0 at at91bus0 addr 0xfffb8000 size 0x4000 pid 12
iic0 at at91twi?
#ds1672rtc* at iic0 addr 0x68
-seeprom* at iic0 addr 0x50 size 4096
+seeprom* at iic0 addr 0x50 flags 32 # 4096 bytes
# Console Devices
Index: src/sys/arch/evbmips/conf/OMSAL400
diff -u src/sys/arch/evbmips/conf/OMSAL400:1.7 src/sys/arch/evbmips/conf/OMSAL400:1.8
--- src/sys/arch/evbmips/conf/OMSAL400:1.7 Sat Jul 29 19:02:28 2006
+++ src/sys/arch/evbmips/conf/OMSAL400 Thu Jun 28 15:21:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: OMSAL400,v 1.7 2006/07/29 19:02:28 kiyohara Exp $
+# $NetBSD: OMSAL400,v 1.8 2018/06/28 15:21:52 thorpej Exp $
#
# Kernel config for the Open Micro Server AL400.
@@ -27,7 +27,7 @@ ausmbus0 at aupsc0
iic0 at ausmbus0
lmtemp* at iic0 addr 0x48 flags 0x0002 # LM77 temperature sensor
r2025rtc* at iic0 addr 0x32 # R2025S RTC
-seeprom* at iic0 addr 0x50 size 4096 # Serial EEPROM AT24C04
+seeprom* at iic0 addr 0x50 flags 32 # 4096 bytes
# Alchemy On-chip PCI
aupci* at aubus? addr ?
