diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-06 13:14:38 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-06 13:14:38 +0300 |
| commit | a0bf675e93bf642b2317805dbe4778afab293f42 (patch) | |
| tree | ec49043d584c8f1b95c7d7818bd2f4af153da0ea /src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc | |
| parent | 30fb87376e85d7965ae73a11290d7eb4cb8e2d75 (diff) | |
| parent | f10a492c8711d881da99554ca9a9fcd988080d3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
* origin/5.6:
Doc: ChangeLog for 5.6.0
Doc: Fix small inconsistency for tree element separator.
Doc: Update which Yocto release is used.
Doc: Clarify GPU options in i.MX6 boards
Doc: Also support Windows as a development host system.
Doc: Remove duplicated file.
Revert "Device settings UI."
Doc: Add note about resetting U-Boot env.
doc: update toradex u-boot commands
doc: update kontron board instructions
doc: update yocto documentation
Doc: List the 3rdparty components used by the Qt add-ons
Change-Id: I7850f35fb8f80052517f2e624f0afca61f108a4b
Diffstat (limited to 'src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc')
| -rw-r--r-- | src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc b/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc index de493b6..a576faf 100644 --- a/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc +++ b/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc @@ -65,7 +65,7 @@ setenv bootcmd 'mmc dev ${mmcdev}; if mmc rescan; then if run loadfdt; then if run loaduimage; then run mmcboot; else run netboot; fi; else run netboot; fi; else run netboot; fi;' setenv uimage /boot/uImage setenv fdtfile /boot/imx6q-smx6-lcd.dtb - setenv mmcroot /dev/mmcblk0p2 rootwait rw + setenv mmcroot /dev/mmcblk2p2 rootwait rw setenv mmcargs 'setenv bootargs video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 fbmem=28M console=${console},${baudrate} root=${mmcroot}' saveenv \endcode |