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 2EB51C433FE for ; Sun, 20 Nov 2022 14:27:08 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CD7FD854F8; Sun, 20 Nov 2022 15:18:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (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=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="PntJFKnz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E834E854D4; Sun, 20 Nov 2022 15:18:12 +0100 (CET) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 8377A854A4 for ; Sun, 20 Nov 2022 15:18:01 +0100 (CET) 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-xf29.google.com with SMTP id d13so796015qvj.8 for ; Sun, 20 Nov 2022 06:18:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=a5ddlUbVro2cjFWtUwNvYpDb/L5FobW+erWg8Q8NOvM=; b=PntJFKnzS4ktGsPKb5hko0tpGk6Z6Q019VSnxKu2gtswQT1qe4yqQ7bFqbes1iEirP H85QkBHvwaWpYZnK0HvEu9XWLYkbCYXlXOr1xMz3wGgmqQYQO/+8xv9bjXtAjPV4gd4F iP0rlVVMCUtOIVu06ZFkynjLRxgY4neH2ABq8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a5ddlUbVro2cjFWtUwNvYpDb/L5FobW+erWg8Q8NOvM=; b=0j2iac7ONz4I76FHZ45AGPx0d9MuZij7ryowvXhSVxLSB7LMPpXC2yHPjsVwLN4QGU MHUeOdMOQDSNrORgHAjrZ8YlBjijcpE9RAM1ngnIiCQgbbOmlcK18sX02xOUuE2pJA5i DqmOmjpkQioWD8WP/GhIrEmsA0mh9lXpJrVnUn+3dC8CSFo4YOqAp8FXJGb2OLnuUojK 7ouCzxTjWyrFHotiT9wP1BbgRfknFKysZMKEZo9dIyiABVWmWqSs+nIEFRnjcyxYYjJ/ ZdmZMCZURFeDbdFvtl6lN5rMVkGsCME6YcnezyTBIiSzjv11NnHAfuv6TDH3eEBaI6MG xP5w== X-Gm-Message-State: ANoB5pn7KvdoGWAwvSrIPst1mdgq3ySGpDExcfnobeJI0ukECQT+FDyb EHzAPElHQHBr/dKkkT80BkRCyERHGyCnNg== X-Google-Smtp-Source: AA0mqf5WXfOI0aBfCTYbRDiK7TWly//agJcQWrZY7u/aysxbLZqAfY9BWNl420OXz21ThuGqUzM4jA== X-Received: by 2002:a05:6214:1850:b0:4bb:6b68:9ab6 with SMTP id d16-20020a056214185000b004bb6b689ab6mr1769645qvy.128.1668953880135; Sun, 20 Nov 2022 06:18:00 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id bk23-20020a05620a1a1700b006ce580c2663sm6400114qkb.35.2022.11.20.06.17.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:17:59 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 224/241] global: Migrate CONFIG_USART_BASE to CFG Date: Sun, 20 Nov 2022 09:17:26 -0500 Message-Id: <20221120141743.3059310-25-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120141743.3059310-1-trini@konsulko.com> References: <20221120140829.3057894-90-trini@konsulko.com> <20221120141743.3059310-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 Signed-off-by: Tom Rini --- drivers/serial/atmel_usart.c | 10 +++++----- include/configs/corvus.h | 2 +- include/configs/sam9x60_curiosity.h | 2 +- include/configs/sam9x60ek.h | 2 +- include/configs/smartweb.h | 2 +- include/configs/taurus.h | 2 +- include/configs/vinco.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index 90ccdf6b2945..56655427b06b 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -72,13 +72,13 @@ static void atmel_serial_activate(atmel_usart3_t *usart) static void atmel_serial_setbrg(void) { - atmel_serial_setbrg_internal((atmel_usart3_t *)CONFIG_USART_BASE, + atmel_serial_setbrg_internal((atmel_usart3_t *)CFG_USART_BASE, CONFIG_USART_ID, gd->baudrate); } static int atmel_serial_init(void) { - atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE; + atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE; atmel_serial_init_internal(usart); serial_setbrg(); @@ -89,7 +89,7 @@ static int atmel_serial_init(void) static void atmel_serial_putc(char c) { - atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE; + atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE; if (c == '\n') serial_putc('\r'); @@ -100,7 +100,7 @@ static void atmel_serial_putc(char c) static int atmel_serial_getc(void) { - atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE; + atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE; while (!(readl(&usart->csr) & USART3_BIT(RXRDY))) schedule(); @@ -109,7 +109,7 @@ static int atmel_serial_getc(void) static int atmel_serial_tstc(void) { - atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_USART_BASE; + atmel_usart3_t *usart = (atmel_usart3_t *)CFG_USART_BASE; return (readl(&usart->csr) & USART3_BIT(RXRDY)) != 0; } diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 8a61086ecc15..c9eb75d93088 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -28,7 +28,7 @@ #define CFG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ /* serial console */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CFG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS /* SDRAM */ diff --git a/include/configs/sam9x60_curiosity.h b/include/configs/sam9x60_curiosity.h index f44ce909b918..204020d5ee74 100644 --- a/include/configs/sam9x60_curiosity.h +++ b/include/configs/sam9x60_curiosity.h @@ -13,7 +13,7 @@ #define CFG_SYS_AT91_SLOW_CLOCK 32768 #define CFG_SYS_AT91_MAIN_CLOCK 24000000 /* 24 MHz crystal */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CFG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID 0 /* ignored in arm */ /* SDRAM */ diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index 27b39ebf4174..800b98ff98af 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -14,7 +14,7 @@ #define CFG_SYS_AT91_SLOW_CLOCK 32768 #define CFG_SYS_AT91_MAIN_CLOCK 24000000 /* 24 MHz crystal */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CFG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID 0 /* ignored in arm */ /* diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 762f61470b15..f9a5aa9e32d0 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -61,7 +61,7 @@ #define CFG_SYS_NAND_READY_PIN AT91_PIN_PC13 /* serial console */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CFG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS /* DFU class support */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 855218a8901e..88870d6fdf69 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -34,7 +34,7 @@ /* Misc CPU related */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CFG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID ATMEL_ID_SYS /* diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 1e1175f00689..9d6abbf7b342 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -17,7 +17,7 @@ /* The value in the common file is too far away for the VInCo platform */ /* serial console */ -#define CONFIG_USART_BASE 0xfc00c000 +#define CFG_USART_BASE 0xfc00c000 #define CONFIG_USART_ID 30 /* Timer */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 83c7abfab261..1b89145261ce 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -238,7 +238,7 @@ CFG_UBOOTPATH CFG_UBOOT_SECTOR_COUNT CFG_UBOOT_SECTOR_START CFG_UEC_ETH -CONFIG_USART_BASE +CFG_USART_BASE CONFIG_USART_ID CONFIG_USBD_HS CONFIG_USB_BOOTING -- 2.25.1