leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Blackfin: move CONFIG_BFIN_CPU to board config.mk

Browse Source 
The CONFIG_BFIN_CPU option is largely used in the build system, so move
it out of the board config.h and into the board config.mk.  It'd be nice
to keep everything in the config.h, but the patch to extract that value
early was rejected.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2010-08-09 17:57:47 -04:00
parent 543ef36586
commit 821ad16fa9
53 changed files with 52 additions and 34 deletions

4
arch/blackfin/config.mk
View File

@ -25,7 +25,6 @@ CROSS_COMPILE ?= bfin-uclinux-
STANDALONE_LOAD_ADDR = 0x1000 -m elf32bfin
CONFIG_BFIN_CPU := $(strip $(subst ",,$(CONFIG_BFIN_CPU)))
CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE)))
CONFIG_ENV_OFFSET := $(strip $(subst ",,$(CONFIG_ENV_OFFSET)))
CONFIG_ENV_SIZE := $(strip $(subst ",,$(CONFIG_ENV_SIZE)))
@ -36,9 +35,8 @@ PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN
LDFLAGS += --gc-sections -m elf32bfin
PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
ifneq (,$(CONFIG_BFIN_CPU))
PLATFORM_CPPFLAGS += -DBFIN_CPU='"$(CONFIG_BFIN_CPU)"'
PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU)
endif
ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
ALL += $(obj)u-boot.ldr

5
arch/blackfin/include/asm/config.h
View File

@ -9,11 +9,6 @@
#ifndef __ASM_BLACKFIN_CONFIG_POST_H__
#define __ASM_BLACKFIN_CONFIG_POST_H__
/* Sanity check CONFIG_BFIN_CPU */
#ifndef CONFIG_BFIN_CPU
# error CONFIG_BFIN_CPU: your board config needs to define this
#endif
#ifndef CONFIG_BFIN_SCRATCH_REG
# define CONFIG_BFIN_SCRATCH_REG retn
#endif

2
arch/blackfin/lib/board.c
View File

@ -254,7 +254,7 @@ void board_init_f(ulong bootflag)
memset((void *)bd, 0, sizeof(bd_t));
bd->bi_r_version = version_string;
bd->bi_cpu = MK_STR(CONFIG_BFIN_CPU);
bd->bi_cpu = BFIN_CPU;
bd->bi_board_name = BFIN_BOARD_NAME;
bd->bi_vco = get_vco();
bd->bi_cclk = get_cclk();

2
board/bf518f-ezbrd/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf518-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/bf526-ezbrd/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf526-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/bf527-ad7160-eval/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf527-0.2
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/bf527-ezkit/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf527-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/bf533-ezkit/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf533-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/bf533-stamp/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf533-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/bf537-minotaur/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
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))

2
board/bf537-pnav/config.mk
View File

@ -26,5 +26,7 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf537-0.2
# Set some default LDR flags based on boot mode.
LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))

2
board/bf537-srv1/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
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))

2
board/bf537-stamp/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf537-0.2
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/bf538f-ezkit/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf538-0.4
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/bf548-ezkit/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf548-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/bf561-acvilon/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf561-0.5
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/bf561-ezkit/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf561-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/blackstamp/config.mk
View File

@ -26,5 +26,7 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf532-0.5
# Set some default LDR flags based on boot mode.
LDR_FLAGS += $(LDR_FLAGS-$(CONFIG_BFIN_BOOT_MODE))

2
board/cm-bf527/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf527-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/cm-bf533/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf533-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/cm-bf537e/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf537-0.2
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/cm-bf537u/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf537-0.2
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/cm-bf548/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf548-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/cm-bf561/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf561-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/ibf-dsp561/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
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))

2
board/ip04/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf532-0.5
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/tcm-bf518/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf518-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

2
board/tcm-bf537/config.mk
View File

@ -26,6 +26,8 @@
# This is not actually used for Blackfin boards so do not change it
#TEXT_BASE = do-not-use-me
CONFIG_BFIN_CPU = bf537-0.2
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2

1
include/configs/bf518f-ezbrd.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf518-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

1
include/configs/bf526-ezbrd.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf526-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

1
include/configs/bf527-ad7160-eval.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf527-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER

1
include/configs/bf527-ezkit.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf527-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

1
include/configs/bf533-ezkit.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf533-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

1
include/configs/bf533-stamp.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf533-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

1
include/configs/bf537-minotaur.h
View File

@ -24,7 +24,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER

1
include/configs/bf537-pnav.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER

1
include/configs/bf537-srv1.h
View File

@ -24,7 +24,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER

1
include/configs/bf537-stamp.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

1
include/configs/bf538f-ezkit.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf538-0.4
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

1
include/configs/bf548-ezkit.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf548-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

1
include/configs/bf561-acvilon.h
View File

@ -12,7 +12,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf561-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

1
include/configs/bf561-ezkit.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf561-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

1
include/configs/blackstamp.h
View File

@ -24,7 +24,6 @@
/* CPU Options
* Be sure to set the Silicon Revision Correctly
*/
#define CONFIG_BFIN_CPU bf532-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
/*

1
include/configs/cm-bf527.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf527-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

1
include/configs/cm-bf533.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf533-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

1
include/configs/cm-bf537e.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

1
include/configs/cm-bf537u.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

1
include/configs/cm-bf548.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf548-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

1
include/configs/cm-bf561.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf561-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

1
include/configs/ibf-dsp561.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf561-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

1
include/configs/ip04.h
View File

@ -20,7 +20,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf532-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_NAND

1
include/configs/tcm-bf518.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf518-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

1
include/configs/tcm-bf537.h
View File

@ -11,7 +11,6 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS