mirror of
https://github.com/torvalds/linux.git
synced 2024-11-02 02:01:29 +00:00
1fdb24e969
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits) ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET ARM: gic, local timers: use the request_percpu_irq() interface ARM: gic: consolidate PPI handling ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H ARM: mach-s5p64x0: remove mach/memory.h ARM: mach-s3c64xx: remove mach/memory.h ARM: plat-mxc: remove mach/memory.h ARM: mach-prima2: remove mach/memory.h ARM: mach-zynq: remove mach/memory.h ARM: mach-bcmring: remove mach/memory.h ARM: mach-davinci: remove mach/memory.h ARM: mach-pxa: remove mach/memory.h ARM: mach-ixp4xx: remove mach/memory.h ARM: mach-h720x: remove mach/memory.h ARM: mach-vt8500: remove mach/memory.h ARM: mach-s5pc100: remove mach/memory.h ARM: mach-tegra: remove mach/memory.h ARM: plat-tcc: remove mach/memory.h ARM: mach-mmp: remove mach/memory.h ARM: mach-cns3xxx: remove mach/memory.h ... Fix up mostly pretty trivial conflicts in: - arch/arm/Kconfig - arch/arm/include/asm/localtimer.h - arch/arm/kernel/Makefile - arch/arm/mach-shmobile/board-ap4evb.c - arch/arm/mach-u300/core.c - arch/arm/mm/dma-mapping.c - arch/arm/mm/proc-v7.S - arch/arm/plat-omap/Kconfig largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -> CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
87 lines
2.6 KiB
Makefile
87 lines
2.6 KiB
Makefile
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
|
|
AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
|
|
|
|
ifdef CONFIG_FUNCTION_TRACER
|
|
CFLAGS_REMOVE_ftrace.o = -pg
|
|
endif
|
|
|
|
CFLAGS_REMOVE_return_address.o = -pg
|
|
|
|
# Object file lists.
|
|
|
|
obj-y := elf.o entry-armv.o entry-common.o irq.o \
|
|
process.o ptrace.o return_address.o setup.o signal.o \
|
|
sys_arm.o stacktrace.o time.o traps.o
|
|
|
|
obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += compat.o
|
|
|
|
obj-$(CONFIG_LEDS) += leds.o
|
|
obj-$(CONFIG_OC_ETM) += etm.o
|
|
|
|
obj-$(CONFIG_ISA_DMA_API) += dma.o
|
|
obj-$(CONFIG_ARCH_ACORN) += ecard.o
|
|
obj-$(CONFIG_FIQ) += fiq.o fiqasm.o
|
|
obj-$(CONFIG_MODULES) += armksyms.o module.o
|
|
obj-$(CONFIG_ARTHUR) += arthur.o
|
|
obj-$(CONFIG_ISA_DMA) += dma-isa.o
|
|
obj-$(CONFIG_PCI) += bios32.o isa.o
|
|
obj-$(CONFIG_ARM_CPU_SUSPEND) += sleep.o suspend.o
|
|
obj-$(CONFIG_HAVE_SCHED_CLOCK) += sched_clock.o
|
|
obj-$(CONFIG_SMP) += smp.o smp_tlb.o
|
|
obj-$(CONFIG_HAVE_ARM_SCU) += smp_scu.o
|
|
obj-$(CONFIG_HAVE_ARM_TWD) += smp_twd.o
|
|
obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
|
|
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
|
|
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
|
|
obj-$(CONFIG_KPROBES) += kprobes.o kprobes-common.o
|
|
ifdef CONFIG_THUMB2_KERNEL
|
|
obj-$(CONFIG_KPROBES) += kprobes-thumb.o
|
|
else
|
|
obj-$(CONFIG_KPROBES) += kprobes-arm.o
|
|
endif
|
|
obj-$(CONFIG_ARM_KPROBES_TEST) += test-kprobes.o
|
|
test-kprobes-objs := kprobes-test.o
|
|
ifdef CONFIG_THUMB2_KERNEL
|
|
test-kprobes-objs += kprobes-test-thumb.o
|
|
else
|
|
test-kprobes-objs += kprobes-test-arm.o
|
|
endif
|
|
obj-$(CONFIG_ATAGS_PROC) += atags.o
|
|
obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o
|
|
obj-$(CONFIG_ARM_THUMBEE) += thumbee.o
|
|
obj-$(CONFIG_KGDB) += kgdb.o
|
|
obj-$(CONFIG_ARM_UNWIND) += unwind.o
|
|
obj-$(CONFIG_HAVE_TCM) += tcm.o
|
|
obj-$(CONFIG_OF) += devtree.o
|
|
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
|
|
obj-$(CONFIG_SWP_EMULATE) += swp_emulate.o
|
|
CFLAGS_swp_emulate.o := -Wa,-march=armv7-a
|
|
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
|
|
|
|
obj-$(CONFIG_CRUNCH) += crunch.o crunch-bits.o
|
|
AFLAGS_crunch-bits.o := -Wa,-mcpu=ep9312
|
|
|
|
obj-$(CONFIG_CPU_XSCALE) += xscale-cp0.o
|
|
obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o
|
|
obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o
|
|
obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o
|
|
obj-$(CONFIG_IWMMXT) += iwmmxt.o
|
|
obj-$(CONFIG_CPU_HAS_PMU) += pmu.o
|
|
obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o
|
|
AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt
|
|
obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o
|
|
|
|
ifneq ($(CONFIG_ARCH_EBSA110),y)
|
|
obj-y += io.o
|
|
endif
|
|
|
|
head-y := head$(MMUEXT).o
|
|
obj-$(CONFIG_DEBUG_LL) += debug.o
|
|
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
|
|
|
extra-y := $(head-y) init_task.o vmlinux.lds
|