1 From 103edf8bf3216697f38dbf7b42be23ab3755cd72 Mon Sep 17 00:00:00 2001
2 From: Fred Fan <r01011@freescale.com>
3 Date: Mon, 23 Feb 2009 13:57:38 +0800
4 Subject: [PATCH] ENGR00102788 Remove CONFIG_NAND_BOOT on i.MX31 3stack
6 1. Change NAND driver Makefile to bulild individual nand driver on i.MX31
8 2. Remove CONFIG_NAND_BOOT to common boot code which supports boot from nand
11 Signed-off-by: Fred Fan <r01011@freescale.com>
13 cpu/arm1136/mx31/Makefile | 2 --
14 drivers/mtd/nand/Makefile | 2 +-
15 include/configs/mx31_3stack.h | 1 -
16 3 files changed, 1 insertions(+), 4 deletions(-)
18 diff --git a/cpu/arm1136/mx31/Makefile b/cpu/arm1136/mx31/Makefile
19 index a57465f..41eb2d4 100644
20 --- a/cpu/arm1136/mx31/Makefile
21 +++ b/cpu/arm1136/mx31/Makefile
22 @@ -29,9 +29,7 @@ COBJS += generic.o
26 -ifdef CONFIG_NAND_BOOT
30 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
31 OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
32 diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
33 index d2f9435..2adf485 100644
34 --- a/drivers/mtd/nand/Makefile
35 +++ b/drivers/mtd/nand/Makefile
36 @@ -47,7 +47,7 @@ COBJS-$(CONFIG_NAND_S3C64XX) += s3c64xx.o
37 COBJS-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
38 COBJS-$(CONFIG_NAND_PLAT) += nand_plat.o
39 COBJS-$(CONFIG_MX31_NAND) += mx31_nand.o
40 -COBJS-y += mxc_nand.o
41 +COBJS-$(CONFIG_MX35) += mxc_nand.o
45 diff --git a/include/configs/mx31_3stack.h b/include/configs/mx31_3stack.h
46 index 7aaef4f..887ffe3 100644
47 --- a/include/configs/mx31_3stack.h
48 +++ b/include/configs/mx31_3stack.h
50 #define CONFIG_DISPLAY_CPUINFO
51 #define CONFIG_DISPLAY_BOARDINFO
53 -#define CONFIG_NAND_BOOT
54 #define CONFIG_SKIP_RELOCATE_UBOOT
56 #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */