From patchwork Tue Jul 16 13:38:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132785 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="iZTgHpdT"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1v55RgMz9s7T for ; Tue, 16 Jul 2019 23:48:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6C1C2C21F67; Tue, 16 Jul 2019 13:42:39 +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=RCVD_IN_MSPIKE_H2, 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 9B0A2C21F5B; Tue, 16 Jul 2019 13:39:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 33415C21E47; Tue, 16 Jul 2019 13:38:23 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id BFBB9C21E47 for ; Tue, 16 Jul 2019 13:38:22 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z1so20964139wru.13 for ; Tue, 16 Jul 2019 06:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O4rqCSkGIquD9sLROO4oCPaIAvMNOomS78dZknECSNA=; b=iZTgHpdTpI4iYBwbnG7miL5hLNKs/OfIz3Cb5vKadPb0yPO/hanwVJljlglRYMwYLz 9QlIOnbaSN17y+37DH/p63I44w6sNqW7GUNmh+nznW0iVef3NXsVHRj5CMUJ3RvDdd59 MzuPcj3LetYHv9lZbo3VdPUWECH+M6rGxTjjlIfcp5gLe5RIU6M6pzbUrTELRqySsMCc BBKo3XMoC1SJkk/uYfZOOG3rxwW+gCtO4kGXfEX4BAT5j5qAKZw63gPP2hfLsffrw+Tf a1GLd1VoTh2yBtC/7Iw+UMrEVqGMwrz71Y5dBXuM6kjKLzKlWf4SbfbGLoTCOkm/TnJt kHUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O4rqCSkGIquD9sLROO4oCPaIAvMNOomS78dZknECSNA=; b=J1uitBFQdr5j+Wzj4Wjmbku9u0qAm7ndZUIsOa/M2bIE0EFyH24XQKn0dJXWUWBgHx OCt5PyZIUnyJuUXa9hskX9f6Bb51EE180+BTwztzZQ89upIb3a6oU5YzRAJnRcxQq+ja 6BkHWLaIPKPL7qYiUOISN4F8d120kHlcJVmccRA3CvMg4bjWgJnTjBbE6LfRoSWMg/0V XZkzb/YN3qDicDkjyhzxJzymCSwLKKmVSqGUaF/wOkMHi1gzrYTOKL5ruUNH6V/VV2v2 DalJgPYty6B+RqqiUqBBoADb24H8tGSfAw1tKzpjQJD1wTM0evdYF9iWm1pKatn2Z8yJ 4vdA== X-Gm-Message-State: APjAAAUdgZ7uH/c12zat+MJ9+5r/ifHRhvTFTfe/6M9eXCWeydelesqK 0J9hNKvHIIhRbqKaxazHb6FQ6Qc9 X-Google-Smtp-Source: APXvYqxRl3TLXAtQ8PnSTqHvflHiHzpEHnQ3fYQ12arcDXI3+WVGm3lrZxVTK/yZ3EBCT9Ki8PI9aQ== X-Received: by 2002:adf:ef8d:: with SMTP id d13mr35035451wro.60.1563284301947; Tue, 16 Jul 2019 06:38:21 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.20 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:21 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:38:01 +0100 Message-Id: <20190716133803.1174-15-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:54 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 14/16] rpi: Add memory map for bcm2838 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 6d6f1ef39a..4242ef35a4 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -249,7 +249,8 @@ static uint32_t rev_type; static const struct rpi_model *model; #ifdef CONFIG_ARM64 -static struct mm_region bcm2837_mem_map[] = { +#ifndef CONFIG_BCM2838 +static struct mm_region bcm283x_mem_map[] = { { .virt = 0x00000000UL, .phys = 0x00000000UL, @@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = { 0, } }; - -struct mm_region *mem_map = bcm2837_mem_map; +#else +static struct mm_region bcm283x_mem_map[] = { + { + .virt = 0x00000000UL, + .phys = 0x00000000UL, + .size = 0xf3000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { + .virt = 0xfe000000UL, + .phys = 0xfe000000UL, + .size = 0x01800000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* List terminator */ + 0, + } +}; +#endif +struct mm_region *mem_map = bcm283x_mem_map; #endif int dram_init(void)