Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge G. Davis <davis_g@com.rmk.(none)>2003-10-16 22:35:33 +0100
committerRussell King <rmk@flint.arm.linux.org.uk>2003-10-16 22:35:33 +0100
commit2352335b966ae1d714eb1ce1834f4537779d792d (patch)
treebf9ee3233b8c6254ba9e5bca3abeb1922cf54f6e
parentce432c93edb57b250f97ac64c15c33ccefa88454 (diff)
[ARM PATCH] 1685/1: Fix bootpImage build target
Patch from George G. Davis The boopImage build target rule is currently broken. This is the quick fix.
-rw-r--r--arch/arm/boot/Makefile2
-rw-r--r--arch/arm/boot/bootp/bootp.lds4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 980d7f2d7a6d..011f788a701c 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -98,7 +98,7 @@ $(obj)/compressed/vmlinux: vmlinux FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
$(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
- $(Q)$(MAKE) $(build)=$(obj)/compressed $@
+ $(Q)$(MAKE) $(build)=$(obj)/bootp $@
.PHONY: initrd
initrd:
diff --git a/arch/arm/boot/bootp/bootp.lds b/arch/arm/boot/bootp/bootp.lds
index 6fbd9ce0bbeb..52e375e7e7fb 100644
--- a/arch/arm/boot/bootp/bootp.lds
+++ b/arch/arm/boot/bootp/bootp.lds
@@ -16,10 +16,10 @@ SECTIONS
.text : {
_stext = .;
*(.start)
- kernel.o
+ arch/arm/boot/bootp/kernel.o
. = ALIGN(32);
initrd_start = .;
- initrd.o
+ arch/arm/boot/bootp/initrd.o
initrd_len = . - initrd_start;
. = ALIGN(32);
_etext = .;