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 tag 'xilinx-for-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u...
[platform/kernel/u-boot.git]
/
include
/
configs
/
sandbox.h
diff --git
a/include/configs/sandbox.h
b/include/configs/sandbox.h
index
1a49d1d
..
1c13055
100644
(file)
--- a/
include/configs/sandbox.h
+++ b/
include/configs/sandbox.h
@@
-8,11
+8,11
@@
#ifdef FTRACE
#define CONFIG_TRACE
#ifdef FTRACE
#define CONFIG_TRACE
+#define CONFIG_CMD_TRACE
#define CONFIG_TRACE_BUFFER_SIZE (16 << 20)
#define CONFIG_TRACE_BUFFER_SIZE (16 << 20)
-#define CONFIG_TRACE_EARLY_SIZE (
8
<< 20)
+#define CONFIG_TRACE_EARLY_SIZE (
16
<< 20)
#define CONFIG_TRACE_EARLY
#define CONFIG_TRACE_EARLY_ADDR 0x00100000
#define CONFIG_TRACE_EARLY
#define CONFIG_TRACE_EARLY_ADDR 0x00100000
-
#endif
#ifndef CONFIG_SPL_BUILD
#endif
#ifndef CONFIG_SPL_BUILD
@@
-37,8
+37,6
@@
/* turn on command-line edit/c/auto */
/* turn on command-line edit/c/auto */
-#define CONFIG_ENV_SIZE 8192
-
/* SPI - enable all SPI flash types for testing purposes */
#define CONFIG_I2C_EDID
/* SPI - enable all SPI flash types for testing purposes */
#define CONFIG_I2C_EDID
@@
-55,7
+53,6
@@
#define CONFIG_SYS_SDRAM_BASE 0
#define CONFIG_SYS_SDRAM_SIZE (128 << 20)
#define CONFIG_SYS_MONITOR_BASE 0
#define CONFIG_SYS_SDRAM_BASE 0
#define CONFIG_SYS_SDRAM_SIZE (128 << 20)
#define CONFIG_SYS_MONITOR_BASE 0
-#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200}
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
115200}
@@
-64,7
+61,11
@@
func(HOST, host, 1) \
func(HOST, host, 0)
func(HOST, host, 1) \
func(HOST, host, 0)
+#ifdef __ASSEMBLY__
+#define BOOTENV
+#else
#include <config_distro_bootcmd.h>
#include <config_distro_bootcmd.h>
+#endif
#define CONFIG_KEEP_SERVERADDR
#define CONFIG_UDP_CHECKSUM
#define CONFIG_KEEP_SERVERADDR
#define CONFIG_UDP_CHECKSUM
@@
-72,7
+73,6
@@
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_BOOTP_SERVERIP
#define CONFIG_BOOTP_DNS2
#define CONFIG_BOOTP_SEND_HOSTNAME
#define CONFIG_BOOTP_SERVERIP
-#define CONFIG_IP_DEFRAG
#ifndef SANDBOX_NO_SDL
#define CONFIG_SANDBOX_SDL
#ifndef SANDBOX_NO_SDL
#define CONFIG_SANDBOX_SDL