Commit 3d87ff3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Add target for a stripped kernel
  sparc64: Make NUMA depend upon SMP.
parents 2caf9599 349101da

arch/sparc/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -52,20 +52,24 @@ endif 
export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o



# Default target

all: image

all: zImage



boot := arch/sparc/boot



image tftpboot.img: vmlinux

image zImage tftpboot.img: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



# This is the image used for packaging

KBUILD_IMAGE := $(boot)/zImage



CLEAN_FILES += arch/$(ARCH)/boot/System.map



# Don't use tabs in echo arguments.

define archhelp

  echo  '* image        - kernel image ($(boot)/image)'

  echo  '* zImage       - stripped kernel image ($(boot)/zImage)'

  echo  '  tftpboot.img - image prepared for tftp'

endef

arch/sparc/boot/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 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),               \
@@ -49,6 +52,9 @@ LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds $(BTOBJS) \ 
$(obj)/image: $(obj)/btfix.o FORCE

	$(call if_changed_rule,image)



$(obj)/zImage: $(obj)/image

	$(call if_changed,strip)



$(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE

	$(call if_changed,elftoaout)

	$(call if_changed,piggy)

arch/sparc64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ endmenu 


config NUMA

	bool "NUMA support"

	depends on SMP



config NODES_SHIFT

	int