summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorFred Fan <r01011@freescale.com>2009-02-23 13:57:38 +0800
committerFred Fan <r01011@freescale.com>2009-09-09 17:27:24 +0800
commit103edf8bf3216697f38dbf7b42be23ab3755cd72 (patch)
tree7855d89e7525571c0a22a8279ff75c90e581e0d2 /cpu
parent4a9ee8a22327ddbd4f2c296a834fcc90fc2d1d14 (diff)
downloadu-boot-imx-103edf8bf3216697f38dbf7b42be23ab3755cd72.zip
u-boot-imx-103edf8bf3216697f38dbf7b42be23ab3755cd72.tar.gz
u-boot-imx-103edf8bf3216697f38dbf7b42be23ab3755cd72.tar.bz2
ENGR00102788 Remove CONFIG_NAND_BOOT on i.MX31 3stack
1. Change NAND driver Makefile to bulild individual nand driver on i.MX31 and i.MX35. 2. Remove CONFIG_NAND_BOOT to common boot code which supports boot from nand and nor. Signed-off-by: Fred Fan <r01011@freescale.com>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm1136/mx31/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/cpu/arm1136/mx31/Makefile b/cpu/arm1136/mx31/Makefile
index a57465f..41eb2d4 100644
--- a/cpu/arm1136/mx31/Makefile
+++ b/cpu/arm1136/mx31/Makefile
@@ -29,9 +29,7 @@ COBJS += generic.o
COBJS += timer.o
COBJS += devices.o
-ifdef CONFIG_NAND_BOOT
SOBJS = nand_load.o
-endif
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))