From mboxrd@z Thu Jan 1 00:00:00 1970 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 F2B71C433EF for ; Wed, 30 Mar 2022 22:08:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C530584193; Thu, 31 Mar 2022 00:08:09 +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 Received: by phobos.denx.de (Postfix, from userid 109) id 794DA8419F; Thu, 31 Mar 2022 00:07:51 +0200 (CEST) Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) (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 8130B81FBB for ; Thu, 31 Mar 2022 00:07:41 +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=tom.rini@gmail.com Received: by mail-qv1-f42.google.com with SMTP id gh15so18174981qvb.8 for ; Wed, 30 Mar 2022 15:07:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f4+ci1qG9DeMSPg7dPw3aKgcbtVc6tvj32QIhEGbbTQ=; b=EEw8PdxDG3VlqOJlyGRqwJvQ4bKObyNvMZKLcGsC7NbbV6Zv/f331mvkhdkF9nxKpd VREyWdJb/FtnuJ2XOyaZdd18yE0ivc1pGpNFJgQxPqtvUaWBcvOdajGgzpyW2V7G1CpI ImwC8gpCBR5csxYGcuPL0Uu1GZFfaUEV1quXQPgN+J0z4ZOBqNoPpcu6cObpvp2ilfKJ ekmv79ge1wvwSVaJqc34HB8kYj1AfBMYusls+ljVsRosws88oGMQqcDwc+9dX7jSSNhk wfjMNFkvBlfg9G+uEK6G1Uw28bKVyXg7xO9iTZsAlkH0jOeAAybnYf0xiHkVh1tvjOrg xL3A== X-Gm-Message-State: AOAM532T2uXBBsqZc5z1fsgfGTs3NORCQzN9P7QFwrYJYzb9PqH0mzX6 oWvp/RoUqaGhmfV8Isp/J6PHWe8fFw== X-Google-Smtp-Source: ABdhPJz34myF9EedVuYBBntUzUrQ4Vh2SXL66HS30ou0VQ0ixf7IUG9DE5bbKje4Qdvm4ZNvETnVGA== X-Received: by 2002:a05:6214:d6a:b0:441:3549:4e32 with SMTP id 10-20020a0562140d6a00b0044135494e32mr1489436qvs.9.1648678060104; Wed, 30 Mar 2022 15:07:40 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id h2-20020ac85842000000b002e1ec550506sm17749694qth.87.2022.03.30.15.07.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 15:07:39 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Stefan Roese Subject: [PATCH 02/25] mvebu: Move BOOTROM_ERR_REG out of CONFIG namespace Date: Wed, 30 Mar 2022 18:07:12 -0400 Message-Id: <20220330220735.908616-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220330220735.908616-1-trini@konsulko.com> References: <20220330220735.908616-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.5 at phobos.denx.de X-Virus-Status: Clean This register is referenced in one location and does not seem configurable, so remove it from CONFIG namespace. Cc: Stefan Roese Signed-off-by: Tom Rini --- arch/arm/mach-mvebu/cpu.c | 2 +- arch/arm/mach-mvebu/include/mach/soc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 0272dd7352d8..1e893777b292 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -91,7 +91,7 @@ u32 get_boot_device(void) * be done, via the bootrom error register. Here the * MSB marks if the UART mode is active. */ - val = readl(CONFIG_BOOTROM_ERR_REG); + val = readl(BOOTROM_ERR_REG); boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS; debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device); if (boot_device == BOOTROM_ERR_MODE_UART) diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index aab61f7c15cf..3b9618852c6d 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -125,7 +125,7 @@ #define COMPHY_REFCLK_ALIGNMENT (MVEBU_REGISTER(0x182f8)) /* BootROM error register (also includes some status infos) */ -#define CONFIG_BOOTROM_ERR_REG (MVEBU_REGISTER(0x182d0)) +#define BOOTROM_ERR_REG (MVEBU_REGISTER(0x182d0)) #define BOOTROM_ERR_MODE_OFFS 28 #define BOOTROM_ERR_MODE_MASK (0xf << BOOTROM_ERR_MODE_OFFS) #define BOOTROM_ERR_MODE_UART 0x6 -- 2.25.1