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 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot...
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx6ullevk.h
diff --git
a/include/configs/mx6ullevk.h
b/include/configs/mx6ullevk.h
index
3d42d26
..
9cedb96
100644
(file)
--- a/
include/configs/mx6ullevk.h
+++ b/
include/configs/mx6ullevk.h
@@
-10,6
+10,7
@@
#include <asm/arch/imx-regs.h>
#include <linux/sizes.h>
#include <asm/arch/imx-regs.h>
#include <linux/sizes.h>
+#include <linux/stringify.h>
#include "mx6_common.h"
#include <asm/mach-imx/gpio.h>
#include "mx6_common.h"
#include <asm/mach-imx/gpio.h>
@@
-131,8
+132,6
@@
"else run netboot; fi"
/* Miscellaneous configurable options */
"else run netboot; fi"
/* Miscellaneous configurable options */
-#define CONFIG_SYS_MEMTEST_START 0x80000000
-#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x8000000)
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_HZ 1000