diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-17 10:10:20 +0100 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-17 10:10:20 +0100 | 
| commit | fc1ff1971a20c83e9417ba30366086b3e2e97de6 (patch) | |
| tree | 8ee20597beb49e3d1d6b9625a8c6fa78a06867ad | |
| parent | b06b1633f5d0c78b7ec2bb1360cfd7837df1d864 (diff) | |
| parent | 8a16f9c6747447aecda6619568d6747f0adf6561 (diff) | |
| download | olio-uboot-2014.01-fc1ff1971a20c83e9417ba30366086b3e2e97de6.tar.xz olio-uboot-2014.01-fc1ff1971a20c83e9417ba30366086b3e2e97de6.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
| -rw-r--r-- | include/configs/davinci_dm6467evm.h | 8 | ||||
| -rw-r--r-- | include/configs/davinci_schmoogie.h | 16 | ||||
| -rw-r--r-- | include/configs/davinci_sffsdr.h | 14 | ||||
| -rw-r--r-- | include/configs/davinci_sonata.h | 16 | 
4 files changed, 35 insertions, 19 deletions
| diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h index f0a8e98c3..3ef455562 100644 --- a/include/configs/davinci_dm6467evm.h +++ b/include/configs/davinci_dm6467evm.h @@ -126,4 +126,12 @@  #define CONFIG_CMD_NAND  #endif +#define CONFIG_MAX_RAM_BANK_SIZE	(256 << 20)	/* 256 MB */ + +#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_RAM_SIZE	0x1000 +#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + \ +					 CONFIG_SYS_INIT_RAM_SIZE - \ +					 GENERATED_GBL_DATA_SIZE) +  #endif /* __CONFIG_H */ diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 967ebcc98..5cc8bc050 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -147,11 +147,13 @@  #undef CONFIG_CMD_SETGETDCR  #undef CONFIG_CMD_FLASH  #undef CONFIG_CMD_IMLS -/*=======================*/ -/* KGDB support (if any) */ -/*=======================*/ -#ifdef CONFIG_CMD_KGDB -#define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */ -#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use */ -#endif + +#define CONFIG_MAX_RAM_BANK_SIZE	(256 << 20)	/* 256 MB */ + +#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_RAM_SIZE	0x1000 +#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + \ +					 CONFIG_SYS_INIT_RAM_SIZE - \ +					 GENERATED_GBL_DATA_SIZE) +  #endif /* __CONFIG_H */ diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h index 4d866d0eb..307b9f274 100644 --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -143,9 +143,13 @@  #undef CONFIG_CMD_SETGETDCR  #undef CONFIG_CMD_FLASH  #undef CONFIG_CMD_IMLS -/* KGDB support (if any) */ -#ifdef CONFIG_CMD_KGDB -#define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */ -#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use */ -#endif + +#define CONFIG_MAX_RAM_BANK_SIZE	(256 << 20)	/* 256 MB */ + +#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_RAM_SIZE	0x1000 +#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + \ +					 CONFIG_SYS_INIT_RAM_SIZE - \ +					 GENERATED_GBL_DATA_SIZE) +  #endif /* __CONFIG_H */ diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index f0eeb90e9..ebfdafa24 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -198,11 +198,13 @@  #else  #error "Either CONFIG_SYS_USE_NAND or CONFIG_SYS_USE_NOR _MUST_ be defined !!!"  #endif -/*=======================*/ -/* KGDB support (if any) */ -/*=======================*/ -#ifdef CONFIG_CMD_KGDB -#define CONFIG_KGDB_BAUDRATE	115200	/* speed to run kgdb serial port */ -#define CONFIG_KGDB_SER_INDEX	1	/* which serial port to use */ -#endif + +#define CONFIG_MAX_RAM_BANK_SIZE	(256 << 20)	/* 256 MB */ + +#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_RAM_SIZE	0x1000 +#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + \ +					 CONFIG_SYS_INIT_RAM_SIZE - \ +					 GENERATED_GBL_DATA_SIZE) +  #endif /* __CONFIG_H */ |