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 2511AC4332F for ; Sun, 20 Nov 2022 14:21:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 164DE853A9; Sun, 20 Nov 2022 15:14:06 +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="KHJXHpUA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3657585289; Sun, 20 Nov 2022 15:12:25 +0100 (CET) Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (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 4EB23853D9 for ; Sun, 20 Nov 2022 15:09:46 +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-x82e.google.com with SMTP id l2so5912170qtq.11 for ; Sun, 20 Nov 2022 06:09:46 -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=ZUFHHbAbBg4kcMUa6eo33EKOxbp6q5RfaFAXcEuu/iw=; b=KHJXHpUA2Ryn6LLIBTHzFZDTW05Skf3Y1EF4KkSYJQL2RwSF7eUfmUolcLG5Wpw0+O YyLoymE9pJ62rMuauRhpQdUWHgnUGyd5blVdfGE2L1aA1C3Locx+iy9hZ74wW7S/32hw ZZ+PYgV7/aRrIAF5GEy7Wu8dEGlUINkBJlGbw= 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=ZUFHHbAbBg4kcMUa6eo33EKOxbp6q5RfaFAXcEuu/iw=; b=Sk4l8g1S6I9cw3mHElDvLkjEIcuejRZSLvlO41EfP0XSX7iUyTl8Ibw03t92fpNPV7 X8xy66xOwBlATFZOfPnOtOm1ZrUIPnC9OaiiZHG/8wpwJ67b/fOxDqoS2uALN3DK2qE8 wj+6K4wSb/yfyK0seHJOZ+qr3AtYPWXXiexpqaCm08IiLPkZEELLJMS2W1MrPdoXj9Uy cwhg/t+zEYGolMl09H276NQErULd6ulyz07YA0YEf1pXRhsLXlN/3HrYUfxP6juUcc65 B1atmdrKeK53XVN1k/P2gPxjTaEeM+EKT6YEXc1awIqbUu6eoAaQ8gqel8P5s3e85IA3 kPhg== X-Gm-Message-State: ANoB5pk4pkCiZvjH7vkPWr5ouOChSln3d21f9DBd+WBYtLoFwkSFpHfv F0AUGv7lYyY/9syoUXH33bHkLhFm77g3pg== X-Google-Smtp-Source: AA0mqf4NEgP9jwsNtOUuhL+DvGvoJpQM0ptwJ9FKS7LiWb9WfGxPFv9DkYHI/UB2lSdxbSAmSfIvhA== X-Received: by 2002:ac8:72d0:0:b0:3a5:9e38:9f4 with SMTP id o16-20020ac872d0000000b003a59e3809f4mr13878158qtp.532.1668953361483; Sun, 20 Nov 2022 06:09:21 -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.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:21 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 188/241] global: Migrate CONFIG_SMP_PEN_ADDR to CFG Date: Sun, 20 Nov 2022 09:08:18 -0500 Message-Id: <20221120140829.3057894-79-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/cpu/armv7/nonsec_virt.S | 4 ++-- board/samsung/arndale/arndale.c | 4 ++-- include/configs/arndale.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/ls1021aiot.h | 2 +- include/configs/ls1021aqds.h | 2 +- include/configs/ls1021atwr.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 51beda79c967..9794ade40463 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -205,11 +205,11 @@ ENTRY(_nonsec_init) bx lr ENDPROC(_nonsec_init) -#ifdef CONFIG_SMP_PEN_ADDR +#ifdef CFG_SMP_PEN_ADDR /* void __weak smp_waitloop(unsigned previous_address); */ ENTRY(smp_waitloop) wfi - ldr r1, =CONFIG_SMP_PEN_ADDR @ load start address + ldr r1, =CFG_SMP_PEN_ADDR @ load start address ldr r1, [r1] #ifdef CFG_PEN_ADDR_BIG_ENDIAN rev r1, r1 diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c index a992dc684291..3ebf600e1d7c 100644 --- a/board/samsung/arndale/arndale.c +++ b/board/samsung/arndale/arndale.c @@ -112,10 +112,10 @@ int checkboard(void) } #endif -#ifdef CONFIG_SMP_PEN_ADDR +#ifdef CFG_SMP_PEN_ADDR void smp_set_core_boot_addr(unsigned long addr, int corenr) { - writel(addr, CONFIG_SMP_PEN_ADDR); + writel(addr, CFG_SMP_PEN_ADDR); /* make sure this write is really executed */ __asm__ volatile ("dsb\n"); diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 8acc525b11c9..b56effcd411e 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -16,7 +16,7 @@ /* Miscellaneous configurable options */ -#define CONFIG_SMP_PEN_ADDR 0x02020000 +#define CFG_SMP_PEN_ADDR 0x02020000 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */ #define CFG_ARM_GIC_BASE_ADDRESS 0x10480000 diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 7e850517494e..3b0ecf578063 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -164,7 +164,7 @@ {1, {I2C_NULL_HOP} }, \ } -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index d6122856f069..08532dc3e0aa 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -90,7 +90,7 @@ #define FSL_PCIE_COMPAT "fsl,ls1021a-pcie" #define CFG_PEN_ADDR_BIG_ENDIAN -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index ccbf7c2e70dc..498c89c3cf21 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -274,7 +274,7 @@ #endif #define CFG_PEN_ADDR_BIG_ENDIAN -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index a554ee459042..128d80f48062 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -155,7 +155,7 @@ /* GPIO */ #define CFG_PEN_ADDR_BIG_ENDIAN -#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define CFG_SMP_PEN_ADDR 0x01ee0200 #define HWCONFIG_BUFFER_SIZE 256 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4cf75324d291..fa6ceab52d5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -197,7 +197,7 @@ CFG_SH_ETHER_USE_PORT CFG_SH_QSPI_BASE CFG_SLIC CFG_SMDK5420 -CONFIG_SMP_PEN_ADDR +CFG_SMP_PEN_ADDR CONFIG_SOCRATES CONFIG_SPI_ADDR CONFIG_SPI_BOOTING -- 2.25.1