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 B6F54C4332F for ; Sun, 20 Nov 2022 14:20:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BF2B28547F; Sun, 20 Nov 2022 15:10: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="jTcgfRgh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CA4CC85369; Sun, 20 Nov 2022 15:09:44 +0100 (CET) Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 E62F285324 for ; Sun, 20 Nov 2022 15:09:23 +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-qt1-x833.google.com with SMTP id e15so5937927qts.1 for ; Sun, 20 Nov 2022 06:09:23 -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=kd/rIY2jyZMBV4P2ffnW++FvAi748Rfizp0wW6pFdt8=; b=jTcgfRghh7DmJ6dwtHCJJKBkVyRxsSG5ZNZqT4syeUKJ7D5IDhMCGJjDugK3dLShsm oNPAv4OEreLofSZLZFXZgWDwtZ8SvmekCZXjlBOD7qor52ID/uWnQz0uKnNdN6bhg/oP jLxq/4wsG3H412iRUtfNCTVjSUE8tf85UdPos= 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=kd/rIY2jyZMBV4P2ffnW++FvAi748Rfizp0wW6pFdt8=; b=uhcykhSHAHiZuszZbqTjSSmUdk1slmvknlEX0O+HEcGb4pDwOSSbzVWb0BOLYtze+F B5aTBB2WtHJdnI1IExpfjAyrzivadxv77Dr2O/F85uqmDGC2HF6tV1iz2DYlAO5P2IjD C2mNulI//6Y5fKvOeQbAdH38i0E87P++s6MBI/olAnzLjmo33zt12EZFspgxgG7zLXZp Uc+XTxmePsGjUtzgbO1vsafzO8FJfo5zuTRlDKNuj5fpIlVBlj2Jrao9Nldet+1pUWJu z364snUVsIhDKwkqLYEbecoSeJAn8wIMCBG/YnQY3+Dkuuv5LuolRAQ92xmkFgc/b3Me UPzw== X-Gm-Message-State: ANoB5pkimWXA411JyQjUw6hjWyatHzfIpTqFgm3Ioe4lgmpC0MrOBWUL aKBcoalhiJdeI8ELrZIk2vi791U6npKVcQ== X-Google-Smtp-Source: AA0mqf7aKLPCFKOVk/3VqqpLDLTFl4JD7oVOkxtnXFgjTseuukr959VEOK7cRijOv2+WWonSUL1HUg== X-Received: by 2002:ac8:7657:0:b0:3a5:663d:730 with SMTP id i23-20020ac87657000000b003a5663d0730mr13671660qtr.291.1668953363435; Sun, 20 Nov 2022 06:09:23 -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-20020a05620a1a1700b006ce580c2663sm6387502qkb.35.2022.11.20.06.09.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:23 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 191/241] global: Migrate CONFIG_SPI_BOOTING to CFG Date: Sun, 20 Nov 2022 09:08:21 -0500 Message-Id: <20221120140829.3057894-82-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-1-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> <20221120140829.3057894-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 --- arch/arm/mach-exynos/spl_boot.c | 6 +++--- include/configs/exynos5-dt-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c index 553dac75b61d..83bdee9f8579 100644 --- a/arch/arm/mach-exynos/spl_boot.c +++ b/arch/arm/mach-exynos/spl_boot.c @@ -94,7 +94,7 @@ static int config_branch_prediction(int set_cr_z) } #endif -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING static void spi_rx_tx(struct exynos_spi *regs, int todo, void *dinp, void const *doutp, int i) { @@ -220,7 +220,7 @@ void copy_uboot_to_ram(void) u32 (*copy_bl2)(u32 offset, u32 nblock, u32 dst) = NULL; u32 offset = 0, size = 0; -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING struct spl_machine_param *param = spl_get_machine_params(); #endif #ifdef CONFIG_SUPPORT_EMMC_BOOT @@ -248,7 +248,7 @@ void copy_uboot_to_ram(void) bootmode = get_boot_mode(); switch (bootmode) { -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING case BOOT_MODE_SERIAL: /* Customised function to copy u-boot from SF */ exynos_spi_copy(param->uboot_size, CONFIG_TEXT_BASE); diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h index c9e0c13172cc..a0cdbd746a9a 100644 --- a/include/configs/exynos5-dt-common.h +++ b/include/configs/exynos5-dt-common.h @@ -17,6 +17,6 @@ #define CFG_SYS_SPI_BASE 0x12D30000 #define FLASH_SIZE (4 << 20) -#define CONFIG_SPI_BOOTING +#define CFG_SPI_BOOTING #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9989d7052f14..cb15aa3c8f4e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -200,7 +200,7 @@ CFG_SMDK5420 CFG_SMP_PEN_ADDR CFG_SOCRATES CFG_SPI_ADDR -CONFIG_SPI_BOOTING +CFG_SPI_BOOTING CONFIG_SPI_FLASH_QUAD CONFIG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX -- 2.25.1