summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-03-07 17:28:04 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-03-07 17:28:04 +0100
commitf624e019a3f37ee4415a407afae0e026dd203714 (patch)
tree32621b909de2746fbbabcc874a05078a032613a5
parent5017686683f7c2eb12bb966924c857622e9cdb94 (diff)
Add default VESA VGA vidargs for our now modedb enabled kernel. This allows easy specifying an alternate parallel RGB resolution. While at it further checkpatchify our board file.
-rw-r--r--board/toradex/colibri_vf/colibri_vf.c4
-rw-r--r--include/configs/colibri_vf.h24
2 files changed, 16 insertions, 12 deletions
diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 62e0702c90..6c960f8690 100644
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -147,7 +147,7 @@ int board_late_init(void)
}
/* Set Ethernet MAC address from config block if not already set
- */
+ */
if (memcmp(mac_addr00, bi_enetaddr, 6) == 0) {
sprintf(env_str, "%02x:%02x:%02x:%02x:%02x:%02x",
mac_addr[0], mac_addr[1], mac_addr[2],
@@ -540,7 +540,7 @@ u32 get_board_rev(void)
/* Check validity */
if (major)
return ((major & 0xff) << 8) | ((minor & 0xf) << 4) |
- ((release & 0xf) + 0xa);
+ ((release & 0xf) + 0xa);
else
return 0;
#else
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index b59da572df..a4963b6e16 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -152,19 +152,22 @@
#define MMC_BOOTCMD \
"run setup; " \
- "setenv bootargs ${defargs} ${mmcargs} ${mtdparts} ${setupargs}; " \
+ "setenv bootargs ${defargs} ${mmcargs} ${mtdparts} " \
+ "${setupargs} ${vidargs}; " \
"echo Booting from MMC/SD card...; " \
"mmc part 0; fatload mmc 0:1 ${loadaddr} uImage && bootm"
#define NFS_BOOTCMD \
"run setup; " \
- "setenv bootargs ${defargs} ${nfsargs} ${mtdparts} ${setupargs}; " \
- "echo Booting from NFS...; " \
+ "setenv bootargs ${defargs} ${mtdparts} ${nfsargs} " \
+ "${setupargs} ${vidargs}; " \
+ "echo Booting via DHCP/TFTP/NFS...; " \
"dhcp && bootm"
#define UBI_BOOTCMD \
"run setup; " \
- "setenv bootargs ${defargs} ${ubiargs} ${mtdparts} ${setupargs}; " \
+ "setenv bootargs ${defargs} ${mtdparts} ${setupargs} " \
+ "${ubiargs} ${vidargs}; " \
"echo Booting from NAND...; " \
"ubi part kernel-ubi && ubi read ${loadaddr} kernel && bootm"
@@ -173,15 +176,16 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"defargs=vmalloc=64M usb_high_speed=1\0" \
- "mmcargs=root=/dev/mmcblk0p2 rw rootwait\0" \
- "sdboot=" MMC_BOOTCMD "\0" \
+ "mmcargs=root=/dev/mmcblk0p2 rw,noatime rootwait\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
- "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
+ "nfsargs=ip=:::::eth0:on root=/dev/nfs\0" \
+ "sdboot=" MMC_BOOTCMD "\0" \
"setup=setenv setupargs " \
- "fec_mac=${ethaddr} no_console_suspend=1 console=tty1 console=ttymxc0" \
- ",${baudrate}n8 ${memargs}\0" \
- "ubiargs=ubi.mtd=5 root=ubi0:rootfs rootfstype=ubifs\0" \
+ "fec_mac=${ethaddr} no_console_suspend=1 console=tty1 " \
+ "console=ttymxc0,${baudrate}n8 ${memargs}\0" \
+ "ubiargs=ip=off ubi.mtd=5 root=ubi0:rootfs rw rootfstype=ubifs\0" \
"ubiboot=" UBI_BOOTCMD "\0" \
+ "vidargs=video=dcufb:640x480-16@60\0" \
""
/* Dynamic MTD partition support */