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 https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
strider.h
diff --git
a/include/configs/strider.h
b/include/configs/strider.h
index
06a86bb
..
85db657
100644
(file)
--- a/
include/configs/strider.h
+++ b/
include/configs/strider.h
@@
-8,6
+8,8
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
+#include <linux/stringify.h>
+
/*
* High Level Configuration Options
*/
/*
* High Level Configuration Options
*/
@@
-90,8
+92,6
@@
/*
* Memory test
*/
/*
* Memory test
*/
-#define CONFIG_SYS_MEMTEST_START 0x00001000 /* memtest region */
-#define CONFIG_SYS_MEMTEST_END 0x07f00000
/*
* The reserved memory
/*
* The reserved memory
@@
-388,10
+388,6
@@
void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
/*
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
/*
- * Command line configuration.
- */
-
-/*
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LOAD_ADDR 0x2000000 /* default load address */
@@
-412,8
+408,6
@@
void fpga_control_clear(unsigned int bus, int pin);
* Environment Configuration
*/
* Environment Configuration
*/
-#define CONFIG_ENV_OVERWRITE
-
#if defined(CONFIG_TSEC_ENET)
#define CONFIG_HAS_ETH0
#endif
#if defined(CONFIG_TSEC_ENET)
#define CONFIG_HAS_ETH0
#endif