path: root/include/configs/mx6qarm2.h
diff options
authorEric Miao <eric.miao@linaro.org>2012-01-17 21:11:54 +0800
committerEric Miao <eric.miao@linaro.org>2012-01-17 21:11:54 +0800
commitc493c61a212aa7599d619ae9d19b9f6af73ff663 (patch)
tree6739705276cde364703736ac78f21c0c6af679f2 /include/configs/mx6qarm2.h
parent5878df1b7162cea6b65436b5dedb5f37fc1cc8f3 (diff)
parentdda3e196c5317dfeddd4cc089512c2327b05ff23 (diff)
Merge branch 'dirkbehme/master_imx6' into lt-imx6lt-imx6
* dirkbehme/master_imx6: (22 commits) imximage: Sort bootops alphabetically imximage: Add support for i.MX6 imximage: Add MX53 to the documentation common/image.c: align usage of fdt_high with initrd_high mx6q: Add fdt_high and initrd_high variables mx6x_pins: fix uart txd definitions mx6qsabrelite: setup uart1 pinmux mx6qsabrelite: add SPI NOR support mx6q: add ECSPI pad settings add imx_ecspi driver fec_mxc: move autonegoatiate restart after mii_postcall fsl_esdhc: fix PIO mode transfers mx6qsabrelite: enet: force master, maximize tx clock delay mx6qsabrelite: add CONFIG_PHY_MICREL_KSZ9021 miiphyutil: add Micrel KSZ9021 support to miiphy_speed fec_mxc: increase autonegotiation timeout fec_mxc: add 1000 Mbps selection mx6qsabrelite: use IMX_GPIO_NR macro i.mx6:imx6q: allign MAC address with burned-in ordering i.mx6q: mx6qarm2: Enable the usboh3 clock ...
Diffstat (limited to 'include/configs/mx6qarm2.h')
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 3a3067993..835218e77 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -87,6 +87,8 @@
"script=boot.scr\0" \
"uimage=uImage\0" \
"console=ttymxc3\0" \
+ "fdt_high=0xffffffff\0" \
+ "initrd_high=0xffffffff\0" \
"mmcdev=1\0" \
"mmcpart=2\0" \
"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \