X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fflash-images;h=1a7134d380903cc846d1a233fb68ca1a5e754cbe;hb=c4979a81c8d27fed69b4f360cc67845bac85549a;hp=36a343dde4c6aed4ff82957829c39167359b9f7b;hpb=fc992179a15a53c920d8f18e276624c0ace6a6ec;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/lfs/flash-images b/lfs/flash-images index 36a343dde..1a7134d38 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -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 @@ -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