From: "Marek Behún" <marek.behun@nic.cz>
To: pali@kernel.org
Cc: Tom Rini <trini@konsulko.com>,
u-boot@lists.denx.de, Stefan Roese <sr@denx.de>
Subject: Re: [PATCH 4/9] mvebu: ddr: Rename CONFIG_DDR_FIXED_SIZE to CONFIG_SYS_SDRAM_SIZE
Date: Sun, 22 Aug 2021 13:35:54 +0200 [thread overview]
Message-ID: <20210822133554.55b24206@thinkpad> (raw)
In-Reply-To: <20210821175019.24180-4-trini@konsulko.com>
+ pali, who can tell whether this won't break how the code is aligned
with upstream mv-ddr
On Sat, 21 Aug 2021 13:50:14 -0400
Tom Rini <trini@konsulko.com> wrote:
> We have a number of CONFIG symbols to express the fixed size of system
> memory. For now, rename CONFIG_DDR_FIXED_SIZE to CONFIG_SYS_SDRAM_SIZE
> and adjust usage to match that CONFIG_SYS_SDRAM_SIZE expects the entire
> size rather than MiB.
>
> Cc: Marek Behún <marek.behun@nic.cz>
> Cc: Stefan Roese <sr@denx.de>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> drivers/ddr/marvell/axp/ddr3_axp.h | 4 ++--
> include/configs/maxbcm.h | 4 +++-
> include/configs/theadorable.h | 4 +++-
> 3 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/ddr/marvell/axp/ddr3_axp.h b/drivers/ddr/marvell/axp/ddr3_axp.h
> index 270691e9bcd3..970651f87029 100644
> --- a/drivers/ddr/marvell/axp/ddr3_axp.h
> +++ b/drivers/ddr/marvell/axp/ddr3_axp.h
> @@ -19,10 +19,10 @@
> #define FAR_END_DIMM_ADDR 0x50
> #define MAX_DIMM_ADDR 0x60
>
> -#ifndef CONFIG_DDR_FIXED_SIZE
> +#ifndef CONFIG_SYS_SDRAM_SIZE
> #define SDRAM_CS_SIZE 0xFFFFFFF
> #else
> -#define SDRAM_CS_SIZE (CONFIG_DDR_FIXED_SIZE - 1)
> +#define SDRAM_CS_SIZE ((CONFIG_SYS_SDRAM_SIZE >> 10) - 1)
> #endif
> #define SDRAM_CS_BASE 0x0
> #define SDRAM_DIMM_SIZE 0x80000000
> diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
> index fc2393204bec..5098f12f5425 100644
> --- a/include/configs/maxbcm.h
> +++ b/include/configs/maxbcm.h
> @@ -6,6 +6,8 @@
> #ifndef _CONFIG_DB_MV7846MP_GP_H
> #define _CONFIG_DB_MV7846MP_GP_H
>
> +#include <linux/sizes.h>
> +
> /*
> * High Level Configuration Options (easy to change)
> */
> @@ -65,7 +67,7 @@
> /* SPL related SPI defines */
>
> /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */
> -#define CONFIG_DDR_FIXED_SIZE (1 << 20) /* 1GiB */
> +#define CONFIG_SYS_SDRAM_SIZE SZ_1G
> #define CONFIG_BOARD_ECC_SUPPORT /* this board supports ECC */
>
> #endif /* _CONFIG_DB_MV7846MP_GP_H */
> diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
> index 760713d3ef87..abc48ff44ca5 100644
> --- a/include/configs/theadorable.h
> +++ b/include/configs/theadorable.h
> @@ -6,6 +6,8 @@
> #ifndef _CONFIG_THEADORABLE_H
> #define _CONFIG_THEADORABLE_H
>
> +#include <linux/sizes.h>
> +
> /*
> * High Level Configuration Options (easy to change)
> */
> @@ -93,6 +95,6 @@
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
>
> /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */
> -#define CONFIG_DDR_FIXED_SIZE (2 << 20) /* 2GiB */
> +#define CONFIG_SYS_SDRAM_SIZE SZ_2G
>
> #endif /* _CONFIG_THEADORABLE_H */
next prev parent reply other threads:[~2021-08-22 11:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-21 17:50 [PATCH 1/9] Kconfig: Use spaces not tabs in Kconfig entires Tom Rini
2021-08-21 17:50 ` [PATCH 2/9] global: Remove unused or unnecessary CONFIG symbols related to DDR Tom Rini
2021-08-21 17:50 ` [PATCH 3/9] mvebu: Migrate CONFIG_DDR_32BIT/64BIT to Kconfig Tom Rini
2021-08-24 10:53 ` Marek Behún
2021-08-31 5:45 ` Stefan Roese
2021-08-21 17:50 ` [PATCH 4/9] mvebu: ddr: Rename CONFIG_DDR_FIXED_SIZE to CONFIG_SYS_SDRAM_SIZE Tom Rini
2021-08-22 11:35 ` Marek Behún [this message]
2021-08-22 11:40 ` Pali Rohár
2021-08-24 10:52 ` Marek Behún
2021-08-31 5:51 ` Stefan Roese
2021-08-31 12:43 ` Tom Rini
2021-09-01 5:27 ` Stefan Roese
2021-09-01 11:29 ` Tom Rini
2021-09-01 14:32 ` Stefan Roese
2021-08-21 17:50 ` [PATCH 5/9] mvebe: Migrate CONFIG_DDR_LOG_LEVEL to Kconfig Tom Rini
2021-08-21 17:50 ` [PATCH 6/9] ddr: Migrate DDR_SPD " Tom Rini
2021-08-21 17:50 ` [PATCH 7/9] nxp: Migrate CONFIG_DDR_CLK_FREQ " Tom Rini
2021-08-21 17:50 ` [PATCH 8/9] nxp: Migrate a number of DDR related symbols " Tom Rini
2021-08-21 17:50 ` [PATCH 9/9] Convert CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT " Tom Rini
2021-08-31 22:09 ` [PATCH 1/9] Kconfig: Use spaces not tabs in Kconfig entires Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210822133554.55b24206@thinkpad \
--to=marek.behun@nic.cz \
--cc=pali@kernel.org \
--cc=sr@denx.de \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox