From patchwork Mon Apr 22 14:41:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 238546 X-Patchwork-Delegate: monstr@monstr.eu 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 018942C00FD for ; Tue, 23 Apr 2013 00:48:23 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B8DB14A204; Mon, 22 Apr 2013 16:47:54 +0200 (CEST) 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 P4lpH7MEAJjQ; Mon, 22 Apr 2013 16:47:54 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3B1894A1A8; Mon, 22 Apr 2013 16:47:49 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3F7CF4A16E for ; Mon, 22 Apr 2013 16:47:43 +0200 (CEST) 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 tHpQ+wqyzL5e for ; Mon, 22 Apr 2013 16:47:38 +0200 (CEST) X-Greylist: delayed 368 seconds by postgrey-1.27 at theia; Mon, 22 Apr 2013 16:47:36 CEST 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-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by theia.denx.de (Postfix) with ESMTPS id 6D26F4A16D for ; Mon, 22 Apr 2013 16:47:36 +0200 (CEST) Received: by mail-wi0-f180.google.com with SMTP id h11so4527422wiv.1 for ; Mon, 22 Apr 2013 07:47:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :content-type:x-gm-message-state; bh=I9mQXpK9+3o2z6hoD593BQIexdbP/GOLSBes069iRTw=; b=IsKmvYpagRAaug+50f2caApNMhdRNdZ0jS8nf+GPIFGBNzDlG5627D73IOILrEOJa/ nFrWfpAd2Fj+9u5SKol0Jdp3nQ+K4sijmiwq+/eyZWvJmVwlkiTR3oxnqP16BtA3wYP0 Ya5WCn1IWTI6ZyD0h9MVpPyhl/RUYObCwgIEdBfSyaCEViDHRyzfH4kDokLJqHZuprgW +zR+xQK+yo7RwrgsAnm6mhikS+IpUHDl4bU8VfQMJJtYwpN9OAaMPVEyDbjJJpKG/mmc vupsmhax+ACtaN+m5nkFaxFFeAbTPUyDneXd60c2pF2Plh1J1uNDXHc186VaLJ6nO0F7 Ocyg== X-Received: by 10.181.12.5 with SMTP id em5mr51979198wid.24.1366641685461; Mon, 22 Apr 2013 07:41:25 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPS id i53sm41143346eeu.5.2013.04.22.07.41.24 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 22 Apr 2013 07:41:24 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de Date: Mon, 22 Apr 2013 16:41:00 +0200 Message-Id: <865c446dd3208ed797260efe67a114ac4b24b86a.1366641621.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.1 X-Gm-Message-State: ALoCoQnN8yGaWAA4nPTOZXIz+LOCLsJyZ4PPFb4WmQdxAneIMJ4gC17I/Tob1edOE7bkYGVGf+Pu Subject: [U-Boot] [PATCH 1/4] microblaze: Fix reset function X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 From: Michal Simek Remove CONFIG_SYS_RESET_ADDRESS macro. It was there from historical point of view when soft reset was just jump to u-boot text start (not used right now). Signed-off-by: Michal Simek Signed-off-by: Michal Simek --- board/xilinx/microblaze-generic/microblaze-generic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.8.2.1 diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index 70f94c1..8ba99f9 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -38,10 +38,10 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) *((unsigned long *)(CONFIG_SYS_GPIO_0_ADDR)) = ++(*((unsigned long *)(CONFIG_SYS_GPIO_0_ADDR))); #endif -#ifdef CONFIG_SYS_RESET_ADDRESS + puts ("Reseting board\n"); asm ("bra r0"); -#endif + return 0; }