diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-04-04 02:18:56 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-04-04 02:18:56 +0200 |
| commit | 25b0806fff1f1fd24f69f6d9ef04d8345667e60b (patch) | |
| tree | 38cbc11d30a3a5de01c5cfa5f5ea0da4597aad64 /board/amcc/acadia/config.mk | |
| parent | 31c98a88228021b314c89ebb8104fb6473da4471 (diff) | |
| parent | 0e7d4916afaf83083b9b70ad779f29f7b57bd8ed (diff) | |
| download | u-boot-imx-25b0806fff1f1fd24f69f6d9ef04d8345667e60b.zip u-boot-imx-25b0806fff1f1fd24f69f6d9ef04d8345667e60b.tar.gz u-boot-imx-25b0806fff1f1fd24f69f6d9ef04d8345667e60b.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Diffstat (limited to 'board/amcc/acadia/config.mk')
| -rw-r--r-- | board/amcc/acadia/config.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/board/amcc/acadia/config.mk b/board/amcc/acadia/config.mk index ce21374..c8566ec 100644 --- a/board/amcc/acadia/config.mk +++ b/board/amcc/acadia/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2000 +# (C) Copyright 2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # See file CREDITS for list of people who contributed to this @@ -21,21 +21,10 @@ # MA 02111-1307 USA # -sinclude $(TOPDIR)/board/amcc/liveoak/config.tmp - ifndef TEXT_BASE TEXT_BASE = 0xFFFC0000 endif -ifeq ($(CONFIG_NAND_U_BOOT),y) -LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds -endif - -ifeq ($(CONFIG_SPI_U_BOOT),y) -LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-spi.lds -PAD_TO = 0x00840000 -endif - ifeq ($(debug),1) PLATFORM_CPPFLAGS += -DDEBUG endif |