projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apalis_imx6: fix video stdout in default environment
[oweals/u-boot.git]
/
include
/
configs
/
apalis_imx6.h
diff --git
a/include/configs/apalis_imx6.h
b/include/configs/apalis_imx6.h
index d2ff7e95345c9c17d90640709b7e5411a4d9b065..6fc7c3982c6511e770ec16c3974131169dccaf0e 100644
(file)
--- a/
include/configs/apalis_imx6.h
+++ b/
include/configs/apalis_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
@@
-80,10
+82,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
@@
-146,8
+144,6
@@
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x20000000\0" \
"fdt_addr_r=0x12100000\0" \
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x20000000\0" \
"fdt_addr_r=0x12100000\0" \
- "fdt_high=0xffffffff\0" \
- "initrd_high=0xffffffff\0" \
"kernel_addr_r=0x11000000\0" \
"pxefile_addr_r=0x17100000\0" \
"ramdisk_addr_r=0x12200000\0" \
"kernel_addr_r=0x11000000\0" \
"pxefile_addr_r=0x17100000\0" \
"ramdisk_addr_r=0x12200000\0" \
@@
-173,7
+169,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 vmalloc=400M\0" \
"boot_file=zImage\0" \
"console=ttymxc0\0" \
"defargs=enable_wait_mode=off vmalloc=400M\0" \
@@
-212,10
+209,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 */
@@
-238,6
+231,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 */