X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fflash-images;h=1a7134d380903cc846d1a233fb68ca1a5e754cbe;hp=e43d53eb27cce5046352bc162f87022da19e689a;hb=7284262a5e94fa4cc15742fa7c7a3a0252d9e9ee;hpb=9776dede5dfed3803272ccbe627f862481cbdcd2

diff --git a/lfs/flash-images b/lfs/flash-images
index e43d53eb2..1a7134d38 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -86,7 +86,7 @@ endif
 	# Install MLO and uboot first
 ifeq "$(MACHINE_TYPE)" "arm"
 	cp -v /boot/MLO $(MNThdd)/boot/
-	cp -v /boot/u-boot.bin $(MNThdd)/boot/
+	cp -v /boot/u-boot.img $(MNThdd)/boot/
 	sync
 	umount $(MNThdd)/boot
 	mount -o loop $(IMGboot) $(MNThdd)/boot
@@ -120,7 +120,7 @@ ifneq "$(MACHINE_TYPE)" "arm"
 	ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
 
 	# Copy grub files manually
-	cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/
+	cp -f $(MNThdd)/usr/lib/grub/i386-pc/* $(MNThdd)/boot/grub/
 endif
 
 	# Setup symlink for partresize at first boot...
@@ -182,7 +182,7 @@ ifneq "$(MACHINE_TYPE)" "arm"
 	sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" $(MNThdd)/boot/grub/grub.conf
 else
 	sed -i -e "s| console=tty1 | console=ttyAMA0,115200n8 |g" $(MNThdd)/boot/cmdline.txt
-	sed -i -e "s| console=tty1 omapfb.mode=dvi:800x600MR-16@60 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/boot.script
+	sed -i -e "s| console=tty1 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/boot.script
 	cd $(MNThdd)/boot && ./convert_bootscript
 endif