Merge branch 'next' into fifteen

[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..4c9df1fa44ec9c1803e9cf66831807de847fd169 100755 (executable)
--- a/config/u-boot/boot.script
+++ b/config/u-boot/boot.script
@@ -1,4 +1,5 @@
-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 0x83600000 uInit-ipfire-multi
+fatload mmc 0:1 ${ftdaddr} omap4-${board_name}.dtb
+setenv bootargs vram=32M console=tty1 rootwait smsc95xx.macaddr=$usbethaddr root=/dev/mmcblk0p3 ro
+bootz 0x82000000 0x83600000 ${ftdaddr}