diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-29 21:46:08 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-29 21:46:08 +0200 |
| commit | 3388db2cd72d85717596158131b3e48efe2acfea (patch) | |
| tree | 590ca2d8a11329d6a5ccdfcb6324877fa7c8ee4a | |
| parent | 1ecb758341bac03994ed045821f9c0f7d1686d07 (diff) | |
| parent | 73520939b41d90c0925d5ea4abaa670b7fce2285 (diff) | |
| download | u-boot-imx-3388db2cd72d85717596158131b3e48efe2acfea.zip u-boot-imx-3388db2cd72d85717596158131b3e48efe2acfea.tar.gz u-boot-imx-3388db2cd72d85717596158131b3e48efe2acfea.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
| -rw-r--r-- | arch/blackfin/config.mk | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/config.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index a330084..ab117ca 100644 --- a/arch/blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -26,8 +26,6 @@ CROSS_COMPILE ?= bfin-uclinux- STANDALONE_LOAD_ADDR = 0x1000 -m elf32bfin 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))) PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h index 388434f..0437252 100644 --- a/arch/blackfin/include/asm/config.h +++ b/arch/blackfin/include/asm/config.h @@ -9,6 +9,9 @@ #ifndef __ASM_BLACKFIN_CONFIG_POST_H__ #define __ASM_BLACKFIN_CONFIG_POST_H__ +/* Some of our defines use this (like CONFIG_SYS_GBL_DATA_ADDR) */ +#include <asm-offsets.h> + #ifndef CONFIG_BFIN_SCRATCH_REG # define CONFIG_BFIN_SCRATCH_REG retn #endif |