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
Convert CONFIG_TRACE et al to Kconfig
[platform/kernel/u-boot.git]
/
include
/
configs
/
sandbox.h
diff --git
a/include/configs/sandbox.h
b/include/configs/sandbox.h
index
6b85811
..
1f04b88
100644
(file)
--- a/
include/configs/sandbox.h
+++ b/
include/configs/sandbox.h
@@
-6,14
+6,6
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
-#ifdef FTRACE
-#define CONFIG_TRACE
-#define CONFIG_TRACE_BUFFER_SIZE (16 << 20)
-#define CONFIG_TRACE_EARLY_SIZE (16 << 20)
-#define CONFIG_TRACE_EARLY
-#define CONFIG_TRACE_EARLY_ADDR 0x00100000
-#endif
-
#ifndef CONFIG_SPL_BUILD
#define CONFIG_IO_TRACE
#endif
#ifndef CONFIG_SPL_BUILD
#define CONFIG_IO_TRACE
#endif
@@
-22,15
+14,9
@@
#define CONFIG_SYS_TIMER_RATE 1000000
#endif
#define CONFIG_SYS_TIMER_RATE 1000000
#endif
-#define CONFIG_LMB
-
#define CONFIG_HOST_MAX_DEVICES 4
#define CONFIG_HOST_MAX_DEVICES 4
-/*
- * Size of malloc() pool, before and after relocation
- */
#define CONFIG_MALLOC_F_ADDR 0x0010000
#define CONFIG_MALLOC_F_ADDR 0x0010000
-#define CONFIG_SYS_MALLOC_LEN (32 << 20) /* 32MB */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
@@
-40,8
+26,6
@@
#define CONFIG_I2C_EDID
#define CONFIG_I2C_EDID
-/* Memory things - we don't really want a memory test */
-#define CONFIG_SYS_LOAD_ADDR 0x00000000
#define CONFIG_SYS_FDT_LOAD_ADDR 0x100
#define CONFIG_PHYSMEM
#define CONFIG_SYS_FDT_LOAD_ADDR 0x100
#define CONFIG_PHYSMEM
@@
-80,8
+64,6
@@
#ifdef CONFIG_SANDBOX_SDL
#define LCD_BPP LCD_COLOR16
#define CONFIG_LCD_BMP_RLE8
#ifdef CONFIG_SANDBOX_SDL
#define LCD_BPP LCD_COLOR16
#define CONFIG_LCD_BMP_RLE8
-#define CONFIG_VIDEO_BMP_RLE8
-#define CONFIG_SPLASH_SCREEN_ALIGN
#define CONFIG_KEYBOARD
#define CONFIG_KEYBOARD
@@
-95,7
+77,9
@@
#endif
#define SANDBOX_ETH_SETTINGS "ethaddr=00:00:11:22:33:44\0" \
#endif
#define SANDBOX_ETH_SETTINGS "ethaddr=00:00:11:22:33:44\0" \
+ "eth2addr=00:00:11:22:33:48\0" \
"eth3addr=00:00:11:22:33:45\0" \
"eth3addr=00:00:11:22:33:45\0" \
+ "eth4addr=00:00:11:22:33:48\0" \
"eth5addr=00:00:11:22:33:46\0" \
"eth6addr=00:00:11:22:33:47\0" \
"ipaddr=1.2.3.4\0"
"eth5addr=00:00:11:22:33:46\0" \
"eth6addr=00:00:11:22:33:47\0" \
"ipaddr=1.2.3.4\0"
@@
-132,6
+116,4
@@
#define CONFIG_SYS_SATA_MAX_DEVICE 2
#define CONFIG_SYS_SATA_MAX_DEVICE 2
-#define CONFIG_MISC_INIT_F
-
#endif
#endif