Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next

[people/teissler/ipfire-2.x.git] / config / u-boot / boot.script

diff --git a/config/u-boot/boot.script b/config/u-boot/boot.script
index e30615fbf4c14068430c3bbf71171acb08dc3481..66d76282fc0d6175c279099252d9676dad9398a1 100755 (executable)
--- a/config/u-boot/boot.script
+++ b/config/u-boot/boot.script
@@ -1,4 +1,7 @@
-fatload mmc 0:1 0x80000000 uImage-ipfire-omap
-fatload mmc 0:1 0x81600000 uInit-ipfire-omap
-setenv bootargs vram=32M console=ttyO2,115200n8 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 rw
-bootm 0x80000000 0x81600000
+fatload mmc 0:1 0x82000000 zImage-ipfire-multi
+fatload mmc 0:1 0x85000000 uInit-ipfire-multi
+#fatload mmc 0:1 ${fdtaddr} omap4-${board_name}.dtb
+setenv bootargs video=800x600 console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro
+# Pandaboard has serious Problems in dt mode with kernel 3.10.x
+#bootz 0x82000000 0x85000000 ${fdtaddr}
+bootz 0x82000000 0x85000000