Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8736CC433EF for ; Mon, 20 Jun 2022 12:11:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DC6484261; Mon, 20 Jun 2022 14:08:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="FZC8+DeT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8411C839F6; Mon, 20 Jun 2022 14:08:26 +0200 (CEST) Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 189158213E for ; Mon, 20 Jun 2022 14:08:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf34.google.com with SMTP id t16so10557382qvh.1 for ; Mon, 20 Jun 2022 05:08:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8g+spiV/zpfWdTlzwuhMdD1aW3mdjIubG8KDKxYwF/Y=; b=FZC8+DeTsmR8/bjy2yObIsXUUvfEL4Nj/spVPbz7XtzwOBrNa1qgkxhmGYpI0qjiel TyZFaSP05XnYV4VPWF/hlcv6w46Iji3RFZcN2pj41bjYdWakCmI1637jLOFIEt2hLlvg CQJKtnkqrqJ3mNjQvo1vA60NC63XuGJyjgp1w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8g+spiV/zpfWdTlzwuhMdD1aW3mdjIubG8KDKxYwF/Y=; b=ru+RHNsiW+LnUDPWPlCe6QBIfgrXmhtH4q1djV/WvP1JLwN0y2uZ23K0fqSCQi3HGY 799s1t2e7nmQib2f31f+CryIVekxKtdrUAT0XFHxGhAxB+eTGgutyifR+3oLaZhbmPz1 BcI4890wgkx0wx7dL9FMczFWqmAy9wIZOF94UML+ZiJk54IhYa3Q1XMkfFAReR+FMHZC AvghoiTxSpVdDFoUgnhElnbhVTmGndbtLNZ50mIwAZ9u3tei5Qeg43+lv6PBZ0reyZzK WagGeBdr4arNCEMDBouiVZ/YIrcgjACCJg+17KkuyA/pkcXvlPi4EQwfLyoWSfpLKj2D ALHw== X-Gm-Message-State: AJIora+FhcaKCSplEhO/0QC1KfD+HcYaGM+xTmM8QqFIMETm1+GT1dIY jsZEv/UkGvb4qd2ANAt7dHDnEcoPFrZaaw== X-Google-Smtp-Source: AGRyM1szuJAC/YXWh7ncgI0HS5Gl6gxlZT7x0HKRW6LGNWbtwWABT/LV96oSoJhWimcX3a7qRtN8Sg== X-Received: by 2002:ac8:5b44:0:b0:305:1aa7:1a96 with SMTP id n4-20020ac85b44000000b003051aa71a96mr19411696qtw.608.1655726893421; Mon, 20 Jun 2022 05:08:13 -0700 (PDT) Received: from bill-the-cat.lan (cpe-65-184-195-139.ec.res.rr.com. [65.184.195.139]) by smtp.gmail.com with ESMTPSA id x9-20020a05620a448900b006a6a904c0a5sm11763312qkp.107.2022.06.20.05.08.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jun 2022 05:08:12 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 16/17] qemu-ppce500: Move CONFIG_SYS_PCI_MAP_{START, END} to board code Date: Mon, 20 Jun 2022 08:07:57 -0400 Message-Id: <20220620120758.765049-16-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220620120758.765049-1-trini@konsulko.com> References: <20220620120758.765049-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean These CONFIG options are only used on this board, in the board file itself. Remove these from the CONFIG namespace and define in the board file. Signed-off-by: Tom Rini --- board/emulation/qemu-ppce500/qemu-ppce500.c | 8 ++++++-- include/configs/qemu-ppce500.h | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/emulation/qemu-ppce500/qemu-ppce500.c b/board/emulation/qemu-ppce500/qemu-ppce500.c index 348fcf3bb099..99edaa3b4215 100644 --- a/board/emulation/qemu-ppce500/qemu-ppce500.c +++ b/board/emulation/qemu-ppce500/qemu-ppce500.c @@ -32,6 +32,10 @@ DECLARE_GLOBAL_DATA_PTR; +/* Virtual address range for PCI region maps */ +#define SYS_PCI_MAP_START 0x80000000 +#define SYS_PCI_MAP_END 0xe0000000 + static void *get_fdt_virt(void) { if (gd->flags & GD_FLG_RELOC) @@ -101,7 +105,7 @@ static int pci_map_region(phys_addr_t paddr, phys_size_t size, ulong *pmap_addr) map_addr += size - 1; map_addr &= ~(size - 1); - if (map_addr + size >= CONFIG_SYS_PCI_MAP_END) + if (map_addr + size >= SYS_PCI_MAP_END) return -1; /* Map virtual memory for range */ @@ -137,7 +141,7 @@ int misc_init_r(void) pci_get_regions(dev, &io, &mem, &pre); /* Start MMIO and PIO range maps above RAM */ - map_addr = CONFIG_SYS_PCI_MAP_START; + map_addr = SYS_PCI_MAP_START; /* Map MMIO range */ ret = pci_map_region(mem->phys_start, mem->size, &map_addr); diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 006593acfddd..451ae0e1e6df 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -25,10 +25,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_SYS_CCSRBAR_PHYS_LOW CONFIG_SYS_CCSRBAR #endif -/* Virtual address range for PCI region maps */ -#define CONFIG_SYS_PCI_MAP_START 0x80000000 -#define CONFIG_SYS_PCI_MAP_END 0xe0000000 - /* Virtual address to a temporary map if we need it (max 128MB) */ #define CONFIG_SYS_TMPVIRT 0xe8000000 -- 2.25.1