aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sparc/Makefile20
-rw-r--r--arch/sparc/boot/Makefile4
2 files changed, 8 insertions, 16 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index c5f3d6fe8a67..43db7e1d5335 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -27,7 +27,6 @@ CPPFLAGS_vmlinux.lds += -m32
27LDFLAGS_vmlinux = -r 27LDFLAGS_vmlinux = -r
28 28
29head-y := arch/sparc/kernel/head.o arch/sparc/kernel/init_task.o 29head-y := arch/sparc/kernel/head.o arch/sparc/kernel/init_task.o
30HEAD_Y := $(head-y)
31 30
32core-y += arch/sparc/kernel/ arch/sparc/mm/ arch/sparc/math-emu/ 31core-y += arch/sparc/kernel/ arch/sparc/mm/ arch/sparc/math-emu/
33libs-y += arch/sparc/prom/ arch/sparc/lib/ 32libs-y += arch/sparc/prom/ arch/sparc/lib/
@@ -35,23 +34,16 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/
35drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/ 34drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
36 35
37# Export what is needed by arch/sparc/boot/Makefile 36# Export what is needed by arch/sparc/boot/Makefile
38# Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-) 37export VMLINUX_INIT VMLINUX_MAIN
39INIT_Y := $(patsubst %/, %/built-in.o, $(init-y)) 38VMLINUX_INIT := $(head-y) $(init-y)
40CORE_Y := $(core-y) 39VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
41CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ 40VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
42CORE_Y := $(patsubst %/, %/built-in.o, $(CORE_Y)) 41VMLINUX_MAIN += $(drivers-y) $(net-y)
43DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y))
44NET_Y := $(patsubst %/, %/built-in.o, $(net-y))
45LIBS_Y1 := $(patsubst %/, %/lib.a, $(libs-y))
46LIBS_Y2 := $(patsubst %/, %/built-in.o, $(libs-y))
47LIBS_Y := $(LIBS_Y1) $(LIBS_Y2)
48 42
49ifdef CONFIG_KALLSYMS 43ifdef CONFIG_KALLSYMS
50kallsyms.o := .tmp_kallsyms2.o 44export kallsyms.o := .tmp_kallsyms2.o
51endif 45endif
52 46
53export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o
54
55# Default target 47# Default target
56all: zImage 48all: zImage
57 49
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile
index 3e77a9f52248..4fd562034a74 100644
--- a/arch/sparc/boot/Makefile
+++ b/arch/sparc/boot/Makefile
@@ -37,8 +37,8 @@ define rule_image
37 echo 'cmd_$@ := $(cmd_image)' > $(@D)/.$(@F).cmd 37 echo 'cmd_$@ := $(cmd_image)' > $(@D)/.$(@F).cmd
38endef 38endef
39 39
40BTOBJS := $(HEAD_Y) $(INIT_Y) 40BTOBJS := $(patsubst %/, %/built-in.o, $(VMLINUX_INIT))
41BTLIBS := $(CORE_Y) $(LIBS_Y) $(DRIVERS_Y) $(NET_Y) 41BTLIBS := $(patsubst %/, %/built-in.o, $(VMLINUX_MAIN))
42LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds $(BTOBJS) \ 42LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds $(BTOBJS) \
43 --start-group $(BTLIBS) --end-group \ 43 --start-group $(BTLIBS) --end-group \
44 $(kallsyms.o) $(obj)/btfix.o 44 $(kallsyms.o) $(obj)/btfix.o