diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-09 02:24:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-09 02:24:51 +0200 |
| commit | ab00e7a23e088505b22cba7b84145806129b83bf (patch) | |
| tree | 5acdfb4c2b87058d132dc8fe9fb81d394cb034bd /board/esd/cpci405/config.mk | |
| parent | 4d2ae70e8c31c22e5710df5ff236b5565ea2cf2c (diff) | |
| parent | 5ff889349d2ace13f10c9335e09365fcec8247cc (diff) | |
| download | u-boot-imx-ab00e7a23e088505b22cba7b84145806129b83bf.zip u-boot-imx-ab00e7a23e088505b22cba7b84145806129b83bf.tar.gz u-boot-imx-ab00e7a23e088505b22cba7b84145806129b83bf.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Conflicts:
Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/esd/cpci405/config.mk')
| -rw-r--r-- | board/esd/cpci405/config.mk | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/board/esd/cpci405/config.mk b/board/esd/cpci405/config.mk index 0be45c7..6cfb891 100644 --- a/board/esd/cpci405/config.mk +++ b/board/esd/cpci405/config.mk @@ -21,20 +21,8 @@ # MA 02111-1307 USA # -# -# esd CPCI405 boards -# +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifeq ($(BOARD_REVISION),CPCI4052) -TEXT_BASE = 0xFFFC0000 -else -ifeq ($(BOARD_REVISION),CPCI405DT) -TEXT_BASE = 0xFFFC0000 -else -ifeq ($(BOARD_REVISION),CPCI405AB) -TEXT_BASE = 0xFFFC0000 -else +ifndef TEXT_BASE TEXT_BASE = 0xFFFD0000 endif -endif -endif |