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 4A9CDC433FE for ; Sun, 20 Nov 2022 14:27:19 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 20F43854F9; Sun, 20 Nov 2022 15:18:43 +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="WW0H9wLf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7DF42854D5; Sun, 20 Nov 2022 15:18:14 +0100 (CET) Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) (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 AD1C0854BF for ; Sun, 20 Nov 2022 15:18:02 +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-xf30.google.com with SMTP id h10so6502484qvq.7 for ; Sun, 20 Nov 2022 06:18:02 -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=rEdDL4jR0Px7gvOoS/qNd7osJor0MAcUJkeVjgG4kx0=; b=WW0H9wLfXDD7r1Ka8M4UQHOgWES7aaKsumk4LwEq2hWfTltrP66lApAZOBYOHnwubg zBDzzOpUPoEhfKgrnUxkkn2ZVtC4mIK4i0DmwR2lvswhv490XP924SuDmTpLrFkwsLad DOHlmoSJzyhKWvF73w/kS8gG63GNlQBkSNihI= 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=rEdDL4jR0Px7gvOoS/qNd7osJor0MAcUJkeVjgG4kx0=; b=VvUIi/CLIdzWuhphl53EtQ1r1ioIEkDRVeB6VtfqkRt/GL3U7hpQv8GPSg++/6qO/E CwXGRF7vCb4V2cLdgdw295uWRZ5n8UQMRipKM4Zb5Z1neFbfDcPxjym68SHX5Hg6fafv xBWlWpUmFS64+KH9z8LiEWjfj4NiWahMeXQNxQ7Wdjt6RK0/8RLWIUEg5IN0W+gbRhiL bYycR0N6B8+ZweqZ1YsoyuTUCwkexBM0QjGtWw9IeXWTVvir+4/E+dCU2DsH4C2+c1EB ZMJXm/JfqLiI15H1iyKI+57mm1vTtOgTXXflpYahIJuMVdJGdovUShKpRnPrmQnxvUi9 PXJg== X-Gm-Message-State: ANoB5pnvosfC4c8pf35diwiesw7+lsLDOIoOUZsqqqK4FMYbju0wgru/ ACYcIaaO3LX7c3M6D//DiVgehnZ9vYWxyA== X-Google-Smtp-Source: AA0mqf7sw9MDi6YdCFB1/4z9SXUfE9uCnyiQCyAQ9HydxBeLYYA1x4LqbNCv+g34q+XWy1FVNBVyUg== X-Received: by 2002:a05:6214:4288:b0:4c6:a305:2419 with SMTP id og8-20020a056214428800b004c6a3052419mr4510924qvb.45.1668953880715; 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.18.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:18:00 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 225/241] global: Migrate CONFIG_USART_ID to CFG Date: Sun, 20 Nov 2022 09:17:27 -0500 Message-Id: <20221120141743.3059310-26-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 | 2 +- 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, 8 insertions(+), 8 deletions(-) diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index 56655427b06b..9d97bc865445 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -73,7 +73,7 @@ static void atmel_serial_activate(atmel_usart3_t *usart) static void atmel_serial_setbrg(void) { atmel_serial_setbrg_internal((atmel_usart3_t *)CFG_USART_BASE, - CONFIG_USART_ID, gd->baudrate); + CFG_USART_ID, gd->baudrate); } static int atmel_serial_init(void) diff --git a/include/configs/corvus.h b/include/configs/corvus.h index c9eb75d93088..f2675e0ec864 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -29,7 +29,7 @@ /* serial console */ #define CFG_USART_BASE ATMEL_BASE_DBGU -#define CONFIG_USART_ID ATMEL_ID_SYS +#define CFG_USART_ID ATMEL_ID_SYS /* SDRAM */ #define CFG_SYS_SDRAM_BASE ATMEL_BASE_CS6 diff --git a/include/configs/sam9x60_curiosity.h b/include/configs/sam9x60_curiosity.h index 204020d5ee74..e79f80f17f61 100644 --- a/include/configs/sam9x60_curiosity.h +++ b/include/configs/sam9x60_curiosity.h @@ -14,7 +14,7 @@ #define CFG_SYS_AT91_MAIN_CLOCK 24000000 /* 24 MHz crystal */ #define CFG_USART_BASE ATMEL_BASE_DBGU -#define CONFIG_USART_ID 0 /* ignored in arm */ +#define CFG_USART_ID 0 /* ignored in arm */ /* SDRAM */ #define CFG_SYS_SDRAM_BASE 0x20000000 diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index 800b98ff98af..2c761821efb1 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -15,7 +15,7 @@ #define CFG_SYS_AT91_MAIN_CLOCK 24000000 /* 24 MHz crystal */ #define CFG_USART_BASE ATMEL_BASE_DBGU -#define CONFIG_USART_ID 0 /* ignored in arm */ +#define CFG_USART_ID 0 /* ignored in arm */ /* * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0) diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index f9a5aa9e32d0..75a1670e3317 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -62,7 +62,7 @@ /* serial console */ #define CFG_USART_BASE ATMEL_BASE_DBGU -#define CONFIG_USART_ID ATMEL_ID_SYS +#define CFG_USART_ID ATMEL_ID_SYS /* DFU class support */ #define DFU_MANIFEST_POLL_TIMEOUT 25000 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 88870d6fdf69..174b848e2595 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -35,7 +35,7 @@ /* Misc CPU related */ #define CFG_USART_BASE ATMEL_BASE_DBGU -#define CONFIG_USART_ID ATMEL_ID_SYS +#define CFG_USART_ID ATMEL_ID_SYS /* * SDRAM: 1 bank, min 32, max 128 MB diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 9d6abbf7b342..1d7a3a1562a0 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -18,7 +18,7 @@ /* serial console */ #define CFG_USART_BASE 0xfc00c000 -#define CONFIG_USART_ID 30 +#define CFG_USART_ID 30 /* Timer */ #define CFG_SYS_TIMER_COUNTER 0xfc06863c diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1b89145261ce..96532633226f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -239,7 +239,7 @@ CFG_UBOOT_SECTOR_COUNT CFG_UBOOT_SECTOR_START CFG_UEC_ETH CFG_USART_BASE -CONFIG_USART_ID +CFG_USART_ID CONFIG_USBD_HS CONFIG_USB_BOOTING CONFIG_USB_EXT2_BOOT -- 2.25.1