Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 225731
b: refs/heads/master
c: 9202db2
h: refs/heads/master
i:
  225729: 8ca9996
  225727: a0239e4
v: v3
  • Loading branch information
Sam Ravnborg authored and David S. Miller committed Jan 5, 2011
1 parent d0d2e7e commit 83bde92
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 56818a6f9105ac016ecf5907f7cb63bcdab639fe
refs/heads/master: 9202db2202288f0013c3285b291d8281a8190962
10 changes: 4 additions & 6 deletions trunk/arch/sparc/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ quiet_cmd_elftoaout = ELFTOAOUT $@
cmd_elftoaout = $(ELFTOAOUT) $(obj)/image -o $@
quiet_cmd_piggy = PIGGY $@
cmd_piggy = $(obj)/piggyback $(BITS) $@ System.map $(ROOT_IMG)
quiet_cmd_strip = STRIP $@
cmd_strip = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start $< -o $@

ifeq ($(CONFIG_SPARC32),y)
quiet_cmd_btfix = BTFIX $@
Expand All @@ -22,9 +24,6 @@ quiet_cmd_sysmap = SYSMAP $(obj)/System.map
cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap
quiet_cmd_image = LD $@
cmd_image = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) -o $@
quiet_cmd_strip = STRIP $@
cmd_strip = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start $(obj)/image -o $@


define rule_image
$(if $($(quiet)cmd_image), \
Expand Down Expand Up @@ -57,16 +56,14 @@ $(obj)/image: $(obj)/btfix.o FORCE

$(obj)/zImage: $(obj)/image
$(call if_changed,strip)
@echo ' kernel: $@ is ready'

$(obj)/btfix.S: $(obj)/btfixupprep vmlinux FORCE
$(call if_changed,btfix)

endif

ifeq ($(CONFIG_SPARC64),y)
quiet_cmd_strip = STRIP $@
cmd_strip = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start vmlinux -o $@


# Actual linking
$(obj)/image: vmlinux FORCE
Expand All @@ -75,6 +72,7 @@ $(obj)/image: vmlinux FORCE

$(obj)/zImage: $(obj)/image
$(call if_changed,gzip)
@echo ' kernel: $@ is ready'

$(obj)/vmlinux.aout: vmlinux FORCE
$(call if_changed,elftoaout)
Expand Down

0 comments on commit 83bde92

Please sign in to comment.