From ec4c6933ff754d8dcc0dc3f2fce19a81babe2fd3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 23 Dec 2010 14:19:23 -0500 Subject: Blackfin: unify bootmode based LDR_FLAGS setup Unify this convention for all Blackfin boards. Signed-off-by: Mike Frysinger diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index 92520e8..4102c6f 100644 --- a/arch/blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -67,6 +67,9 @@ endif LDR_FLAGS += $(LDR_FLAGS-y) +# Set some default LDR flags based on boot mode. +LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) + ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),) LDSCRIPT = $(obj)arch/$(ARCH)/lib/u-boot.lds.S endif diff --git a/board/bct-brettl2/config.mk b/board/bct-brettl2/config.mk index df11d61..6e7e543 100644 --- a/board/bct-brettl2/config.mk +++ b/board/bct-brettl2/config.mk @@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf536-0.3 CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk index 7664261..d941092 100644 --- a/board/bf518f-ezbrd/config.mk +++ b/board/bf518f-ezbrd/config.mk @@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf518-0.0 CFLAGS_lib += -O2 CFLAGS_lib/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 60f6f9c..83fd42e 100644 --- a/board/bf526-ezbrd/config.mk +++ b/board/bf526-ezbrd/config.mk @@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf526-0.0 CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf527-ad7160-eval/config.mk b/board/bf527-ad7160-eval/config.mk index ecb31bf..05c7d3b 100644 --- a/board/bf527-ad7160-eval/config.mk +++ b/board/bf527-ad7160-eval/config.mk @@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf527-0.2 CFLAGS_lib += -O2 CFLAGS_lib/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 436a7b3..b10c3d2 100644 --- a/board/bf527-ezkit/config.mk +++ b/board/bf527-ezkit/config.mk @@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf527-0.0 CFLAGS_lib += -O2 CFLAGS_lib/lzma += -O2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf527-sdp/config.mk b/board/bf527-sdp/config.mk index 8eff4fd..47c2989 100644 --- a/board/bf527-sdp/config.mk +++ b/board/bf527-sdp/config.mk @@ -30,4 +30,3 @@ CFLAGS_lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 6 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk index c775398..c45a197 100644 --- a/board/bf533-ezkit/config.mk +++ b/board/bf533-ezkit/config.mk @@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk index c775398..c45a197 100644 --- a/board/bf533-stamp/config.mk +++ b/board/bf533-stamp/config.mk @@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf537-minotaur/config.mk b/board/bf537-minotaur/config.mk index 0f0ed48..f7aa8ef 100644 --- a/board/bf537-minotaur/config.mk +++ b/board/bf537-minotaur/config.mk @@ -26,5 +26,4 @@ CONFIG_BFIN_CPU = bf537-0.2 # Set some default LDR flags based on boot mode. -LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) +LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6 diff --git a/board/bf537-pnav/config.mk b/board/bf537-pnav/config.mk index 1e7afcc..b48bb00 100644 --- a/board/bf537-pnav/config.mk +++ b/board/bf537-pnav/config.mk @@ -24,6 +24,3 @@ # CONFIG_BFIN_CPU = bf537-0.2 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf537-srv1/config.mk b/board/bf537-srv1/config.mk index 0f0ed48..f7aa8ef 100644 --- a/board/bf537-srv1/config.mk +++ b/board/bf537-srv1/config.mk @@ -26,5 +26,4 @@ CONFIG_BFIN_CPU = bf537-0.2 # Set some default LDR flags based on boot mode. -LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) +LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6 diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk index f913f9a..2bb6b79 100644 --- a/board/bf537-stamp/config.mk +++ b/board/bf537-stamp/config.mk @@ -31,4 +31,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk index 2644021..9bae4d1 100644 --- a/board/bf538f-ezkit/config.mk +++ b/board/bf538f-ezkit/config.mk @@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk index b7f91f2..97b64b9 100644 --- a/board/bf548-ezkit/config.mk +++ b/board/bf548-ezkit/config.mk @@ -34,4 +34,3 @@ LDR_FLAGS-BFIN_BOOT_FIFO := --dma 1 LDR_FLAGS-BFIN_BOOT_SPI_MASTER := --dma 1 LDR_FLAGS-BFIN_BOOT_UART := --dma 1 LDR_FLAGS-BFIN_BOOT_NAND := --dma 6 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf561-acvilon/config.mk b/board/bf561-acvilon/config.mk index 20c1ec2f..5633b3b 100644 --- a/board/bf561-acvilon/config.mk +++ b/board/bf561-acvilon/config.mk @@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk index db92eec..8b22d0d 100644 --- a/board/bf561-ezkit/config.mk +++ b/board/bf561-ezkit/config.mk @@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/blackstamp/config.mk b/board/blackstamp/config.mk index 083aff1..5bf4189 100644 --- a/board/blackstamp/config.mk +++ b/board/blackstamp/config.mk @@ -24,6 +24,3 @@ # CONFIG_BFIN_CPU = bf532-0.5 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/blackvme/config.mk b/board/blackvme/config.mk index 0400ace..620104a 100644 --- a/board/blackvme/config.mk +++ b/board/blackvme/config.mk @@ -24,6 +24,3 @@ # CONFIG_BFIN_CPU = bf561-0.5 - -# Set some default LDR flags based on boot mode. -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk index 436a7b3..b10c3d2 100644 --- a/board/cm-bf527/config.mk +++ b/board/cm-bf527/config.mk @@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf527-0.0 CFLAGS_lib += -O2 CFLAGS_lib/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 c775398..c45a197 100644 --- a/board/cm-bf533/config.mk +++ b/board/cm-bf533/config.mk @@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk index 36d8778..d5d6dd9 100644 --- a/board/cm-bf537e/config.mk +++ b/board/cm-bf537e/config.mk @@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/cm-bf537u/config.mk b/board/cm-bf537u/config.mk index 36d8778..d5d6dd9 100644 --- a/board/cm-bf537u/config.mk +++ b/board/cm-bf537u/config.mk @@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk index e1620e0..a28a426 100644 --- a/board/cm-bf548/config.mk +++ b/board/cm-bf548/config.mk @@ -33,4 +33,3 @@ LDR_FLAGS-BFIN_BOOT_PARA := --dma 6 LDR_FLAGS-BFIN_BOOT_FIFO := --dma 1 LDR_FLAGS-BFIN_BOOT_SPI_MASTER := --dma 1 LDR_FLAGS-BFIN_BOOT_UART := --dma 1 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk index db92eec..8b22d0d 100644 --- a/board/cm-bf561/config.mk +++ b/board/cm-bf561/config.mk @@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/ibf-dsp561/config.mk b/board/ibf-dsp561/config.mk index e213714..7d25d0b 100644 --- a/board/ibf-dsp561/config.mk +++ b/board/ibf-dsp561/config.mk @@ -27,4 +27,3 @@ CONFIG_BFIN_CPU = bf561-0.5 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/ip04/config.mk b/board/ip04/config.mk index 0722a96..2e9ee28 100644 --- a/board/ip04/config.mk +++ b/board/ip04/config.mk @@ -31,4 +31,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) diff --git a/board/tcm-bf518/config.mk b/board/tcm-bf518/config.mk index 7664261..d941092 100644 --- a/board/tcm-bf518/config.mk +++ b/board/tcm-bf518/config.mk @@ -27,6 +27,3 @@ CONFIG_BFIN_CPU = bf518-0.0 CFLAGS_lib += -O2 CFLAGS_lib/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 36d8778..d5d6dd9 100644 --- a/board/tcm-bf537/config.mk +++ b/board/tcm-bf537/config.mk @@ -30,4 +30,3 @@ CFLAGS_lib/lzma += -O2 # Set some default LDR flags based on boot mode. LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 -LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE)) -- cgit v0.10.2