- Makefile (ia64): RELEASE_BOOT_IMG is all.img

- make_boot_img (initrd): ia64: increased image to 16 MB, don't try to
  copy /etc/pcmcia since we don't have it

2 files changed, 7 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 153c8ddc9..3aae7a662 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,10 @@ ifeq (ppc,$(ARCH))
 BOOT_IMG = 
 RELEASE_BOOT_IMG = all.img
 endif
+ifeq (ia64,$(ARCH))
+BOOT_IMG =
+RELEASE_BOOT_IMG = all.img
+endif
 BOOT_IMG += $(RELEASE_BOOT_IMG)
 
 FRELEASE_BOOT_IMG = $(BOOT_IMG:%=images/%)
diff --git a/make_boot_img b/make_boot_img
index ca226f309..2de5e52be 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -72,7 +72,7 @@ sub initrd {
     my $tar = "$instdir/stage1-data/stage1.tar.bz2";
 
     __ "$sudo umount $tmp $mnt 2>/dev/null";
-    _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ ? ($type eq "all" ? 12000 : 12000) : ($type eq "all" ? 4000 : 2000));
+    _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ ? ($type eq "all" ? 16386 : 16384) : ($type eq "all" ? 4000 : 2000));
     _ "$mke2fs $tmp";
     _ "$sudo mount -t ext2 $tmp $mnt -o loop";
 
@@ -89,7 +89,7 @@ sub initrd {
     }
 
     my $ftype = $type =~ /^(all)$/ ? "pcmcia" : $type;
-    if ($ftype eq "pcmcia" && $arch !~ /ppc/) {
+    if ($ftype eq "pcmcia" && $arch !~ /ppc/ && $arch !~ /ia64/) {
 	 _ "$sudo cp -a /etc/pcmcia $mnt/etc";
 	 _ "$sudo patch -p0 -d $mnt/etc < $instdir/pcmcia_config.patch";
     }
@@ -218,7 +218,7 @@ sub boot_img_ia64 {
     my ($mnt, $img, $kernel) = @_;
 
     __ "$sudo umount $mnt 2>/dev/null";
-    _ "dd if=/dev/zero of=$img bs=1k count=12000";
+    _ "dd if=/dev/zero of=$img bs=1k count=16384";
     _ "mkdosfs $img";
     _ "$sudo mount -t vfat $img $mnt -o loop,umask=000";
     _ "$sudo cp -f $kernel $mnt/vmlinux";