From 265ba07ab2497016c0fe6ba4b74b1c391ada8bf2 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Sun, 17 Oct 2010 20:23:52 -0300
Subject: [PATCH] eda-tools now has all the R and C we need here. Removed local
 database.

- bom/Makefile: access database in eda-tools/boom/
- dk/digi-key.equ: removed resistors and capacitors
- bom/Makefile, bom/avx.gen, bom/johanson.gen, bom/murata.gen,
  bom/panasonic.gen, bom/stackpole.chr, bom/tdk.gen, bom/yageo.gen: remove
  databases already present in eda-tools
---
 bom/Makefile        | 40 +++++++------------------------
 bom/avx.gen         | 29 -----------------------
 bom/dk/digi-key.equ | 27 ---------------------
 bom/johanson.gen    | 58 ---------------------------------------------
 bom/murata.gen      | 42 --------------------------------
 bom/panasonic.gen   | 22 -----------------
 bom/stackpole.chr   | 14 -----------
 bom/tdk.gen         | 32 -------------------------
 bom/yageo.gen       | 34 --------------------------
 9 files changed, 9 insertions(+), 289 deletions(-)
 delete mode 100644 bom/avx.gen
 delete mode 100644 bom/johanson.gen
 delete mode 100644 bom/murata.gen
 delete mode 100644 bom/panasonic.gen
 delete mode 100644 bom/stackpole.chr
 delete mode 100644 bom/tdk.gen
 delete mode 100644 bom/yageo.gen

diff --git a/bom/Makefile b/bom/Makefile
index 9989d5e..580a432 100644
--- a/bom/Makefile
+++ b/bom/Makefile
@@ -1,11 +1,14 @@
 BOOM=PATH=/home/moko/svn.openmoko.org/trunk/eda/boom:../boom:$$PATH boom
 
+BOOM2=../../eda-tools/boom
+BOOM_CONFIG=$(BOOM2)/boom-config
+
 KITS=1
 
-EQU=atrf.equ dk/digi-key.equ
-INV=atrf.inv dk/digi-key.inv
-GEN=avx.gen johanson.gen murata.gen panasonic.gen tdk.gen yageo.gen
-CHR=$(GEN:%.gen=%.chr) stackpole.chr
+EQU=atrf.equ dk/digi-key.equ $(shell $(BOOM_CONFIG) equ)
+INV=atrf.inv dk/digi-key.inv $(shell $(BOOM_CONFIG) inv)
+DSC=dk/digi-key.dsc $(shell $(BOOM_CONFIG) dsc)
+CHR=$(shell $(BOOM_CONFIG) chr)
 
 
 .PHONY:		all again show-atusd spotless
@@ -25,30 +28,6 @@ atusd.par:	$(EQU) $(INV) $(CHR) ../atusd/atusd.lst atrf.sub
 		  ../atusd/atusd.lst atrf.sub \
 		  >$@ || { rm -rf $@; exit 1; }
 
-avx.chr:	dk/digi-key.equ avx.gen
-		$(BOOM) gen2chr AVX dk/digi-key.equ avx.gen >$@ || \
-		  { rm -f $@; exit 1; }
-
-johanson.chr:	dk/digi-key.equ johanson.gen
-		$(BOOM) gen2chr JOHANSON dk/digi-key.equ johanson.gen >$@ || \
-		  { rm -f $@; exit 1; }
-
-murata.chr:	dk/digi-key.equ murata.gen
-		$(BOOM) gen2chr MURATA dk/digi-key.equ murata.gen >$@ || \
-		  { rm -f $@; exit 1; }
-
-panasonic.chr:	dk/digi-key.equ panasonic.gen
-		$(BOOM) gen2chr PANASONIC dk/digi-key.equ panasonic.gen >$@ || \
-		  { rm -f $@; exit 1; }
-
-tdk.chr:	dk/digi-key.equ tdk.gen
-		$(BOOM) gen2chr TDK dk/digi-key.equ tdk.gen >$@ || \
-		  { rm -f $@; exit 1; }
-
-yageo.chr:	dk/digi-key.equ yageo.gen
-		$(BOOM) gen2chr YAGEO dk/digi-key.equ yageo.gen >$@ || \
-		  { rm -f $@; exit 1; }
-
 dk/digi-key.inv:
 		$(MAKE) -C dk digi-key.inv
 
@@ -61,10 +40,9 @@ SHOW_PRETTY = (echo '\#ORD'; grep '^$(2) ' $(1).ord ; ) | \
 		awk '{ s += $$(NF); if ($$(NF)+0) n++; print; } \
 		END { print "$(4)", s, "items:", n }'
 
-show-atusd:	atusd.ord dk/digi-key.dsc
-		$(call SHOW_PRETTY,atusd,DIGI-KEY,dk/digi-key.dsc,USD)
+show-atusd:	atusd.ord $(DSC)
+		$(call SHOW_PRETTY,atusd,DIGI-KEY,$(DSC),USD)
 
 spotless:
 		$(MAKE) -C dk spotless
 		rm -f atusd.par atusd.ord
-		rm -f $(GEN:%.gen=%.chr)
diff --git a/bom/avx.gen b/bom/avx.gen
deleted file mode 100644
index bbbaa68..0000000
--- a/bom/avx.gen
+++ /dev/null
@@ -1,29 +0,0 @@
-#GEN
-
-# http://www.avx.com/docs/Catalogs/ccog.pdf
-# http://www.avx.com/docs/Catalogs/cx5r.pdf
-
-* -> T=C {
-    (????)(?)(?)([0-9][0-9][0-9])(?)* ->
-        FP=$REF:1 _V=$REF:2 _M=$REF:3 _E12_P=$REF:4 _TOL=$REF:5
-
-    _M=A -> M=NP0
-    _M=D -> M=X5R
-
-    include lib/captol.inc
-
-    _V=4 -> V=4V
-    _V=6 -> V=6.3V
-    _V=Z -> V=10V
-    _V=Y -> V=16V
-    _V=3 -> V=25V
-    _V=D -> V=35V
-    _V=5 -> V=50V
-    _V=1 -> V=100V
-    _V=2 -> V=200V
-    _V=7 -> V=500V
-}
-
-include lib/e12.inc
-
-T=C -> C=${_E12}F !
diff --git a/bom/dk/digi-key.equ b/bom/dk/digi-key.equ
index 788d4a1..a0f2e2d 100644
--- a/bom/dk/digi-key.equ
+++ b/bom/dk/digi-key.equ
@@ -6,30 +6,3 @@ DIGI-KEY 336-1296-5-ND			SILABS C8051F326-GM
 
 DIGI-KEY 732-2230-1-ND			WURTH 748421245
 DIGI-KEY 712-1538-1-ND			JOHANSON 2450FB15L0001E
-
-# resistors
-
-DIGI-KEY RMCF0402ZT0R00CT-ND  		STACKPOLE RMCF0402ZT0R00
-DIGI-KEY P0.0JCT-ND			PANASONIC ERJ-2GE0R00X
-DIGI-KEY 311-0.0JRCT-ND			YAGEO RC0402JR-070RL
-
-# caps
-
-DIGI-KEY 712-1274-1-ND			JOHANSON 500R07S220GV4T
-
-DIGI-KEY 490-1320-1-ND			MURATA GRM155R60J105KE19D
-DIGI-KEY 445-4998-1-ND			TDK C1005X5R0J105K
-DIGI-KEY 478-2583-1-ND			AVX 04026D105KAT2A
-
-DIGI-KEY 311-1018-1-ND			YAGEO CC0402JRNP09BN220
-DIGI-KEY 490-1283-1-ND			MURATA GRM1555C1H220JZ01D
-DIGI-KEY 445-1239-1-ND			TDK C1005C0G1H220J
-DIGI-KEY 478-1074-1-ND			AVX 04025A220JAT2A
-
-DIGI-KEY 311-1020-1-ND			YAGEO CC0402JRNP09BN330
-DIGI-KEY 490-3220-1-ND			MURATA GRM1555C1H330JZ01D
-DIGI-KEY 445-1241-1-ND			TDK C1005C0G1H330J
-
-DIGI-KEY 311-1035-1-ND			YAGEO CC0402KRX7R9BB221
-DIGI-KEY 445-1254-1-ND			TDK C1005X7R1H221K
-DIGI-KEY 490-1298-1-ND			MURATA GRM155R71H221KA01D
diff --git a/bom/johanson.gen b/bom/johanson.gen
deleted file mode 100644
index 42c7dc3..0000000
--- a/bom/johanson.gen
+++ /dev/null
@@ -1,58 +0,0 @@
-#GEN
-
-# http://www.johansontechnology.com/images/stories/rfcaps/mlhqcaps/jti_high-q-mlcc_2008-11.pdf
-# http://www.johansondielectrics.com/surface-mount-products/surface-mount-mlc-capacitors/part-number-breakdown.html
-
-* -> T=C {
-    (???)([RS][0-9][0-9])(?)([0-9][0-9][0-9])(?)* ->
-	_V=$REF:1 _FP=$REF:2 _M=$REF:3 _E12=$REF:4 _TOL=$REF:5
-
-    _V=6R3 -> V=6.3V
-    _V=100 -> V=10V
-    _V=160 -> V=16V
-    _V=250 -> V=25V
-    _V=500 -> V=50V
-    _V=101 -> V=100V
-    _V=201 -> V=200V
-    _V=251 -> V=250V
-    _V=501 -> V=500V
-    _V=631 -> V=630V
-    _V=102 -> V=1000V
-    _V=152 -> V=1500V
-    _V=202 -> V=2000V
-    _V=252 -> V=2500V
-    _V=302 -> V=3000V
-    _V=402 -> V=4000V
-    _V=502 -> V=5000V
-
-    _FP=R03 -> FP=01005
-    _FP=R05 -> FP=0201
-    _FP=R07 -> FP=0402
-    _FP=R14 -> FP=0603
-    _FP=R15 -> FP=0805
-    _FP=S42 -> FP=1111
-    _FP=R18 -> FP=1206
-    _FP=S41 -> FP=1210
-    _FP=R29 -> FP=1808
-    _FP=S43 -> FP=1812
-    _FP=S47 -> FP=2220
-    _FP=S49 -> FP=1825
-    _FP=S48 -> FP=2225	# MMLC says 2225, High-Q says 2525
-    _FP=S58 -> FP=3838
-
-    _M=S -> M=NP0/RF
-    _M=L -> M=NP0/RF
-    _M=E -> M=NP0/RF
-    _M=W -> M=X7R/RF
-    _M=N -> M=NP0
-    _M=W -> M=X7R
-    _M=X -> M=X5R
-    _M=Z -> M=Z5U
-    _M=Y -> M=Y5V
-
-    include lib/captol.inc
-}
-
-include lib/e12.inc
-
-T=C -> C=${_E12}F !
diff --git a/bom/murata.gen b/bom/murata.gen
deleted file mode 100644
index f847044..0000000
--- a/bom/murata.gen
+++ /dev/null
@@ -1,42 +0,0 @@
-#GEN
-
-# http://www.murata.com/products/catalog/pdf/c02e.pdf
-
-GRM* -> T=C {
-    GRM(??)?(??)(??)([0-9R][0-9R][0-9])(?)* ->
-        _FP=$REF:1 _M=$REF:2 _V=$REF:3 _E12_P=$REF:4 _TOL=$REF:5
-
-    _FP=02 -> FP=01005
-    _FP=03 -> FP=0201
-    _FP=15 -> FP=0402
-    _FP=18 -> FP=0603
-    _FP=21 -> FP=0805
-    _FP=31 -> FP=1206
-    _FP=32 -> FP=1210
-
-    _M=5C -> M=NP0
-    _M=7U -> M=U2J
-    _M=6P -> M=P2H
-    _M=6T -> M=T2H
-    _M=R7 -> M=X7R
-    _M=E7 -> M=X7U
-    _M=D7 -> M=X7T
-    _M=C8 -> M=X6S
-    _M=D8 -> M=X6T
-    _M=R6 -> M=X5R
-
-    _V=0G -> V=4V
-    _V=0J -> V=6.3V
-    _V=1A -> V=10V
-    _V=1C -> V=16V
-    _V=1E -> V=25V
-    _V=YA -> V=35V
-    _V=1H -> V=50V
-    _V=2A -> V=100V
-    
-    include lib/captol.inc
-}
-
-include lib/e12.inc
-
-T=C -> C=${_E12}F !
diff --git a/bom/panasonic.gen b/bom/panasonic.gen
deleted file mode 100644
index f95a195..0000000
--- a/bom/panasonic.gen
+++ /dev/null
@@ -1,22 +0,0 @@
-#GEN
-
-# http://industrial.panasonic.com/www-data/pdf/AOA0000/AOA0000CE1.pdf
-
-ERJ* -> T=R {
-    ERJ-(???)(Y|)(?)([0-9R][0-9R][0-9])* ->
-	_FP=$REF:1 _TOL=$REF:3 _E12_1=$REF:4
-
-    _TOL=J -> TOL=5%
-
-    _FP=XGN -> FP=01005 P=1/32W V=15V
-    _FP=1GE -> FP=0201 P=1/20W V=25V
-    _FP=2GE -> FP=0402 P=1/10W V=50V
-    _FP=3GE -> FP=0603 P=1/10W V=75V
-    _FP=6GE -> FP=0805 P=1/8W V=150V
-    _FP=8GE -> FP=1206 P=1/4W V=200V
-    # @@@ handle 1210 and beyond later
-}
-
-include lib/e12.inc
-
-T=R -> R=${_E12}R !
diff --git a/bom/stackpole.chr b/bom/stackpole.chr
deleted file mode 100644
index a70796b..0000000
--- a/bom/stackpole.chr
+++ /dev/null
@@ -1,14 +0,0 @@
-#CHR
-
-#
-# Stackpole are changing their part numbers, with a transition period from
-# 2011-01-03 to 2011-12-31. Digi-Key already went ahead and switched, so we use
-# the new style here as well.
-#
-# Since there's no complete reference for the Stackpole parts with new numbers
-# yet, we just put the parts we need here and defer generation until later.
-#
-# http://www.seielect.com/news/20100730_PartNumberChange.htm
-#
-
-STACKPOLE RMCF0402ZT0R00 T=R R=0R FP=0402 P=1/16W V=50V
diff --git a/bom/tdk.gen b/bom/tdk.gen
deleted file mode 100644
index 9e58338..0000000
--- a/bom/tdk.gen
+++ /dev/null
@@ -1,32 +0,0 @@
-#GEN
-
-# http://www.tdk.co.jp/tefe02/e412_c.pdf
-
-C* -> T=C {
-    C(????)(???)(??)([0-9][0-9R][0-9])(?)* ->
-        _FP=$REF:1 M=$REF:2 _V=$REF:3 _E12_P=$REF:4 _TOL=$REF:5
-
-    M=C0G -> M=NP0		# normalize
-
-    _FP=0603 -> FP=0201
-    _FP=1005 -> FP=0402
-    _FP=1608 -> FP=0603
-    _FP=2012 -> FP=0805
-    _FP=3216 -> FP=1206
-    _FP=3225 -> FP=1210
-    _FP=4532 -> FP=1812
-    _FP=5750 -> FP=2220
-
-    include lib/captol.inc
-
-    _V=0G -> V=4V
-    _V=0J -> V=6.3V
-    _V=1A -> V=10V
-    _V=1C -> V=16V
-    _V=1E -> V=25V
-    _V=1H -> V=50V
-}
-
-include lib/e12.inc
-
-T=C -> C=${_E12}F !
diff --git a/bom/yageo.gen b/bom/yageo.gen
deleted file mode 100644
index 98b48b0..0000000
--- a/bom/yageo.gen
+++ /dev/null
@@ -1,34 +0,0 @@
-#GEN
-
-# http://www.yageo.com/pdf/Pu-RC0402_51_PbFree_L_2.pdf
-
-RC* -> T=R {
-    RC(????)(?)?-??(*)L ->
-        FP=$REF:1 _TOL=$REF:2 _R=$REF:3
-
-    include lib/captol.inc
-
-    FP=0402 -> P=1/16W V=50V
-    _R=$R -> R=$_R !
-}
-
-# http://www.yageo.com/pdf/yageo/NP0_16V-to-100V_6.pdf
-# http://www.yageo.com/pdf/UPY-GPHC_X7R_6.3V-to-50V_3.pdf
-
-CC* -> T=C {
-    CC(????)(?)?(???)(?)??([0-9][0-9R][0-9]) ->
-        FP=$REF:1 _TOL=$REF:2 M=$REF:3 _V=$REF:4 _E12_P=$REF:5
-
-    include lib/captol.inc
-
-    _V=5 -> V=6.3V
-    _V=6 -> V=10V
-    _V=7 -> V=16V
-    _V=8 -> V=25V
-    _V=9 -> V=50V
-    _V=0 -> V=100V
-}
-
-include lib/e12.inc
-
-T=C -> C=${_E12}F !