Update of /cvsroot/linux-vax/kernel-2.4/arch/alpha/boot
In directory usw-pr-cvs1:/tmp/cvs-serv19209/alpha/boot
Modified Files:
Makefile bootloader.lds bootp.c
Log Message:
synch 2.4.15 commit 31
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/alpha/boot/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 14 Jan 2001 19:22:26 -0000 1.1.1.1
+++ Makefile 10 Apr 2002 13:07:22 -0000 1.2
@@ -59,7 +59,7 @@
echo "#define KERNEL_SIZE `ls -l vmlinux.nh | awk '{print $$5}'`" > $@T
ifdef INITRD
[ -f $(INITRD) ] || exit 1
- echo "#define INITRD_SIZE `ls -l $(INITRD) | awk '{print $$5}'`" >> $@T
+ echo "#define INITRD_IMAGE_SIZE `ls -l $(INITRD) | awk '{print $$5}'`" >> $@T
endif
cmp -s $@T $@ || mv -f $@T $@
rm -f $@T
Index: bootloader.lds
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/alpha/boot/bootloader.lds,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- bootloader.lds 14 Jan 2001 19:22:26 -0000 1.1.1.1
+++ bootloader.lds 10 Apr 2002 13:07:22 -0000 1.2
@@ -6,7 +6,7 @@
.text : { *(.text) }
_etext = .;
PROVIDE (etext = .);
- .rodata : { *(.rodata) }
+ .rodata : { *(.rodata) *(.rodata.*) }
.data : { *(.data) CONSTRUCTORS }
.got : { *(.got) }
.sdata : { *(.sdata) }
Index: bootp.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/alpha/boot/bootp.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- bootp.c 14 Jan 2001 19:22:28 -0000 1.1.1.1
+++ bootp.c 10 Apr 2002 13:07:22 -0000 1.2
@@ -147,7 +147,7 @@
*/
static long nbytes;
static char envval[256] __attribute__((aligned(8)));
-#ifdef INITRD_SIZE
+#ifdef INITRD_IMAGE_SIZE
static unsigned long initrd_start;
#endif
@@ -164,7 +164,7 @@
}
pal_init();
-#ifdef INITRD_SIZE
+#ifdef INITRD_IMAGE_SIZE
/* The initrd must be page-aligned. See below for the
cause of the magic number 5. */
initrd_start = ((START_ADDR + 5*KERNEL_SIZE) | (PAGE_SIZE-1)) + 1;
@@ -192,17 +192,17 @@
*
* Sigh... */
-#ifdef INITRD_SIZE
- load(initrd_start, KERNEL_ORIGIN+KERNEL_SIZE, INITRD_SIZE);
+#ifdef INITRD_IMAGE_SIZE
+ load(initrd_start, KERNEL_ORIGIN+KERNEL_SIZE, INITRD_IMAGE_SIZE);
#endif
load(START_ADDR+(4*KERNEL_SIZE), KERNEL_ORIGIN, KERNEL_SIZE);
load(START_ADDR, START_ADDR+(4*KERNEL_SIZE), KERNEL_SIZE);
memset((char*)ZERO_PGE, 0, PAGE_SIZE);
strcpy((char*)ZERO_PGE, envval);
-#ifdef INITRD_SIZE
+#ifdef INITRD_IMAGE_SIZE
((long *)(ZERO_PGE+256))[0] = initrd_start;
- ((long *)(ZERO_PGE+256))[1] = INITRD_SIZE;
+ ((long *)(ZERO_PGE+256))[1] = INITRD_IMAGE_SIZE;
#endif
runkernel();
|
