From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 03/10] am33xx: Stop using PHYS_DRAM_1 define
Date: Fri, 2 Aug 2013 16:26:08 -0400 [thread overview]
Message-ID: <1375475175-5073-4-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1375475175-5073-1-git-send-email-trini@ti.com>
We defined PHYS_DRAM_1 to 0x80000000 (start of DRAM) and then used this
for CONFIG_SYS_SDRAM_BASE. But then we kept on referencing PHYS_DRAM_1
in other places. Change to directly setting CONFIG_SYS_DRAM_BASE and
then using that name in code.
Signed-off-by: Tom Rini <trini@ti.com>
---
board/isee/igep0033/board.c | 2 +-
board/phytec/pcm051/board.c | 2 +-
board/ti/am335x/board.c | 2 +-
board/ti/ti814x/evm.c | 2 +-
include/configs/igep0033.h | 3 +--
include/configs/pcm051.h | 5 ++---
include/configs/ti814x_evm.h | 5 ++---
7 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/board/isee/igep0033/board.c b/board/isee/igep0033/board.c
index c0f0c0d..7a66e33 100644
--- a/board/isee/igep0033/board.c
+++ b/board/isee/igep0033/board.c
@@ -119,7 +119,7 @@ void s_init(void)
*/
int board_init(void)
{
- gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
+ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
gpmc_init();
diff --git a/board/phytec/pcm051/board.c b/board/phytec/pcm051/board.c
index 6291d03..77202f7 100644
--- a/board/phytec/pcm051/board.c
+++ b/board/phytec/pcm051/board.c
@@ -135,7 +135,7 @@ int board_init(void)
{
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
- gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
+ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
return 0;
}
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 728afc2..88663ea 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -371,7 +371,7 @@ int board_init(void)
STNOR_GPMC_CONFIG5, STNOR_GPMC_CONFIG6, STNOR_GPMC_CONFIG7 };
#endif
- gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
+ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
gpmc_init();
diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c
index c469645..26d2f9b 100644
--- a/board/ti/ti814x/evm.c
+++ b/board/ti/ti814x/evm.c
@@ -161,7 +161,7 @@ void s_init(void)
*/
int board_init(void)
{
- gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
+ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
return 0;
}
diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h
index e318c74..f520ef8 100644
--- a/include/configs/igep0033.h
+++ b/include/configs/igep0033.h
@@ -127,10 +127,9 @@
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
-#define PHYS_DRAM_1 0x80000000 /* DRAM Bank #1 */
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
-#define CONFIG_SYS_SDRAM_BASE PHYS_DRAM_1
+#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \
GENERATED_GBL_DATA_SIZE)
/* Platform/Board specific defs */
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index 62ffc67..b182d50 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -118,7 +118,7 @@
* memtest works on 8 MB in DRAM after skipping 32MB from
* start addr of ram disk
*/
-#define CONFIG_SYS_MEMTEST_START (PHYS_DRAM_1 + (64 * 1024 * 1024))
+#define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE + (64 << 20))
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \
+ (8 * 1024 * 1024))
@@ -142,10 +142,9 @@
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
-#define PHYS_DRAM_1 0x80000000 /* DRAM Bank #1 */
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 19) /* 512MiB */
-#define CONFIG_SYS_SDRAM_BASE PHYS_DRAM_1
+#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \
GENERATED_GBL_DATA_SIZE)
/* Platform/Board specific defs */
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 2428f9d..daad14c 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -112,7 +112,7 @@
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_MEMTEST_START PHYS_DRAM_1
+#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \
+ PHYS_DRAM_1_SIZE - (8 << 12))
@@ -132,11 +132,10 @@
* Physical Memory Map
*/
#define CONFIG_NR_DRAM_BANKS 1 /* 1 banks of DRAM */
-#define PHYS_DRAM_1 0x80000000 /* DRAM Bank #1 */
#define PHYS_DRAM_1_SIZE 0x20000000 /* 512MB */
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */
-#define CONFIG_SYS_SDRAM_BASE PHYS_DRAM_1
+#define CONFIG_SYS_SDRAM_BASE 0x80000000
#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \
GENERATED_GBL_DATA_SIZE)
--
1.7.9.5
next prev parent reply other threads:[~2013-08-02 20:26 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-02 20:26 [U-Boot] [PATCH 00/10] Introduce common config file for TI ARMv7 platforms Tom Rini
2013-08-02 20:26 ` [U-Boot] [PATCH 01/10] am33xx: Move V_OSCK/V_SCLK to <asm/arch-am33xx/clocks_am33xx.h> Tom Rini
2013-08-03 4:41 ` Heiko Schocher
2013-08-05 15:17 ` Tom Rini
2013-08-05 15:26 ` Lars Poeschel
2013-08-05 15:40 ` Tom Rini
2013-08-05 15:53 ` Tom Rini
2013-08-02 20:26 ` [U-Boot] [PATCH 02/10] am33xx: CONFIG_DMA_COHERENT defines are unused, remove Tom Rini
2013-08-06 18:25 ` Dan Murphy
2013-08-02 20:26 ` Tom Rini [this message]
2013-08-02 20:26 ` [U-Boot] [PATCH 04/10] am335x_evm: Use default baud rate table Tom Rini
2013-08-02 20:26 ` [U-Boot] [PATCH 05/10] arm: spl: For Falcon Mode, set a default machid of ~0 Tom Rini
2013-08-05 3:53 ` Heiko Schocher
2013-08-06 18:28 ` Dan Murphy
2013-08-06 19:10 ` Tom Rini
2013-08-06 20:03 ` Dan Murphy
2013-08-02 20:26 ` [U-Boot] [PATCH 06/10] am335x_evm: Bring in 'boot_fdt' logic from i.MX Tom Rini
2013-08-02 20:26 ` [U-Boot] [PATCH 07/10] TI:am33xx: Create common config files for TI ARMv7 platforms, and AM33xx Tom Rini
2013-08-06 18:33 ` Dan Murphy
2013-08-06 19:11 ` Tom Rini
2013-08-02 20:26 ` [U-Boot] [PATCH 08/10] TI:omap5: Convert to ti_armv7_common.h Tom Rini
2013-08-06 18:37 ` Dan Murphy
2013-08-06 19:13 ` Tom Rini
2013-08-06 19:24 ` Dan Murphy
2013-08-06 18:38 ` Dan Murphy
2013-08-02 20:26 ` [U-Boot] [PATCH 09/10] TI:armv7: Enable CONFIG_CMD_SPI Tom Rini
2013-08-06 18:34 ` Dan Murphy
2013-08-06 18:50 ` Jagan Teki
2013-08-06 18:55 ` Jagan Teki
2013-08-06 19:03 ` Tom Rini
2013-08-06 19:10 ` Jagan Teki
2013-08-02 20:26 ` [U-Boot] [PATCH 10/10] TI:armv7: Enable CONFIG_CMD_GPIO Tom Rini
2013-08-06 18:34 ` Dan Murphy
2013-08-03 4:51 ` [U-Boot] [PATCH 00/10] Introduce common config file for TI ARMv7 platforms Heiko Schocher
2013-08-05 15:39 ` 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=1375475175-5073-4-git-send-email-trini@ti.com \
--to=trini@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.