Commit fbcf8e8c authored by Mike Frysinger's avatar Mike Frysinger

Blackfin: move CONFIG_BFIN_CPU back to board config.h

This is a revert of 821ad16f as Wolfgang doesn't like the new code.
Signed-off-by: 's avatarMike Frysinger <vapier@gentoo.org>
parent ec4c6933
......@@ -25,6 +25,13 @@ CROSS_COMPILE ?= bfin-uclinux-
STANDALONE_LOAD_ADDR = 0x1000 -m elf32bfin
ifeq ($(CONFIG_BFIN_CPU),)
CONFIG_BFIN_CPU := \
$(shell awk '$$2 == "CONFIG_BFIN_CPU" { print $$3 }' \
$(src)include/configs/$(BOARD).h)
else
CONFIG_BFIN_CPU := $(strip $(subst ",,$(CONFIG_BFIN_CPU)))
endif
CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE)))
PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic
......@@ -34,7 +41,6 @@ LDFLAGS_FINAL += --gc-sections
LDFLAGS += -m elf32bfin
PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
PLATFORM_CPPFLAGS += -DBFIN_CPU='"$(CONFIG_BFIN_CPU)"'
PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU)
ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
......
......@@ -12,6 +12,11 @@
/* Some of our defines use this (like CONFIG_SYS_GBL_DATA_ADDR) */
#include <asm-offsets.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
......
......@@ -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 = BFIN_CPU;
bd->bi_cpu = MK_STR(CONFIG_BFIN_CPU);
bd->bi_board_name = BFIN_BOARD_NAME;
bd->bi_vco = get_vco();
bd->bi_cclk = get_cclk();
......
......@@ -23,7 +23,5 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf536-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......@@ -23,7 +23,5 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf518-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......@@ -23,7 +23,5 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf526-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......@@ -23,7 +23,5 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf527-0.2
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......@@ -23,7 +23,5 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf527-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf527-0.2
CFLAGS_lib_generic += -O2
CFLAGS_lzma += -O2
......
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf533-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf533-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,7 +23,5 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf537-0.2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6
......@@ -23,4 +23,3 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf537-0.2
......@@ -23,7 +23,5 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf537-0.2
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_UART := --port g --gpio 6
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf537-0.2
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf538-0.4
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf548-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf561-0.5
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf561-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,4 +23,3 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf532-0.5
......@@ -22,5 +22,3 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf561-0.5
......@@ -23,7 +23,5 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf527-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf533-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf537-0.2
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf537-0.2
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf548-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf561-0.3
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,7 +23,5 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf561-0.5
# Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf532-0.5
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -23,7 +23,5 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf518-0.0
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......@@ -23,8 +23,6 @@
# MA 02111-1307 USA
#
CONFIG_BFIN_CPU = bf537-0.2
CFLAGS_lib += -O2
CFLAGS_lib/lzma += -O2
......
......@@ -11,7 +11,8 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
#define CONFIG_BFIN_CPU bf536-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
/*
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf518-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf526-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf527-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf527-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf527-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf533-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf533-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
......
......@@ -24,6 +24,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
......
......@@ -24,6 +24,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf538-0.4
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf548-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
......
......@@ -12,7 +12,8 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
#define CONFIG_BFIN_CPU bf561-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
/*
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf561-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
......
......@@ -24,6 +24,7 @@
/* 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
/*
......
......@@ -23,7 +23,8 @@
#define CONFIG_PANIC_HANG 0
/* CPU Options */
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
#define CONFIG_BFIN_CPU bf561-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER
/*
* CLOCK SETTINGS CAVEAT
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf527-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf533-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf548-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf561-0.3
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf561-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
......
......@@ -20,6 +20,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf532-0.5
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_NAND
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf518-0.0
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA
......
......@@ -11,6 +11,7 @@
/*
* Processor Settings
*/
#define CONFIG_BFIN_CPU bf537-0.2
#define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment