Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1802 - developers/werner/usb-pullup ([EMAIL PROTECTED])
2. r1803 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
3. r1804 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2007-04-19 03:26:34 +0200 (Thu, 19 Apr 2007)
New Revision: 1802
Added:
developers/werner/usb-pullup/gates.fig
developers/werner/usb-pullup/npn-pnp.sch
developers/werner/usb-pullup/two-diodes.sch
Log:
two-diodes.sch: QUCS schematic and simulation of dual diode design
npn-pnp.sch: QUCS schematic and simulation of NPN/PNP pair
gates.fig: schematic (XFig) for solution using 74AUP1Gxx or 74AHC1Gxx gates
Added: developers/werner/usb-pullup/gates.fig
===================================================================
--- developers/werner/usb-pullup/gates.fig 2007-04-18 23:50:06 UTC (rev
1801)
+++ developers/werner/usb-pullup/gates.fig 2007-04-19 01:26:34 UTC (rev
1802)
@@ -0,0 +1,50 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter
+100.00
+Single
+-2
+1200 2
+5 1 0 1 0 7 50 -1 -1 0.000 0 0 0 0 4500.000 5100.000 4500 4800 4800 5100 4500
5400
+1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 4875 5100 75 75 4875 5100 4950 5100
+1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 5700 3825 75 75 5700 3825 5700 3750
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4
+ 4500 5400 4200 5400 4200 4800 4500 4800
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4
+ 5400 3300 5400 3900 6000 3600 5400 3300
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
+ 5700 3900 5700 5100 4950 5100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 6600 3450 7500 3450 7500 3750 6600 3750 6600 3450
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+ 6000 3600 6600 3600
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+ 7500 3600 8100 3600
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+ 2550 4950 4200 4950
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+ 3000 5250 4200 5250
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 3450 5700 3750 5700 3750 6600 3450 6600 3450 5700
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+ 3600 5250 3600 5700
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+ 3600 6600 3600 7200
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+ 3300 7200 3900 7200
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
+ 5400 3600 4800 3600 4800 2700
+2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
+ 8100 3600 9000 3600
+4 0 0 50 -1 0 12 0.0000 4 180 1140 1800 5325 USB_PULLUP\001
+4 0 0 50 -1 0 12 0.0000 4 135 660 1800 5025 nRESET\001
+4 1 0 50 -1 0 12 0.0000 4 180 600 4800 2625 IO_3V3\001
+4 0 0 50 -1 0 12 0.0000 4 135 270 6600 4050 1k5\001
+4 0 0 50 -1 0 12 0.0000 4 135 480 6600 3375 R4910\001
+4 0 0 50 -1 0 12 0.0000 4 135 360 3900 6225 360k\001
+4 0 0 50 -1 0 12 0.0000 4 135 960 3900 4725 74AUP1G00\001
+4 0 0 50 -1 0 12 0.0000 4 135 1050 5100 3225 74AUP1G125\001
+4 0 0 50 -1 0 12 0.0000 4 135 3060 4800 6525 Note: can also use AHC instead of
AUP\001
+4 0 0 50 -1 0 12 0.0000 4 135 240 9075 3675 D+\001
Added: developers/werner/usb-pullup/npn-pnp.sch
===================================================================
--- developers/werner/usb-pullup/npn-pnp.sch 2007-04-18 23:50:06 UTC (rev
1801)
+++ developers/werner/usb-pullup/npn-pnp.sch 2007-04-19 01:26:34 UTC (rev
1802)
@@ -0,0 +1,93 @@
+<Qucs Schematic 0.0.11>
+<Properties>
+ <View=-41,0,1090,873,1,41,0>
+ <Grid=10,10,1>
+ <DataSet=npn-pnp.dat>
+ <DataDisplay=npn-pnp.dpl>
+ <OpenDisplay=1>
+ <showFrame=0>
+ <FrameText0=Title>
+ <FrameText1=Drawn By:>
+ <FrameText2=Date:>
+ <FrameText3=Revision:>
+</Properties>
+<Symbol>
+</Symbol>
+<Components>
+ <Switch S1 1 130 220 -26 11 0 0 "off" 0 "1 ms" 0 "0" 0 "1e12" 0 "26.85" 0>
+ <GND * 1 60 440 0 0 0 0>
+ <GND * 1 60 260 0 0 0 0>
+ <GND * 1 800 360 0 0 0 0>
+ <Vdc V1 1 800 290 18 -26 0 1 "3.3 V" 1>
+ <Idc I1 1 220 470 18 -26 0 1 "-10 uA" 1>
+ <GND * 1 220 540 0 0 0 0>
+ <R R6 1 900 150 15 -26 0 1 "1.5 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <GND * 1 900 360 0 0 0 0>
+ <R R7 1 900 280 15 -26 0 1 "Rusb" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <R R5 1 220 330 15 -26 0 1 "33 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <GND * 1 680 510 0 0 0 0>
+ <R R3 1 680 450 15 -26 0 1 "Rusb" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <R R4 1 680 350 15 -26 0 1 "1.5 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <GND * 1 450 480 0 0 0 0>
+ <R R8 1 330 400 -26 15 0 0 "47kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <_BJT T2 1 450 400 8 -26 0 0 "npn" 1 "1e-16" 1 "1" 1 "1" 0 "0" 0 "0" 0 "0" 1
"0" 0 "0" 0 "1.5" 0 "0" 0 "2" 0 "50" 1 "1" 0 "0" 0 "0" 0 "0" 0 "0" 0 "0" 0 "0"
0 "0.75" 0 "0.33" 0 "0" 0 "0.75" 0 "0.33" 0 "1.0" 0 "0" 0 "0.75" 0 "0" 0 "0.5"
0 "0.0" 0 "0.0" 0 "0.0" 0 "0.0" 0 "0.0" 0 "26.85" 0 "0.0" 0 "1.0" 0 "1.0" 0
"0.0" 0 "1.0" 0 "1.0" 0 "0.0" 0 "0.0" 0 "3.0" 0 "1.11" 0 "26.85" 0 "1.0" 0>
+ <_BJT T1 1 680 220 8 -26 1 0 "pnp" 1 "1e-16" 1 "1" 1 "1" 0 "0" 0 "0" 0 "0" 1
"0" 0 "0" 0 "1.5" 0 "0" 0 "2" 0 "50" 1 "1" 0 "0" 0 "0" 0 "0" 0 "0" 0 "0" 0 "0"
0 "0.75" 0 "0.33" 0 "0" 0 "0.75" 0 "0.33" 0 "1.0" 0 "0" 0 "0.75" 0 "0" 0 "0.5"
0 "0.0" 0 "0.0" 0 "0.0" 0 "0.0" 0 "0.0" 0 "26.85" 0 "0.0" 0 "1.0" 0 "1.0" 0
"0.0" 0 "1.0" 0 "1.0" 0 "0.0" 0 "0.0" 0 "3.0" 0 "1.11" 0 "26.85" 0 "1.0" 0>
+ <Eqn Eqn1 1 330 130 -24 14 0 0 "err=(Vusb.V/Rref.V-1)*100" 1 "yes" 0>
+ <.DC DC1 1 70 90 0 33 0 0 "26.85" 0 "0.001" 0 "1 pA" 0 "1 uV" 0 "yes" 0
"150" 0 "no" 0 "none" 0 "CroutLU" 0>
+ <.SW SW1 1 380 570 0 51 0 0 "DC1" 1 "log" 1 "Rusb" 1 "1 Ohm" 1 "1 MOhm" 1
"50" 1>
+ <R R9 1 580 130 15 -26 0 1 "47 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <R R10 1 520 220 -26 15 0 0 "33 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <Switch S2 1 130 400 -26 11 0 0 "off" 0 "1 ms" 0 "0" 0 "1e12" 0 "26.85" 0>
+</Components>
+<Wires>
+ <160 400 220 400 "" 0 0 0 "">
+ <220 400 300 400 "nRESET" 260 360 20 "">
+ <220 360 220 400 "" 0 0 0 "">
+ <60 220 60 260 "" 0 0 0 "">
+ <60 220 100 220 "" 0 0 0 "">
+ <60 400 60 440 "" 0 0 0 "">
+ <60 400 100 400 "" 0 0 0 "">
+ <800 60 800 260 "" 0 0 0 "">
+ <800 320 800 360 "" 0 0 0 "">
+ <220 60 220 300 "" 0 0 0 "">
+ <220 60 580 60 "" 0 0 0 "">
+ <220 400 220 440 "" 0 0 0 "">
+ <220 500 220 540 "" 0 0 0 "">
+ <800 60 900 60 "" 0 0 0 "">
+ <900 60 900 120 "" 0 0 0 "">
+ <900 180 900 250 "Rref" 930 190 37 "">
+ <900 310 900 360 "" 0 0 0 "">
+ <680 480 680 510 "" 0 0 0 "">
+ <680 380 680 420 "Vusb" 730 390 40 "">
+ <680 60 800 60 "" 0 0 0 "">
+ <680 60 680 190 "" 0 0 0 "">
+ <680 250 680 320 "" 0 0 0 "">
+ <160 220 450 220 "" 0 0 0 "">
+ <580 60 680 60 "" 0 0 0 "">
+ <580 60 580 100 "" 0 0 0 "">
+ <580 220 650 220 "" 0 0 0 "">
+ <580 160 580 220 "" 0 0 0 "">
+ <450 220 450 370 "" 0 0 0 "">
+ <360 400 420 400 "" 0 0 0 "">
+ <450 430 450 480 "" 0 0 0 "">
+ <550 220 580 220 "" 0 0 0 "">
+ <450 220 490 220 "" 0 0 0 "">
+</Wires>
+<Diagrams>
+ <Rect 60 760 240 160 3 #c0c0c0 1 12 1 100 1 100000 1 -0.698248 2 4 1 -0.01 1
-3e-05 315 0 225 "" "" "">
+ <"V1.I" #0000ff 0 3 0 0 1>
+ <"Vusb.V" #ff00ff 0 3 0 0 0>
+ <"Rref.V" #ff0000 0 3 0 0 0>
+ </Rect>
+ <Rect 760 560 240 160 3 #c0c0c0 1 10 1 1 1 1e+06 0 -5 5 1 1 -1 1 1 315 0 225
"" "" "">
+ <"err" #000000 0 3 0 0 0>
+ </Rect>
+ <Tab 540 762 361 162 3 #c0c0c0 1 00 1 41 1 1 1 0 1 1 1 0 1 50 315 0 225 ""
"" "">
+ <"V1.I" #0000ff 0 3 1 0 0>
+ <"nRESET.V" #0000ff 0 3 1 0 0>
+ <"Vusb.V" #0000ff 0 3 1 0 0>
+ <"Rref.V" #0000ff 0 3 1 0 0>
+ </Tab>
+</Diagrams>
+<Paintings>
+</Paintings>
Added: developers/werner/usb-pullup/two-diodes.sch
===================================================================
--- developers/werner/usb-pullup/two-diodes.sch 2007-04-18 23:50:06 UTC (rev
1801)
+++ developers/werner/usb-pullup/two-diodes.sch 2007-04-19 01:26:34 UTC (rev
1802)
@@ -0,0 +1,90 @@
+<Qucs Schematic 0.0.11>
+<Properties>
+ <View=-41,0,1090,873,1,41,0>
+ <Grid=10,10,1>
+ <DataSet=two-diodes.dat>
+ <DataDisplay=two-diodes.dpl>
+ <OpenDisplay=1>
+ <showFrame=0>
+ <FrameText0=Title>
+ <FrameText1=Drawn By:>
+ <FrameText2=Date:>
+ <FrameText3=Revision:>
+</Properties>
+<Symbol>
+</Symbol>
+<Components>
+ <Switch S1 1 130 220 -26 11 0 0 "off" 0 "1 ms" 0 "0" 0 "1e12" 0 "26.85" 0>
+ <Switch S2 1 130 400 -26 11 0 0 "off" 0 "1 ms" 0 "0" 0 "1e12" 0 "26.85" 0>
+ <GND * 1 620 500 0 0 0 0>
+ <GND * 1 60 440 0 0 0 0>
+ <GND * 1 60 260 0 0 0 0>
+ <GND * 1 800 360 0 0 0 0>
+ <Vdc V1 1 800 290 18 -26 0 1 "3.3 V" 1>
+ <_BJT T1 1 620 320 8 -26 0 0 "npn" 1 "1e-16" 1 "1" 1 "1" 0 "0" 0 "0" 0 "0" 1
"0" 0 "0" 0 "1.5" 0 "0" 0 "2" 0 "50" 1 "1" 0 "0" 0 "0" 0 "0" 0 "0" 0 "0" 0 "0"
0 "0.75" 0 "0.33" 0 "0" 0 "0.75" 0 "0.33" 0 "1.0" 0 "0" 0 "0.75" 0 "0" 0 "0.5"
0 "0.0" 0 "0.0" 0 "0.0" 0 "0.0" 0 "0.0" 0 "26.85" 0 "0.0" 0 "1.0" 0 "1.0" 0
"0.0" 0 "1.0" 0 "1.0" 0 "0.0" 0 "0.0" 0 "3.0" 0 "1.11" 0 "26.85" 0 "1.0" 0>
+ <R R4 1 620 220 15 -26 0 1 "1.5 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <Idc I1 1 220 470 18 -26 0 1 "-10 uA" 1>
+ <GND * 1 220 540 0 0 0 0>
+ <R R3 1 620 440 15 -26 0 1 "Rusb" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <R R6 1 900 150 15 -26 0 1 "1.5 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <GND * 1 900 360 0 0 0 0>
+ <R R7 1 900 280 15 -26 0 1 "Rusb" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <R R5 1 220 330 15 -26 0 1 "33 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <R R1 1 420 130 15 -26 0 1 "22 kOhm" 1 "26.85" 0 "0.0" 0 "0.0" 0 "26.85" 0
"european" 0>
+ <.SW SW1 1 390 610 0 51 0 0 "DC1" 1 "log" 1 "Rusb" 1 "1 Ohm" 1 "0.9 MOhm" 1
"17" 1>
+ <Eqn Eqn1 1 270 110 -24 14 0 0 "err=(Vusb.V/Rref.V-1)*100" 1 "yes" 0>
+ <.DC DC1 1 50 70 0 33 0 0 "26.85" 0 "0.001" 0 "1 pA" 0 "1 uV" 0 "yes" 0
"150" 0 "no" 0 "none" 0 "CroutLU" 0>
+ <Diode D1 1 330 220 -26 15 0 0 "1e-15 A" 1 "1" 1 "10 fF" 1 "0.5" 0 "0.7 V" 0
"0.5" 0 "0.0 fF" 0 "0.0" 0 "2.0" 0 "0 Ohm" 0 "0.0 ps" 0 "0" 0 "0.0" 0 "1.0" 0
"1.0" 0 "0" 0 "1 mA" 0 "26.85" 0 "3.0" 0 "1.11" 0 "0.0" 0 "0.0" 0 "0.0" 0 "0.0"
0 "0.0" 0 "0.0" 0 "26.85" 0 "1.0" 0 "normal" 0>
+ <Diode D2 1 330 400 -26 15 0 0 "1e-15 A" 1 "1" 1 "10 fF" 1 "0.5" 0 "0.7 V" 0
"0.5" 0 "0.0 fF" 0 "0.0" 0 "2.0" 0 "0 Ohm" 0 "0.0 ps" 0 "0" 0 "0.0" 0 "1.0" 0
"1.0" 0 "0" 0 "1 mA" 0 "26.85" 0 "3.0" 0 "1.11" 0 "0.0" 0 "0.0" 0 "0.0" 0 "0.0"
0 "0.0" 0 "0.0" 0 "26.85" 0 "1.0" 0 "normal" 0>
+</Components>
+<Wires>
+ <160 220 300 220 "" 0 0 0 "">
+ <160 400 220 400 "" 0 0 0 "">
+ <220 400 300 400 "nRESET" 260 360 20 "">
+ <220 360 220 400 "" 0 0 0 "">
+ <360 400 420 400 "" 0 0 0 "">
+ <360 220 420 220 "" 0 0 0 "">
+ <420 220 420 320 "" 0 0 0 "">
+ <420 320 420 400 "" 0 0 0 "">
+ <620 250 620 290 "" 0 0 0 "">
+ <420 160 420 220 "" 0 0 0 "">
+ <60 220 60 260 "" 0 0 0 "">
+ <60 220 100 220 "" 0 0 0 "">
+ <60 400 60 440 "" 0 0 0 "">
+ <60 400 100 400 "" 0 0 0 "">
+ <420 60 420 100 "" 0 0 0 "">
+ <800 60 800 260 "" 0 0 0 "">
+ <420 60 620 60 "" 0 0 0 "">
+ <620 60 800 60 "" 0 0 0 "">
+ <620 60 620 190 "" 0 0 0 "">
+ <800 320 800 360 "" 0 0 0 "">
+ <220 60 220 300 "" 0 0 0 "">
+ <220 60 420 60 "" 0 0 0 "">
+ <220 400 220 440 "" 0 0 0 "">
+ <220 500 220 540 "" 0 0 0 "">
+ <620 470 620 500 "" 0 0 0 "">
+ <620 350 620 410 "Vusb" 700 410 34 "">
+ <800 60 900 60 "" 0 0 0 "">
+ <900 60 900 120 "" 0 0 0 "">
+ <900 180 900 250 "Rref" 930 190 37 "">
+ <900 310 900 360 "" 0 0 0 "">
+ <420 320 590 320 "" 0 0 0 "">
+</Wires>
+<Diagrams>
+ <Rect 60 760 240 160 3 #c0c0c0 1 12 1 100 1 100000 1 -0.698248 2 4 1 -0.01 1
-3e-05 315 0 225 "" "" "">
+ <"V1.I" #0000ff 0 3 0 0 1>
+ <"Vusb.V" #ff00ff 0 3 0 0 0>
+ <"Rref.V" #ff0000 0 3 0 0 0>
+ </Rect>
+ <Tab 540 772 361 162 3 #c0c0c0 1 00 1 8 1 1 1 0 1 1 1 0 1 17 315 0 225 "" ""
"">
+ <"V1.I" #0000ff 0 3 1 0 0>
+ <"nRESET.V" #0000ff 0 3 1 0 0>
+ <"Vusb.V" #0000ff 0 3 1 0 0>
+ <"Rref.V" #0000ff 0 3 1 0 0>
+ </Tab>
+ <Rect 740 580 240 160 3 #c0c0c0 1 10 1 1 1 1e+06 0 -20 5 5 1 -1 1 1 315 0
225 "" "" "">
+ <"err" #000000 0 3 0 0 0>
+ </Rect>
+</Diagrams>
+<Paintings>
+</Paintings>
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-04-19 09:45:25 +0200 (Thu, 19 Apr 2007)
New Revision: 1803
Removed:
trunk/src/target/u-boot/patches/mmc_parititon_fix.patch
Modified:
trunk/src/target/u-boot/patches/series
trunk/src/target/u-boot/patches/uboot-dfu.patch
trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
Log:
* remove mmc_partition_fix since it is now in mainline u-boot
* make sure uboot-s3c2410_udc and uboot-dfu still apply (makefile hunk update)
* actually copy descriptor in DFU rather than assigning pointers
Deleted: trunk/src/target/u-boot/patches/mmc_parititon_fix.patch
===================================================================
--- trunk/src/target/u-boot/patches/mmc_parititon_fix.patch 2007-04-19
01:26:34 UTC (rev 1802)
+++ trunk/src/target/u-boot/patches/mmc_parititon_fix.patch 2007-04-19
07:45:25 UTC (rev 1803)
@@ -1,16 +0,0 @@
-This fixes a compile problem (no partition support for MMC)
-
-Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
-
-Index: u-boot.git/disk/part.c
-===================================================================
---- u-boot.git.orig/disk/part.c 2007-01-13 17:59:35.000000000 +0100
-+++ u-boot.git/disk/part.c 2007-01-13 17:59:45.000000000 +0100
-@@ -126,6 +126,7 @@
- #if ((CONFIG_COMMANDS & CFG_CMD_IDE) || \
- (CONFIG_COMMANDS & CFG_CMD_SCSI) || \
- (CONFIG_COMMANDS & CFG_CMD_USB) || \
-+ defined(CONFIG_MMC) || \
- defined(CONFIG_SYSTEMACE) )
-
- #if defined(CONFIG_MAC_PARTITION) || \
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-04-19 01:26:34 UTC (rev
1802)
+++ trunk/src/target/u-boot/patches/series 2007-04-19 07:45:25 UTC (rev
1803)
@@ -8,7 +8,6 @@
uboot-s3c2410-warnings-fix.patch
uboot-strtoul.patch
uboot-cramfs_but_no_jffs2.patch
-mmc_parititon_fix.patch
nand-read_write_oob.patch
uboot-arm920t-gd_in_irq.patch
uboot-arm920_s3c2410_irq_demux.patch
Modified: trunk/src/target/u-boot/patches/uboot-dfu.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-04-19 01:26:34 UTC
(rev 1802)
+++ trunk/src/target/u-boot/patches/uboot-dfu.patch 2007-04-19 07:45:25 UTC
(rev 1803)
@@ -18,7 +18,7 @@
#if 0
#define dbg_ep0(lvl,fmt,args...) serial_printf("[%s] %s:%d:
"fmt"\n",__FILE__,__FUNCTION__,__LINE__,##args)
#else
-@@ -213,7 +218,7 @@ static int ep0_get_descriptor (struct us
+@@ -213,7 +218,7 @@
urb->buffer = device_descriptor;
urb->actual_length = MIN(sizeof(*device_descriptor),
max);
}
@@ -27,7 +27,7 @@
break;
case USB_DESCRIPTOR_TYPE_CONFIGURATION:
-@@ -267,7 +272,24 @@ static int ep0_get_descriptor (struct us
+@@ -267,7 +272,24 @@
return -1;
case USB_DESCRIPTOR_TYPE_ENDPOINT:
return -1;
@@ -52,7 +52,7 @@
{
return -1; /* unsupported at this time */
#if 0
-@@ -294,6 +316,7 @@ static int ep0_get_descriptor (struct us
+@@ -294,6 +316,7 @@
max);
#endif
}
@@ -60,7 +60,7 @@
break;
case USB_DESCRIPTOR_TYPE_REPORT:
{
-@@ -388,6 +411,24 @@ int ep0_recv_setup (struct urb *urb)
+@@ -388,6 +411,24 @@
le16_to_cpu (request->wLength),
USBD_DEVICE_REQUESTS (request->bRequest));
@@ -85,7 +85,7 @@
/* handle USB Standard Request (c.f. USB Spec table 9-2) */
if ((request->bmRequestType & USB_REQ_TYPE_MASK) != 0) {
if (device->device_state <= STATE_CONFIGURED)
-@@ -570,7 +611,8 @@ int ep0_recv_setup (struct urb *urb)
+@@ -570,7 +611,8 @@
device->interface = le16_to_cpu (request->wIndex);
device->alternate = le16_to_cpu (request->wValue);
/*dbg_ep0(2, "set interface: %d alternate: %d",
device->interface, device->alternate); */
@@ -99,7 +99,7 @@
===================================================================
--- /dev/null
+++ u-boot/drivers/usbdfu.c
-@@ -0,0 +1,1043 @@
+@@ -0,0 +1,1042 @@
+/*
+ * (C) 2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -586,8 +586,7 @@
+ remain = len;
+
+ debug("copying %u bytes ", remain);
-+// memcpy(urb->buffer, ds->ptr, remain);
-+ urb->buffer = ds->ptr;
++ memcpy(urb->buffer, ds->ptr, remain);
+ ds->ptr += remain;
+ urb->actual_length = remain;
+
@@ -1147,15 +1146,15 @@
===================================================================
--- u-boot.orig/drivers/Makefile
+++ u-boot/drivers/Makefile
-@@ -46,7 +46,7 @@ COBJS = 3c589.o 5701rls.o ali512x.o atme
- sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
+@@ -47,7 +47,7 @@
status_led.o sym53c8xx.o systemace.o ahci.o \
ti_pci1410a.o tigon3.o tsec.o \
+ tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
- usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbdcore_s3c2410.o
usbtty.o \
+ usbdcore.o usbdfu.o usbdcore_ep0.o usbdcore_omap1510.o
usbdcore_s3c2410.o usbtty.o \
videomodes.o w83c553f.o \
ks8695eth.o \
- pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o \
+ pcf50606.o \
Index: u-boot/drivers/usbdcore.c
===================================================================
--- u-boot.orig/drivers/usbdcore.c
@@ -1168,7 +1167,7 @@
#define MAX_INTERFACES 2
-@@ -212,6 +213,10 @@ struct usb_alternate_instance *usbd_devi
+@@ -212,6 +213,10 @@
*/
struct usb_device_descriptor *usbd_device_device_descriptor (struct
usb_device_instance *device, int port)
{
@@ -1179,7 +1178,7 @@
return (device->device_descriptor);
}
-@@ -232,6 +237,10 @@ struct usb_configuration_descriptor *usb
+@@ -232,6 +237,10 @@
if (!(configuration_instance = usbd_device_configuration_instance
(device, port, configuration))) {
return NULL;
}
@@ -1190,7 +1189,7 @@
return (configuration_instance->configuration_descriptor);
}
-@@ -253,6 +262,13 @@ struct usb_interface_descriptor *usbd_de
+@@ -253,6 +262,13 @@
if (!(interface_instance = usbd_device_interface_instance (device,
port, configuration, interface))) {
return NULL;
}
@@ -1204,7 +1203,7 @@
if ((alternate < 0) || (alternate >= interface_instance->alternates)) {
return NULL;
}
-@@ -681,4 +697,7 @@ void usbd_device_event_irq (struct usb_d
+@@ -681,4 +697,7 @@
/* usbdbg("calling device->event"); */
device->event(device, event, data);
}
@@ -1225,7 +1224,7 @@
#include <config.h> /* If defined, override Linux identifiers with
* vendor specific ones */
-@@ -118,7 +120,7 @@ extern struct usb_string_descriptor **us
+@@ -118,7 +120,7 @@
static unsigned short rx_endpoint = 0;
static unsigned short tx_endpoint = 0;
static unsigned short interface_count = 0;
@@ -1234,7 +1233,7 @@
/* USB Descriptor Strings */
static u8 wstrLang[4] = {4,USB_DT_STRING,0x9,0x4};
-@@ -169,6 +171,10 @@ struct acm_config_desc {
+@@ -169,6 +171,10 @@
struct usb_interface_descriptor data_class_interface;
struct usb_endpoint_descriptor
data_endpoints[NUM_ENDPOINTS-1] __attribute__((packed));
@@ -1245,7 +1244,7 @@
} __attribute__((packed));
static struct acm_config_desc acm_configuration_descriptors[NUM_CONFIGS] = {
-@@ -179,7 +185,11 @@ static struct acm_config_desc acm_config
+@@ -179,7 +185,11 @@
.bDescriptorType = USB_DT_CONFIG,
.wTotalLength =
cpu_to_le16(sizeof(struct acm_config_desc)),
@@ -1257,7 +1256,7 @@
.bConfigurationValue = 1,
.iConfiguration = STR_CONFIG,
.bmAttributes =
-@@ -278,6 +288,11 @@ static struct acm_config_desc acm_config
+@@ -278,6 +288,11 @@
.bInterval = 0xFF,
},
},
@@ -1269,7 +1268,7 @@
},
};
-@@ -390,7 +405,7 @@ static int fill_buffer (circbuf_t * buf)
+@@ -390,7 +405,7 @@
void usbtty_poll (void);
/* utility function for converting char* to wide string used by USB */
@@ -1278,7 +1277,7 @@
{
int i;
for (i = 0; i < strlen (str) && str[i]; i++){
-@@ -652,6 +667,9 @@ static void usbtty_init_instances (void)
+@@ -652,6 +667,9 @@
device_instance->bus = bus_instance;
device_instance->configurations = NUM_CONFIGS;
device_instance->configuration_instance_array = config_instance;
@@ -1292,7 +1291,7 @@
===================================================================
--- u-boot.orig/include/configs/neo1973.h
+++ u-boot/include/configs/neo1973.h
-@@ -165,7 +165,7 @@
+@@ -167,7 +167,7 @@
*/
#define CONFIG_STACKSIZE (128*1024) /* regular stack */
#ifdef CONFIG_USE_IRQ
@@ -1301,7 +1300,7 @@
#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
#endif
-@@ -182,6 +182,10 @@
+@@ -184,6 +184,10 @@
#define CONFIG_USBD_MANUFACTURER "OpenMoko, Inc"
#define CONFIG_USBD_PRODUCT_NAME "Neo1973 Bootloader " U_BOOT_VERSION
#define CONFIG_EXTRA_ENV_SETTINGS "usbtty=cdc_acm\0"
@@ -1527,7 +1526,7 @@
#define MAX_URBS_QUEUED 5
-@@ -475,7 +476,11 @@ typedef struct urb_link {
+@@ -475,7 +476,11 @@
* function driver to inform it that data has arrived.
*/
@@ -1539,7 +1538,7 @@
struct urb {
struct usb_endpoint_instance *endpoint;
-@@ -603,6 +608,12 @@ struct usb_device_instance {
+@@ -603,6 +608,12 @@
unsigned long usbd_rxtx_timestamp;
unsigned long usbd_last_rxtx_timestamp;
@@ -1552,7 +1551,7 @@
};
/* Bus Interface configuration structure
-@@ -632,6 +643,8 @@ extern char *usbd_device_status[];
+@@ -632,6 +643,8 @@
extern char *usbd_device_requests[];
extern char *usbd_device_descriptors[];
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch 2007-04-19
01:26:34 UTC (rev 1802)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410_udc.patch 2007-04-19
07:45:25 UTC (rev 1803)
@@ -2,12 +2,12 @@
Index: u-boot/drivers/Makefile
===================================================================
---- u-boot.orig/drivers/Makefile 2007-03-28 18:50:13.000000000 +0200
-+++ u-boot/drivers/Makefile 2007-03-28 18:50:57.000000000 +0200
-@@ -46,7 +46,7 @@
- sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
+--- u-boot.orig/drivers/Makefile
++++ u-boot/drivers/Makefile
+@@ -47,7 +47,7 @@
status_led.o sym53c8xx.o systemace.o ahci.o \
ti_pci1410a.o tigon3.o tsec.o \
+ tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
- usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
+ usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbdcore_s3c2410.o
usbtty.o \
videomodes.o w83c553f.o \
@@ -15,8 +15,8 @@
pcf50606.o \
Index: u-boot/drivers/usbdcore_s3c2410.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/drivers/usbdcore_s3c2410.c 2007-03-28 18:50:57.000000000 +0200
+--- /dev/null
++++ u-boot/drivers/usbdcore_s3c2410.c
@@ -0,0 +1,721 @@
+/* S3C2410 USB Device Controller Driver for u-boot
+ *
@@ -741,8 +741,8 @@
+#endif /* CONFIG_S3C2410 && CONFIG_USB_DEVICE */
Index: u-boot/drivers/usbdcore_s3c2410.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/drivers/usbdcore_s3c2410.h 2007-03-28 18:50:57.000000000 +0200
+--- /dev/null
++++ u-boot/drivers/usbdcore_s3c2410.h
@@ -0,0 +1,273 @@
+/* linux/include/asm/arch-s3c2410/regs-udc.h
+ *
@@ -1019,8 +1019,8 @@
+#endif
Index: u-boot/drivers/usbdcore_ep0.c
===================================================================
---- u-boot.orig/drivers/usbdcore_ep0.c 2007-03-28 18:50:57.000000000 +0200
-+++ u-boot/drivers/usbdcore_ep0.c 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/drivers/usbdcore_ep0.c
++++ u-boot/drivers/usbdcore_ep0.c
@@ -43,7 +43,7 @@
#include <common.h>
@@ -1116,8 +1116,8 @@
case USB_REQ_SET_DESCRIPTOR: /* XXX should we support this?
*/
Index: u-boot/include/configs/neo1973.h
===================================================================
---- u-boot.orig/include/configs/neo1973.h 2007-03-28 18:50:56.000000000
+0200
-+++ u-boot/include/configs/neo1973.h 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/include/configs/neo1973.h
++++ u-boot/include/configs/neo1973.h
@@ -173,6 +173,16 @@
#define CONFIG_USB_OHCI 1
#endif
@@ -1137,8 +1137,8 @@
*/
Index: u-boot/cpu/arm920t/s3c24x0/interrupts.c
===================================================================
---- u-boot.orig/cpu/arm920t/s3c24x0/interrupts.c 2007-03-28
18:50:57.000000000 +0200
-+++ u-boot/cpu/arm920t/s3c24x0/interrupts.c 2007-03-28 18:50:57.000000000
+0200
+--- u-boot.orig/cpu/arm920t/s3c24x0/interrupts.c
++++ u-boot/cpu/arm920t/s3c24x0/interrupts.c
@@ -222,6 +222,13 @@
S3C24X0_INTERRUPT * irq = S3C24X0_GetBase_INTERRUPT();
u_int32_t intpnd = irq->INTPND;
@@ -1155,8 +1155,8 @@
Index: u-boot/drivers/usbtty.h
===================================================================
---- u-boot.orig/drivers/usbtty.h 2007-03-28 18:50:56.000000000 +0200
-+++ u-boot/drivers/usbtty.h 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/drivers/usbtty.h
++++ u-boot/drivers/usbtty.h
@@ -29,6 +29,8 @@
#include "usbdcore_mpc8xx.h"
#elif defined(CONFIG_OMAP1510)
@@ -1168,8 +1168,8 @@
#include <config.h>
Index: u-boot/board/neo1973/cmd_neo1973.c
===================================================================
---- u-boot.orig/board/neo1973/cmd_neo1973.c 2007-03-28 18:50:14.000000000
+0200
-+++ u-boot/board/neo1973/cmd_neo1973.c 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/board/neo1973/cmd_neo1973.c
++++ u-boot/board/neo1973/cmd_neo1973.c
@@ -93,6 +93,18 @@
neo1973_vibrator(1);
else
@@ -1198,8 +1198,8 @@
#endif /* CFG_CMD_BDI */
Index: u-boot/board/neo1973/Makefile
===================================================================
---- u-boot.orig/board/neo1973/Makefile 2007-03-28 18:50:14.000000000 +0200
-+++ u-boot/board/neo1973/Makefile 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/board/neo1973/Makefile
++++ u-boot/board/neo1973/Makefile
@@ -25,7 +25,7 @@
LIB = lib$(BOARD).a
@@ -1211,8 +1211,8 @@
$(LIB): $(OBJS) $(SOBJS)
Index: u-boot/board/neo1973/udc.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/udc.c 2007-03-28 18:51:09.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/udc.c
@@ -0,0 +1,23 @@
+
+#include <common.h>
@@ -1239,8 +1239,8 @@
+}
Index: u-boot/include/usbdcore.h
===================================================================
---- u-boot.orig/include/usbdcore.h 2007-03-28 18:50:57.000000000 +0200
-+++ u-boot/include/usbdcore.h 2007-03-28 18:50:57.000000000 +0200
+--- u-boot.orig/include/usbdcore.h
++++ u-boot/include/usbdcore.h
@@ -671,4 +671,10 @@
void usbd_rcv_complete(struct usb_endpoint_instance *endpoint, int len, int
urb_bad);
void usbd_tx_complete (struct usb_endpoint_instance *endpoint);
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-04-19 10:24:51 +0200 (Thu, 19 Apr 2007)
New Revision: 1804
Removed:
trunk/src/target/u-boot/patches/dynpart-absorb-bad.patch
Modified:
trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch
trunk/src/target/u-boot/patches/series
Log:
* merge dynpart-absorb-bad.patch into nand-dynamic_partitions.patch
* introduce new CONFIG_NAND_DYNPART to [de]activate dynpart feature
* modularize dynpart partition size and names into per-board data structures
* use CONFIG_NAND_DYNPART and per-board data from qt2410 and neo1973
Deleted: trunk/src/target/u-boot/patches/dynpart-absorb-bad.patch
===================================================================
--- trunk/src/target/u-boot/patches/dynpart-absorb-bad.patch 2007-04-19
07:45:25 UTC (rev 1803)
+++ trunk/src/target/u-boot/patches/dynpart-absorb-bad.patch 2007-04-19
08:24:51 UTC (rev 1804)
@@ -1,50 +0,0 @@
-Index: u-boot/drivers/nand/nand_bbt.c
-===================================================================
---- u-boot.orig/drivers/nand/nand_bbt.c 2007-02-25 14:57:29.000000000
+0100
-+++ u-boot/drivers/nand/nand_bbt.c 2007-02-25 15:03:52.000000000 +0100
-@@ -1065,6 +1065,15 @@
- static char *part_names[] = {
- "u-boot", "u-boot_env", "kernel", "splash", "rootfs" };
-
-+
-+static int skip_offs(const struct nand_chip *this, unsigned int offs)
-+{
-+ int block = (int) (offs >> (this->bbt_erase_shift - 1));
-+ u_int8_t bbt = (this->bbt[block >> 3] >> (block & 0x06)) & 0x03;
-+
-+ return bbt == 3;
-+}
-+
- int nand_create_mtd_dynpart(struct mtd_info *mtd)
- {
- struct nand_chip *this = mtd->priv;
-@@ -1083,12 +1092,23 @@
- unsigned int bb_delta = 0;
- unsigned int offs = 0;
- char mtdpart[32];
-- for (offs = cur_offs; offs < cur_offs + part_size[part] +
bb_delta;
-- offs += this->erasesize) {
-- int block = (int) (offs >> (this->bbt_erase_shift - 1));
-- u_int8_t bbt = (this->bbt[block >> 3] >> (block &
0x06)) & 0x03;
-- if (bbt == 0x03)
-- bb_delta += this->erasesize;
-+
-+ for (offs = cur_offs;
-+ offs < cur_offs + part_size[part] + bb_delta;
-+ offs += mtd->erasesize) {
-+ if (skip_offs(this, offs))
-+ bb_delta += mtd->erasesize;
-+ }
-+
-+ /*
-+ * Absorb bad blocks immediately following this partition also
-+ * into the partition, in order to make next partition start
-+ * with a good block. This simplifies handling of the
-+ * environment partition.
-+ */
-+ while (offs < this->chipsize && skip_offs(this, offs)) {
-+ bb_delta += mtd->erasesize;
-+ offs += mtd->erasesize;
- }
-
- if (cur_offs + part_size[part] + bb_delta > this->chipsize)
Modified: trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch
===================================================================
--- trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch
2007-04-19 07:45:25 UTC (rev 1803)
+++ trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch
2007-04-19 08:24:51 UTC (rev 1804)
@@ -17,9 +17,9 @@
Index: u-boot/drivers/nand/nand_bbt.c
===================================================================
---- u-boot.orig/drivers/nand/nand_bbt.c 2007-02-25 15:36:10.000000000
+0100
-+++ u-boot/drivers/nand/nand_bbt.c 2007-02-25 15:36:51.000000000 +0100
-@@ -1044,9 +1044,70 @@
+--- u-boot.orig/drivers/nand/nand_bbt.c
++++ u-boot/drivers/nand/nand_bbt.c
+@@ -1044,9 +1044,83 @@
switch ((int)res) {
case 0x00: return 0;
case 0x01: return 1;
@@ -29,18 +29,18 @@
return 1;
}
-+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
++#if defined(CONFIG_NAND_DYNPART)
++extern unsigned int *dynpart_size;
++extern char **dynpart_names;
+
+
-+/* NOTE: this is extremely device-dependent, so it shouldn't really be here.
-+ The sum of all part_size[]s must equal to the NAND size, i.e., 0x4000000.
-+ "initrd" is sized such that it can hold two uncompressed 16 bit 640*480
-+ images: 640*480*2*2 = 1228800 < 1245184. */
++static int skip_offs(const struct nand_chip *this, unsigned int offs)
++{
++ int block = (int) (offs >> (this->bbt_erase_shift - 1));
++ u_int8_t bbt = (this->bbt[block >> 3] >> (block & 0x06)) & 0x03;
+
-+static unsigned int part_size[] = {
-+ CFG_UBOOT_SIZE, 0x4000, 0x200000, 0xa0000, 0x3d5c000-CFG_UBOOT_SIZE };
-+static char *part_names[] = {
-+ "u-boot", "u-boot_env", "kernel", "splash", "rootfs" };
++ return bbt == 3;
++}
+
+int nand_create_mtd_dynpart(struct mtd_info *mtd)
+{
@@ -54,29 +54,41 @@
+ return -ENOMEM;
+
+ memset(mtdparts, 0, sizeof(mtdparts));
-+ sprintf(mtdparts, "mtdparts=neo1973-nand:");
++ sprintf(mtdparts, "mtdparts=" CFG_NAND_DYNPART_MTD_KERNEL_NAME);
+
-+ for (part = 0; part < ARRAY_SIZE(part_size); part++) {
++ for (part = 0; dynpart_size[part] != 0; part++) {
+ unsigned int bb_delta = 0;
+ unsigned int offs = 0;
+ char mtdpart[32];
-+ for (offs = cur_offs; offs < cur_offs + part_size[part] +
bb_delta;
-+ offs += this->erasesize) {
-+ int block = (int) (offs >> (this->bbt_erase_shift - 1));
-+ u_int8_t bbt = (this->bbt[block >> 3] >> (block &
0x06)) & 0x03;
-+ if (bbt == 0x03)
-+ bb_delta += this->erasesize;
++
++ for (offs = cur_offs;
++ offs < cur_offs + dynpart_size[part] + bb_delta;
++ offs += mtd->erasesize) {
++ if (skip_offs(this, offs))
++ bb_delta += mtd->erasesize;
+ }
+
-+ if (cur_offs + part_size[part] + bb_delta > this->chipsize)
-+ part_size[part] = this->chipsize - cur_offs - bb_delta;
++ /*
++ * Absorb bad blocks immediately following this partition also
++ * into the partition, in order to make next partition start
++ * with a good block. This simplifies handling of the
++ * environment partition.
++ */
++ while (offs < this->chipsize && skip_offs(this, offs)) {
++ bb_delta += mtd->erasesize;
++ offs += mtd->erasesize;
++ }
++
++ if (cur_offs + dynpart_size[part] + bb_delta > this->chipsize)
++ dynpart_size[part] = this->chipsize - cur_offs -
bb_delta;
+#if 0
+ printf("partition %u: start = 0x%08x, end=%08x size=%08x,
size_inc_bb=%08x\n",
-+ part, cur_offs, cur_offs + part_size[part] + bb_delta,
-+ part_size[part], part_size[part] + bb_delta);
++ part, cur_offs, cur_offs + dynpart_size[part] +
bb_delta,
++ dynpart_size[part], dynpart_size[part] + bb_delta);
+#endif
-+ cur_offs += part_size[part] + bb_delta;
-+ sprintf(mtdpart, "0x%.8x(%.16s),", part_size[part] + bb_delta,
part_names[part]);
++ cur_offs += dynpart_size[part] + bb_delta;
++ sprintf(mtdpart, "0x%.8x(%.16s),", dynpart_size[part] +
bb_delta,
++ dynpart_names[part]);
+ mtdpart[sizeof(mtdpart)-1] = '\0';
+ strncat(mtdparts, mtdpart, sizeof(mtdparts)-strlen(mtdparts)-1);
+ }
@@ -88,12 +100,13 @@
+ free(mtdparts);
+ return 0;
+}
++#endif /* CONFIG_NAND_DYNPART */
+
#endif
Index: u-boot/include/configs/neo1973.h
===================================================================
---- u-boot.orig/include/configs/neo1973.h 2007-02-25 15:36:18.000000000
+0100
-+++ u-boot/include/configs/neo1973.h 2007-02-25 15:36:51.000000000 +0100
+--- u-boot.orig/include/configs/neo1973.h
++++ u-boot/include/configs/neo1973.h
@@ -99,7 +99,7 @@
CFG_CMD_ELF | \
CFG_CMD_MISC | \
@@ -103,9 +116,9 @@
CFG_CMD_DIAG | \
/* CFG_CMD_HWFLOW | */ \
CFG_CMD_SAVES | \
-@@ -209,13 +209,13 @@
+@@ -212,13 +212,13 @@
#define CONFIG_FAT 1
- #define CONFIG_SUPPORT_VFAT 1
+ #define CONFIG_SUPPORT_VFAT
-#if 0
+#if 1
@@ -120,18 +133,20 @@
#endif
/* ATAG configuration */
-@@ -251,4 +251,7 @@
+@@ -257,4 +257,9 @@
- #define CONFIG_S3C2410_NAND_BBT 1
+ #define CONFIG_DRIVER_PCF50606 1
+#define MTDIDS_DEFAULT "nand0=neo1973-nand"
+#define MTPARTS_DEFAULT
"neo1973-nand:256k(u-boot),16k(u-boot_env),2M(kernel),640k(splash),-(jffs2)"
++#define CFG_NAND_DYNPART_MTD_KERNEL_NAME "neo1973-nand"
++#define CONFIG_NAND_DYNPART
+
#endif /* __CONFIG_H */
Index: u-boot/common/cmd_jffs2.c
===================================================================
---- u-boot.orig/common/cmd_jffs2.c 2007-02-25 15:36:10.000000000 +0100
-+++ u-boot/common/cmd_jffs2.c 2007-02-25 15:36:18.000000000 +0100
+--- u-boot.orig/common/cmd_jffs2.c
++++ u-boot/common/cmd_jffs2.c
@@ -1841,6 +1841,29 @@
return NULL;
}
@@ -162,11 +177,12 @@
/***************************************************/
/* U-boot commands */
/***************************************************/
-@@ -2132,6 +2155,20 @@
+@@ -2132,6 +2155,24 @@
printf ("Usage:\n%s\n", cmdtp->usage);
return 1;
}
+
++#if defined(CONFIG_NAND_DYNPART)
+extern int nand_create_mtd_dynpart(struct mtd_info *mtd);
+
+int do_dynpart(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -180,27 +196,32 @@
+
+ return 0;
+}
++#endif /* CONFIG_NAND_DYNPART */
++
++
#endif /* #ifdef CONFIG_JFFS2_CMDLINE */
/***************************************************/
-@@ -2197,6 +2234,13 @@
+@@ -2197,6 +2238,15 @@
"<name> := '(' NAME ')'\n"
"<ro-flag> := when set to 'ro' makes partition read-only (not used,
passed to kernel)\n"
);
+
++#if defined(CONFIG_NAND_DYNPART)
+U_BOOT_CMD(
+ dynpart, 1, 1, do_dynpart,
+ "dynpart\t- dynamically calculate partition table based on BBT\n",
+ "\n"
+ " - sets 'mtdparts' according to BBT\n");
++#endif /* CONFIG_NAND_DYNPART */
+
#endif /* #ifdef CONFIG_JFFS2_CMDLINE */
/***************************************************/
Index: u-boot/common/cmd_nand.c
===================================================================
---- u-boot.orig/common/cmd_nand.c 2007-02-25 15:36:10.000000000 +0100
-+++ u-boot/common/cmd_nand.c 2007-02-25 15:36:50.000000000 +0100
+--- u-boot.orig/common/cmd_nand.c
++++ u-boot/common/cmd_nand.c
@@ -101,7 +101,7 @@
}
@@ -260,8 +281,8 @@
if (!nand_unlock(nand, off, size)) {
Index: u-boot/common/cmd_dynenv.c
===================================================================
---- u-boot.orig/common/cmd_dynenv.c 2007-02-25 15:37:32.000000000 +0100
-+++ u-boot/common/cmd_dynenv.c 2007-02-25 15:37:39.000000000 +0100
+--- u-boot.orig/common/cmd_dynenv.c
++++ u-boot/common/cmd_dynenv.c
@@ -60,7 +60,7 @@
buf[2] = 'V';
buf[3] = '0';
@@ -273,8 +294,8 @@
}
Index: u-boot/include/util.h
===================================================================
---- u-boot.orig/include/util.h 2007-02-25 15:37:43.000000000 +0100
-+++ u-boot/include/util.h 2007-02-25 15:37:49.000000000 +0100
+--- u-boot.orig/include/util.h
++++ u-boot/include/util.h
@@ -28,6 +28,6 @@
/* common/cmd_nand.c */
@@ -283,3 +304,48 @@
+ ulong *size, int net);
#endif /* UTIL_H */
+Index: u-boot/board/neo1973/neo1973.c
+===================================================================
+--- u-boot.orig/board/neo1973/neo1973.c
++++ u-boot/board/neo1973/neo1973.c
+@@ -375,3 +375,14 @@
+ return 0;
+ return 1;
+ }
++
++/* The sum of all part_size[]s must equal to the NAND size, i.e., 0x4000000.
++ "initrd" is sized such that it can hold two uncompressed 16 bit 640*480
++ images: 640*480*2*2 = 1228800 < 1245184. */
++
++unsigned int dynpart_size[] = {
++ CFG_UBOOT_SIZE, 0x4000, 0x200000, 0xa0000, 0x3d5c000-CFG_UBOOT_SIZE, 0 };
++char *dynpart_names[] = {
++ "u-boot", "u-boot_env", "kernel", "splash", "rootfs", NULL };
++
++
+Index: u-boot/board/qt2410/qt2410.c
+===================================================================
+--- u-boot.orig/board/qt2410/qt2410.c
++++ u-boot/board/qt2410/qt2410.c
+@@ -126,3 +126,9 @@
+
+ return 0;
+ }
++
++unsigned int dynpart_size[] = {
++ CFG_UBOOT_SIZE, 0x4000, 0x200000, 0xa0000, 0x3d5c000-CFG_UBOOT_SIZE, 0 };
++char *dynpart_names[] = {
++ "u-boot", "u-boot_env", "kernel", "splash", "rootfs", NULL };
++
+Index: u-boot/include/configs/qt2410.h
+===================================================================
+--- u-boot.orig/include/configs/qt2410.h
++++ u-boot/include/configs/qt2410.h
+@@ -283,5 +283,7 @@
+
+ #define MTDIDS_DEFAULT "nand0=qt2410-nand"
+ #define MTPARTS_DEFAULT
"qt2410-nand:192k(u-boot),8k(u-boot_env),2M(kernel),2M(splash),-(jffs2)"
++#define CFG_NAND_DYNPART_MTD_KERNEL_NAME "qt2410-nand"
++#define CONFIG_NAND_DYNPART
+
+ #endif /* __CONFIG_H */
Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series 2007-04-19 07:45:25 UTC (rev
1803)
+++ trunk/src/target/u-boot/patches/series 2007-04-19 08:24:51 UTC (rev
1804)
@@ -39,7 +39,6 @@
nand-createbbt.patch
dontask.patch
nand-badisbad.patch
-dynpart-absorb-bad.patch
uboot-bbt-quiet.patch
# splash screen
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
