Change directory-specific CFLAGS to use full path

Previously, a specific file or directory could be compiled with custom
CFLAGS by adding a Makefile variable such as:
  CFLAGS_dlmalloc.o = <custom flags for common/dlmalloc.c>
or
  CFLAGS_lib = <custom flags for lib directory>

This method breaks down once multiple files or directories share the
same path.  Eg FLAGS_fileA = <custom flags> would incorrectly result in
both dir1/fileA.c and dir2/fileA.c being compiled with <custom flags>.

This change allows finer grained control which we need once we move
lib_$ARCH to arch/$ARCH/lib/ and lib_generic/ to lib/.  Without this
change all lib/ directories would share the same custom CFLAGS.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk
index f85bef5e2a73d6e9bf582a0e5933d7413b48d35f..fb93531f7700f0cc66cb2f773a72587ab96bca2b 100644 (file)
--- a/board/bf518f-ezbrd/config.mk
+++ b/board/bf518f-ezbrd/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))

diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk
index f85bef5e2a73d6e9bf582a0e5933d7413b48d35f..fb93531f7700f0cc66cb2f773a72587ab96bca2b 100644 (file)
--- a/board/bf526-ezbrd/config.mk
+++ b/board/bf526-ezbrd/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))

diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk
index f85bef5e2a73d6e9bf582a0e5933d7413b48d35f..fb93531f7700f0cc66cb2f773a72587ab96bca2b 100644 (file)
--- a/board/bf527-ezkit/config.mk
+++ b/board/bf527-ezkit/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))

diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk
index 3c0b46f7214170152ea17874700752764f65fbe7..b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6 100644 (file)
--- a/board/bf533-ezkit/config.mk
+++ b/board/bf533-ezkit/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk
index 3c0b46f7214170152ea17874700752764f65fbe7..b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6 100644 (file)
--- a/board/bf533-stamp/config.mk
+++ b/board/bf533-stamp/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk
index bc142574896b2f8c327f59bab2e309d13ac63eaa..95d0fcc08ff715a256e40c85fbe6ef13effe8716 100644 (file)
--- a/board/bf537-stamp/config.mk
+++ b/board/bf537-stamp/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk
index 3c0b46f7214170152ea17874700752764f65fbe7..b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6 100644 (file)
--- a/board/bf538f-ezkit/config.mk
+++ b/board/bf538f-ezkit/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk
index 42ff94667307bbe17608e4d3b5e0591f0f1be3fc..aff12e9dc59dd869e320273dd4da9abc12ef806c 100644 (file)
--- a/board/bf548-ezkit/config.mk
+++ b/board/bf548-ezkit/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6

diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk
index cfad21a2a46233b18a64d5baea81e217f9907afd..b5170259b427d4859757bec0a5e7b11c340f6d9b 100644 (file)
--- a/board/bf561-acvilon/config.mk
+++ b/board/bf561-acvilon/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16

diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk
index cfad21a2a46233b18a64d5baea81e217f9907afd..b5170259b427d4859757bec0a5e7b11c340f6d9b 100644 (file)
--- a/board/bf561-ezkit/config.mk
+++ b/board/bf561-ezkit/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16

diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk
index f85bef5e2a73d6e9bf582a0e5933d7413b48d35f..fb93531f7700f0cc66cb2f773a72587ab96bca2b 100644 (file)
--- a/board/cm-bf527/config.mk
+++ b/board/cm-bf527/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))

diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk
index 3c0b46f7214170152ea17874700752764f65fbe7..b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6 100644 (file)
--- a/board/cm-bf533/config.mk
+++ b/board/cm-bf533/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk
index 3c0b46f7214170152ea17874700752764f65fbe7..b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6 100644 (file)
--- a/board/cm-bf537e/config.mk
+++ b/board/cm-bf537e/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk
index 3c0b46f7214170152ea17874700752764f65fbe7..b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6 100644 (file)
--- a/board/cm-bf537u/config.mk
+++ b/board/cm-bf537u/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk
index 0c95b39627713601d38e7a8625b7e036948d6721..66c7368f72703ab53bf32045035115df89ffd425 100644 (file)
--- a/board/cm-bf548/config.mk
+++ b/board/cm-bf548/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6

diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk
index cfad21a2a46233b18a64d5baea81e217f9907afd..b5170259b427d4859757bec0a5e7b11c340f6d9b 100644 (file)
--- a/board/cm-bf561/config.mk
+++ b/board/cm-bf561/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16

diff --git a/board/eNET/config.mk b/board/eNET/config.mk
index 5c64804fb291c7aae66189fb26bb78a1cd50e4f9..dcde7fcedb21f83a22f0c43e28d8340ce61b326c 100644 (file)
--- a/board/eNET/config.mk
+++ b/board/eNET/config.mk
@@ -22,7 +22,7 @@
 #
 
 TEXT_BASE = 0x38040000
-CFLAGS_dlmalloc.o += -Wa,--no-warn -fno-strict-aliasing
+CFLAGS_common/dlmalloc.o += -Wa,--no-warn -fno-strict-aliasing
 PLATFORM_RELFLAGS += -fvisibility=hidden
 PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm
 PLATFORM_LDFLAGS += -pic --emit-relocs -Bsymbolic -Bsymbolic-functions

diff --git a/board/tcm-bf518/config.mk b/board/tcm-bf518/config.mk
index f85bef5e2a73d6e9bf582a0e5933d7413b48d35f..fb93531f7700f0cc66cb2f773a72587ab96bca2b 100644 (file)
--- a/board/tcm-bf518/config.mk
+++ b/board/tcm-bf518/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))

diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk
index 3c0b46f7214170152ea17874700752764f65fbe7..b50e1f2c80ad2a1d698415f56a6d4437b99ef6f6 100644 (file)
--- a/board/tcm-bf537/config.mk
+++ b/board/tcm-bf537/config.mk
@@ -27,7 +27,7 @@
 #TEXT_BASE = do-not-use-me
 
 CFLAGS_lib_generic += -O2
-CFLAGS_lzma += -O2
+CFLAGS_lib_generic/lzma += -O2
 
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

diff --git a/config.mk b/config.mk
index c82cb63d247ab22a59a4ef9b172e862f142e255b..1a61dbb7fa0c78797f54f085fd98a1acbd61bc93 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -236,16 +236,21 @@ export    TEXT_BASE PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS
 #########################################################################
 
 # Allow boards to use custom optimize flags on a per dir/file basis
-BCURDIR := $(notdir $(CURDIR))
+BCURDIR = $(subst $(SRCTREE)/,,$(CURDIR:$(obj)%=%))
 $(obj)%.s:     %.S
-       $(CPP) $(AFLAGS) $(AFLAGS_$(@F)) $(AFLAGS_$(BCURDIR)) -o $@ $<
+       $(CPP) $(AFLAGS) $(AFLAGS_$(BCURDIR)/$(@F)) $(AFLAGS_$(BCURDIR)) \
+               -o $@ $<
 $(obj)%.o:     %.S
-       $(CC)  $(AFLAGS) $(AFLAGS_$(@F)) $(AFLAGS_$(BCURDIR)) -o $@ $< -c
+       $(CC)  $(AFLAGS) $(AFLAGS_$(BCURDIR)/$(@F)) $(AFLAGS_$(BCURDIR)) \
+               -o $@ $< -c
 $(obj)%.o:     %.c
-       $(CC)  $(CFLAGS) $(CFLAGS_$(@F)) $(CFLAGS_$(BCURDIR)) -o $@ $< -c
+       $(CC)  $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
+               -o $@ $< -c
 $(obj)%.i:     %.c
-       $(CPP) $(CFLAGS) $(CFLAGS_$(@F)) $(CFLAGS_$(BCURDIR)) -o $@ $< -c
+       $(CPP) $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
+               -o $@ $< -c
 $(obj)%.s:     %.c
-       $(CC)  $(CFLAGS) $(CFLAGS_$(@F)) $(CFLAGS_$(BCURDIR)) -o $@ $< -c -S
+       $(CC)  $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
+               -o $@ $< -c -S
 
 #########################################################################