new Serials of DiRICH3

diff --git a/base/serials_dirich.db b/base/serials_dirich.db
index 8f8d788109303bc31d28aa9fd7e8b1ed38d706a8..d70bab12b27f549062ec6d4d498155846e308589 100644 (file)
--- a/base/serials_dirich.db
+++ b/base/serials_dirich.db
@@ -943,14 +943,62 @@
 9231   0x7100000a49e0e728 # dirich3  untested
 9241   0xdd00000a494eb928 # dirich3  untested MACHXo3 not programmed -> JTAG prob.
 9251   0x8900000a48dfb128 # dirich3  untested
-<<<<<<< HEAD
 9261    0xd500000a49406b28 # dirich3  untested
 9281    0x0300000a525aa428 # dirich3  untested
+9291    0x3d00000a197aa228 # dirich3
+9301    0xfb00000a19821128 # dirich3
+9311    0xa700000a197ac128 # dirich3
+9321    0x7500000a197abc28 # dirich3
+9331    0xe300000a197ab528 # dirich3
+9381    0x0400000a197ada28 # dirich3
+9391    0x7200000a19861828 # dirich3
+#9421    0x  #no connection after ecp5 flash; thr. is flashed
+9401    0xe400000a19861128 # dirich3
+9411    0xc500000a197aa928 # dirich3
+9431    0xc700000a197aba28 # dirich3
+9531    0x0d00000a1971f028 # dirich3 # problem with ECP5 (trbnet) flashing
+9541    0x8500000a197e9f28 # dirich3
+9551    0x1b00000a1981e528 # dirich3
+9561    0xce00000a1972bb28 # dirich3
+9571    0xb800000a197dea28 # dirich3
+9581    0xea00000a1972b428 # dirich3
+9591    0xd500000a19642628 # dirich3
+9601    0xb800000a19848328 # dirich3
+9611    0xd700000a19834b28 # dirich3
+9621    0x8f00000a1980e628 # dirich3
+9631    0xf100000a19835728 # dirich3
+9641    0xc500000a1981f228 # dirich3
+9651    0x5300000a197def28 # dirich3
+9661    0xe200000a1972f828 # dirich3
+9671    0x7400000a1972f128 # dirich3
+9681    0x0900000a1972fd28 # dirich3
+9701    0x5e00000a1968f428 # dirich3
+9711    0x5100000a1964a428 # dirich3
+9721    0xfd00000a1968ef28 # dirich3
+9731    0xd600000a1964b028 # dirich3
+9741    0xae00000a1972c028 # dirich3
+9751    0x1800000a1972e028 # dirich3
+9771    0x6300000a1972d928 # dirich3
+9781    0x6500000a1972ec28 # dirich3
+9791    0x1b00000a196f4a28 # dirich3
+9801    0xd700000a196ecf28 # dirich3
+9811
+9821    0x4100000a196ec628 # dirich3
+9851    0x3500000a196f1a28 # dirich3
+9861    0xb200000a196f0e28 # dirich3
+9871    0xa500000a196f2628 # dirich3
+9881    0xd300000a1972cc28 # dirich3
+9891    0x9200000a19713028 # dirich3
+9901    0xe400000a196ee828 # dirich3
+9911    0xda00000a196f3928 # dirich3
+9921    0xbd00000a196eeb28 # dirich3
+9941    0x8b00000a19716128 # dirich3
+9951
+9961    0xef00000a19713c28 # dirich3
+9981    0xc600000a196ed228 # dirich3
+10001   0x3700000a196f0928 # dirich3
 10301   0x4100000a4917a128 # dirich3  untested
 10311   0xaa00000a4917a428 # dirich3  untested
-=======
-10301   0x4100000a4917a128 #test
->>>>>>> b0291c6ff6b9e056ca23dd0424169c7525c7cbe7
 10331   0x0600000a49897828 # dirich3  untested
 10341   0x6100000a49bc4c28 # dirich3  untested
 10361   0xf700000a49bc4528 # dirich3  untested