projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
colibri_imx6: fix video stdout in default environment
[oweals/u-boot.git]
/
include
/
configs
/
colibri_imx6.h
diff --git
a/include/configs/colibri_imx6.h
b/include/configs/colibri_imx6.h
index 4cdd3c53afbb2d7b57890684dd8887f87472ed50..0a52a701c628c0f65096fa9c760d7ba534dbfc05 100644
(file)
--- a/
include/configs/colibri_imx6.h
+++ b/
include/configs/colibri_imx6.h
@@
-8,6
+8,8
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
+#include <linux/stringify.h>
+
#include "mx6_common.h"
#undef CONFIG_DISPLAY_BOARDINFO
#include "mx6_common.h"
#undef CONFIG_DISPLAY_BOARDINFO
@@
-68,10
+70,6
@@
#define CONFIG_ENV_OVERWRITE
/* Command definition */
#define CONFIG_ENV_OVERWRITE
/* Command definition */
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_FLASH
#undef CONFIG_IPADDR
#define CONFIG_IPADDR 192.168.10.2
#undef CONFIG_IPADDR
#define CONFIG_IPADDR 192.168.10.2
@@
-154,7
+152,8
@@
BOOTENV \
"bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \
"usb start ; " \
BOOTENV \
"bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \
"usb start ; " \
- "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+ "setenv stdout serial,vidconsole; " \
+ "setenv stdin serial,usbkbd\0" \
"boot_file=zImage\0" \
"console=ttymxc0\0" \
"defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
"boot_file=zImage\0" \
"console=ttymxc0\0" \
"defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
@@
-189,10
+188,6
@@
#undef CONFIG_SYS_MAXARGS
#define CONFIG_SYS_MAXARGS 48
#undef CONFIG_SYS_MAXARGS
#define CONFIG_SYS_MAXARGS 48
-#define CONFIG_SYS_MEMTEST_START 0x10000000
-#define CONFIG_SYS_MEMTEST_END 0x10010000
-#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000
-
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Physical Memory Map */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Physical Memory Map */
@@
-215,6
+210,4
@@
#define CONFIG_SYS_MMC_ENV_PART 1
#endif
#define CONFIG_SYS_MMC_ENV_PART 1
#endif
-#define CONFIG_CMD_TIME
-
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */