From cae5e448c6e134f916b842d8db0a03c947e8885b Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 2 Nov 2010 12:37:13 +0900
Subject: [PATCH] doc changes

---
 AUTHORS |  3 +++
 NEWS    |  9 ++++++++-
 README  | 46 ++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b392da2..6115e69 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,9 @@ NIIBE Yutaka:
 	boards/CQ_STARM/board.h
 	boards/CQ_STARM/board.mk
 	boards/CQ_STARM/mcuconf.h
+    Wrote a tool for DfuSe:
+	tool/dfuse.py
+	tool/intel_hex.py
     Wrote:
 	gnuk.svg
 	src/configure
diff --git a/NEWS b/NEWS
index cb7df8b..d0f8314 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,15 @@
 Gnuk NEWS - User visible changes
 
+* Major changes in Gnuk 0.4
+
+  Released 2010-11-XX, by NIIBE Yutaka
+
+** Flash writing tool for "DfuSe" is included now.
+
+
 * Major changes in Gnuk 0.3
 
-  Released 2010-10-XX, by NIIBE Yutaka
+  Released 2010-10-23, by NIIBE Yutaka
 
 ** Now we have 'configure' script to select target.
 
diff --git a/README b/README
index d128681..74184fc 100644
--- a/README
+++ b/README
@@ -1,14 +1,14 @@
 Gnuk - software for GPG USB Token
 
-							    Version 0.3
-							     2010-10-23
+							    Version 0.4
+							     2010-11-XX
 						           Niibe Yutaka
 				      Free Software Initiative of Japan
 
 What's Gnuk?
 ============
 
-Gnuk is software implementation of a USB token for GNU privacy guard.
+Gnuk is software implementation of a USB token for GNU Privacy Guard.
 Gnuk supports OpenPGP card protocol version 2, and it runs on STM32
 processor.
 
@@ -164,6 +164,9 @@ Then, we will have "gnuk.elf".
 How to run
 ==========
 
+Olimex STM32-H103 board
+-----------------------
+
 If you are using Olimex JTAG-Tiny, type following to invoke OpenOCD:
 
   $ openocd -f interface/olimex-jtag-tiny.cfg -f board/olimex_stm32_h103.cfg
@@ -177,6 +180,33 @@ Then, with another terminal, type following to write "gnuk.elf" to Flash ROM:
   > exit
   $ 
 
+
+CQ STARM
+--------
+
+Put jumper for J6 to enable DfuSe.  Connecting the board, and type:
+
+  # cd ../tool
+  # ./dfuse.py ../src/gnuk.hex
+
+Then, remove the jumper and reset the board.
+
+
+STBee Mini
+----------
+
+Reset the board with "USER" switch pushed.  Type following to write
+to flash:
+
+  # cd ../tool
+  # ./dfuse.py ../src/gnuk.hex
+
+Then, reset the board.
+
+
+Debug enabled
+-------------
+
 If you compiled with --enable-debug option, Gnuk has two interfaces
 (one is CCID/ICCD device and another is virtual COM port).  Open
 virtual COM port by:
@@ -185,6 +215,10 @@ virtual COM port by:
 
 and you will see debug output of Gnuk.
 
+
+Libccid fix needed
+------------------
+
 For libccid, we need following change:
 
 --- /etc/libccid_Info.plist.dpkg-dist	2009-07-29 06:50:20.000000000 +0900
@@ -215,7 +249,11 @@ For libccid, we need following change:
  		<string>Gemplus GemPC Key</string>
 ------------------
 
-Then, try following to see Gnuk runs:
+
+Testing Gnuk
+------------
+
+Try following to see Gnuk runs:
 
   $ gpg --card-status