diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/qemu-mips.h | 54 | 
1 files changed, 26 insertions, 28 deletions
| diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index f45f78b9a..5bc7b0d1d 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -28,14 +28,10 @@  #ifndef __CONFIG_H  #define __CONFIG_H -#define CONFIG_MIPS32		1	/* MIPS32 CPU core */ -#define CONFIG_QEMU_MIPS	1 +#define CONFIG_MIPS32			/* MIPS32 CPU core */ +#define CONFIG_QEMU_MIPS  #define CONFIG_MISC_INIT_R -/*IP address is default used by Qemu*/ -#define CONFIG_IPADDR		10.0.2.15	/* Our IP address */ -#define CONFIG_SERVERIP		10.0.2.2	/* Server IP address */ -  #define CONFIG_BOOTDELAY	10	/* autoboot after 10 seconds */  #define CONFIG_BAUDRATE		115200 @@ -74,31 +70,31 @@  #define CONFIG_CMD_DHCP  #define CONFIG_DRIVER_NE2000 -#define CONFIG_DRIVER_NE2000_BASE	(0xb4000300) +#define CONFIG_DRIVER_NE2000_BASE	0xb4000300  #define CONFIG_SYS_NS16550  #define CONFIG_SYS_NS16550_SERIAL  #define CONFIG_SYS_NS16550_REG_SIZE	1  #define CONFIG_SYS_NS16550_CLK		115200 -#define CONFIG_SYS_NS16550_COM1	(0xb40003f8) -#define CONFIG_CONS_INDEX	1 +#define CONFIG_SYS_NS16550_COM1		0xb40003f8 +#define CONFIG_CONS_INDEX		1  #define CONFIG_CMD_IDE  #define CONFIG_DOS_PARTITION  #define CONFIG_SYS_IDE_MAXBUS		2 -#define CONFIG_SYS_ATA_IDE0_OFFSET	(0x1f0) -#define CONFIG_SYS_ATA_IDE1_OFFSET	(0x170) -#define CONFIG_SYS_ATA_DATA_OFFSET	(0) -#define CONFIG_SYS_ATA_REG_OFFSET	(0) -#define CONFIG_SYS_ATA_BASE_ADDR	(0xb4000000) +#define CONFIG_SYS_ATA_IDE0_OFFSET	0x1f0 +#define CONFIG_SYS_ATA_IDE1_OFFSET	0x170 +#define CONFIG_SYS_ATA_DATA_OFFSET	0 +#define CONFIG_SYS_ATA_REG_OFFSET	0 +#define CONFIG_SYS_ATA_BASE_ADDR	0xb4000000 -#define CONFIG_SYS_IDE_MAXDEVICE	(4) +#define CONFIG_SYS_IDE_MAXDEVICE	4  /*   * Miscellaneous configurable options   */ -#define CONFIG_SYS_LONGHELP				/* undef to save memory */ +#define CONFIG_SYS_LONGHELP		/* undef to save memory */  /* Monitor Command Prompt */  #if defined(CONFIG_SYS_LITTLE_ENDIAN) @@ -111,9 +107,12 @@  #define CONFIG_CMDLINE_EDITING  #define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_CBSIZE		256		/* Console I/O Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */ -#define CONFIG_SYS_MAXARGS		16		/* max number of command args */ +/* Console I/O Buffer Size */ +#define CONFIG_SYS_CBSIZE		256 +/* Print Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) +/* max number of command args */ +#define CONFIG_SYS_MAXARGS		16  #define CONFIG_SYS_MALLOC_LEN		128*1024 @@ -125,9 +124,11 @@  #define CONFIG_SYS_HZ			1000 -#define CONFIG_SYS_SDRAM_BASE		0x80000000	/* Cached addr */ +/* Cached addr */ +#define CONFIG_SYS_SDRAM_BASE		0x80000000 -#define CONFIG_SYS_LOAD_ADDR		0x81000000	/* default load address */ +/* default load address */ +#define CONFIG_SYS_LOAD_ADDR		0x81000000  #define CONFIG_SYS_MEMTEST_START	0x80100000  #define CONFIG_SYS_MEMTEST_END		0x80800000 @@ -135,7 +136,6 @@  /*-----------------------------------------------------------------------   * FLASH and environment organization   */ -  /* The following #defines are needed to get flash environment right */  #define CONFIG_SYS_TEXT_BASE		0xbfc00000 /* Rom version */  #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE @@ -147,11 +147,11 @@  #define CONFIG_SYS_FLASH_BASE		0xbfc00000  #define CONFIG_SYS_MAX_FLASH_BANKS	1  #define CONFIG_SYS_MAX_FLASH_SECT	128 -#define CONFIG_SYS_FLASH_CFI		1	/* Flash memory is CFI compliant */ -#define CONFIG_FLASH_CFI_DRIVER	1 -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE	1 +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_FLASH_CFI_DRIVER +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define CONFIG_ENV_IS_IN_FLASH	1 +#define CONFIG_ENV_IS_IN_FLASH  #define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)  /* Address and size of Primary Environment Sector */ @@ -161,8 +161,6 @@  #define MEM_SIZE		128 -#undef CONFIG_MEMSIZE_IN_BYTES -  #define CONFIG_LZMA  /*----------------------------------------------------------------------- |