[ARM] Convert bootp to use kbuild infrastructure.

arch/arm/boot/bootp/Makefile

@@ -2,21 +2,23 @@
 # linux/arch/arm/boot/bootp/Makefile
 #
 
-ZSYSTEM		= arch/arm/boot/zImage
-ZLDFLAGS	=-p -X -T $(obj)/bootp.lds \
+LDFLAGS_bootp	:=-p --no-undefined -X \
 		 --defsym initrd_phys=$(INITRD_PHYS) \
-		 --defsym params_phys=$(PARAMS_PHYS)
+		 --defsym params_phys=$(PARAMS_PHYS) -T
+AFLAGS_initrd.o :=-DINITRD=\"$(INITRD)\"
 
-extra-y := bootp
+targets	:= bootp bootp.lds init.o kernel.o initrd.o
 
 # Note that bootp.lds picks up kernel.o and initrd.o
-$(obj)/bootp:	$(addprefix $(obj)/,init.o kernel.o initrd.o bootp.lds)
-		$(LD) $(ZLDFLAGS) -o $@ $(obj)/init.o
+$(obj)/bootp:	$(addprefix $(obj)/,bootp.lds init.o kernel.o initrd.o) FORCE
+	$(call if_changed,ld)
+	@:
 
-$(obj)/kernel.o: $(ZSYSTEM)
-		$(LD) -r -s -o $@ -b binary $(ZSYSTEM)
+# kernel.o and initrd.o includes a binary image using
+# .incbin, a dependency which is not tracked automatically
 
-$(obj)/initrd.o: $(INITRD)
-		$(LD) -r -s -o $@ -b binary $(INITRD)
+$(obj)/kernel.o: arch/arm/boot/zImage FORCE
 
-.PHONY:		$(INITRD) $(ZSYSTEM)
+$(obj)/initrd.o: $(INITRD) FORCE
+
+.PHONY:	$(INITRD) FORCE

arch/arm/boot/bootp/bootp.lds

@@ -12,16 +12,11 @@ ENTRY(_start)
 SECTIONS
 {
   . = 0;
-  _text = .;
   .text : {
    _stext = .;
    *(.start)
-   arch/arm/boot/bootp/kernel.o
-   . = ALIGN(32);
-   initrd_start = .;
-   arch/arm/boot/bootp/initrd.o
-   initrd_len = . - initrd_start;
-   . = ALIGN(32);
+   *(.text)
+   initrd_size = initrd_end - initrd_start;
    _etext = .;
   }
   

arch/arm/boot/bootp/init.S

@@ -20,11 +20,8 @@
 		.type	_start, #function
 		.globl	_start
 
-_start:		adr	r12, kernel_start	@ offset of kernel zImage
-		ldr	r4, [r12, #0x2c]	@ length of zImage
-		adr	r13, data
-		add	r4, r4, r12		@ end of zImage, start of initrd
-		ldmia	r13!, {r5-r6}		@ r5 = dest, r6 = length
+_start:		adr	r13, data
+		ldmia	r13!, {r4-r6}		@ r5 = dest, r6 = length
 		bl	move			@ move the initrd
 
 /*
@@ -45,7 +42,7 @@ _start:		adr	r12, kernel_start	@ offset of kernel zImage
  */
 		movne	r10, #0			@ terminator
 		movne	r4, #2			@ Size of this entry (2 words)
-		stmneia	r8, {r4, r5, r10}	@ Size, ATAG_CORE, terminator
+		stmneia	r9, {r4, r5, r10}	@ Size, ATAG_CORE, terminator
 
 /*
  * find the end of the tag list, and then add an INITRD tag on the end.
@@ -59,7 +56,7 @@ taglist:	ldr	r10, [r9, #0]		@ tag length
 
 		mov	r5, #4			@ Size of initrd tag (4 words)
 		stmia	r9, {r5, r6, r7, r8, r10}
-		mov	pc, r12			@ call kernel
+		b	kernel_start		@ call kernel
 
 /*
  * Move the block of memory length r6 from address r4 to address r5
@@ -75,16 +72,13 @@ move:		ldmia	r4!, {r7 - r10}		@ move 32-bytes at a time
 		.size	_start, . - _start
 
 		.type	data,#object
-data:		.word	initrd_phys		@ destination initrd address
-		.word	initrd_len		@ initrd size
+data:		.word	initrd_start		@ source initrd address
+		.word	initrd_phys		@ destination initrd address
+		.word	initrd_size		@ initrd size
 
-		.word	0x54410001		@ r4 = ATAG_CORE
-		.word	0x54420005		@ r5 = ATAG_INITRD2
-		.word	initrd_phys		@ r6
-		.word	initrd_len		@ r7
-		.word	params_phys		@ r8
-		.size	data, . - _data
-
-		.type	initrd_start,#object
-
-kernel_start:
+		.word	0x54410001		@ r5 = ATAG_CORE
+		.word	0x54420005		@ r6 = ATAG_INITRD2
+		.word	initrd_phys		@ r7
+		.word	initrd_size		@ r8
+		.word	params_phys		@ r9
+		.size	data, . - data

arch/arm/boot/bootp/initrd.S

+	.type	initrd_start,#object
+	.globl	initrd_start
+initrd_start:
+	.incbin	INITRD
+	.globl	initrd_end
+initrd_end:

arch/arm/boot/bootp/kernel.S

+	.globl	kernel_start
+kernel_start:
+	.incbin	"arch/arm/boot/zImage"
+	.globl	kernel_end
+kernel_end:
+	.align	2