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 CFF13C4332F for ; Sun, 20 Nov 2022 14:29:40 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BF8998553C; Sun, 20 Nov 2022 15:18:59 +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="GlO70R7i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4000A854B6; Sun, 20 Nov 2022 15:18:23 +0100 (CET) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (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 5B71F854E1 for ; Sun, 20 Nov 2022 15:18:19 +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-x72b.google.com with SMTP id 8so6555937qka.1 for ; Sun, 20 Nov 2022 06:18:19 -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=Uuyk4spcymgmmmzbKxO5B7Z1KkzaFVFBga/uGHmiGUk=; b=GlO70R7ioB5pcP2tbA4tiwN44qLTvva+hO0vCW9EkVfem4UvmfjxaWBMAcdE5N/6y+ f7PNnJJJN6pu65RRlzl7ibYS4mtLuitNyoZ1/yFnHNqMdrv23ZJpWU3ri/aTy1v8WW66 XErRxKHdUzxA6SGriOQXKeviKDQWRvbS4JAGg= 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=Uuyk4spcymgmmmzbKxO5B7Z1KkzaFVFBga/uGHmiGUk=; b=obOIjGj97aI+VMv7wCbrR0WIcqQJUo1nW6RUeqoV7M7nnrwOVb3vhDx+4tAacroA5w WhhY7o00DWJI6KTTPeqeLeLQiZ3lJ4y/qjhhZXtrrnLjEU85TI+el5CDzch3Mp6Vsgej IgSTyhf52Buj+QBxMy/EoUIhWuU7kcweuChd+U4k+48csy8evgkbFwfIDVT8niSz/+S6 Rc5Y5wppP5Eumcoq5vq8u/KRUG5u2HkxWdV2nlKA7Hll0I3qDsDmENSS8diXRUd4AAx7 Tkr0eWrcvNu2qixhvjwdLlZ5UZpRCdtJuWvg05kUF5saCkJ0bc8quMrTaKWlq6KfRrkq y41Q== X-Gm-Message-State: ANoB5plcsI14z2uk869nQzM7EQvEBw32RvR1WTOZ18y2uTW5GUvGh/KP aK75WWyfe+WNXcr5uJNDvWaJjx+g/9V0eg== X-Google-Smtp-Source: AA0mqf6T6muBW4dumq0BbPKHomMvs54OCWb5gK9TceYXxI5ioy35RwRTGklVyv81INF8i3DxCNQuAQ== X-Received: by 2002:ae9:e507:0:b0:6fa:5778:8e with SMTP id w7-20020ae9e507000000b006fa5778008emr13266429qkf.71.1668953884521; Sun, 20 Nov 2022 06:18:04 -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.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:18:04 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 231/241] global: Migrate CONFIG_U_BOOT_HDR_SIZE to CFG Date: Sun, 20 Nov 2022 09:17:33 -0500 Message-Id: <20221120141743.3059310-32-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/common/fsl_chain_of_trust.c | 2 +- drivers/mtd/nand/raw/fsl_ifc_spl.c | 2 +- include/configs/T104xRDB.h | 4 ++-- include/configs/ls1021atsn.h | 6 +++--- include/configs/ls1021atwr.h | 6 +++--- include/configs/ls1043a_common.h | 8 ++++---- include/configs/ls1046a_common.h | 2 +- include/configs/ls1088a_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c index 9ca350ed4689..9e0e61e0bac7 100644 --- a/board/freescale/common/fsl_chain_of_trust.c +++ b/board/freescale/common/fsl_chain_of_trust.c @@ -143,7 +143,7 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) (image_entry_noargs_t)(unsigned long)spl_image->entry_point; hdr_addr = (spl_image->entry_point + spl_image->size - - CONFIG_U_BOOT_HDR_SIZE); + CFG_U_BOOT_HDR_SIZE); spl_validate_uboot(hdr_addr, (uintptr_t)spl_image->entry_point); /* * In case of failure in validation, spl_validate_uboot would diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c index 3b464ce10ce9..2df63c5fc3ee 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_spl.c +++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c @@ -281,7 +281,7 @@ void nand_boot(void) #define CONFIG_U_BOOT_HDR_ADDR \ ((CFG_SYS_NAND_U_BOOT_START + \ CFG_SYS_NAND_U_BOOT_SIZE) - \ - CONFIG_U_BOOT_HDR_SIZE) + CFG_U_BOOT_HDR_SIZE) spl_validate_uboot(CONFIG_U_BOOT_HDR_ADDR, CFG_SYS_NAND_U_BOOT_START); /* diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 7b9669a6eb98..4691e99c8b82 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -20,13 +20,13 @@ #ifdef CONFIG_MTD_RAW_NAND #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_U_BOOT_HDR_SIZE (16 << 10) /* * HDR would be appended at end of image and copied to DDR along * with U-Boot image. */ #define CFG_SYS_NAND_U_BOOT_SIZE ((768 << 10) + \ - CONFIG_U_BOOT_HDR_SIZE) + CFG_U_BOOT_HDR_SIZE) #else #define CFG_SYS_NAND_U_BOOT_SIZE (768 << 10) #endif diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index d4855819bd7f..728b1a08fafd 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -40,17 +40,17 @@ #ifdef CONFIG_SD_BOOT #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_U_BOOT_HDR_SIZE (16 << 10) #endif /* ifdef CONFIG_NXP_ESBC */ -#ifdef CONFIG_U_BOOT_HDR_SIZE +#ifdef CFG_U_BOOT_HDR_SIZE /* * HDR would be appended at end of image and copied to DDR along * with U-Boot image. Here u-boot max. size is 512K. So if binary * size increases then increase this size in case of secure boot as * it uses raw U-Boot image instead of FIT image. */ -#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ +#endif /* ifdef CFG_U_BOOT_HDR_SIZE */ #endif #define PHYS_SDRAM 0x80000000 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 128d80f48062..506f5ff1d10b 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -43,17 +43,17 @@ * HDR would be appended at end of image and copied to DDR along * with U-Boot image. */ -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_U_BOOT_HDR_SIZE (16 << 10) #endif /* ifdef CONFIG_NXP_ESBC */ -#ifdef CONFIG_U_BOOT_HDR_SIZE +#ifdef CFG_U_BOOT_HDR_SIZE /* * HDR would be appended at end of image and copied to DDR along * with U-Boot image. Here u-boot max. size is 512K. So if binary * size increases then increase this size in case of secure boot as * it uses raw u-boot image instead of fit image. */ -#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ +#endif /* ifdef CFG_U_BOOT_HDR_SIZE */ #endif #define PHYS_SDRAM 0x80000000 diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index c79e113db4e4..674aa7e7cf40 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -45,7 +45,7 @@ /* SD boot SPL */ #ifdef CONFIG_SD_BOOT #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_U_BOOT_HDR_SIZE (16 << 10) /* * HDR would be appended at end of image and copied to DDR along * with U-Boot image. Here u-boot max. size is 512K. So if binary @@ -61,17 +61,17 @@ #define CFG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_U_BOOT_HDR_SIZE (16 << 10) #endif /* ifdef CONFIG_NXP_ESBC */ -#ifdef CONFIG_U_BOOT_HDR_SIZE +#ifdef CFG_U_BOOT_HDR_SIZE /* * HDR would be appended at end of image and copied to DDR along * with U-Boot image. Here u-boot max. size is 512K. So if binary * size increases then increase this size in case of secure boot as * it uses raw u-boot image instead of fit image. */ -#endif /* ifdef CONFIG_U_BOOT_HDR_SIZE */ +#endif /* ifdef CFG_U_BOOT_HDR_SIZE */ #endif diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index e566ad4eed33..161b34e57a2f 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -45,7 +45,7 @@ /* SD boot SPL */ #ifdef CONFIG_SD_BOOT #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_U_BOOT_HDR_SIZE (16 << 10) /* * HDR would be appended at end of image and copied to DDR along * with U-Boot image. Here u-boot max. size is 512K. So if binary diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index e229ba2eea64..49686b4f160f 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -136,7 +136,7 @@ unsigned long long get_qixis_addr(void); #ifdef CONFIG_SPL #ifdef CONFIG_NXP_ESBC -#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +#define CFG_U_BOOT_HDR_SIZE (16 << 10) /* * HDR would be appended at end of image and copied to DDR along * with U-Boot image. Here u-boot max. size is 512K. So if binary diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ea722d3e2798..c5c22db16c1c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -245,7 +245,7 @@ CFG_USB_BOOTING CFG_USB_EXT2_BOOT CFG_USB_FAT_BOOT CFG_USB_ISP1301_I2C_ADDR -CONFIG_U_BOOT_HDR_SIZE +CFG_U_BOOT_HDR_SIZE CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM CONFIG_VSC7385_IMAGE -- 2.25.1