nand/ppc4xx: Move PPC4xx NAND driver to common NAND driver directory

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>

diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile
index 96ab5c6a42a50de5492c25f92b11ad764194cb67..6f52dfd14f59fa8e7aecf865c21cd43466e09b95 100644 (file)
--- a/cpu/ppc4xx/Makefile
+++ b/cpu/ppc4xx/Makefile
@@ -51,7 +51,6 @@ COBJS += fdt.o
 COBJS  += i2c.o
 COBJS  += interrupts.o
 COBJS  += iop480_uart.o
-COBJS  += ndfc.o
 COBJS  += sdram.o
 COBJS  += speed.o
 COBJS  += tlb.o

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index a5680e80ee55256378ad5410ade4ddc83ca9a49a..945a95445702e7668b9be9714dc5f2d81ecd6209 100644 (file)
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -42,6 +42,7 @@ COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
 COBJS-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
 COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
 COBJS-$(CONFIG_NAND_MPC5121_NFC) += mpc5121_nfc.o
+COBJS-$(CONFIG_NAND_NDFC) += ndfc.o
 COBJS-$(CONFIG_NAND_NOMADIK) += nomadik.o
 COBJS-$(CONFIG_NAND_S3C2410) += s3c2410_nand.o
 COBJS-$(CONFIG_NAND_S3C64XX) += s3c64xx.o

diff --git a/cpu/ppc4xx/ndfc.c b/drivers/mtd/nand/ndfc.c
similarity index 100%
rename from cpu/ppc4xx/ndfc.c
rename to drivers/mtd/nand/ndfc.c

diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile
index 931f04b29ad39ba99abb7f39bb3e61e891f8949b..822f82f2b23789b953c58fca8a51960411525ea3 100644 (file)
--- a/nand_spl/board/amcc/acadia/Makefile
+++ b/nand_spl/board/amcc/acadia/Makefile
@@ -73,7 +73,7 @@ $(obj)gpio.c:
 
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c
-       ln -s $(SRCTREE)/cpu/ppc4xx/ndfc.c $(obj)ndfc.c
+       ln -s $(SRCTREE)/drivers/mtd/nand/ndfc.c $(obj)ndfc.c
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S

diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile
index e1c146750b721a85e4968890f2778f68bca355a2..293292732fc9999acc9a99c095c0d77db9a1ddc9 100644 (file)
--- a/nand_spl/board/amcc/bamboo/Makefile
+++ b/nand_spl/board/amcc/bamboo/Makefile
@@ -59,7 +59,7 @@ $(nandobj)u-boot-spl: $(OBJS)
 # from cpu directory
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c
-       ln -s $(SRCTREE)/cpu/ppc4xx/ndfc.c $(obj)ndfc.c
+       ln -s $(SRCTREE)/drivers/mtd/nand/ndfc.c $(obj)ndfc.c
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S

diff --git a/nand_spl/board/amcc/canyonlands/Makefile b/nand_spl/board/amcc/canyonlands/Makefile
index fb86752002d0bea98442ce60e67eec09e27df317..84b14548eea28826fb4a19e51be4b324ae69f5a0 100644 (file)
--- a/nand_spl/board/amcc/canyonlands/Makefile
+++ b/nand_spl/board/amcc/canyonlands/Makefile
@@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS)
 # from cpu directory
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c
-       ln -s $(SRCTREE)/cpu/ppc4xx/ndfc.c $(obj)ndfc.c
+       ln -s $(SRCTREE)/drivers/mtd/nand/ndfc.c $(obj)ndfc.c
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S

diff --git a/nand_spl/board/amcc/kilauea/Makefile b/nand_spl/board/amcc/kilauea/Makefile
index cedc8e02e6e8847cde7a1889a7deeb2d23e0bae5..8a062fe4cd9d45b805b5973e2647c8c5e0da37b3 100644 (file)
--- a/nand_spl/board/amcc/kilauea/Makefile
+++ b/nand_spl/board/amcc/kilauea/Makefile
@@ -71,7 +71,7 @@ $(obj)ecc.h:
 
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c
-       ln -s $(SRCTREE)/cpu/ppc4xx/ndfc.c $(obj)ndfc.c
+       ln -s $(SRCTREE)/drivers/mtd/nand/ndfc.c $(obj)ndfc.c
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S

diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile
index fba0322a727307fa79e7779fe2ff498c40c1d84d..462005f4b27bd9190482af21b18fe00c642fc114 100644 (file)
--- a/nand_spl/board/amcc/sequoia/Makefile
+++ b/nand_spl/board/amcc/sequoia/Makefile
@@ -63,7 +63,7 @@ $(obj)denali_data_eye.c:
 
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c
-       ln -s $(SRCTREE)/cpu/ppc4xx/ndfc.c $(obj)ndfc.c
+       ln -s $(SRCTREE)/drivers/mtd/nand/ndfc.c $(obj)ndfc.c
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S