OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9717e87
)
[POWERPC] ppc: Don't run prom_init_check for arch/ppc builds
author
Segher Boessenkool
<segher@kernel.crashing.org>
Tue, 6 May 2008 22:58:50 +0000
(08:58 +1000)
committer
Paul Mackerras
<paulus@samba.org>
Mon, 12 May 2008 10:27:50 +0000
(20:27 +1000)
arch/ppc doesn't have prom_init.o (anymore).
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/Makefile
patch
|
blob
|
history
diff --git
a/arch/powerpc/kernel/Makefile
b/arch/powerpc/kernel/Makefile
index
d14cebf
..
2346d27
100644
(file)
--- a/
arch/powerpc/kernel/Makefile
+++ b/
arch/powerpc/kernel/Makefile
@@
-105,6
+105,9
@@
PHONY += systbl_chk
systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
$(call cmd,systbl_chk)
+
+ifeq ($(CONFIG_PPC_MERGE),y)
+
$(obj)/built-in.o: prom_init_check
quiet_cmd_prom_init_check = CALL $<
@@
-114,4
+117,7
@@
PHONY += prom_init_check
prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o
$(call cmd,prom_init_check)
+endif
+
+
clean-files := vmlinux.lds