From patchwork Sun Aug 13 00:01:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 109944 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp2676557qge; Sat, 12 Aug 2017 17:03:20 -0700 (PDT) X-Received: by 10.80.157.77 with SMTP id j13mr19000395edk.178.1502582600788; Sat, 12 Aug 2017 17:03:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502582600; cv=none; d=google.com; s=arc-20160816; b=mLP1mm+8HLXstDOD4dpATyIyv439hvemvNnjI9kKOWODoXdnWdNpfh0TVOIYKlVwnN hheIpMjpKzs3JHUnFhjncHx+2IgMt3LM40+kYcax9LR24Sf4U8WGBPv1ijB6KLvbYqUZ 9DTj8oVKLDkoDfOkFugv/Sda0UC1FwVPOGnYNVhVN2H1U57mevRoolgoAkRHX+P6uo2K c48eYIWCRlcrt5Q9TcMnhr4xbjH7L55YGR4y4/mq3jcfpMZrLYWJlsmwUzC/kI54Qjf2 Ko+5l+JbTyAdFNni0o0cknp6jAgNHzaavnS+Z6pe1zx6NDUm4VqhqPKK969Y8/vXx2yq ICCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter:arc-authentication-results; bh=fa0LlEvwZCJIgfDcfJNu5B/0o4lufs5WITd9NhZYPqw=; b=IXxB4UAPr+f1InbO1KqE4SLDZBMp7x/G5gHS+rfzY4jVnaJEXIZa32C9WlkaD6WtxI 6Tn8+1dHcWw6A5Myla4blx16JUtaaPOtoWEYoClF9P3zNWnYDdNEPoPz+E1S5Ppk2pQq sq5q3rwp1htO8Xa0uh7RQA3NB0AabqhwkKwzKyGTkCEKdNjv/slQL/DWwCPd5vw7v3E+ ZWXKFZflcUg2brPsBdwdaLiXEzZZUr0CLXo9JuqFZ4bjjqryUqS8AKQOhAqVg2IHb8HN e+l1v5a65Y9K5HGJL4pdtdTg13fOXbCIUmopw5xxfb6WFaX4cCDgierOL4KgwqoBJvfJ 5kVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=LxLdph2y; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id l18si3325142edj.524.2017.08.12.17.03.20; Sat, 12 Aug 2017 17:03:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=LxLdph2y; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 41DE2C21E1E; Sun, 13 Aug 2017 00:02:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D55E4C21DFB; Sun, 13 Aug 2017 00:01:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BA042C21C6A; Sun, 13 Aug 2017 00:01:38 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id 6B8E4C21D76 for ; Sun, 13 Aug 2017 00:01:37 +0000 (UTC) Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-10.nifty.com with ESMTP id v7D01JJx005965; Sun, 13 Aug 2017 09:01:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v7D01JJx005965 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1502582480; bh=omV0ik08xyiQQsvzRqPmyikEnV/XFu4suhrPHiAsntQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LxLdph2yt6oVqLLr6Xac1+j4k/pEo+MZpTWCJEnEMRiDrCByk3AgQ8rllthX9t3cT Cr84tljV1iPVsS4eUd8S4JMvLBXMn+rMzhflp/WP9JMPqWb9ycBSn7NBBSPMd3qE2Y WofNP6e4vtatW202RxnWBFivsyaGO1dPiXT1bj4OMY6W+a25C9QK/0AaeKXyyOkeSP 9giHTJyUWZwNMwor2fIgRVom93oVVHrHz+mVfDpS7dspgG1o1hIuDVws2qjeNb38dO 3Vecz3MAqhkParjQeDBwTBOydM7LiUzatwO5p4FcSxheKHuS/7B5O3foDFyqLy2vs7 gi7uxI3JQ/K4Q== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sun, 13 Aug 2017 09:01:14 +0900 Message-Id: <1502582477-27948-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502582477-27948-1-git-send-email-yamada.masahiro@socionext.com> References: <1502582477-27948-1-git-send-email-yamada.masahiro@socionext.com> Cc: Albert Aribaud Subject: [U-Boot] [PATCH 2/5] Revert "ARM: uniphier: move lowlevel debug init code after page table switch" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This reverts commit bcc51c1512a3deb6a9fdd37362c6dde32ad3da23. Commit bcc51c1512a3 ("ARM: uniphier: move lowlevel debug init code after page table switch") was intended to support lowlevel debug for sLD3. Now the sLD3 SoC support has been removed. Revert it to allow to enable lowlevel debug earlier. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/arm32/lowlevel_init.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-uniphier/arm32/lowlevel_init.S b/arch/arm/mach-uniphier/arm32/lowlevel_init.S index 89bb5a6355fd..3c7c6502793c 100644 --- a/arch/arm/mach-uniphier/arm32/lowlevel_init.S +++ b/arch/arm/mach-uniphier/arm32/lowlevel_init.S @@ -25,6 +25,10 @@ ENTRY(lowlevel_init) orr r0, r0, #(CR_C | CR_M) @ enable MMU and Dcache mcr p15, 0, r0, c1, c0, 0 +#ifdef CONFIG_DEBUG_LL + bl debug_ll_init +#endif + bl setup_init_ram @ RAM area for stack and page table /* @@ -42,10 +46,6 @@ ENTRY(lowlevel_init) bl enable_mmu -#ifdef CONFIG_DEBUG_LL - bl debug_ll_init -#endif - mov lr, r8 @ restore link mov pc, lr @ back to my caller ENDPROC(lowlevel_init)