From 00d10eb0410d2459727307d5eea562247959db2f Mon Sep 17 00:00:00 2001 From: Macpaul Lin Date: Fri, 15 Apr 2011 21:37:11 +0000 Subject: [PATCH] ftsmc020: move ftsmc020 static mem controller to driver/mtd Move the header file and definitions of ftsmc020 static memory control unit from a320 SoC folder to "drivers/mtd" folder. This change will let other SoC which also use ftsmc020 could share the same header file. Signed-off-by: Macpaul Lin --- arch/arm/cpu/arm920t/a320/Makefile | 1 - board/faraday/a320evb/a320evb.c | 2 +- drivers/mtd/Makefile | 1 + {arch/arm/cpu/arm920t/a320 => drivers/mtd}/ftsmc020.c | 2 +- include/configs/a320evb.h | 4 +++- .../arm/include/asm/arch-a320 => include/faraday}/ftsmc020.h | 0 6 files changed, 6 insertions(+), 4 deletions(-) rename {arch/arm/cpu/arm920t/a320 => drivers/mtd}/ftsmc020.c (97%) rename {arch/arm/include/asm/arch-a320 => include/faraday}/ftsmc020.h (100%) diff --git a/arch/arm/cpu/arm920t/a320/Makefile b/arch/arm/cpu/arm920t/a320/Makefile index 31da706e59..50eb265665 100644 --- a/arch/arm/cpu/arm920t/a320/Makefile +++ b/arch/arm/cpu/arm920t/a320/Makefile @@ -27,7 +27,6 @@ LIB = $(obj)lib$(SOC).o SOBJS += reset.o COBJS += timer.o -COBJS += ftsmc020.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c index b9343e42da..2578be4f92 100644 --- a/board/faraday/a320evb/a320evb.c +++ b/board/faraday/a320evb/a320evb.c @@ -21,7 +21,7 @@ #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 999431c3c0..5a5ecdfe3c 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -32,6 +32,7 @@ COBJS-$(CONFIG_HAS_DATAFLASH) += at45.o COBJS-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o COBJS-$(CONFIG_FLASH_CFI_MTD) += cfi_mtd.o COBJS-$(CONFIG_HAS_DATAFLASH) += dataflash.o +COBJS-$(CONFIG_FTSMC020) += ftsmc020.o COBJS-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o COBJS-$(CONFIG_MW_EEPROM) += mw_eeprom.o COBJS-$(CONFIG_SPEARSMI) += spr_smi.o diff --git a/arch/arm/cpu/arm920t/a320/ftsmc020.c b/drivers/mtd/ftsmc020.c similarity index 97% rename from arch/arm/cpu/arm920t/a320/ftsmc020.c rename to drivers/mtd/ftsmc020.c index 76465373ec..b027685b11 100644 --- a/arch/arm/cpu/arm920t/a320/ftsmc020.c +++ b/drivers/mtd/ftsmc020.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include struct ftsmc020_config { unsigned int config; diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h index 5373bcb570..4b297f0239 100644 --- a/include/configs/a320evb.h +++ b/include/configs/a320evb.h @@ -163,7 +163,8 @@ * Static memory controller configuration */ -#include +#define CONFIG_FTSMC020 +#include #define FTSMC020_BANK0_CONFIG (FTSMC020_BANK_ENABLE | \ FTSMC020_BANK_BASE(PHYS_FLASH_1) | \ @@ -196,6 +197,7 @@ { FTSMC020_BANK0_CONFIG, FTSMC020_BANK0_TIMING, }, \ { FTSMC020_BANK1_CONFIG, FTSMC020_BANK1_TIMING, }, \ } +#endif /* CONFIG_FTSMC020 */ /*----------------------------------------------------------------------- * FLASH and environment organization diff --git a/arch/arm/include/asm/arch-a320/ftsmc020.h b/include/faraday/ftsmc020.h similarity index 100% rename from arch/arm/include/asm/arch-a320/ftsmc020.h rename to include/faraday/ftsmc020.h -- 2.39.2