Commit 6de71484 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (98 commits)
  sparc: move select of ARCH_SUPPORTS_MSI
  sparc: drop SUN_IO
  sparc: unify sections.h
  sparc: use .data.init_task section for init_thread_union
  sparc: fix array overrun check in of_device_64.c
  sparc: unify module.c
  sparc64: prepare module_64.c for unification
  sparc64: use bit neutral Elf symbols
  sparc: unify module.h
  sparc: introduce CONFIG_BITS
  sparc: fix hardirq.h removal fallout
  sparc64: do not export pus_fs_struct
  sparc: use sparc64 version of scatterlist.h
  sparc: Commonize memcmp assembler.
  sparc: Unify strlen assembler.
  sparc: Add asm/asm.h
  sparc: Kill memcmp_32.S code which has been ifdef'd out for centuries.
  sparc: replace for_each_cpu_mask_nr with for_each_cpu
  sparc: fix sparse warnings in irq_32.c
  sparc: add include guards to kernel.h
  ...
parents 1dff81f2 e3c6d4ee

Makefile

+5 −4
Original line number Diff line number Diff line
@@ -205,13 +205,14 @@ ifeq ($(ARCH),x86_64) 
        SRCARCH := x86

endif



# Where to locate arch specific headers

# Additional ARCH settings for sparc

ifeq ($(ARCH),sparc64)

       hdr-arch  := sparc

else

       hdr-arch  := $(SRCARCH)

       SRCARCH := sparc

endif



# Where to locate arch specific headers

hdr-arch  := $(SRCARCH)



KCONFIG_CONFIG	?= .config



# SHELL used by kbuild

arch/sparc/Kconfig

+390 −135
Original line number Diff line number Diff line
@@ -4,21 +4,116 @@ 


mainmenu "Linux/SPARC Kernel Configuration"



config SPARC

	bool

	default y

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_ARCH_KGDB if !SMP || SPARC64

	select HAVE_ARCH_TRACEHOOK

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select RTC_CLASS

	select RTC_DRV_M48T59



# Identify this as a Sparc32 build

config SPARC32

	bool

	default y if ARCH = "sparc"

	help

	  SPARC is a family of RISC microprocessors designed and marketed by

	  Sun Microsystems, incorporated.  They are very widely found in Sun

	  workstations and clones. This port covers the original 32-bit SPARC;

	  it is old and stable and usually considered one of the "big three"

	  along with the Intel and Alpha ports.  The UltraLinux project

	  maintains both the SPARC32 and SPARC64 ports; its web page is

	  available at <http://www.ultralinux.org/>.



config SPARC64

	bool

	default y if ARCH = "sparc64"

	select ARCH_SUPPORTS_MSI

	select HAVE_FUNCTION_TRACER

	select HAVE_KRETPROBES

	select HAVE_KPROBES

	select HAVE_LMB

	select USE_GENERIC_SMP_HELPERS if SMP

	select RTC_DRV_CMOS

	select RTC_DRV_BQ4802

	select RTC_DRV_SUN4V

	select RTC_DRV_STARFIRE



config ARCH_DEFCONFIG

	string

	default "arch/sparc/configs/sparc32_defconfig" if SPARC32

	default "arch/sparc/configs/sparc64_defconfig" if SPARC64



# CONFIG_BITS can be used at source level to get 32/64 bits

config BITS

	int

	default 32 if SPARC32

	default 64 if SPARC64



config 64BIT

	def_bool y if SPARC64



config GENERIC_TIME

	bool

	default y if SPARC64



config GENERIC_CMOS_UPDATE

	bool

	default y if SPARC64



config GENERIC_CLOCKEVENTS

	bool

	default y if SPARC64



config IOMMU_HELPER

	bool

	default y if SPARC64



config QUICKLIST

	bool

	default y if SPARC64



config STACKTRACE_SUPPORT

	bool

	default y if SPARC64



config LOCKDEP_SUPPORT

	bool

	default y if SPARC64



config HAVE_LATENCYTOP_SUPPORT

	bool

	default y if SPARC64



config AUDIT_ARCH

	bool

	default y



config HAVE_SETUP_PER_CPU_AREA

	def_bool y if SPARC64



config GENERIC_HARDIRQS_NO__DO_IRQ

	bool

	def_bool y if SPARC64



config MMU

	bool

	default y



config HIGHMEM

	bool

	default y

	default y if SPARC32



config ZONE_DMA

	bool

	default y

	default y if SPARC32



config GENERIC_ISA_DMA

	bool

	default y

	default y if SPARC32



config GENERIC_GPIO

	bool
@@ -31,15 +126,11 @@ config ARCH_NO_VIRT_TO_BUS 
config OF

	def_bool y



config HZ

	int

	default 100



source "init/Kconfig"



source "kernel/Kconfig.freezer"



menu "General machine setup"

menu "Processor type and features"



config SMP

	bool "Symmetric multi-processing support (does not work on sun4/sun4c)"
@@ -64,82 +155,269 @@ config SMP 
	  If you don't know what to do here, say N.



config NR_CPUS

	int "Maximum number of CPUs (2-32)"

	range 2 32

	int "Maximum number of CPUs"

	depends on SMP

	default "32"

	range 2 32 if SPARC32

	range 2 1024 if SPARC64

	default 32 if SPARC32

	default 64 if SPARC64



config SPARC

source kernel/Kconfig.hz



config RWSEM_GENERIC_SPINLOCK

	bool

	default y if SPARC32



config RWSEM_XCHGADD_ALGORITHM

	bool

	default y if SPARC64



config GENERIC_FIND_NEXT_BIT

	bool

	default y

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_ARCH_KGDB if !SMP

	select HAVE_ARCH_TRACEHOOK

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select RTC_CLASS

	select RTC_DRV_M48T59



# Identify this as a Sparc32 build

config SPARC32

config GENERIC_HWEIGHT

	bool

	default y if !ULTRA_HAS_POPULATION_COUNT



config GENERIC_CALIBRATE_DELAY

	bool

	default y

	help

	  SPARC is a family of RISC microprocessors designed and marketed by

	  Sun Microsystems, incorporated.  They are very widely found in Sun

	  workstations and clones. This port covers the original 32-bit SPARC;

	  it is old and stable and usually considered one of the "big three"

	  along with the Intel and Alpha ports.  The UltraLinux project

	  maintains both the SPARC32 and SPARC64 ports; its web page is

	  available at <http://www.ultralinux.org/>.



# Global things across all Sun machines.

config ISA

config ARCH_MAY_HAVE_PC_FDC

	bool

	help

	  ISA is found on Espresso only and is not supported currently.

	  Say N

	default y



config EISA

config ARCH_HAS_ILOG2_U32

	bool

	default n



config ARCH_HAS_ILOG2_U64

	bool

	default n



config EMULATED_CMPXCHG

	bool

	default y if SPARC32

	help

	  EISA is not supported.

	  Say N

	  Sparc32 does not have a CAS instruction like sparc64. cmpxchg()

	  is emulated, and therefore it is not completely atomic.



config MCA

# Makefile helpers

config SPARC32_SMP

	bool

	default y

	depends on SPARC32 && SMP



config SPARC64_SMP

	bool

	default y

	depends on SPARC64 && SMP



choice

	prompt "Kernel page size" if SPARC64

	default SPARC64_PAGE_SIZE_8KB



config SPARC64_PAGE_SIZE_8KB

	bool "8KB"

	help

	  MCA is not supported.

	  Say N

	  This lets you select the page size of the kernel.



config PCMCIA

	tristate

	---help---

	  Say Y here if you want to attach PCMCIA- or PC-cards to your Linux

	  computer.  These are credit-card size devices such as network cards,

	  modems or hard drives often used with laptops computers.  There are

	  actually two varieties of these cards: the older 16 bit PCMCIA cards

	  and the newer 32 bit CardBus cards.  If you want to use CardBus

	  cards, you need to say Y here and also to "CardBus support" below.

	  8KB and 64KB work quite well, since SPARC ELF sections

	  provide for up to 64KB alignment.



	  To use your PC-cards, you will need supporting software from David

	  Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>

	  for location).  Please also read the PCMCIA-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.

	  If you don't know what to do, choose 8KB.



	  To compile this driver as modules, choose M here: the

	  modules will be called pcmcia_core and ds.

config SPARC64_PAGE_SIZE_64KB

	bool "64KB"



config SBUS

endchoice



config SECCOMP

	bool "Enable seccomp to safely compute untrusted bytecode"

	depends on SPARC64 && PROC_FS

	default y

	help

	  This kernel feature is useful for number crunching applications

	  that may need to compute untrusted bytecode during their

	  execution. By using pipes or other transports made available to

	  the process as file descriptors supporting the read/write

	  syscalls, it's possible to isolate those applications in

	  their own address space using seccomp. Once seccomp is

	  enabled via /proc/<pid>/seccomp, it cannot be disabled

	  and the task is only allowed to execute a few safe syscalls

	  defined by each seccomp mode.



	  If unsure, say Y. Only embedded should say N here.



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs"

	depends on SPARC64 && SMP

	select HOTPLUG

	help

	  Say Y here to experiment with turning CPUs off and on.  CPUs

	  can be controlled through /sys/devices/system/cpu/cpu#.

	  Say N if you want to disable CPU hotplug.



config GENERIC_HARDIRQS

	bool

	default y if SPARC64



source "kernel/time/Kconfig"



if SPARC64

source "drivers/cpufreq/Kconfig"



config US3_FREQ

	tristate "UltraSPARC-III CPU Frequency driver"

	depends on CPU_FREQ

	select CPU_FREQ_TABLE

	help

	  This adds the CPUFreq driver for UltraSPARC-III processors.



	  For details, take a look at <file:Documentation/cpu-freq>.



	  If in doubt, say N.



config US2E_FREQ

	tristate "UltraSPARC-IIe CPU Frequency driver"

	depends on CPU_FREQ

	select CPU_FREQ_TABLE

	help

	  This adds the CPUFreq driver for UltraSPARC-IIe processors.



	  For details, take a look at <file:Documentation/cpu-freq>.



	  If in doubt, say N.



endif



config US3_MC

	tristate "UltraSPARC-III Memory Controller driver"

	depends on SPARC64

	default y

	help

	  This adds a driver for the UltraSPARC-III memory controller.

	  Loading this driver allows exact mnemonic strings to be

	  printed in the event of a memory error, so that the faulty DIMM

	  on the motherboard can be matched to the error.



config SBUSCHAR

	  If in doubt, say Y, as this information can be very useful.



# Global things across all Sun machines.

config GENERIC_LOCKBREAK

	bool

	default y

	depends on SPARC64 && SMP && PREEMPT



choice

	prompt "SPARC64 Huge TLB Page Size"

	depends on SPARC64 && HUGETLB_PAGE

	default HUGETLB_PAGE_SIZE_4MB



config HUGETLB_PAGE_SIZE_4MB

	bool "4MB"



config HUGETLB_PAGE_SIZE_512K

	bool "512K"



config HUGETLB_PAGE_SIZE_64K

	depends on !SPARC64_PAGE_SIZE_64KB

	bool "64K"



endchoice



config NUMA

	bool "NUMA support"

	depends on SPARC64 && SMP



config NODES_SHIFT

	int

	default "4"

	depends on NEED_MULTIPLE_NODES



# Some NUMA nodes have memory ranges that span

# other nodes.  Even though a pfn is valid and

# between a node's start and end pfns, it may not

# reside on that node.  See memmap_init_zone()

# for details.

config NODES_SPAN_OTHER_NODES

	def_bool y

	depends on NEED_MULTIPLE_NODES



config ARCH_POPULATES_NODE_MAP

	def_bool y if SPARC64



config ARCH_SELECT_MEMORY_MODEL

	def_bool y if SPARC64



config ARCH_SPARSEMEM_ENABLE

	def_bool y if SPARC64

	select SPARSEMEM_VMEMMAP_ENABLE



config ARCH_SPARSEMEM_DEFAULT

	def_bool y if SPARC64



source "mm/Kconfig"



config SCHED_SMT

	bool "SMT (Hyperthreading) scheduler support"

	depends on SPARC64 && SMP

	default y

	help

	  SMT scheduler support improves the CPU scheduler's decision making

	  when dealing with SPARC cpus at a cost of slightly increased overhead

	  in some places. If unsure say N here.



config SCHED_MC

	bool "Multi-core scheduler support"

	depends on SPARC64 && SMP

	default y

	help

	  Multi-core scheduler support improves the CPU scheduler's decision

	  making when dealing with multi-core CPU chips at a cost of slightly

	  increased overhead in some places. If unsure say N here.



if SPARC64

source "kernel/Kconfig.preempt"

endif



config CMDLINE_BOOL

	bool "Default bootloader kernel arguments"

	depends on SPARC64



config CMDLINE

	string "Initial kernel command string"

	depends on CMDLINE_BOOL

	default "console=ttyS0,9600 root=/dev/sda1"

	help

	  Say Y here if you want to be able to pass default arguments to

	  the kernel. This will be overridden by the bootloader, if you

	  use one (such as SILO). This is most useful if you want to boot

	  a kernel from TFTP, and want default options to be available

	  with having them passed on the command line.



	  NOTE: This option WILL override the PROM bootargs setting!



config SUN_PM

	bool

	default y if SPARC32

	help

	  Enable power management and CPU standby features on supported

	  SPARC platforms.



config SPARC_LED

	tristate "Sun4m LED driver"

	depends on SPARC32

	help

	  This driver toggles the front-panel LED on sun4m systems

	  in a user-specifiable manner.  Its state can be probed

	  by reading /proc/led and its blinking mode can be changed

	  via writes to /proc/led



config SERIAL_CONSOLE

	bool

	depends on SPARC32

	default y

	---help---

	  If you say Y here, it will be possible to use a serial port as the
@@ -161,71 +439,66 @@ config SERIAL_CONSOLE 


	  If unsure, say N.



config SUN_AUXIO

	bool

	default y



config SUN_IO

	bool

	default y



config RWSEM_GENERIC_SPINLOCK

	bool

	default y

endmenu



config RWSEM_XCHGADD_ALGORITHM

menu "Bus options (PCI etc.)"

config ISA

	bool

	help

	  ISA is found on Espresso only and is not supported currently.



config GENERIC_FIND_NEXT_BIT

config ISAPNP

	bool

	default y

	help

	  ISAPNP is not supported



config GENERIC_HWEIGHT

config EISA

	bool

	default y

	help

	  EISA is not supported.



config GENERIC_CALIBRATE_DELAY

config MCA

	bool

	default y

	help

	  MCA is not supported.



config ARCH_MAY_HAVE_PC_FDC

config SBUS

	bool

	default y



config ARCH_HAS_ILOG2_U32

	bool

	default n



config ARCH_HAS_ILOG2_U64

	bool

	default n



config EMULATED_CMPXCHG

config SBUSCHAR

	bool

	default y

	help

	  Sparc32 does not have a CAS instruction like sparc64. cmpxchg()

	  is emulated, and therefore it is not completely atomic.



config SUN_PM

	bool

	default y

config SUN_LDOMS

	bool "Sun Logical Domains support"

	depends on SPARC64

	help

	  Enable power management and CPU standby features on supported

	  SPARC platforms.

	  Say Y here is you want to support virtual devices via

	  Logical Domains.



config PCI

	bool "Support for PCI and PS/2 keyboard/mouse"

	help

	  Find out whether your system includes a PCI bus. PCI is the name of

	  a bus system, i.e. the way the CPU talks to the other stuff inside

	  your box.  If you say Y here, the kernel will include drivers and

	  infrastructure code to support PCI bus devices.



	  CONFIG_PCI is needed for all JavaStation's (including MrCoffee),

	  CP-1200, JavaEngine-1, Corona, Red October, and Serengeti SGSC.

	  All of these platforms are extremely obscure, so say N if unsure.



config PCI_DOMAINS

	def_bool PCI if SPARC64



config PCI_SYSCALL

	def_bool PCI



source "drivers/pci/Kconfig"



source "drivers/pcmcia/Kconfig"



config SUN_OPENPROMFS

	tristate "Openprom tree appears in /proc/openprom"

	help
@@ -239,17 +512,33 @@ config SUN_OPENPROMFS 
	  Only choose N if you know in advance that you will not need to modify

	  OpenPROM settings on the running system.



config SPARC_LED

	tristate "Sun4m LED driver"

	help

	  This driver toggles the front-panel LED on sun4m systems

	  in a user-specifiable manner.  Its state can be probed

	  by reading /proc/led and its blinking mode can be changed

	  via writes to /proc/led

# Makefile helpers

config SPARC32_PCI

	bool

	default y

	depends on SPARC32 && PCI



config SPARC64_PCI

	bool

	default y

	depends on SPARC64 && PCI



endmenu



menu "Executable file formats"



source "fs/Kconfig.binfmt"



source "mm/Kconfig"

config COMPAT

	bool

	depends on SPARC64

	default y

	select COMPAT_BINFMT_ELF



config SYSVIPC_COMPAT

	bool

	depends on COMPAT && SYSVIPC

	default y



endmenu
@@ -259,40 +548,6 @@ source "drivers/Kconfig" 


source "drivers/sbus/char/Kconfig"



# This one must be before the filesystem configs. -DaveM



menu "Unix98 PTY support"



config UNIX98_PTYS

	bool "Unix98 PTY support"

	---help---

	  A pseudo terminal (PTY) is a software device consisting of two

	  halves: a master and a slave. The slave device behaves identical to

	  a physical terminal; the master device is used by a process to

	  read data from and write data to the slave, thereby emulating a

	  terminal. Typical programs for the master side are telnet servers

	  and xterms.



	  Linux has traditionally used the BSD-like names /dev/ptyxx for

	  masters and /dev/ttyxx for slaves of pseudo terminals. This scheme

	  has a number of problems. The GNU C library glibc 2.1 and later,

	  however, supports the Unix98 naming standard: in order to acquire a

	  pseudo terminal, a process opens /dev/ptmx; the number of the pseudo

	  terminal is then made available to the process and the pseudo

	  terminal slave can be accessed as /dev/pts/<number>. What was

	  traditionally /dev/ttyp2 will then be /dev/pts/2, for example.



	  The entries in /dev/pts/ are created on the fly by a virtual

	  file system; therefore, if you say Y here you should say Y to

	  "/dev/pts file system for Unix98 PTYs" as well.



	  If you want to say Y here, you need to have the C library glibc 2.1

	  or later (equal to libc-6.1, check with "ls -l /lib/libc.so.*").

	  Read the instructions in <file:Documentation/Changes> pertaining to

	  pseudo terminals. It's safe to say N.



endmenu



source "fs/Kconfig"



source "arch/sparc/Kconfig.debug"

arch/sparc/Kconfig.debug

+26 −0
Original line number Diff line number Diff line
@@ -15,4 +15,30 @@ config DEBUG_STACK_USAGE 


	  This option will slow down process creation somewhat.



config DEBUG_DCFLUSH

	bool "D-cache flush debugging"

	depends on SPARC64 && DEBUG_KERNEL



config STACK_DEBUG

	bool "Stack Overflow Detection Support"



config DEBUG_PAGEALLOC

	bool "Debug page memory allocations"

	depends on SPARC64 && DEBUG_KERNEL && !HIBERNATION

	help

	  Unmap pages from the kernel linear mapping after free_pages().

	  This results in a large slowdown, but helps to find certain types

	  of memory corruptions.



config MCOUNT

	bool

	depends on SPARC64

	depends on STACK_DEBUG || FUNCTION_TRACER

	default y



config FRAME_POINTER

	bool

	depends on MCOUNT

	default y



endmenu

arch/sparc/Makefile

+69 −28
Original line number Diff line number Diff line
@@ -2,9 +2,21 @@ 
# sparc/Makefile

#

# Makefile for the architecture dependent flags and dependencies on the

# Sparc.

# Sparc and sparc64.

#

# Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu)

# Copyright (C) 1994,1996,1998 David S. Miller (davem@caip.rutgers.edu)

# Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)



# We are not yet configured - so test on arch

ifeq ($(ARCH),sparc)

        KBUILD_DEFCONFIG := sparc32_defconfig

else

        KBUILD_DEFCONFIG := sparc64_defconfig

endif



ifeq ($(CONFIG_SPARC32),y)

#####

# sparc32

#



#
@@ -14,6 +26,7 @@ 
AS             := $(AS) -32

LDFLAGS        := -m elf32_sparc

CHECKFLAGS     += -D__sparc__

export BITS    := 32



#KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7

KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7
@@ -25,38 +38,60 @@ CPPFLAGS_vmlinux.lds += -m32 
#  Actual linking is done with "make image".

LDFLAGS_vmlinux = -r



head-y := arch/sparc/kernel/head.o arch/sparc/kernel/init_task.o

HEAD_Y := $(head-y)

# Default target

all: zImage





else

#####

# sparc64

#



core-y += arch/sparc/kernel/ arch/sparc/mm/ arch/sparc/math-emu/

libs-y += arch/sparc/prom/ arch/sparc/lib/

CHECKFLAGS      += -D__sparc__ -D__sparc_v9__ -D__arch64__ -m64



# Undefine sparc when processing vmlinux.lds - it is used

# And teach CPP we are doing 64 bit builds (for this case)

CPPFLAGS_vmlinux.lds += -m64 -Usparc

LDFLAGS              := -m elf64_sparc

export BITS          := 64



KBUILD_CFLAGS += -m64 -pipe -mno-fpu -mcpu=ultrasparc -mcmodel=medlow   \

                 -ffixed-g4 -ffixed-g5 -fcall-used-g7 -Wno-sign-compare \

                 -Wa,--undeclared-regs

KBUILD_CFLAGS += $(call cc-option,-mtune=ultrasparc3)

KBUILD_AFLAGS += -m64 -mcpu=ultrasparc -Wa,--undeclared-regs



ifeq ($(CONFIG_MCOUNT),y)

  KBUILD_CFLAGS += -pg

endif



endif



head-y                 := arch/sparc/kernel/head_$(BITS).o

head-y                 += arch/sparc/kernel/init_task.o



core-y                 += arch/sparc/kernel/

core-y                 += arch/sparc/mm/ arch/sparc/math-emu/



libs-y                 += arch/sparc/prom/

libs-y                 += arch/sparc/lib/



drivers-$(CONFIG_OPROFILE)	+= arch/sparc/oprofile/



# Export what is needed by arch/sparc/boot/Makefile

# Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-)

INIT_Y		:= $(patsubst %/, %/built-in.o, $(init-y))

CORE_Y		:= $(core-y)

CORE_Y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/

CORE_Y		:= $(patsubst %/, %/built-in.o, $(CORE_Y))

DRIVERS_Y	:= $(patsubst %/, %/built-in.o, $(drivers-y))

NET_Y		:= $(patsubst %/, %/built-in.o, $(net-y))

LIBS_Y1		:= $(patsubst %/, %/lib.a, $(libs-y))

LIBS_Y2		:= $(patsubst %/, %/built-in.o, $(libs-y))

LIBS_Y		:= $(LIBS_Y1) $(LIBS_Y2)

export VMLINUX_INIT VMLINUX_MAIN

VMLINUX_INIT := $(head-y) $(init-y)

VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/

VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)

VMLINUX_MAIN += $(drivers-y) $(net-y)



ifdef CONFIG_KALLSYMS

kallsyms.o := .tmp_kallsyms2.o

export kallsyms.o := .tmp_kallsyms2.o

endif



export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o



# Default target

all: zImage



boot := arch/sparc/boot



image zImage tftpboot.img: vmlinux

image zImage tftpboot.img vmlinux.aout: vmlinux

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



archclean:
@@ -65,11 +100,17 @@ archclean: 
# 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.

ifeq ($(ARCH),sparc)

define archhelp

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

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

  echo  '  tftpboot.img - image prepared for tftp'

endef

else

define archhelp

  echo  '* vmlinux       - Standard sparc64 kernel'

  echo  '  vmlinux.aout  - a.out kernel for sparc64'

  echo  '  tftpboot.img - image prepared for tftp'

endef

endif

arch/sparc64/boot/.gitignore→arch/sparc/boot/.gitignore

+4 −0
Original line number Diff line number Diff line 
btfix.S

btfixupprep

image

zImage

tftpboot.img

vmlinux.aout

piggyback

CRA Git | Maintained and supported by SUSTech CRA and CCSE