projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename environment.c in env_embedded.c to reflect is functionality
[oweals/u-boot.git]
/
board
/
amcc
/
canyonlands
/
config.mk
diff --git
a/board/amcc/canyonlands/config.mk
b/board/amcc/canyonlands/config.mk
index 1e4bbc47e684359a941d912e645682ad1b88f1fe..2330cae925bb759677cfda5fa28d8a2afb73cb39 100644
(file)
--- a/
board/amcc/canyonlands/config.mk
+++ b/
board/amcc/canyonlands/config.mk
@@
-24,20
+24,12
@@
# AMCC 460EX/460GT Evaluation Board (Canyonlands) board
#
# AMCC 460EX/460GT Evaluation Board (Canyonlands) board
#
-sinclude $(
TOPDIR
)/board/$(BOARDDIR)/config.tmp
+sinclude $(
OBJTREE
)/board/$(BOARDDIR)/config.tmp
ifndef TEXT_BASE
TEXT_BASE = 0xFFFA0000
endif
ifndef TEXT_BASE
TEXT_BASE = 0xFFFA0000
endif
-ifeq ($(CONFIG_NAND_U_BOOT),y)
-LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
-endif
-
-ifeq ($(CONFIG_PCIBOOT_U_BOOT),y)
-LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
-endif
-
PLATFORM_CPPFLAGS += -DCONFIG_440=1
ifeq ($(debug),1)
PLATFORM_CPPFLAGS += -DCONFIG_440=1
ifeq ($(debug),1)