summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Fix SPI build errors in exports.cSimon Glass2011-12-07-0/+1
| | | | | | | | | | | | | | | | | | | The spi.h include is no longer included in exports.h, so must be included here. This fixes these errors: In file included from exports.c:41:0: /home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h: In function 'jumptable_init': /home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:27:1: error: 'spi_init' undeclared (first use in this function) /home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:27:1: note: each undeclared identifier is reported only once for each function it appears in /home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:28:1: error: 'spi_setup_slave' undeclared (first use in this function) /home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:29:1: error: 'spi_free_slave' undeclared (first use in this function) /home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:30:1: error: 'spi_claim_bus' undeclared (first use in this function) /home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:31:1: error: 'spi_release_bus' undeclared (first use in this function) /home/sjg/trunk/src/third_party/u-boot/files/include/_exports.h:32:1: error: 'spi_xfer' undeclared (first use in this function) Signed-off-by: Simon Glass <sjg@chromium.org>
* Include common.h in qsort.c to fix build warningSimon Glass2011-12-07-0/+1
| | | | | | | | | | | | exports.h no longer includes common.h, which contains assert(). qsort.c needs to be updated. This fixes this warning: qsort.c: In function 'qsort': qsort.c:30:3: warning: implicit declaration of function 'assert' [-Wimplicit-function-declaration] Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Kumar Gala <galak@kernel.crashing.org> Tested-by: Heiko Schocher <hs@denx.de>
* Revert "mii: miiphy register address width change"Wolfgang Denk2011-12-07-10/+10
| | | | | | | | | | | | This reverts commit 5c45a22b9203351a32aec4600514341b91175542. It causes a lot of "incompatible pointer type" warnings for a large number of Ethernet drivers, which are not really worth fixing especially as this patch was only supposed to help the old, deprecated miiphy API. Instead of adding more efforts to a lost case we rather revert it. Signed-off-by: Wolfgang Denk <wd@denx.de>
* net: Make sure IPaddr_t is 32 bits in sizeMatthias Weisser2011-12-06-6/+7
| | | | | | | | | | | When building u-boot as 64 bit application (e.g. sandbox) ulong might be 64 bits in size. This breaks network code as IPaddr_t is 64 bytes in size then and an IPv4 address is 32 bits in size. This patch makes sure that IPaddr_t is always 32 bits in size. Also some warnings introduced by this patch are fixed. Signed-off-by: Matthias Weisser <weisserm@arcor.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
* MAKEALL: Add -l option to only list build targetsMarek Vasut2011-12-06-2/+13
| | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Wolfgang Denk <wd@denx.de>
* OMAP3: Change devkit8000 maintainerThomas Weber2011-12-06-4/+4
| | | | Signed-off-by: Thomas Weber <weber@corscience.de>
* tools/envcrc: fix compile breakageIgor Grinberg2011-12-06-3/+3
| | | | | | | | | | | When ENV_IS_EMBEDDED is not set, but CONFIG_BUILD_ENVCRC is set, the environment.h file does not get included resulting in unrecognized env_t type. Fix this by moving the include directive. Reported-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Tested-by: Mike Frysinger <vapier@gentoo.org>
* Add a "tidy" build optionAndy Fleming2011-12-06-5/+8
| | | | | | | | | | It is sometimes desireable to clean up the byproducts of the build process without removing the executable results. "make clean" is close, but leaves the build directory with a large number of *.depend* files. This new build option invokes make clean, and then removes the depend files. Signed-off-by: Andy Fleming <afleming@freescale.com>
* add a git mailrc file for maintainersMike Frysinger2011-12-06-0/+101
| | | | | | This should make sending out e-mails to the right people easier. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Add a cli command to test the TPM device.Vadim Bendebury2011-12-06-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The command gets an arbitrary number of arguments (up to 30), which are interpreted as byte values and are feed into the TPM device after proper initialization. Then the return value and data of the TPM driver is examined. TPM commands are described in the TCG specification. For instance, the following sequence is the 'TPM Startup' command, it is processed by the TPM and a response is generated: boot > tpm 0x0 0xc1 0x0 0x0 0x0 0xc 0x0 0x0 0x0 0x99 0x0 0x1 Found TPM SLB9635 TT 1.2 by Infineon Got TPM response: 00 c4 00 00 00 0a 00 00 00 00 If the command is corrupted (fed one byte short), an error is reported: boot > tpm 0x0 0xc1 0x0 0x0 0x0 0xc 0x0 0x0 0x0 0x99 0x0 generic_lpc_tpm.c:311 unexpected TPM status 0xff000888 generic_lpc_tpm.c:516 failed sending data to TPM tpm command failed boot > Change-Id: I3f3c5bfec8b852e208c4e99ba37b0f2b875140b0 Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> CC: Wolfgang Denk <wd@denx.de>
* pxe: make the first label the implicit defaultJason Hobbs2011-12-06-3/+14
| | | | | | | | | | If no default label is specified, but a situation arises where the default label should be used, treat the first label specified as the default label. Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com> Cc: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> Cc: Wolfgang Denk <wd@denx.de>
* cmd_bdinfo: simplify local static funcs a bitMike Frysinger2011-12-06-58/+31
| | | | | | | | | If we move the local funcs to the top of the file, and use the __maybe_unused define, we can drop a lot of ugly ifdef logic and duplicated prototypes. Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* mii: miiphy register address width changeChandan Nath2011-12-06-10/+10
| | | | | | | | | | | This patch is added for PHY whose register offset value exceeds 0xFF and cannot be used with "unsigned char" datatype in miiphy_read, miiphy_write and miiphy_register functions. Datatype of register offset is changed to unsigned short instead of unsigned char so that offset value greater then 0xFF can be used. Signed-off-by: Chandan Nath <chandan.nath@ti.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* Standalone Apps: Standalone apps should need only exports.h.Mike Partington2011-12-06-4/+3
| | | | | | | | | Modify exports.h to remove its dependencies on other files, thus enabling standalone apps to require only exports.h from the U-Boot source tree. This appears to be the intent based on the following note: http://lists.denx.de/pipermail/u-boot/2010-January/067174.html Signed-off-by: Mike Partington <mparting@lexmark.com>
* env_nand: Remove DEBUG definitionThomas Weber2011-12-06-2/+0
| | | | Signed-off-by: Thomas Weber <weber@corscience.de>
* Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-stagingWolfgang Denk2011-12-05-15/+9
|\ | | | | | | | | | | | | | | | | | | * 'agust@denx.de' of git://git.denx.de/u-boot-staging: Makefile: add tools/mkenvimage to target 'clean' mv_common.c: get rid of 'defined but not used' warning m68k: fix ambiguous bit testing sparc: fix unknown escape sequence warnings sparc: fix unused variable warnings sf: fix erase debug output
| * Makefile: add tools/mkenvimage to target 'clean'Horst Kronstorfer2011-12-05-1/+1
| | | | | | | | | | Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
| * mv_common.c: get rid of 'defined but not used' warningMichael Jones2011-12-05-1/+1
| | | | | | | | | | | | | | | | | | When CONFIG_ENV_IS_NOWHERE, got following warning: mv_common.c:32:14: warning: 'entries_to_keep' defined but not used. Get rid of this warning. Signed-off-by: Michael Jones <michael.jones@matrix-vision.de> Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
| * m68k: fix ambiguous bit testingMike Frysinger2011-12-05-1/+1
| | | | | | | | | | | | | | | | | | | | Building for some m68k boards results in the warning: cpu_init.c: In function 'cpu_init_f': cpu_init.c:287: warning: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * sparc: fix unknown escape sequence warningsMike Frysinger2011-12-05-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know what exactly the code was going for, but the object code is the same before/after my change, and in looking at the env strings, this seems to be OK. Otherwise gcc warns: cc1: warning: unknown escape sequence: '\$' cc1: warning: unknown escape sequence: '\)' cc1: warning: unknown escape sequence: '\040' cc1: warning: unknown escape sequence: '\$' cc1: warning: unknown escape sequence: '\)' Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * sparc: fix unused variable warningsMike Frysinger2011-12-05-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the build warnings: board.c: In function 'board_init_f': board.c:179:8: warning: unused variable 'e' board.c:178:6: warning: unused variable 'i' board.c:173:13: warning: unused variable 'cmdtp' bootm.c: In function 'do_bootm_linux': bootm.c:101:28: warning: unused variable 'kernend' bootm.c:101:15: warning: unused variable 'initrd_addr' bootm.c:100:26: warning: unused variable 'checksum' bootm.c:100:21: warning: unused variable 'len' bootm.c:100:15: warning: unused variable 'data' Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * sf: fix erase debug outputVadim Bendebury2011-12-05-2/+1
| | | | | | | | | | | | | | | | We want to show the length, so multiplying by sector size makes no sense. This is a hold over from the erase code before the big refactor. Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | common/menu.c: Fix build warningAnatolij Gustschin2011-12-05-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix: menu.c: In function 'menu_item_print': menu.c:91: warning: passing argument 1 of 'putc' makes integer from pointer without a cast Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Heiko Schocher <hs@denx.de> Tested-by: Heiko Schocher <hs@denx.de> Acked-by: Marek Vasut <marek.vasut@gmail.com>
* | board/amcc/taihu/flash.c: Fix GCC 4.6 build warningsWolfgang Denk2011-12-05-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: flash.c: In function 'flash_erase_1': flash.c:514:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable] flash.c: In function 'flash_erase_2': flash.c:956:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable] Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | board/amcc/yucca/flash.c: Fix GCC 4.6 build warningsWolfgang Denk2011-12-05-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: flash.c: In function 'flash_erase_1': flash.c:425:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable] flash.c: In function 'flash_erase_2': flash.c:834:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable] Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | board/amcc/common/flash.c: Fix GCC 4.6 build warningWolfgang Denk2011-12-05-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix: In file included from flash.c:45:0: ../common/flash.c: In function 'flash_erase': ../common/flash.c:399:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable] Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* | pci_ftpci100: Implementation FTPCI100 PCI driverGavin Guo2011-12-05-0/+425
| | | | | | | | | | | | | | | | | | FTPCI100 is a SoC PCI componenet of Faraday company. Which is usually built into SoC chips for providing embedded PCI functions. Signed-off-by: Gavin Guo <gavinguo@andestech.com> Signed-off-by: Macpaul Lin <macpaul@andestech.com>
* | phy: Add support for SMSC LAN87xx PHYsNobuhiro Iwamatsu2011-12-05-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for the SMSC LAN87xx PHYs. Following PHYs can be used by set CONFIG_PHY_SMSC to config. - SMSC LAN8700 - SMSC LAN8710/LAN8720 - SMSC LAN8710/LAN8720 A setup of PHY was copied from linux kenrel. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Fixed white space errors; modified commit message a bit. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Fix tsize warning in tools/aisimage.cSimon Glass2011-12-05-3/+3
| | | | | | | | | | | | | | | | | | This fixes the following warning with gcc 4.4.3. aisimage.c: In function 'aisimage_generate': aisimage.c:365: warning: 'tsize' may be used uninitialized in this function Signed-off-by: Simon Glass <sjg@chromium.org>
* | drivers/net/mvgbe.c: Fix GCC 4.6 warningsAnatolij Gustschin2011-12-05-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: mvgbe.c: In function 'mvgbe_send': mvgbe.c:555:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] mvgbe.c: In function 'mvgbe_recv': mvgbe.c:640:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: Prafulla Wadaskar <prafulla@marvell.com> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
* | serial: constify serial_assign()Gerlando Falauto2011-12-05-2/+2
| | | | | | | | | | Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | serial: cosmetic checkpatch complianceGerlando Falauto2011-12-05-35/+35
| | | | | | | | | | Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | disk: part_efi: fix regression due to incorrect buffer usageStephen Warren2011-12-05-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit deb5ca80275e8cfa74d5680b41204e08a095eca5 "disk: part_efi: fix **pgpt_pte == NULL" modified the code to pass "&gpt_head" to is_gpt_valid() rather than the previous "gpt_head". However, gpt_head is a pointer to the buffer, not the actual buffer, since it was allocated using ALLOC_CACHE_ALIGN_BUFFER. This caused is_gpt_valid() to read the disk block onto the stack rather than into the buffer, causing the code to fail. This change reverts that portion of the commit mentioned above. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Doug Anderson <dianders@chromium.org> Tested-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org> Tested-by: Anton Staaf <robotboy@chromium.org>
* | miiphy: Note that miiphy_* API is deprecatedAndy Fleming2011-12-05-0/+21
| | | | | | | | | | | | | | We want to move everything to phylib, and we definitely don't want new drivers using the miiphy infrastructure. Signed-off-by: Andy Fleming <afleming@freescale.com>
* | Phy/Marvell: Rewrite the MV88E1111 phy config function based on kernel codeZang Roy-R619112011-12-05-6/+107
| | | | | | | | | | | | | | | | | | | | The original m88e1111s_config() does not do the SGMII mode initialization and is buggy. Rewrite the function according to 3.0.6 kernel function m88e1111_config_init() in drivers/net/phy/marvell.c Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Acked-by: Andy Fleming <afleming@freescale.com> Cc: Kumar Gala <galak@kernel.crashing.org>
* | Merge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-stagingWolfgang Denk2011-12-05-7/+2
|\ \ | | | | | | | | | | | | | | | | | | * 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging: tools/os_support: add OS X Lion support board/esd/dasa_sim/flash.c: Fix GCC 4.6 warning board/esd/common/xilinx_jtag_micro.c: Fix GCC 4.6 warning
| * | tools/os_support: add OS X Lion supportAndreas Bießmann2011-12-02-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OS X Lion's c-library implements getline(), therefore prevent including the old helper implementation for __DARWIN_C_LEVEL < 200809L. Without this patch following error occours: ---8<--- In file included from os_support.h:32, from img2srec.c:55: getline.h:1: error: conflicting types for ‘getline’ /usr/include/stdio.h:449: error: previous declaration of ‘getline’ was here --->8--- Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * | board/esd/dasa_sim/flash.c: Fix GCC 4.6 warningMatthias Fuchs2011-12-02-3/+0
| | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
| * | board/esd/common/xilinx_jtag_micro.c: Fix GCC 4.6 warningMatthias Fuchs2011-12-02-2/+0
| |/ | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
* | sh: Add support for ecovec boardNobuhiro Iwamatsu2011-12-02-0/+575
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The ecovec board has SH7724, 256MB DDR2-SDRAM, USB, Ethernet, and more. This patch supports the following functions: - 256MB DDR2-SDRAM - USB - I2C - Ethernet Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh: Add support Renesas SH7724Nobuhiro Iwamatsu2011-12-02-0/+236
| | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh: Add updating method of SPI ROM to README of sh7757lcrNobuhiro Iwamatsu2011-12-02-0/+14
| | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh: espt: change config for new sh_eth driverYoshihiro Shimoda2011-12-02-0/+4
| | | | | | | | | | | | | | The new sh_eth driver uses the phy driver. So, this patch enables it. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh7763rdp: change config for new sh_eth driverYoshihiro Shimoda2011-12-02-0/+4
| | | | | | | | | | | | | | The new sh_eth driver uses the phy driver. So, this patch enables it. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh: avoid multiple definition errors with cache funcsMike Frysinger2011-12-02-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | Recent builds for SH4 boards fail with a lot of errors like: cmd_mem.o: In function 'dcache_invalid_range': include/asm/cache.h:25: multiple definition of 'dcache_invalid_range' include/asm/cache.h:25: first defined here This is due to the funcs being defined in the header, but not static or inline or extern. So move them to the sh4-specific cache.c file. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh: Add a flag which controls the DDR ECC mode of sh7757lcrNobuhiro Iwamatsu2011-12-02-1/+3
| | | | | | | | | | | | | | | | | | | | | | When DDR-ECC is effective, the physical memory which can be used reduces this boardby half. However, this mode can chenge to disable. When it was disabled, user can use 512 MB of physical memory. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> CC: "Yoshihiro Shimoda" <yoshihiro.shimoda.uh@renesas.com> Acked-by: "Yoshihiro Shimoda" <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh: Add ashrsi3 libgcc functionPhil Edworthy2011-12-02-0/+186
| | | | | | | | | | | | | | | | | | | | | | The ashrsi3 function is used by some commands that aren't in SH2A default configs (e.g. JFFS2). The ashrsi3.S file has been copied from Linux. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh: only add -mno-fdpic if the compiler supports itMike Frysinger2011-12-02-1/+2
| | | | | | | | | | | | | | | | | | Not all SuperH toolchains support -mno-fdpic. Chances are good that if the flag doesn't work, it isn't defaulting to the FDPIC ABI, so the flag isn't needed. So only add it if it is actually supported. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | sh7757lcr: change config for new sh_eth driverYoshihiro Shimoda2011-12-02-0/+4
| | | | | | | | | | | | | | The new sh_eth driver uses the phy driver. So, this patch enables it. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | net: sh_eth: use miiphybb instead of own mii functionsYoshihiro Shimoda2011-12-02-248/+104
|/ | | | | | | | | | The sh_eth driver had an own mii functions. However the function didn't support the gigabit PHY. The U-Boot has the general phy driver and miiphybb driver, and they already support it. So this patch removes the own functions and uses the phy driver. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>