qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

microblaze: Read information about RAM from DT 

Do not setup ram start/size in board file. Read it from DT instead.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2015-12-11 14:45:29 +01:00
parent 85916e29df
commit 44a3a91cb0
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
board/xilinx/microblaze-generic/microblaze-generic.c
View File

@ -23,7 +23,6 @@ DECLARE_GLOBAL_DATA_PTR;
static int reset_pin = -1; static int reset_pin = -1;
#endif #endif
#if CONFIG_IS_ENABLED(OF_CONTROL)
ulong ram_base; ulong ram_base;
void dram_init_banksize(void) void dram_init_banksize(void)
@ -57,14 +56,6 @@ int dram_init(void)
return 0; return 0;
}; };
#else
int dram_init(void)
{
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
return 0;
}
#endif
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {

4
board/xilinx/microblaze-generic/xparameters.h
View File

@ -35,10 +35,6 @@
#define XILINX_FLASH_START 0x2c000000 #define XILINX_FLASH_START 0x2c000000
#define XILINX_FLASH_SIZE 0x00800000 #define XILINX_FLASH_SIZE 0x00800000
/* Main Memory is DDR_SDRAM_64Mx32 */
#define XILINX_RAM_START 0x28000000
#define XILINX_RAM_SIZE 0x04000000
/* Watchdog IP is wxi_timebase_wdt_0 */ /* Watchdog IP is wxi_timebase_wdt_0 */
#define XILINX_WATCHDOG_BASEADDR 0x50000000 #define XILINX_WATCHDOG_BASEADDR 0x50000000
#define XILINX_WATCHDOG_IRQ 1 #define XILINX_WATCHDOG_IRQ 1

9
include/configs/microblaze-generic.h
View File

@ -68,13 +68,6 @@
# endif # endif
#endif #endif
#if !defined(CONFIG_OF_CONTROL) || \
(defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_OF_CONTROL))
/* ddr sdram - main memory */
# define CONFIG_SYS_SDRAM_BASE XILINX_RAM_START
# define CONFIG_SYS_SDRAM_SIZE XILINX_RAM_SIZE
#endif
#define CONFIG_SYS_MALLOC_LEN 0xC0000 #define CONFIG_SYS_MALLOC_LEN 0xC0000
/* Stack location before relocation */ /* Stack location before relocation */
@ -259,7 +252,7 @@
#define CONFIG_SYS_MAXARGS 15 #define CONFIG_SYS_MAXARGS 15
#define CONFIG_SYS_LONGHELP #define CONFIG_SYS_LONGHELP
/* default load address */ /* default load address */
#define CONFIG_SYS_LOAD_ADDR XILINX_RAM_START #define CONFIG_SYS_LOAD_ADDR 0
#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */ #define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */
#define CONFIG_BOOTARGS "root=romfs" #define CONFIG_BOOTARGS "root=romfs"