diff options
| author | Tom Rini <[email protected]> | 2019-07-11 18:10:11 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-07-11 18:10:11 -0400 |
| commit | a9758ece08bceb60634145c2126582e5d282bd09 (patch) | |
| tree | b391039a3bc2aa8222a14b3e960541296d585878 /include/configs | |
| parent | 68deea2308141c26707da44654b273d7b072ab0d (diff) | |
| parent | 7ea33579576d2bcd19df76bd8769e7ab3b4a169b (diff) | |
Merge tag 'dm-pull-9jul19-take2' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
- Sandbox improvements including .dts refactor
- Minor tracing and PCI improvements
- Various other minor fixes
- Conversion of patman, dtoc and binman to support Python 3
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/sandbox.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 50affaf1a82..5d75021ed6b 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -63,7 +63,11 @@ func(HOST, host, 1) \ func(HOST, host, 0) +#ifdef __ASSEMBLY__ +#define BOOTENV +#else #include <config_distro_bootcmd.h> +#endif #define CONFIG_KEEP_SERVERADDR #define CONFIG_UDP_CHECKSUM |