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 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC8313ERDB_NOR.h
diff --git
a/include/configs/MPC8313ERDB_NOR.h
b/include/configs/MPC8313ERDB_NOR.h
index
382c39c
..
c223ea5
100644
(file)
--- a/
include/configs/MPC8313ERDB_NOR.h
+++ b/
include/configs/MPC8313ERDB_NOR.h
@@
-18,6
+18,7
@@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
#endif
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
#endif
+#include <linux/stringify.h>
#define CONFIG_PCI_INDIRECT_BRIDGE
/*
#define CONFIG_PCI_INDIRECT_BRIDGE
/*
@@
-274,10
+275,6
@@
#define CONFIG_BOOTP_BOOTFILESIZE
/*
#define CONFIG_BOOTP_BOOTFILESIZE
/*
- * 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 */
@@
-307,7
+304,6
@@
/*
* Environment Configuration
*/
/*
* Environment Configuration
*/
-#define CONFIG_ENV_OVERWRITE
#define CONFIG_NETDEV "eth1"
#define CONFIG_NETDEV "eth1"