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 3CF84C4332F for ; Sun, 20 Nov 2022 14:27:56 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4CCA285515; Sun, 20 Nov 2022 15:18:47 +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="HiAjC47T"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C3867854E1; Sun, 20 Nov 2022 15:18:18 +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 B99DC854C6 for ; Sun, 20 Nov 2022 15:18: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=trini@konsulko.com Received: by mail-qv1-xf2a.google.com with SMTP id p8so5853067qvn.5 for ; Sun, 20 Nov 2022 06:18:06 -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=4aQqUP39dIQ9MiuStpjR8CeU/bBDrcI6PiQdX0hQNxw=; b=HiAjC47TaZTBZ6QSDDmuKT7QUAOukN/iVP6bFUeWWw7JqWM+1TYp46kSaxB0/yd+/B 1hnF+XS4RqBJlohu+QLc1oSraM9NHLNXFWiB67pp+QB0fmWON8U+7Gh1uPAxanvPRKgz rXwauk5nrFXoW+hfHrVpmhQhCcgUbNgWwJtVc= 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=4aQqUP39dIQ9MiuStpjR8CeU/bBDrcI6PiQdX0hQNxw=; b=sPMn68iX/8XgPxlpQUl1Opu6IfczCzNAr5EzD68jh1a/ouALGXsZ9zsc6gcjl5oPMy mS3TSqQ5BgMqr2Uak81oKH3D19XzAMfPMG6o15j0BbmOwRH7+n6j2+YCHXXK6euwu27H nzvOA7llmkI8iullyRx/2U6ERUmxldYWZbDLgWXoLmiNHecowP5Qnt7WzAUb1iewP83z sMRjZGX3WSvJRmJCshvTwCRz+gQGNQpJcGphIJSOZg3J1uh4ocKvaD+rDADTqwRlF8yW VlnAMIyuK5MBH5VWN5Rbl+fKLqmeeFq+X9vfkGLyDNQ4UJqB/YyEDlU06x9F4y9Q13QA dyNg== X-Gm-Message-State: ANoB5pnNvM90YzUApYpXVafBtU53vMKHDMQq6DnJz5vblW/sEE/kHyXe KRhXeNLe2u+xNmjr4BsZu/jmLeeeTRg2DA== X-Google-Smtp-Source: AA0mqf5sKyx9OllJ71G8cI3fyJVv0oeZpBpCBYN/7TrfJ3RkN0c7mnYfUvWzhifslmPgXjhiTqzIBw== X-Received: by 2002:a05:6214:3113:b0:4bb:7436:49de with SMTP id ks19-20020a056214311300b004bb743649demr13756387qvb.27.1668953885984; Sun, 20 Nov 2022 06:18:05 -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.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:18:05 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 233/241] global: Migrate CONFIG_VERY_BIG_RAM to CFG Date: Sun, 20 Nov 2022 09:17:35 -0500 Message-Id: <20221120141743.3059310-34-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/include/asm/arch-ls102xa/config.h | 2 +- arch/xtensa/include/asm/config.h | 2 +- drivers/ram/mpc83xx_sdram.c | 2 +- include/configs/P2041RDB.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/kmcent2.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/ls1028a_common.h | 2 +- include/configs/ls1043a_common.h | 2 +- include/configs/ls1046a_common.h | 2 +- include/configs/ls1088a_common.h | 2 +- include/configs/ls2080a_common.h | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/mt7621.h | 2 +- include/configs/qemu-ppce500.h | 2 +- include/configs/rcar-gen3-common.h | 2 +- include/configs/socrates.h | 2 +- include/configs/synquacer.h | 2 +- scripts/config_whitelist.txt | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index 86bea960f1d1..581d4b3f9a60 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -75,7 +75,7 @@ /* SATA */ #define AHCI_BASE_ADDR (CONFIG_SYS_IMMR + 0x02200000) #ifdef CONFIG_DDR_SPD -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) #endif diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h index aad06118cdbd..07107c936481 100644 --- a/arch/xtensa/include/asm/config.h +++ b/arch/xtensa/include/asm/config.h @@ -14,7 +14,7 @@ * restricting used physical memory to the first 128MB. */ #if XCHAL_HAVE_PTP_MMU -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED (128 << 20) #endif diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c index 5d022d4993bc..ca207441b3fc 100644 --- a/drivers/ram/mpc83xx_sdram.c +++ b/drivers/ram/mpc83xx_sdram.c @@ -118,7 +118,7 @@ int dram_init(void) phys_size_t get_effective_memsize(void) { - if (!IS_ENABLED(CONFIG_VERY_BIG_RAM)) + if (!IS_ENABLED(CFG_VERY_BIG_RAM)) return gd->ram_size; /* Limit stack to what we can reasonable map */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 2fa9d777b926..89018fc3b38f 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -62,7 +62,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index dff468d93bf1..8241bba92b36 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -112,7 +112,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE #if defined(CONFIG_TARGET_T1024RDB) diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 4691e99c8b82..446b40a0c93d 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -86,7 +86,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index ac1a7614b6a2..dc88b4e80938 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -78,7 +78,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE #define CFG_SYS_SDRAM_SIZE 2048 /* for fixed parameter use */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 3f51554d2322..515ee7c85982 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -78,7 +78,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE #define CFG_SYS_SDRAM_SIZE 2048 /* for fixed parameter use */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 9081bd03749d..5a00853c9fa2 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -60,7 +60,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 2aca6ad085e6..4abf10be2c25 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -13,7 +13,7 @@ #include -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED 0x80000000 #ifndef CONFIG_QSPI_BOOT diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index aa3112d94e0e..a7cc42c526c5 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -161,7 +161,7 @@ /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 0029499ea3c0..26943ebae20d 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -18,7 +18,7 @@ /* DDR */ #define CFG_MEM_INIT_VALUE 0xdeadbeef -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index b190bfe9c8e0..cf3137281a81 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -12,7 +12,7 @@ /* Link Definitions */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 674aa7e7cf40..777f96f7bf83 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -31,7 +31,7 @@ /* Link Definitions */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 161b34e57a2f..b8b234c8c8d9 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -31,7 +31,7 @@ /* Link Definitions */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000 #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 49686b4f160f..12e0347edfdf 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -29,7 +29,7 @@ /* Link Definitions */ #define CFG_SYS_FSL_QSPI_BASE 0x20000000 -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 631392cb8dd2..81e97759205e 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -16,7 +16,7 @@ /* Link Definitions */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index dea14f28828d..8305260c718b 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -13,7 +13,7 @@ #define CFG_SYS_FLASH_BASE 0x20000000 /* DDR */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL #define CFG_SYS_FSL_DDR_SDRAM_BASE_PHY 0 #define CFG_SYS_DDR_BLOCK2_BASE 0x2080000000ULL diff --git a/include/configs/mt7621.h b/include/configs/mt7621.h index 188f481ec1fb..803de70f3d9c 100644 --- a/include/configs/mt7621.h +++ b/include/configs/mt7621.h @@ -10,7 +10,7 @@ #define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED 0x1c000000 #define CFG_SYS_INIT_SP_OFFSET 0x800000 diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 9040874a23ea..e2dea9ba6325 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -29,7 +29,7 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); /* * DDR Setup */ -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index f13e9e6213bb..9e6835e615f1 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -28,7 +28,7 @@ #define DRAM_RSV_SIZE 0x08000000 #define CFG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE) #define CFG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE) -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM #define CFG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE) /* ENV setting */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 3796d3464def..3ebf3bb765f8 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -55,7 +55,7 @@ #define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE -#define CONFIG_VERY_BIG_RAM +#define CFG_VERY_BIG_RAM /* I2C addresses of SPD EEPROMs */ #define SPD_EEPROM_ADDRESS 0x50 /* CTLR 0 DIMM 0 */ diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index be606ce2955b..d8b6d09c9ef7 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -14,7 +14,7 @@ #define CFG_SYS_SDRAM_BASE (0x80000000) /* Start address of DDR3 */ #define PHYS_SDRAM_SIZE (0x7c000000) /* Default size (2GB - Secure memory) */ -#define CONFIG_VERY_BIG_RAM /* SynQuacer supports up to 64GB */ +#define CFG_VERY_BIG_RAM /* SynQuacer supports up to 64GB */ #define CFG_MAX_MEM_MAPPED PHYS_SDRAM_SIZE #define SQ_DRAMINFO_BASE (0x2e00ffc0) /* DRAM info from TF-A */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 00973c35313c..9b67ea892eb1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -247,7 +247,7 @@ CFG_USB_FAT_BOOT CFG_USB_ISP1301_I2C_ADDR CFG_U_BOOT_HDR_SIZE CFG_VAR_SIZE_SPL -CONFIG_VERY_BIG_RAM +CFG_VERY_BIG_RAM CONFIG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE CONFIG_WATCHDOG_PRESC -- 2.25.1