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 F0DCCC433FE for ; Sun, 20 Nov 2022 14:29:09 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E4E1E85532; Sun, 20 Nov 2022 15:18:56 +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="F262DQrb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6C550854E6; Sun, 20 Nov 2022 15:18:21 +0100 (CET) Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 6DBA28549D 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-xf2a.google.com with SMTP id p8so5852992qvn.5 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=g5VMCx78gGODWJZyGURENL+y15YiuwYxkX9yxoq2Of4=; b=F262DQrbFwJCWPlC1uPlnPqIYSRkpMh5da3XCU/wYDPXo7Jbbwn2ynW9MusRr0Ws9m evbqzJSbVdfMmHjWbHw1w6COWIOxzcTEyv695xgP3GgoqZJsZ7YBTzIpV5WLjtWooic4 eNldo2VPBIjuoDd98p0zrUS1lWbq49jk7W/HU= 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=g5VMCx78gGODWJZyGURENL+y15YiuwYxkX9yxoq2Of4=; b=7De80JSuhlYfWhyEHq0XoIj7BKKzflYpUlSNpu1iEi6MEg2WyMm0CwRJ1uiK/i4rjZ TFxpSLNCbb8hXL5iq6obRZp2NKBWTxD7BBbk4pz5yrcwLH7JeXr5INpUS+etBVzsSlnr appjq5zt/P2HZVO39jQ5gLueFjIrbeM9rdhhrnCPWWgxBX7tqwXU79ljHToHi0b4PLvM 2P5SSgFFj5GjzHUUH0wodk4WtbtUnieruiB4Mj4xaj4XCzJVimanSyKSCDD6cs33dtzy VsL/3LHcYVoSM7yyGfb6PSt5nhSfpG3vX+38kbtvIdI0eZtE72uSo5yilQFbCDqS7ToK Yayw== X-Gm-Message-State: ANoB5plw/3/+OFqsV3gOKhG0RHw2iDZQvNNC+ynkFyrVjgQF04jvzCkB T/cdbhM685HuIhO5eILZfjFj1faSCQO6oA== X-Google-Smtp-Source: AA0mqf4lIlRr4pcWP5lGUgN0BQvmswe4f69lLRXtyQjBs4jJlKGSluwSeA1OKePocWM1ZxdGf+qMdw== X-Received: by 2002:a05:6214:a0f:b0:4b7:b387:b63d with SMTP id dw15-20020a0562140a0f00b004b7b387b63dmr13824267qvb.83.1668953881889; Sun, 20 Nov 2022 06:18:01 -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.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:18:01 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 227/241] global: Migrate CONFIG_USB_BOOTING to CFG Date: Sun, 20 Nov 2022 09:17:29 -0500 Message-Id: <20221120141743.3059310-28-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 --- arch/arm/mach-exynos/spl_boot.c | 6 +++--- include/configs/exynos5-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 83bdee9f8579..d3eabef0e801 100644 --- a/arch/arm/mach-exynos/spl_boot.c +++ b/arch/arm/mach-exynos/spl_boot.c @@ -78,7 +78,7 @@ void *get_irom_func(int index) return (void *)*(u32 *)irom_ptr_table[index]; } -#ifdef CONFIG_USB_BOOTING +#ifdef CFG_USB_BOOTING /* * Set/clear program flow prediction and return the previous state. */ @@ -227,7 +227,7 @@ void copy_uboot_to_ram(void) u32 (*copy_bl2_from_emmc)(u32 nblock, u32 dst); void (*end_bootop_from_emmc)(void); #endif -#ifdef CONFIG_USB_BOOTING +#ifdef CFG_USB_BOOTING int is_cr_z_set; unsigned int sec_boot_check; @@ -271,7 +271,7 @@ void copy_uboot_to_ram(void) end_bootop_from_emmc(); break; #endif -#ifdef CONFIG_USB_BOOTING +#ifdef CFG_USB_BOOTING case BOOT_MODE_USB: /* * iROM needs program flow prediction to be disabled diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index e8236a9ec418..b91e2614e8d5 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -58,7 +58,7 @@ /* USB */ /* USB boot mode */ -#define CONFIG_USB_BOOTING +#define CFG_USB_BOOTING #define EXYNOS_COPY_USB_FNPTR_ADDR 0x02020070 #define EXYNOS_USB_SECONDARY_BOOT 0xfeed0002 #define EXYNOS_IRAM_SECONDARY_BASE 0x02020018 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2c7beda9248d..16d64d1cd3c3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -241,7 +241,7 @@ CFG_UEC_ETH CFG_USART_BASE CFG_USART_ID CFG_USBD_HS -CONFIG_USB_BOOTING +CFG_USB_BOOTING CONFIG_USB_EXT2_BOOT CONFIG_USB_FAT_BOOT CONFIG_USB_ISP1301_I2C_ADDR -- 2.25.1