update makefiles to use the newer flag variables

PATCH RESEND In review matt mooney 3 participants 31 messages Jan 14, 2011 – Mar 17, 2011

Subsystems (37)

Network drivers Arm (32-bit) SCSI Kbuild +33 more subsystems

lore

Share & tools

lore

matt mooney

author

2011-01-14 14:13 UTC #0 lore raw

cover update makefiles to use the newer flag variables

Hi Michal,

These are the patches that never made their way into the linux-next tree. I have added all of the acks that came through.

Thanks,
matt

matt mooney (27):
kernel: change to new flag variable
alpha: change to new flag variables
arm: change to new flag variables
h8300: change to new flag variable
ia64: change to new flag variables
m68k: change to new flag variables
microblaze: change to new flag variable
mips: change to new flag variable
s390: change to new flag variable
um: change to new flag variables
xtensa: change to new flag variable
fs: change to new flag variable
char: change to new flag variable
dma: change to new flag variable
hwmon: change to new flag variable
ide: change to new flag variable
ieee802154: change to new flag variable
isdn: change to new flag variable
memstick: change to new flag variable
message: change to new flag variable
misc: change to new flag variable
net: change to new flag variable
pps: change to new flag variable
rapidio: change to new flag variable
rtc: change to new flag variable
scsi: change to new flag variable
video: change to new flag variable

 arch/alpha/kernel/Makefile                  |    4 ++--
 arch/alpha/lib/Makefile                     |    4 ++--
 arch/alpha/math-emu/Makefile                |    2 +-
 arch/alpha/mm/Makefile                      |    2 +-
 arch/alpha/oprofile/Makefile                |    2 +-
 arch/arm/boot/compressed/Makefile           |    4 ++--
 arch/arm/vfp/Makefile                       |    4 ++--
 arch/h8300/boot/compressed/Makefile         |    2 +-
 arch/ia64/kvm/Makefile                      |    4 ++--
 arch/ia64/sn/kernel/Makefile                |    2 +-
 arch/ia64/sn/kernel/sn2/Makefile            |    2 +-
 arch/ia64/sn/pci/Makefile                   |    2 +-
 arch/ia64/sn/pci/pcibr/Makefile             |    2 +-
 arch/ia64/uv/kernel/Makefile                |    2 +-
 arch/m68k/math-emu/Makefile                 |    4 ++--
 arch/microblaze/kernel/cpu/Makefile         |    2 +-
 arch/mips/Makefile                          |    4 ++--
 arch/mips/bcm63xx/boards/Makefile           |    2 +-
 arch/mips/fw/arc/Makefile                   |    2 +-
 arch/mips/jz4740/Makefile                   |    2 +-
 arch/mips/oprofile/Makefile                 |    2 +-
 arch/mips/pmc-sierra/yosemite/Makefile      |    2 +-
 arch/mips/powertv/Makefile                  |    2 +-
 arch/mips/powertv/asic/Makefile             |    2 +-
 arch/mips/powertv/pci/Makefile              |    2 +-
 arch/s390/boot/Makefile                     |    2 +-
 arch/s390/kvm/Makefile                      |    2 +-
 arch/s390/math-emu/Makefile                 |    2 +-
 arch/um/sys-ppc/Makefile                    |   10 +++++-----
 arch/xtensa/boot/Makefile                   |    2 +-
 arch/xtensa/boot/lib/Makefile               |    2 +-
 drivers/char/mwave/Makefile                 |    4 ++--
 drivers/char/mwave/README                   |    2 +-
 drivers/dma/Makefile                        |    8 ++------
 drivers/hwmon/Makefile                      |    4 +---
 drivers/ide/Makefile                        |    2 +-
 drivers/ieee802154/Makefile                 |    2 +-
 drivers/isdn/hisax/Makefile                 |    2 +-
 drivers/memstick/Makefile                   |    4 +---
 drivers/memstick/core/Makefile              |    4 ----
 drivers/memstick/host/Makefile              |    4 ----
 drivers/message/fusion/Makefile             |    2 +-
 drivers/misc/cb710/Makefile                 |    4 +---
 drivers/misc/sgi-gru/Makefile               |    4 +---
 drivers/net/caif/Makefile                   |    4 +---
 drivers/net/skfp/Makefile                   |    2 +-
 drivers/net/wan/lmc/Makefile                |    2 +-
 drivers/net/wireless/hostap/hostap_config.h |    4 ++--
 drivers/net/wireless/zd1211rw/Makefile      |    4 +---
 drivers/pps/clients/Makefile                |    4 +---
 drivers/rapidio/Makefile                    |    4 +---
 drivers/rapidio/switches/Makefile           |    4 -----
 drivers/rtc/Makefile                        |    4 +---
 drivers/scsi/aacraid/Makefile               |    2 +-
 drivers/scsi/aic94xx/Makefile               |    4 +---
 drivers/scsi/libsas/Makefile                |    6 ++----
 drivers/scsi/lpfc/Makefile                  |    6 ++----
 drivers/scsi/mvsas/Makefile                 |    4 +---
 drivers/scsi/pcmcia/Makefile                |    2 +-
 drivers/video/intelfb/Makefile              |    5 +----
 fs/affs/Makefile                            |    2 +-
 fs/coda/Makefile                            |    2 +-
 fs/gfs2/Makefile                            |    2 +-
 fs/jfs/Makefile                             |    2 +-
 fs/ncpfs/Makefile                           |    2 +-
 fs/ntfs/Makefile                            |   19 +++++++------------
 fs/ocfs2/Makefile                           |    4 ++--
 fs/ocfs2/dlm/Makefile                       |    2 +-
 fs/ocfs2/dlmfs/Makefile                     |    2 +-
 fs/reiserfs/Makefile                        |    4 +---
 fs/xfs/Makefile                             |    7 ++-----
 kernel/gcov/Makefile                        |    2 +-
 kernel/power/Makefile                       |    3 ++-
 73 files changed, 95 insertions(+), 149 deletions(-)

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #1 lore raw

PATCH RESEND 1/27 kernel: change to new flag variable

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 kernel/gcov/Makefile  |    2 +-
 kernel/power/Makefile |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

kernel/gcov/Makefile +1 -1

index 3f76100..e97ca59 100644
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"'
+ccflags-y := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"'
 
 obj-$(CONFIG_GCOV_KERNEL) := base.o fs.o gcc_3_4.o

kernel/power/Makefile +2 -1

index c350e18..c5ebc6a 100644
@@ -1,4 +1,5 @@
-ccflags-$(CONFIG_PM_DEBUG)	:=	-DDEBUG
+
+ccflags-$(CONFIG_PM_DEBUG)	:= -DDEBUG
 
 obj-$(CONFIG_PM)		+= main.o
 obj-$(CONFIG_PM_SLEEP)		+= console.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #2 lore raw

PATCH RESEND 2/27 alpha: change to new flag variables

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 arch/alpha/kernel/Makefile   |    4 ++--
 arch/alpha/lib/Makefile      |    4 ++--
 arch/alpha/math-emu/Makefile |    2 +-
 arch/alpha/mm/Makefile       |    2 +-
 arch/alpha/oprofile/Makefile |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

arch/alpha/kernel/Makefile +2 -2

index 1ee9b5b..9bb7b85 100644
@@ -3,8 +3,8 @@
 #
 
 extra-y		:= head.o vmlinux.lds
-EXTRA_AFLAGS	:= $(KBUILD_CFLAGS)
-EXTRA_CFLAGS	:= -Werror -Wno-sign-compare
+asflags-y	:= $(KBUILD_CFLAGS)
+ccflags-y	:= -Werror -Wno-sign-compare
 
 obj-y    := entry.o traps.o process.o init_task.o osf_sys.o irq.o \
 	    irq_alpha.o signal.o setup.o ptrace.o time.o \

arch/alpha/lib/Makefile +2 -2

index 9b72c59..c0a83ab 100644
@@ -2,8 +2,8 @@
 # Makefile for alpha-specific library files..
 #
 
-EXTRA_AFLAGS := $(KBUILD_CFLAGS)
-EXTRA_CFLAGS := -Werror
+asflags-y := $(KBUILD_CFLAGS)
+ccflags-y := -Werror
 
 # Many of these routines have implementations tuned for ev6.
 # Choose them iff we're targeting ev6 specifically.

arch/alpha/math-emu/Makefile +1 -1

index 359ef08..7f46719 100644
@@ -2,7 +2,7 @@
 # Makefile for the FPU instruction emulation.
 #
 
-EXTRA_CFLAGS := -w
+ccflags-y := -w
 
 obj-$(CONFIG_MATHEMU) += math-emu.o

arch/alpha/mm/Makefile +1 -1

index 09399c5..c993d3f 100644
@@ -2,7 +2,7 @@
 # Makefile for the linux alpha-specific parts of the memory manager.
 #
 
-EXTRA_CFLAGS := -Werror
+ccflags-y := -Werror
 
 obj-y	:= init.o fault.o extable.o

arch/alpha/oprofile/Makefile +1 -1

index 4aa5624..3473de7 100644
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS := -Werror -Wno-sign-compare
+ccflags-y := -Werror -Wno-sign-compare
 
 obj-$(CONFIG_OPROFILE) += oprofile.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:19 UTC #3 lore raw

PATCH RESEND 3/27 arm: change to new flag variables

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 arch/arm/boot/compressed/Makefile |    4 ++--
 arch/arm/vfp/Makefile             |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

arch/arm/boot/compressed/Makefile +2 -2

index 0a8f748..0a53b8a 100644
@@ -80,8 +80,8 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
 endif
 
-EXTRA_CFLAGS  := -fpic -fno-builtin
-EXTRA_AFLAGS  := -Wa,-march=all
+ccflags-y := -fpic -fno-builtin
+asflags-y := -Wa,-march=all
 
 # Supply ZRELADDR to the decompressor via a linker symbol.
 ifneq ($(CONFIG_AUTO_ZRELADDR),y)

arch/arm/vfp/Makefile +2 -2

index 39f6d8e..6de73aa 100644
@@ -4,8 +4,8 @@
 # Copyright (C) 2001 ARM Limited
 #
 
-# EXTRA_CFLAGS := -DDEBUG
-# EXTRA_AFLAGS := -DDEBUG
+# ccflags-y := -DDEBUG
+# asflags-y := -DDEBUG
 
 KBUILD_AFLAGS	:=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp)
 LDFLAGS		+=--no-warn-mismatch

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #4 lore raw

PATCH RESEND 4/27 h8300: change to new flag variable

In reply to matt mooney

Replace EXTRA_AFLAGS with asflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 arch/h8300/boot/compressed/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/h8300/boot/compressed/Makefile +1 -1

index d6189e0..6745cb1 100644
@@ -5,7 +5,7 @@
 #
 
 targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
-EXTRA_AFLAGS	:= -traditional
+asflags-y	:= -traditional
 
 OBJECTS = $(obj)/head.o $(obj)/misc.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:19 UTC #5 lore raw

PATCH RESEND 5/27 ia64: change to new flag variables

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 arch/ia64/kvm/Makefile           |    4 ++--
 arch/ia64/sn/kernel/Makefile     |    2 +-
 arch/ia64/sn/kernel/sn2/Makefile |    2 +-
 arch/ia64/sn/pci/Makefile        |    2 +-
 arch/ia64/sn/pci/pcibr/Makefile  |    2 +-
 arch/ia64/uv/kernel/Makefile     |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

arch/ia64/kvm/Makefile +2 -2

index 1089b3e..db3d7c5 100644
@@ -45,8 +45,8 @@ FORCE : $(obj)/$(offsets-file)
 # Makefile for Kernel-based Virtual Machine module
 #
 
-EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
-EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
+ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
+asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
 
 common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
 		coalesced_mmio.o irq_comm.o assigned-dev.o)

arch/ia64/sn/kernel/Makefile +1 -1

index 0591038..d27df1d 100644
@@ -7,7 +7,7 @@
 # Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc.  All Rights Reserved.
 #
 
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 
 obj-y				+= setup.o bte.o bte_error.o irq.o mca.o idle.o \
 				   huberror.o io_acpi_init.o io_common.o \

arch/ia64/sn/kernel/sn2/Makefile +1 -1

index 08e6565..3d09108 100644
@@ -9,7 +9,7 @@
 # sn2 specific kernel files
 #
 
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 
 obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \
 	 prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o

arch/ia64/sn/pci/Makefile +1 -1

index ad4ef34..df2a901 100644
@@ -7,6 +7,6 @@
 #
 # Makefile for the sn pci general routines.
 
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 
 obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/

arch/ia64/sn/pci/pcibr/Makefile +1 -1

index 01192d3..396bcae 100644
@@ -7,7 +7,7 @@
 #
 # Makefile for the sn2 io routines.
 
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 
 obj-y				+=  pcibr_dma.o pcibr_reg.o \
 				    pcibr_ate.o pcibr_provider.o

arch/ia64/uv/kernel/Makefile +1 -1

index 8d92b46..124e441 100644
@@ -7,7 +7,7 @@
 # Copyright (C) 2008 Silicon Graphics, Inc.  All Rights Reserved.
 #
 
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 
 obj-y				+= setup.o
 obj-$(CONFIG_IA64_GENERIC)      += machvec.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #6 lore raw

PATCH RESEND 6/27 m68k: change to new flag variables

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 arch/m68k/math-emu/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

arch/m68k/math-emu/Makefile +2 -2

index a0935bf..547c23c 100644
@@ -2,8 +2,8 @@
 # Makefile for the linux kernel.
 #
 
-#EXTRA_AFLAGS += -DFPU_EMU_DEBUG
-#EXTRA_CFLAGS += -DFPU_EMU_DEBUG
+#asflags-y := -DFPU_EMU_DEBUG
+#ccflags-y := -DFPU_EMU_DEBUG
 
 obj-y		:= fp_entry.o fp_scan.o fp_util.o fp_move.o fp_movem.o \
 			fp_cond.o fp_arith.o fp_log.o fp_trig.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #7 lore raw

PATCH RESEND 7/27 microblaze: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 arch/microblaze/kernel/cpu/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/microblaze/kernel/cpu/Makefile +1 -1

index 59cc7bc..fceed4e 100644
@@ -6,7 +6,7 @@ ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_cache.o = -pg
 endif
 
-EXTRA_CFLAGS += -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \
+ccflags-y := -DCPU_MAJOR=$(CPU_MAJOR) -DCPU_MINOR=$(CPU_MINOR) \
 		-DCPU_REV=$(CPU_REV)
 
 obj-y += cache.o cpuinfo.o cpuinfo-pvr-full.o cpuinfo-static.o mb.o pvr.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #8 lore raw

PATCH RESEND 8/27 mips: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 arch/mips/Makefile                     |    4 ++--
 arch/mips/bcm63xx/boards/Makefile      |    2 +-
 arch/mips/fw/arc/Makefile              |    2 +-
 arch/mips/jz4740/Makefile              |    2 +-
 arch/mips/oprofile/Makefile            |    2 +-
 arch/mips/pmc-sierra/yosemite/Makefile |    2 +-
 arch/mips/powertv/Makefile             |    2 +-
 arch/mips/powertv/asic/Makefile        |    2 +-
 arch/mips/powertv/pci/Makefile         |    2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

arch/mips/Makefile +2 -2

index 7c1102e..ac1d5b6 100644
@@ -286,11 +286,11 @@ CLEAN_FILES += vmlinux.32 vmlinux.64
 archprepare:
 ifdef CONFIG_MIPS32_N32
 	@echo '  Checking missing-syscalls for N32'
-	$(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=n32"
+	$(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=n32"
 endif
 ifdef CONFIG_MIPS32_O32
 	@echo '  Checking missing-syscalls for O32'
-	$(Q)$(MAKE) $(build)=. missing-syscalls EXTRA_CFLAGS="-mabi=32"
+	$(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=32"
 endif
 
 install:

arch/mips/bcm63xx/boards/Makefile +1 -1

index e5cc86d..9f64fb4 100644
@@ -1,3 +1,3 @@
 obj-$(CONFIG_BOARD_BCM963XX)		+= board_bcm963xx.o
 
-EXTRA_CFLAGS += -Werror
+ccflags-y := -Werror

arch/mips/fw/arc/Makefile +1 -1

index e0aaad4..5314b37 100644
@@ -9,4 +9,4 @@ lib-$(CONFIG_ARC_MEMORY)	+= memory.o
 lib-$(CONFIG_ARC_CONSOLE)	+= arc_con.o
 lib-$(CONFIG_ARC_PROMLIB)	+= promlib.o
 
-EXTRA_CFLAGS			+= -Werror
+ccflags-y			:= -Werror

arch/mips/jz4740/Makefile +1 -1

index a604eae..a9dff33 100644
@@ -17,4 +17,4 @@ obj-$(CONFIG_JZ4740_QI_LB60)	+= board-qi_lb60.o
 
 obj-$(CONFIG_PM) += pm.o
 
-EXTRA_CFLAGS += -Werror -Wall
+ccflags-y := -Werror -Wall

arch/mips/oprofile/Makefile +1 -1

index 02cc65e..4b9d704 100644
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS := -Werror
+ccflags-y := -Werror
 
 obj-$(CONFIG_OPROFILE) += oprofile.o

arch/mips/pmc-sierra/yosemite/Makefile +1 -1

index b16f95c..02f5fb9 100644
@@ -6,4 +6,4 @@ obj-y    += irq.o prom.o py-console.o setup.o
 
 obj-$(CONFIG_SMP)		+= smp.o
 
-EXTRA_CFLAGS += -Werror
+ccflags-y := -Werror

arch/mips/powertv/Makefile +1 -1

index baf6e90..348d2e8 100644
@@ -28,4 +28,4 @@ obj-y += init.o ioremap.o memory.o powertv_setup.o reset.o time.o \
 
 obj-$(CONFIG_USB) += powertv-usb.o
 
-EXTRA_CFLAGS += -Wall
+ccflags-y := -Wall

arch/mips/powertv/asic/Makefile +1 -1

index f0e95dc..d810a33 100644
@@ -20,4 +20,4 @@ obj-y += asic-calliope.o asic-cronus.o asic-gaia.o asic-zeus.o \
 	asic_devices.o asic_int.o irq_asic.o prealloc-calliope.o \
 	prealloc-cronus.o prealloc-cronuslite.o prealloc-gaia.o prealloc-zeus.o
 
-EXTRA_CFLAGS += -Wall -Werror
+ccflags-y := -Wall -Werror

arch/mips/powertv/pci/Makefile +1 -1

index f5c6246..5783201 100644
@@ -18,4 +18,4 @@
 
 obj-$(CONFIG_PCI)	+= fixup-powertv.o
 
-EXTRA_CFLAGS += -Wall -Werror
+ccflags-y := -Wall -Werror

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:19 UTC #9 lore raw

PATCH RESEND 9/27 s390: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 arch/s390/boot/Makefile     |    2 +-
 arch/s390/kvm/Makefile      |    2 +-
 arch/s390/math-emu/Makefile |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

arch/s390/boot/Makefile +1 -1

index 8800cf09..635d677 100644
@@ -6,7 +6,7 @@ COMPILE_VERSION := __linux_compile_version_id__`hostname |  \
 			tr -c '[0-9A-Za-z]' '_'`__`date | \
 			tr -c '[0-9A-Za-z]' '_'`_t
 
-EXTRA_CFLAGS  := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
+ccflags-y  := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.
 
 targets := image
 targets += bzImage

arch/s390/kvm/Makefile +1 -1

index e5221ec..860d265 100644
@@ -8,7 +8,7 @@
 
 common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)
 
-EXTRA_CFLAGS += -Ivirt/kvm -Iarch/s390/kvm
+ccflags-y := -Ivirt/kvm -Iarch/s390/kvm
 
 kvm-objs := $(common-objs) kvm-s390.o sie64a.o intercept.o interrupt.o priv.o sigp.o diag.o
 obj-$(CONFIG_KVM) += kvm.o

arch/s390/math-emu/Makefile +1 -1

index c848903..51d3995 100644
@@ -4,4 +4,4 @@
 
 obj-$(CONFIG_MATHEMU) := math.o
 
-EXTRA_CFLAGS := -I$(src) -Iinclude/math-emu -w
+ccflags-y := -I$(src) -Iinclude/math-emu -w

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #10 lore raw

PATCH RESEND 10/27 um: change to new flag variables

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 arch/um/sys-ppc/Makefile |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

arch/um/sys-ppc/Makefile +5 -5

index b8bc844..20d363b 100644
@@ -6,7 +6,7 @@ OBJ = built-in.o
 OBJS = ptrace.o sigcontext.o checksum.o miscthings.o misc.o \
 	ptrace_user.o sysrq.o
 
-EXTRA_AFLAGS := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel
+asflags-y := -DCONFIG_PPC32 -I. -I$(srctree)/arch/ppc/kernel
 
 all: $(OBJ)

@@ -15,10 +15,10 @@ $(OBJ): $(OBJS)
 	$(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@
 
 ptrace_user.o: ptrace_user.c
-	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) -D__KERNEL__ $(USER_CFLAGS) $(ccflags-y) -c -o $@ $<
 
 sigcontext.o: sigcontext.c
-	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) $(USER_CFLAGS) $(ccflags-y) -c -o $@ $<
 
 checksum.S:
 	rm -f $@

@@ -53,13 +53,13 @@ ppc_defs.h: mk_defs.c ppc_defs.head \
 checksum.o: checksum.S
 	rm -f asm
 	ln -s $(srctree)/include/asm-ppc asm
-	$(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
+	$(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
 	rm -f asm
 
 misc.o: misc.S ppc_defs.h
 	rm -f asm
 	ln -s $(srctree)/include/asm-ppc asm
-	$(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
+	$(CC) $(asflags-y) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
 	rm -f asm
 
 clean-files := $(OBJS) ppc_defs.h checksum.S mk_defs.c

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:19 UTC #11 lore raw

PATCH RESEND 11/27 xtensa: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 arch/xtensa/boot/Makefile     |    2 +-
 arch/xtensa/boot/lib/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

arch/xtensa/boot/Makefile +1 -1

index 8657c62..068f143 100644
@@ -14,7 +14,7 @@ HOSTFLAGS	+= -Iarch/$(ARCH)/boot/include
 
 BIG_ENDIAN	:= $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#")
 
-export EXTRA_CFLAGS
+export ccflags-y
 export BIG_ENDIAN
 
 subdir-y	:= lib

arch/xtensa/boot/lib/Makefile +1 -1

index d3d2aa2..ad8952e 100644
@@ -6,7 +6,7 @@ zlib	:= inffast.c inflate.c inftrees.c
 
 lib-y	+= $(zlib:.c=.o) zmem.o
 
-EXTRA_CFLAGS	+= -Ilib/zlib_inflate
+ccflags-y	:= -Ilib/zlib_inflate
 
 quiet_cmd_copy_zlib = COPY    $@
       cmd_copy_zlib = cat $< > $@

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #12 lore raw

PATCH RESEND 12/27 fs: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y. And change ntfs-objs to ntfs-y for cleaner conditional inclusion.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 fs/affs/Makefile        |    2 +-
 fs/coda/Makefile        |    2 +-
 fs/gfs2/Makefile        |    2 +-
 fs/jfs/Makefile         |    2 +-
 fs/ncpfs/Makefile       |    2 +-
 fs/ntfs/Makefile        |   19 +++++++------------
 fs/ocfs2/Makefile       |    4 ++--
 fs/ocfs2/dlm/Makefile   |    2 +-
 fs/ocfs2/dlmfs/Makefile |    2 +-
 fs/reiserfs/Makefile    |    4 +---
 fs/xfs/Makefile         |    7 ++-----
 11 files changed, 19 insertions(+), 29 deletions(-)

fs/affs/Makefile +1 -1

index b2c4f54..3988b4a 100644
@@ -2,7 +2,7 @@
 # Makefile for the Linux affs filesystem routines.
 #
 
-#EXTRA_CFLAGS=-DDEBUG=1
+#ccflags-y := -DDEBUG=1
 
 obj-$(CONFIG_AFFS_FS) += affs.o

fs/coda/Makefile +1 -1

index 6c22e61..1bab69a 100644
@@ -9,4 +9,4 @@ coda-objs := psdev.o cache.o cnode.o inode.o dir.o file.o upcall.o \
 
 # If you want debugging output, please uncomment the following line.
 
-# EXTRA_CFLAGS += -DDEBUG -DDEBUG_SMB_MALLOC=1
+# ccflags-y := -DDEBUG -DDEBUG_SMB_MALLOC=1

fs/gfs2/Makefile +1 -1

index 21f7e46..f3d23ef 100644
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS := -I$(src)
+ccflags-y := -I$(src)
 obj-$(CONFIG_GFS2_FS) += gfs2.o
 gfs2-y := acl.o bmap.o dir.o xattr.o glock.o \
 	glops.o inode.o log.o lops.o main.o meta_io.o \

fs/jfs/Makefile +1 -1

index 3adb639..a58fa72 100644
@@ -13,4 +13,4 @@ jfs-y    := super.o file.o inode.o namei.o jfs_mount.o jfs_umount.o \
 
 jfs-$(CONFIG_JFS_POSIX_ACL) += acl.o
 
-EXTRA_CFLAGS += -D_JFS_4K
+ccflags-y := -D_JFS_4K

fs/ncpfs/Makefile +1 -1

index 68ea095..c66af56 100644
@@ -11,6 +11,6 @@ ncpfs-$(CONFIG_NCPFS_EXTRAS)   += symlink.o
 ncpfs-$(CONFIG_NCPFS_NFS_NS)   += symlink.o
 
 # If you want debugging output, please uncomment the following line
-# EXTRA_CFLAGS += -DDEBUG_NCP=1
+# ccflags-y := -DDEBUG_NCP=1
 
 CFLAGS_ncplib_kernel.o := -finline-functions

fs/ntfs/Makefile +7 ~~-12~~

index 4ff028f..30206b2 100644
@@ -2,18 +2,13 @@
 
 obj-$(CONFIG_NTFS_FS) += ntfs.o
 
-ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \
-	     index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \
-	     unistr.o upcase.o
+ntfs-y := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \
+	  index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \
+	  unistr.o upcase.o
 
-EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.30\"
+ntfs-$(CONFIG_NTFS_RW) += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o
 
-ifeq ($(CONFIG_NTFS_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-y := -DNTFS_VERSION=\"2.1.30\"
+ccflags-$(CONFIG_NTFS_DEBUG)	+= -DDEBUG
+ccflags-$(CONFIG_NTFS_RW)	+= -DNTFS_RW
 
-ifeq ($(CONFIG_NTFS_RW),y)
-EXTRA_CFLAGS += -DNTFS_RW
-
-ntfs-objs += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o
-endif

fs/ocfs2/Makefile +2 -2

index 07d9fd8..d8a0313 100644
@@ -1,6 +1,6 @@
-EXTRA_CFLAGS += -Ifs/ocfs2
+ccflags-y := -Ifs/ocfs2
 
-EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES
+ccflags-y += -DCATCH_BH_JBD_RACES
 
 obj-$(CONFIG_OCFS2_FS) += 	\
 	ocfs2.o			\

fs/ocfs2/dlm/Makefile +1 -1

index dcebf0d..c8a044e 100644
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -Ifs/ocfs2
+ccflags-y := -Ifs/ocfs2
 
 obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_dlm.o

fs/ocfs2/dlmfs/Makefile +1 -1

index df69b48..f14be89 100644
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -Ifs/ocfs2
+ccflags-y := -Ifs/ocfs2
 
 obj-$(CONFIG_OCFS2_FS) += ocfs2_dlmfs.o

fs/reiserfs/Makefile +1 -3

index 792b3cb..3c3b001 100644
@@ -31,9 +31,7 @@ endif
 # and causing a panic. Since this behavior only affects ppc32, this ifeq
 # will work around it. If any other architecture displays this behavior,
 # add it here.
-ifeq ($(CONFIG_PPC32),y)
-EXTRA_CFLAGS := $(call cc-ifversion, -lt, 0400, -O1)
-endif
+ccflags-$(CONFIG_PPC32) := $(call cc-ifversion, -lt, 0400, -O1)
 
 TAGS:
 	etags *.c

fs/xfs/Makefile +2 -5

index faca449..82b1371 100644
@@ -16,14 +16,11 @@
 # Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-EXTRA_CFLAGS +=	 -I$(src) -I$(src)/linux-2.6
+ccflags-y := -I$(src) -I$(src)/linux-2.6
+ccflags-$(CONFIG_XFS_DEBUG) += -g
 
 XFS_LINUX := linux-2.6
 
-ifeq ($(CONFIG_XFS_DEBUG),y)
-	EXTRA_CFLAGS += -g
-endif
-
 obj-$(CONFIG_XFS_FS)		+= xfs.o
 
 xfs-y				+= linux-2.6/xfs_trace.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:19 UTC #13 lore raw

PATCH RESEND 13/27 char: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 drivers/char/mwave/Makefile |    4 ++--
 drivers/char/mwave/README   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

drivers/char/mwave/Makefile +2 -2

index 26b4fce..efa6a82 100644
@@ -9,7 +9,7 @@ obj-$(CONFIG_MWAVE) += mwave.o
 mwave-y := mwavedd.o smapi.o tp3780i.o 3780i.o
 
 # To have the mwave driver disable other uarts if necessary
-# EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES
+# ccflags-y := -DMWAVE_FUTZ_WITH_OTHER_DEVICES
 
 # To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
-ccflags-y := -DMW_TRACE
+ccflags-y += -DMW_TRACE

drivers/char/mwave/README +1 -1

index 480251f..c2a58f4 100644
@@ -11,7 +11,7 @@ are not saved by the BIOS and so do not persist after unload and reload.
 	0x0008 tp3780i tracing
 
         Tracing only occurs if the driver has been compiled with the
-        MW_TRACE macro #defined  (i.e. let EXTRA_CFLAGS += -DMW_TRACE
+        MW_TRACE macro #defined  (i.e. let ccflags-y := -DMW_TRACE
         in the Makefile).
 
   mwave_3780i_irq=5/7/10/11/15

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #14 lore raw

PATCH RESEND 14/27 dma: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 drivers/dma/Makefile |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

drivers/dma/Makefile +2 -6

index 64b21f5..1be065a 100644
@@ -1,9 +1,5 @@
-ifeq ($(CONFIG_DMADEVICES_DEBUG),y)
-	ccflags-y	+= -DDEBUG
-endif
-ifeq ($(CONFIG_DMADEVICES_VDEBUG),y)
-	ccflags-y	+= -DVERBOSE_DEBUG
-endif
+ccflags-$(CONFIG_DMADEVICES_DEBUG)  := -DDEBUG
+ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG
 
 obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
 obj-$(CONFIG_NET_DMA) += iovlock.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #15 lore raw

PATCH RESEND 15/27 hwmon: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

Acked-by Guenter Roeck <[email protected]>

---
 drivers/hwmon/Makefile |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

drivers/hwmon/Makefile +1 -3

index dde02d9..974f9cc 100644
@@ -112,7 +112,5 @@ obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l786ng.o
 obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
 obj-$(CONFIG_SENSORS_WM8350)	+= wm8350-hwmon.o
 
-ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #16 lore raw

PATCH RESEND 16/27 ide: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

Acked-by David S. Miller <[email protected]>

---
 drivers/ide/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/ide/Makefile +1 -1

index 81df925..7f879b2 100644
@@ -2,7 +2,7 @@
 # link order is important here
 #
 
-EXTRA_CFLAGS				+= -Idrivers/ide
+ccflags-y				:= -Idrivers/ide
 
 ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \
 	      ide-taskfile.o ide-pm.o ide-park.o ide-sysfs.o ide-devsets.o \

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:19 UTC #17 lore raw

PATCH RESEND 17/27 ieee802154: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

Acked-by Dmitry Eremin-Solenikov <[email protected]>

---
 drivers/ieee802154/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/ieee802154/Makefile +1 -1

index e0e8e1a..6899913 100644
@@ -1,3 +1,3 @@
 obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o
 
-EXTRA_CFLAGS += -DDEBUG -DCONFIG_FFD
+ccflags-y := -DDEBUG -DCONFIG_FFD

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:14 UTC #18 lore raw

PATCH RESEND 18/27 isdn: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

Acked-by David S. Miller <[email protected]>

---
 drivers/isdn/hisax/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/isdn/hisax/Makefile +1 -1

index ab638b08..646368f 100644
@@ -4,7 +4,7 @@
 
 # Define maximum number of cards
 
-EXTRA_CFLAGS      += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
+ccflags-y      := -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS)
 
 obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax.o
 obj-$(CONFIG_HISAX_SEDLBAUER_CS)	+= sedlbauer_cs.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #19 lore raw

PATCH RESEND 19/27 memstick: change to new flag variable

In reply to matt mooney

The EXTRA_CFLAGS assignment in memstick/Makefile was not accomplishing anything because this flag only has effect on sources at the same level as the makefile (i.e., per directory). Since both core/ and host/ rely on MEMSTICK_DEBUG, the subdir-ccflags-y variant seems to be the appropriate choice.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 drivers/memstick/Makefile      |    4 +---
 drivers/memstick/core/Makefile |    4 ----
 drivers/memstick/host/Makefile |    4 ----
 3 files changed, 1 insertions(+), 11 deletions(-)

drivers/memstick/Makefile +1 -3

index dc160fb..9862359 100644
@@ -2,9 +2,7 @@
 # Makefile for the kernel MemoryStick device drivers.
 #
 
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
-	EXTRA_CFLAGS		+= -DDEBUG
-endif
+subdir-ccflags-$(CONFIG_MEMSTICK_DEBUG) := -DDEBUG
 
 obj-$(CONFIG_MEMSTICK)		+= core/
 obj-$(CONFIG_MEMSTICK)		+= host/

drivers/memstick/core/Makefile +0 -4

index 8b2b529..ecd0299 100644
@@ -2,10 +2,6 @@
 # Makefile for the kernel MemoryStick core.
 #
 
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
-	EXTRA_CFLAGS		+= -DDEBUG
-endif
-
 obj-$(CONFIG_MEMSTICK)		+= memstick.o
 
 obj-$(CONFIG_MSPRO_BLOCK)	+= mspro_block.o

drivers/memstick/host/Makefile +0 -4

index 12530e4..a1815e9 100644
@@ -2,9 +2,5 @@
 # Makefile for MemoryStick host controller drivers
 #
 
-ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
-	EXTRA_CFLAGS			+= -DDEBUG
-endif
-
 obj-$(CONFIG_MEMSTICK_TIFM_MS)		+= tifm_ms.o
 obj-$(CONFIG_MEMSTICK_JMICRON_38X)	+= jmb38x_ms.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #20 lore raw

PATCH RESEND 20/27 message: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 drivers/message/fusion/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/message/fusion/Makefile +1 -1

index 95c9532..d182a24 100644
@@ -2,7 +2,7 @@
 
 # enable verbose logging
 # CONFIG_FUSION_LOGGING needs to be enabled in Kconfig
-#EXTRA_CFLAGS += -DMPT_DEBUG_VERBOSE
+#ccflags-y := -DMPT_DEBUG_VERBOSE
 
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:19 UTC #21 lore raw

PATCH RESEND 21/27 misc: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 drivers/misc/cb710/Makefile   |    4 +---
 drivers/misc/sgi-gru/Makefile |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

drivers/misc/cb710/Makefile +1 -3

index 7b80cbf..467c8e9 100644
@@ -1,6 +1,4 @@
-ifeq ($(CONFIG_CB710_DEBUG),y)
-	EXTRA_CFLAGS		+= -DDEBUG
-endif
+ccflags-$(CONFIG_CB710_DEBUG)	:= -DDEBUG
 
 obj-$(CONFIG_CB710_CORE)	+= cb710.o

drivers/misc/sgi-gru/Makefile +1 -3

index 7c4c306..0003a1d 100644
@@ -1,6 +1,4 @@
-ifdef CONFIG_SGI_GRU_DEBUG
-  EXTRA_CFLAGS	+= -DDEBUG
-endif
+ccflags-$(CONFIG_SGI_GRU_DEBUG)	:= -DDEBUG
 
 obj-$(CONFIG_SGI_GRU) := gru.o
 gru-y := grufile.o grumain.o grufault.o grutlbpurge.o gruprocfs.o grukservices.o gruhandles.o grukdump.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:14 UTC #22 lore raw

PATCH RESEND 22/27 net: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

Acked-by Sjur Braendeland <[email protected]>

Acked-by David S. Miller <[email protected]>

Acked-by John W. Linville <[email protected]>

---
 drivers/net/caif/Makefile                   |    4 +---
 drivers/net/skfp/Makefile                   |    2 +-
 drivers/net/wan/lmc/Makefile                |    2 +-
 drivers/net/wireless/hostap/hostap_config.h |    4 ++--
 drivers/net/wireless/zd1211rw/Makefile      |    4 +---
 5 files changed, 6 insertions(+), 10 deletions(-)

drivers/net/caif/Makefile +1 -3

index b38d987..9560b9d 100644
@@ -1,6 +1,4 @@
-ifeq ($(CONFIG_CAIF_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG
 
 # Serial interface
 obj-$(CONFIG_CAIF_TTY) += caif_serial.o

drivers/net/skfp/Makefile +1 -1

index cb23580..b0be023 100644
@@ -17,4 +17,4 @@ skfp-objs :=  skfddi.o    hwmtm.o    fplustm.o  smt.o      cfm.o     \
 #   projects. To keep the source common for all those drivers (and
 #   thus simplify fixes to it), please do not clean it up!
 
-EXTRA_CFLAGS += -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes 
+ccflags-y := -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes

drivers/net/wan/lmc/Makefile +1 -1

index dabdcfe..609710d 100644
@@ -14,4 +14,4 @@ lmc-objs := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o
 # -DDEBUG \
 # -DLMC_PACKET_LOG
 
-EXTRA_CFLAGS += -I. $(DBGDEF)
+ccflags-y := -I. $(DBGDEF)

drivers/net/wireless/hostap/hostap_config.h +2 -2

index 30acd39..2c8f71f 100644
@@ -30,9 +30,9 @@
 
 /* Following defines can be used to remove unneeded parts of the driver, e.g.,
  * to limit the size of the kernel module. Definitions can be added here in
- * hostap_config.h or they can be added to make command with EXTRA_CFLAGS,
+ * hostap_config.h or they can be added to make command with ccflags-y,
  * e.g.,
- * 'make pccard EXTRA_CFLAGS="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
+ * 'make pccard ccflags-y="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
  */
 
 /* Do not include debug messages into the driver */

drivers/net/wireless/zd1211rw/Makefile +1 -3

index 1907eaf..5728a91 100644
@@ -5,7 +5,5 @@ zd1211rw-objs := zd_chip.o zd_mac.o \
 		zd_rf_al7230b.o zd_rf_uw2453.o \
 		zd_rf.o zd_usb.o
 
-ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_ZD1211RW_DEBUG) := -DDEBUG

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #23 lore raw

PATCH RESEND 23/27 pps: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 drivers/pps/clients/Makefile |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

drivers/pps/clients/Makefile +1 -3

index 42517da..4feb7e9 100644
@@ -6,6 +6,4 @@ obj-$(CONFIG_PPS_CLIENT_KTIMER)	+= pps-ktimer.o
 obj-$(CONFIG_PPS_CLIENT_LDISC)	+= pps-ldisc.o
 obj-$(CONFIG_PPS_CLIENT_PARPORT) += pps_parport.o
 
-ifeq ($(CONFIG_PPS_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_PPS_DEBUG) := -DDEBUG

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #24 lore raw

PATCH RESEND 24/27 rapidio: change to new flag variable

In reply to matt mooney

switches/ depends on RAPIDIO_DEBUG so the subdir-ccflags-y variant seems to be appropriate here.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 drivers/rapidio/Makefile          |    4 +---
 drivers/rapidio/switches/Makefile |    4 -----
 2 files changed, 1 insertions(+), 7 deletions(-)

drivers/rapidio/Makefile +1 -3

index b6139fe..89b8eca 100644
@@ -5,6 +5,4 @@ obj-y += rio.o rio-access.o rio-driver.o rio-scan.o rio-sysfs.o
 
 obj-$(CONFIG_RAPIDIO)		+= switches/
 
-ifeq ($(CONFIG_RAPIDIO_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+subdir-ccflags-$(CONFIG_RAPIDIO_DEBUG) := -DDEBUG

drivers/rapidio/switches/Makefile +0 -4

index 48d67a6..c4d3acc 100644
@@ -7,7 +7,3 @@ obj-$(CONFIG_RAPIDIO_CPS_XX)	+= idtcps.o
 obj-$(CONFIG_RAPIDIO_TSI568)	+= tsi568.o
 obj-$(CONFIG_RAPIDIO_TSI500)	+= tsi500.o
 obj-$(CONFIG_RAPIDIO_CPS_GEN2)	+= idt_gen2.o
-
-ifeq ($(CONFIG_RAPIDIO_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:19 UTC #25 lore raw

PATCH RESEND 25/27 rtc: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 drivers/rtc/Makefile |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

drivers/rtc/Makefile +1 -3

index 2afdaf3..5f6c383 100644
@@ -2,9 +2,7 @@
 # Makefile for RTC class/drivers.
 #
 
-ifeq ($(CONFIG_RTC_DEBUG),y)
-	EXTRA_CFLAGS		+= -DDEBUG
-endif
+ccflags-$(CONFIG_RTC_DEBUG)	:= -DDEBUG
 
 obj-$(CONFIG_RTC_LIB)		+= rtc-lib.o
 obj-$(CONFIG_RTC_HCTOSYS)	+= hctosys.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #26 lore raw

PATCH RESEND 26/27 scsi: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 drivers/scsi/aacraid/Makefile |    2 +-
 drivers/scsi/aic94xx/Makefile |    4 +---
 drivers/scsi/libsas/Makefile  |    6 ++----
 drivers/scsi/lpfc/Makefile    |    6 ++----
 drivers/scsi/mvsas/Makefile   |    4 +---
 drivers/scsi/pcmcia/Makefile  |    2 +-
 6 files changed, 8 insertions(+), 16 deletions(-)

drivers/scsi/aacraid/Makefile +1 -1

index f1cca4e..92df4d6 100644
@@ -5,4 +5,4 @@ obj-$(CONFIG_SCSI_AACRAID) := aacraid.o
 aacraid-objs	:= linit.o aachba.o commctrl.o comminit.o commsup.o \
 		   dpcsup.o rx.o sa.o rkt.o nark.o
 
-EXTRA_CFLAGS	:= -Idrivers/scsi
+ccflags-y	:= -Idrivers/scsi

drivers/scsi/aic94xx/Makefile +1 -3

index e78ce0f..c0a15c7 100644
@@ -22,9 +22,7 @@
 # along with the aic94xx driver; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-ifeq ($(CONFIG_AIC94XX_DEBUG),y)
-	EXTRA_CFLAGS += -DASD_DEBUG -DASD_ENTER_EXIT
-endif
+ccflags-$(CONFIG_AIC94XX_DEBUG) := -DASD_DEBUG -DASD_ENTER_EXIT
 
 obj-$(CONFIG_SCSI_AIC94XX) += aic94xx.o
 aic94xx-y += aic94xx_init.o \

drivers/scsi/libsas/Makefile +2 -4

index 1ad1323..c62aa7b 100644
@@ -21,9 +21,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-ifeq ($(CONFIG_SCSI_SAS_LIBSAS_DEBUG),y)
-	EXTRA_CFLAGS += -DSAS_DEBUG
-endif
+ccflags-$(CONFIG_SCSI_SAS_LIBSAS_DEBUG) := -DSAS_DEBUG
 
 obj-$(CONFIG_SCSI_SAS_LIBSAS) += libsas.o
 libsas-y +=  sas_init.o     \

@@ -36,4 +34,4 @@ libsas-y +=  sas_init.o     \
 		sas_scsi_host.o \
 		sas_task.o
 libsas-$(CONFIG_SCSI_SAS_ATA) +=	sas_ata.o
-libsas-$(CONFIG_SCSI_SAS_HOST_SMP) +=	sas_host_smp.o
\ No newline at end of file
+libsas-$(CONFIG_SCSI_SAS_HOST_SMP) +=	sas_host_smp.o

drivers/scsi/lpfc/Makefile +2 -4

index ad05d6e..14de249 100644
@@ -19,10 +19,8 @@
 # *******************************************************************/
 ######################################################################
 
-ifneq ($(GCOV),)
-  EXTRA_CFLAGS += -fprofile-arcs -ftest-coverage
-  EXTRA_CFLAGS += -O0
-endif
+ccflags-$(GCOV) := -fprofile-arcs -ftest-coverage
+ccflags-$(GCOV) += -O0
 
 obj-$(CONFIG_SCSI_LPFC) := lpfc.o

drivers/scsi/mvsas/Makefile +1 -3

index 52ac426..ffbf759 100644
@@ -21,9 +21,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 
-ifeq ($(CONFIG_SCSI_MVSAS_DEBUG),y)
-	EXTRA_CFLAGS += -DMV_DEBUG
-endif
+ccflags-$(CONFIG_SCSI_MVSAS_DEBUG) := -DMV_DEBUG
 
 obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
 mvsas-y +=  mv_init.o  \

drivers/scsi/pcmcia/Makefile +1 -1

index eca3790..683bf14 100644
@@ -1,5 +1,5 @@
 
-EXTRA_CFLAGS		+= -Idrivers/scsi
+ccflags-y		:= -Idrivers/scsi
 
 # 16-bit client drivers
 obj-$(CONFIG_PCMCIA_QLOGIC)	+= qlogic_cs.o

Signature · 1 line

1.7.3.4

matt mooney

author

2011-01-14 14:13 UTC #27 lore raw

PATCH RESEND 27/27 video: change to new flag variable

In reply to matt mooney

Replace EXTRA_CFLAGS with ccflags-y.

Signed-off-by matt mooney <[email protected]>

Acked-by WANG Cong <[email protected]>

---
 drivers/video/intelfb/Makefile |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

drivers/video/intelfb/Makefile +1 -4

index 6c782d3..f7d631e 100644
@@ -4,7 +4,4 @@ intelfb-y := intelfbdrv.o intelfbhw.o
 intelfb-$(CONFIG_FB_INTEL_I2C) += intelfb_i2c.o
 intelfb-objs := $(intelfb-y)
 
-ifdef CONFIG_FB_INTEL_DEBUG
-#EXTRA_CFLAGS += -DDEBUG -DVERBOSE -DREGDUMP
-EXTRA_CFLAGS += -DDEBUG -DREGDUMP
-endif
+ccflags-$(CONFIG_FB_INTEL_DEBUG) := -DDEBUG -DREGDUMP

Signature · 1 line

1.7.3.4

Michal Marek

2011-03-17 13:15 UTC #28 lore raw

In reply to matt mooney

Quoted 29 lines · matt mooney

Hi Michal,
These are the patches that never made their way into the linux-next tree. I have added all of the acks that came through.
Thanks,
matt
matt mooney (27):
kernel: change to new flag variable
alpha: change to new flag variables
arm: change to new flag variables
h8300: change to new flag variable
ia64: change to new flag variables
m68k: change to new flag variables
microblaze: change to new flag variable
mips: change to new flag variable
s390: change to new flag variable
um: change to new flag variables
xtensa: change to new flag variable
fs: change to new flag variable
char: change to new flag variable
dma: change to new flag variable
hwmon: change to new flag variable
ide: change to new flag variable
ieee802154: change to new flag variable
isdn: change to new flag variable
memstick: change to new flag variable

Quoted 8 lines

message: change to new flag variable
misc: change to new flag variable
net: change to new flag variable
pps: change to new flag variable
rapidio: change to new flag variable
rtc: change to new flag variable
scsi: change to new flag variable
video: change to new flag variable

I committed these to kbuild.2.6.git#trivial and will send a pull request to Linus.

Thanks,
Michal

Geert Uytterhoeven

maintainer

2011-03-17 13:20 UTC #29 lore raw

Quoted 8 lines · Michal Marek

Quoted 4 lines · matt mooney
These are the patches that never made their way into the linux-next tree. I have added all of the acks that came through.
m68k: change to new flag variables
I committed these to kbuild.2.6.git#trivial and will send a pull request to Linus.

JFYI, the m68k one went in last night through the m68k tree.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

Michal Marek

2011-03-17 13:31 UTC #30 lore raw

Quoted 11 lines · Geert Uytterhoeven

Quoted 8 lines · Michal Marek
Quoted 4 lines · matt mooney
These are the patches that never made their way into the linux-next tree. I have added all of the acks that came through.
m68k: change to new flag variables
I committed these to kbuild.2.6.git#trivial and will send a pull request to Linus.
JFYI, the m68k one went in last night through the m68k tree.

I did a rebase onto linux-next and back, so that I don't duplicate patches that have been picked up by subsystem maintainers already. This is the resulting shortlog, m68k is not there:

matt mooney (25):
kernel: change to new flag variable
arm: change to new flag variables
h8300: change to new flag variable
ia64: change to new flag variables
microblaze: change to new flag variable
mips: change to new flag variable
s390: change to new flag variable
um: change to new flag variables
xtensa: change to new flag variable
fs: change to new flag variable
char: change to new flag variable
dma: change to new flag variable
hwmon: change to new flag variable
ide: change to new flag variable
ieee802154: change to new flag variable
isdn: change to new flag variable
memstick: change to new flag variable
message: change to new flag variable
misc: change to new flag variable
net: change to new flag variable
pps: change to new flag variable
rapidio: change to new flag variable
rtc: change to new flag variable
scsi: change to new flag variable
video: change to new flag variable

I guess I should be more verbose than "thanks, applied" next time :).

Michal