summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-02-07 17:28:20 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2014-02-07 17:28:20 +0100
commitaa8f51eb40230bc53c0453d45a31ad64a9e9851f (patch)
treeec7628fc01d9f13f722fd159830d4d43ac8a07d2
parent2415e9d072b9752e86ea26c6e6a0f28ab07c5b16 (diff)
config: setup 4 fbdev, make nfsboot the default for now
-rw-r--r--include/configs/apalis-imx6.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/include/configs/apalis-imx6.h b/include/configs/apalis-imx6.h
index 4ccf7ea1e2..5f0f919285 100644
--- a/include/configs/apalis-imx6.h
+++ b/include/configs/apalis-imx6.h
@@ -193,7 +193,7 @@
"fatload mmc 1:1 10800000 uImage && bootm 10800000"
#define CONFIG_EXTRA_ENV_SETTINGS \
- "bootcmd=run emmcboot ; "\
+ "bootcmd=run nfsboot ; run emmcboot ; "\
"setenv stdout serial,vga ; " \
"echo ; echo emmcboot failed ; " \
"usb start; setenv stdin serial,usbkbd\0" \
@@ -212,13 +212,11 @@
"consoleblank=0 no_console_suspend=1 console=tty1 " \
"console=ttymxc0,${baudrate}n8 " \
"fbcon=map:1\0 " \
- "vidargs=fbmem=28M "
-/* "vidargs=video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 " \
- "video=mxcfb3:dev=lcd,640x480M@60,if=RGB565 " \
+ "vidargs=video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 " \
"video=mxcfb1:dev=ldb,1024x600M@60,if=RGB666 " \
- "video=mxcfb2:dev=lcd,1024x600M@60,if=RGB888 " \
+ "video=mxcfb2:dev=ldb,1024x600M@60,if=RGB666 " \
+ "video=mxcfb3:dev=lcd,800x480M@60,if=RGB24 " \
"fbmem=28M "
- */
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP