projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-i2c
[platform/kernel/u-boot.git]
/
include
/
configs
/
qemu-mips64.h
diff --git
a/include/configs/qemu-mips64.h
b/include/configs/qemu-mips64.h
index
60a3a71
..
28b791a
100644
(file)
--- a/
include/configs/qemu-mips64.h
+++ b/
include/configs/qemu-mips64.h
@@
-14,13
+14,8
@@
#define CONFIG_QEMU_MIPS
#define CONFIG_QEMU_MIPS
-#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_MISC_INIT_R
#define CONFIG_MISC_INIT_R
-#define CONFIG_BOOTDELAY 10 /* autoboot after 10 seconds */
-
-#define CONFIG_BAUDRATE 115200
-
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#undef CONFIG_BOOTARGS
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#undef CONFIG_BOOTARGS
@@
-56,7
+51,6
@@
#define CONFIG_CONS_INDEX 1
#define CONFIG_CMD_IDE
#define CONFIG_CONS_INDEX 1
#define CONFIG_CMD_IDE
-#define CONFIG_DOS_PARTITION
#ifdef CONFIG_SYS_BIG_ENDIAN
#define CONFIG_IDE_SWAP_IO
#ifdef CONFIG_SYS_BIG_ENDIAN
#define CONFIG_IDE_SWAP_IO
@@
-86,7
+80,7
@@
/* max number of command args */
#define CONFIG_SYS_MAXARGS 16
/* max number of command args */
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_MALLOC_LEN
128*1024
+#define CONFIG_SYS_MALLOC_LEN
(256 << 10)
#define CONFIG_SYS_BOOTPARAMS_LEN 128*1024
#define CONFIG_SYS_BOOTPARAMS_LEN 128*1024
@@
-108,7
+102,6
@@
*/
/* The following #defines are needed to get flash environment right */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
*/
/* The following #defines are needed to get flash environment right */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN (192 << 10)
#define CONFIG_SYS_INIT_SP_OFFSET 0x400000
#define CONFIG_SYS_INIT_SP_OFFSET 0x400000
@@
-121,10
+114,10
@@
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
#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 */
#define CONFIG_ENV_SIZE 0x8000
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_SIZE 0x8000
+#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE)
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_OVERWRITE 1
@@
-132,11
+125,4
@@
#define CONFIG_LZMA
#define CONFIG_LZMA
-/*-----------------------------------------------------------------------
- * Cache Configuration
- */
-#define CONFIG_SYS_DCACHE_SIZE 16384
-#define CONFIG_SYS_ICACHE_SIZE 16384
-#define CONFIG_SYS_CACHELINE_SIZE 32
-
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */