diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
commit | 1e09481365ce248dbb4eb06dad70129bb5807037 (patch) | |
tree | c0cff5bef95c8b5e7486f144718ade9a06c284dc /Makefile | |
parent | 3e2f69fdd1b00166e7d589bce56b2d36a9e74374 (diff) | |
parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (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-- | Makefile | 21 |
1 files changed, 19 insertions, 2 deletions
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 2 | 1 | VERSION = 2 |
2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
3 | SUBLEVEL = 26 | 3 | SUBLEVEL = 26 |
4 | EXTRAVERSION = -rc8 | 4 | EXTRAVERSION = |
5 | NAME = Rotary Wombat | 5 | NAME = 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 |
452 | init-y := init/ | 452 | init-y := init/ |
453 | drivers-y := drivers/ sound/ | 453 | drivers-y := drivers/ sound/ firmware/ |
454 | net-y := net/ | 454 | net-y := net/ |
455 | libs-y := lib/ | 455 | libs-y := lib/ |
456 | core-y := usr/ | 456 | core-y := usr/ |
@@ -528,6 +528,10 @@ KBUILD_CFLAGS += -g | |||
528 | KBUILD_AFLAGS += -gdwarf-2 | 528 | KBUILD_AFLAGS += -gdwarf-2 |
529 | endif | 529 | endif |
530 | 530 | ||
531 | ifdef CONFIG_FTRACE | ||
532 | KBUILD_CFLAGS += -pg | ||
533 | endif | ||
534 | |||
531 | # We trigger additional mismatches with less inlining | 535 | # We trigger additional mismatches with less inlining |
532 | ifdef CONFIG_DEBUG_SECTION_MISMATCH | 536 | ifdef CONFIG_DEBUG_SECTION_MISMATCH |
533 | KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once) | 537 | KBUILD_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 | ||
1003 | INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware | ||
1004 | export INSTALL_FW_PATH | ||
1005 | |||
1006 | PHONY += firmware_install | ||
1007 | firmware_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 |
999 | INSTALL_HDR_PATH=$(objtree)/usr | 1013 | INSTALL_HDR_PATH=$(objtree)/usr |
1000 | export INSTALL_HDR_PATH | 1014 | export INSTALL_HDR_PATH |
@@ -1080,6 +1094,7 @@ _modinst_: | |||
1080 | # boot script depmod is the master version. | 1094 | # boot script depmod is the master version. |
1081 | PHONY += _modinst_post | 1095 | PHONY += _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 | ||
1085 | else # CONFIG_MODULES | 1100 | else # 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' |