Merge remote-tracking branch 'ummeegge/OpenVPN_validating_N2N' into next

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

diff --git a/config/u-boot/boot.script b/config/u-boot/boot.script
index 6fccbf1351e0c17939d67c9fab342052650f006a..2017e71ae64204b6c5205c68d8362c993a4093a1 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=tty1 omapfb.mode=dvi:800x600MR-16@60 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 rw
-bootm 0x80000000 0x81600000
+setenv initrd_high 90000000
+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
+#bootz 0x82000000 0x85000000 ${fdtaddr}
+bootz 0x82000000 - ${fdtaddr}