From patchwork Sun Aug 13 00:01:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 109945 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp2676605qge; Sat, 12 Aug 2017 17:03:25 -0700 (PDT) X-Received: by 10.80.155.30 with SMTP id o30mr19408656edi.27.1502582605361; Sat, 12 Aug 2017 17:03:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502582605; cv=none; d=google.com; s=arc-20160816; b=BIt64XVcdZjopuyHuz9vx0Buqf/Jf90caHPZ0TZNUXn130QkaFg0eCgXif9kNDsNjW NJEesy2zm9BGo4Q2Ba028sdPfnouPvz7md9ax8k7/KZoykEKLOlHNiimiL77AizH955j C07ZyihOT2XgHuUEJSkK0JMjwnwWFU6PhIPdRlgNsCuqyxOgmhdolIxv2kKnaZxlg5DB wysPBWDxvK5TVwQWeJzjBkR1BtsSZ2SKdSUPXir2HRbqmTVvJQietSyLU4B47cIrnPW8 9CFOo1H/p45dYRTP8LaNQEngGvU2RPR45khdRuKKKq9C2oZk+cFGTEvYvVVcylg/7iqc vlRw== 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=xlDeiGQ5BbxTcEeRbx/+/lLR9NFSU6UtXsM9ezLclIY=; b=iJOvhnCkG/gOEK96P2idFusg5emCQlW4G05T2qwitFwU1FrtsCoqB5WcV95sdvmWNQ BWdBKk/KEN3OkA4kvlp7ekR1xFZ3yl9mjHcp877neNXZuPGDyeDwVWYt3B84sm/9eFFT +b3MWUrGkZ9/5bQZR28K7yzA1yQSzLXL29tUJGLqJZVRsX3c3Ygf0QTeAZw8VljwKHFH 6GGLofdX1/A2sAYusYomBDalpIH40x/mM25VnrMtIxrBR0yvUSx5/jj9KqyxznrbWGS8 TErfRFP0I1goliP/rTGNDtO6ir+MGehI4WrA8xVBYieIDoZtLDVr49lT5S661SU7FFLx tFxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=EY/aSwUG; 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 i4si3505302edc.311.2017.08.12.17.03.24; Sat, 12 Aug 2017 17:03:25 -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=EY/aSwUG; 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 B6CD1C21DE0; Sun, 13 Aug 2017 00:03:20 +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 9EA3EC21E49; Sun, 13 Aug 2017 00:01:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D405EC21D76; 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 6F957C21D90 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 v7D01JK0005965; Sun, 13 Aug 2017 09:01:20 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v7D01JK0005965 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1502582480; bh=YqFIOWn4k4lJrFEevAlGiuqOt2Pmx1Ix4vWc7tD/J9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EY/aSwUGBYzBStq1m2VDTgBnNADF86Dl1y3WRWW9rRgJr4l1VPRtPmEH8RToS7NDa d/EbfK++OrIsASE6ldUMVVWJ4URBuyq+XOngt4Dgnc0Se1tKwgBLazoOGQDobDlGML dc7Zs77m4vjMtYNkquXMY5YM2UEGE68Td3OiTQj5rrLNBhQyEJO8t9NH4D/CqdphBO 1aQfq5QBD7k6OusF4eRHKcZeoKm8vU3ivKs74B3uE1/ZBNkxro6vi9cNWdgpn4e6Fl V66Uao9ZmTSl9EzFxJ9fcKQreMeb7ihuWXE9JbJNTJuAMtl5D2o/eLNC15PCmX5/yS B6LkDO/MyFB8Q== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sun, 13 Aug 2017 09:01:15 +0900 Message-Id: <1502582477-27948-3-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 3/5] Revert "ARM: uniphier: fix ROM boot mode for PH1-sLD3" 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 82d075e79fa509ffb8ecd8dd2dc216929d6e8289. Commit 82d075e79fa5 ("ARM: uniphier: fix ROM boot mode for PH1-sLD3") was a workaround for sLD3. Now the sLD3 SoC support has been removed. Revert it to allow to simplify the init code. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/arm32/lowlevel_init.S | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/mach-uniphier/arm32/lowlevel_init.S b/arch/arm/mach-uniphier/arm32/lowlevel_init.S index 3c7c6502793c..a399a169a9da 100644 --- a/arch/arm/mach-uniphier/arm32/lowlevel_init.S +++ b/arch/arm/mach-uniphier/arm32/lowlevel_init.S @@ -98,11 +98,6 @@ ENDPROC(enable_mmu) ENTRY(setup_init_ram) ldr r1, = SSCO_BASE - mrc p15, 0, r0, c2, c0, 0 @ TTBR0 - ldr r0, [r0, #0x400] @ entry for virtual address 0x100***** - bfc r0, #0, #20 - cmp r0, #0x50000000 @ is sLD3 page table? - biceq r1, r1, #0xc0000000 @ sLD3 ROM maps 0x5******* to 0x1******* /* Touch to zero for the boot way */ 0: ldr r0, = 0x00408006 @ touch to zero with address range