From patchwork Sun Jan 9 16:18:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiangfu Liu X-Patchwork-Id: 78030 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 8AD31B7138 for ; Mon, 10 Jan 2011 03:21:18 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2DDCC281B8; Sun, 9 Jan 2011 17:20:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hk6c8xAU8uky; Sun, 9 Jan 2011 17:20:50 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EE93D281B9; Sun, 9 Jan 2011 17:20:25 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7D4572818C for ; Sun, 9 Jan 2011 17:20:17 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XRoQOxOeykGx for ; Sun, 9 Jan 2011 17:20:17 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pw0-f44.google.com (mail-pw0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTP id 0245828183 for ; Sun, 9 Jan 2011 17:19:58 +0100 (CET) Received: by mail-pw0-f44.google.com with SMTP id 7so2648490pwi.3 for ; Sun, 09 Jan 2011 08:19:58 -0800 (PST) Received: by 10.142.216.16 with SMTP id o16mr3493147wfg.434.1294589998724; Sun, 09 Jan 2011 08:19:58 -0800 (PST) Received: from localhost.localdomain (fidelio.qi-hardware.com [213.239.211.82]) by mx.google.com with ESMTPS id w42sm6248563wfh.3.2011.01.09.08.19.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 09 Jan 2011 08:19:57 -0800 (PST) From: Xiangfu Liu To: u-boot@lists.denx.de Date: Mon, 10 Jan 2011 00:18:45 +0800 Message-Id: <1294589925-32639-9-git-send-email-xiangfu@openmobilefree.net> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1294589925-32639-8-git-send-email-xiangfu@openmobilefree.net> References: <1294589925-32639-1-git-send-email-xiangfu@openmobilefree.net> <1294589925-32639-2-git-send-email-xiangfu@openmobilefree.net> <1294589925-32639-3-git-send-email-xiangfu@openmobilefree.net> <1294589925-32639-4-git-send-email-xiangfu@openmobilefree.net> <1294589925-32639-5-git-send-email-xiangfu@openmobilefree.net> <1294589925-32639-6-git-send-email-xiangfu@openmobilefree.net> <1294589925-32639-7-git-send-email-xiangfu@openmobilefree.net> <1294589925-32639-8-git-send-email-xiangfu@openmobilefree.net> Cc: zpxu@ingenic.cn, cwjia@ingenic.cn Subject: [U-Boot] [PATCH v5 8/8] add software usbboot X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Signed-off-by: Xiangfu Liu Acked-by: Daniel Acked-by: ChangWei Jia --- drivers/mtd/nand/jz4740_nand.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c index 32b41ef..b15c4ea 100644 --- a/drivers/mtd/nand/jz4740_nand.c +++ b/drivers/mtd/nand/jz4740_nand.c @@ -285,6 +285,18 @@ extern int serial_init(void); pll_init(); serial_init(); sdram_init(); + +#if defined(CONFIG_NANONOTE) +#define KEY_U_OUT (32 * 2 + 16) +#define KEY_U_IN (32 * 3 + 19) + __gpio_as_input(KEY_U_IN); + __gpio_enable_pull(KEY_U_IN); + __gpio_as_output(KEY_U_OUT); + __gpio_clear_pin(KEY_U_OUT); + + if (__gpio_get_pin(KEY_U_IN) == 0) + usb_boot(); +#endif #endif uint32_t reg;