aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-15 17:12:58 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-15 17:12:58 -0400
commit1e09481365ce248dbb4eb06dad70129bb5807037 (patch)
treec0cff5bef95c8b5e7486f144718ade9a06c284dc /Makefile
parent3e2f69fdd1b00166e7d589bce56b2d36a9e74374 (diff)
parentb9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff)
Merge branch 'linus' into core/softlockup
Conflicts: kernel/softlockup.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 files changed, 19 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6aff5f47c21d..5efdd88db850 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
1VERSION = 2 1VERSION = 2
2PATCHLEVEL = 6 2PATCHLEVEL = 6
3SUBLEVEL = 26 3SUBLEVEL = 26
4EXTRAVERSION = -rc8 4EXTRAVERSION =
5NAME = Rotary Wombat 5NAME = Rotary Wombat
6 6
7# *DOCUMENTATION* 7# *DOCUMENTATION*
@@ -450,7 +450,7 @@ scripts: scripts_basic include/config/auto.conf
450 450
451# Objects we will link into vmlinux / subdirs we need to visit 451# Objects we will link into vmlinux / subdirs we need to visit
452init-y := init/ 452init-y := init/
453drivers-y := drivers/ sound/ 453drivers-y := drivers/ sound/ firmware/
454net-y := net/ 454net-y := net/
455libs-y := lib/ 455libs-y := lib/
456core-y := usr/ 456core-y := usr/
@@ -528,6 +528,10 @@ KBUILD_CFLAGS += -g
528KBUILD_AFLAGS += -gdwarf-2 528KBUILD_AFLAGS += -gdwarf-2
529endif 529endif
530 530
531ifdef CONFIG_FTRACE
532KBUILD_CFLAGS += -pg
533endif
534
531# We trigger additional mismatches with less inlining 535# We trigger additional mismatches with less inlining
532ifdef CONFIG_DEBUG_SECTION_MISMATCH 536ifdef CONFIG_DEBUG_SECTION_MISMATCH
533KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once) 537KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)
@@ -995,6 +999,16 @@ depend dep:
995 @echo '*** Warning: make $@ is unnecessary now.' 999 @echo '*** Warning: make $@ is unnecessary now.'
996 1000
997# --------------------------------------------------------------------------- 1001# ---------------------------------------------------------------------------
1002# Firmware install
1003INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware
1004export INSTALL_FW_PATH
1005
1006PHONY += firmware_install
1007firmware_install: FORCE
1008 @mkdir -p $(objtree)/firmware
1009 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_install
1010
1011# ---------------------------------------------------------------------------
998# Kernel headers 1012# Kernel headers
999INSTALL_HDR_PATH=$(objtree)/usr 1013INSTALL_HDR_PATH=$(objtree)/usr
1000export INSTALL_HDR_PATH 1014export INSTALL_HDR_PATH
@@ -1080,6 +1094,7 @@ _modinst_:
1080# boot script depmod is the master version. 1094# boot script depmod is the master version.
1081PHONY += _modinst_post 1095PHONY += _modinst_post
1082_modinst_post: _modinst_ 1096_modinst_post: _modinst_
1097 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modinst
1083 $(call cmd,depmod) 1098 $(call cmd,depmod)
1084 1099
1085else # CONFIG_MODULES 1100else # CONFIG_MODULES
@@ -1197,6 +1212,8 @@ help:
1197 @echo '* vmlinux - Build the bare kernel' 1212 @echo '* vmlinux - Build the bare kernel'
1198 @echo '* modules - Build all modules' 1213 @echo '* modules - Build all modules'
1199 @echo ' modules_install - Install all modules to INSTALL_MOD_PATH (default: /)' 1214 @echo ' modules_install - Install all modules to INSTALL_MOD_PATH (default: /)'
1215 @echo ' firmware_install- Install all firmware to INSTALL_FW_PATH'
1216 @echo ' (default: $$(INSTALL_MOD_PATH)/lib/firmware)'
1200 @echo ' dir/ - Build all files in dir and below' 1217 @echo ' dir/ - Build all files in dir and below'
1201 @echo ' dir/file.[ois] - Build specified target only' 1218 @echo ' dir/file.[ois] - Build specified target only'
1202 @echo ' dir/file.ko - Build module including final link' 1219 @echo ' dir/file.ko - Build module including final link'