Merge branch 'master' of git://git.denx.de/u-boot-arm

This commit is contained in:
Wolfgang Denk 2010-12-17 10:10:20 +01:00
commit fc1ff1971a
4 changed files with 35 additions and 19 deletions

View File

@ -126,4 +126,12 @@
#define CONFIG_CMD_NAND #define CONFIG_CMD_NAND
#endif #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 */ #endif /* __CONFIG_H */

View File

@ -147,11 +147,13 @@
#undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_SETGETDCR
#undef CONFIG_CMD_FLASH #undef CONFIG_CMD_FLASH
#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_IMLS
/*=======================*/
/* KGDB support (if any) */ #define CONFIG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MB */
/*=======================*/
#ifdef CONFIG_CMD_KGDB #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ #define CONFIG_SYS_INIT_RAM_SIZE 0x1000
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \
#endif CONFIG_SYS_INIT_RAM_SIZE - \
GENERATED_GBL_DATA_SIZE)
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

View File

@ -143,9 +143,13 @@
#undef CONFIG_CMD_SETGETDCR #undef CONFIG_CMD_SETGETDCR
#undef CONFIG_CMD_FLASH #undef CONFIG_CMD_FLASH
#undef CONFIG_CMD_IMLS #undef CONFIG_CMD_IMLS
/* KGDB support (if any) */
#ifdef CONFIG_CMD_KGDB #define CONFIG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MB */
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#endif #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 */ #endif /* __CONFIG_H */

View File

@ -198,11 +198,13 @@
#else #else
#error "Either CONFIG_SYS_USE_NAND or CONFIG_SYS_USE_NOR _MUST_ be defined !!!" #error "Either CONFIG_SYS_USE_NAND or CONFIG_SYS_USE_NOR _MUST_ be defined !!!"
#endif #endif
/*=======================*/
/* KGDB support (if any) */ #define CONFIG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MB */
/*=======================*/
#ifdef CONFIG_CMD_KGDB #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ #define CONFIG_SYS_INIT_RAM_SIZE 0x1000
#define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \
#endif CONFIG_SYS_INIT_RAM_SIZE - \
GENERATED_GBL_DATA_SIZE)
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */