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 3E9B9C433FE for ; Sun, 20 Nov 2022 14:29:51 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2A45D85527; Sun, 20 Nov 2022 15:19: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=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="em/fYiCM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 09A57854E8; Sun, 20 Nov 2022 15:18:24 +0100 (CET) Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (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 68A68854D9 for ; Sun, 20 Nov 2022 15:18:21 +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-qk1-x732.google.com with SMTP id z17so6526898qki.11 for ; Sun, 20 Nov 2022 06:18:21 -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=VG2bHCJ/1S38AEfH2fBwMjAbYTb+6Pq36r5BDnNSuO8=; b=em/fYiCMnv4EhFF3Ht7w2K1pCmTWsvjAjJgM4n/YBiapGvSeA/PocvIcz7IDP/6UJ+ /KWhfyY5QOlYw+eDlMkT4HEQyPe0r8lXyV7v1YSgJPnuDkJXcCPG5xK8MjqlXqRw7eig 3pl4TEs16OTzCfHWnI9xjM9u0R45yM6IlgV4c= 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=VG2bHCJ/1S38AEfH2fBwMjAbYTb+6Pq36r5BDnNSuO8=; b=cw5PB6b4LNotERHQlsJD0kpyGolR31AOXRX+pv+15uWDHNxYv5mUkEGlh4aWCfimYX SXoLmTmdQpmVm9J8W/O3QlwTk7vjMxz4RvU09JRJJP6fK1UVL3Gx9GCD6p3RVLCQ0xxR IX/vnSRWpFxGsVzM2wc1terJG4PAR/VNHM2uAcek1uFBJJzpG4E1NKxeM2y/sWTZJ+sG HuIxxx64CRG67A3YUMXA+dMtcU5kDGBHn0Bq4JpW3yrFM4k7wtjT5Be7yqnBTfr1MQj2 Ea8FRef7RwHuFM6+XGCRLUqi02dR4shN8g0W6wSvmc+Pq6EIKMHa9w093vxyN7qgvyzc 17uQ== X-Gm-Message-State: ANoB5pmmBweHAXnWez2odbtpwjLh2q+i84waH2g8c00p9WD/IAfuKxvJ MVA2eHXUqLsGrwr3XpRQ0ditJirPLhS09Q== X-Google-Smtp-Source: AA0mqf4qpBko9wVyxW4BHaa1dbANTFX2XcGIcvn7Z3fxSQxgpVzhw4BgfD5BpTjWclug5sQdVrZb4w== X-Received: by 2002:a05:620a:2b48:b0:6ec:c52d:65d4 with SMTP id dp8-20020a05620a2b4800b006ecc52d65d4mr12899460qkb.714.1668953886492; Sun, 20 Nov 2022 06:18:06 -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.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:18:06 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 234/241] global: Migrate CONFIG_VSC7385_IMAGE to CFG Date: Sun, 20 Nov 2022 09:17:36 -0500 Message-Id: <20221120141743.3059310-35-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 --- board/freescale/mpc837xerdb/mpc837xerdb.c | 6 +++--- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- include/configs/MPC837XERDB.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 2 +- scripts/config_whitelist.txt | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 8b1bfe0a9f91..97884a397964 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -206,9 +206,9 @@ int misc_init_r(void) { int rc = 0; -#ifdef CONFIG_VSC7385_IMAGE - if (vsc7385_upload_firmware((void *) CONFIG_VSC7385_IMAGE, - CONFIG_VSC7385_IMAGE_SIZE)) { +#ifdef CFG_VSC7385_IMAGE + if (vsc7385_upload_firmware((void *) CFG_VSC7385_IMAGE, + CFG_VSC7385_IMAGE_SIZE)) { puts("Failure uploading VSC7385 microcode.\n"); rc = 1; } diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index f9eea1ad9c58..ecdf731ddf83 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -355,7 +355,7 @@ int board_early_init_r(void) vscfw_addr = hextoul(tmp, NULL); printf("uploading VSC7385 microcode from %x\n", vscfw_addr); if (vsc7385_upload_firmware((void *)vscfw_addr, - CONFIG_VSC7385_IMAGE_SIZE)) + CFG_VSC7385_IMAGE_SIZE)) puts("Failure uploading VSC7385 microcode.\n"); } else { puts("No address specified for VSC7385 microcode.\n"); diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 13406cfa547b..1b24d7983b3d 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -44,8 +44,8 @@ #define CFG_TSEC2 /* The flash address and size of the VSC7385 firmware image */ -#define CONFIG_VSC7385_IMAGE 0xFE7FE000 -#define CONFIG_VSC7385_IMAGE_SIZE 8192 +#define CFG_VSC7385_IMAGE 0xFE7FE000 +#define CFG_VSC7385_IMAGE_SIZE 8192 #endif diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 9790b0ac896c..14d8f6c1c6d7 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -276,7 +276,7 @@ #endif /* The size of the VSC7385 firmware image */ -#define CONFIG_VSC7385_IMAGE_SIZE 8192 +#define CFG_VSC7385_IMAGE_SIZE 8192 #endif #ifndef __VSCFW_ADDR diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9b67ea892eb1..2e217a15b300 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -248,8 +248,8 @@ CFG_USB_ISP1301_I2C_ADDR CFG_U_BOOT_HDR_SIZE CFG_VAR_SIZE_SPL CFG_VERY_BIG_RAM -CONFIG_VSC7385_IMAGE -CONFIG_VSC7385_IMAGE_SIZE +CFG_VSC7385_IMAGE +CFG_VSC7385_IMAGE_SIZE CONFIG_WATCHDOG_PRESC CONFIG_WATCHDOG_RC CONFIG_WATCHDOG_TIMEOUT -- 2.25.1