linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

am33xx: Stop using PHYS_DRAM_1 define

Browse Source 
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>
This commit is contained in:
Tom Rini
2013-08-09 11:22:13 -04:00
parent dd5729a028
commit 73feefdc1a
7 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/isee/igep0033/board.c
View File

@ -96,7 +96,7 @@ void sdram_init(void)
*/ */
int board_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(); gpmc_init();

2
board/phytec/pcm051/board.c
View File

@ -112,7 +112,7 @@ int board_init(void)
{ {
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); 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; return 0;
} }

2
board/ti/am335x/board.c
View File

@ -343,7 +343,7 @@ int board_init(void)
STNOR_GPMC_CONFIG5, STNOR_GPMC_CONFIG6, STNOR_GPMC_CONFIG7 }; STNOR_GPMC_CONFIG5, STNOR_GPMC_CONFIG6, STNOR_GPMC_CONFIG7 };
#endif #endif
gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100; gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
gpmc_init(); gpmc_init();

2
board/ti/ti814x/evm.c
View File

@ -112,7 +112,7 @@ void sdram_init(void)
*/ */
int board_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; return 0;
} }

3
include/configs/igep0033.h
View File

@ -136,10 +136,9 @@
/* Physical Memory Map */ /* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #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_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 - \ #define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \
GENERATED_GBL_DATA_SIZE) GENERATED_GBL_DATA_SIZE)
/* Platform/Board specific defs */ /* Platform/Board specific defs */

5
include/configs/pcm051.h
View File

@ -123,7 +123,7 @@
* memtest works on 8 MB in DRAM after skipping 32MB from * memtest works on 8 MB in DRAM after skipping 32MB from
* start addr of ram disk * 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 \ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \
+ (8 * 1024 * 1024)) + (8 * 1024 * 1024))
@ -147,10 +147,9 @@
/* Physical Memory Map */ /* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #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_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 - \ #define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \
GENERATED_GBL_DATA_SIZE) GENERATED_GBL_DATA_SIZE)
/* Platform/Board specific defs */ /* Platform/Board specific defs */

5
include/configs/ti814x_evm.h
View File

@ -117,7 +117,7 @@
/* Boot Argument Buffer Size */ /* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #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 \ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \
+ PHYS_DRAM_1_SIZE - (8 << 12)) + PHYS_DRAM_1_SIZE - (8 << 12))
@ -137,11 +137,10 @@
* Physical Memory Map * Physical Memory Map
*/ */
#define CONFIG_NR_DRAM_BANKS 1 /* 1 banks of DRAM */ #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 PHYS_DRAM_1_SIZE 0x20000000 /* 512MB */
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */ #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 - \ #define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \
GENERATED_GBL_DATA_SIZE) GENERATED_GBL_DATA_SIZE)