aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Benard2013-04-22 00:55:00 -0500
committerTom Rini2013-05-10 07:25:56 -0500
commit34fa07063a7f5fc437bcaa71156182bb3bf2f516 (patch)
treeb4bf61cb0c60c79b5708b99c7b4cca6c0c45d73f
parent81ac7e51ccf2984e9c0964a883d6b7e8fe875aad (diff)
downloadu-boot-34fa07063a7f5fc437bcaa71156182bb3bf2f516.tar.gz
u-boot-34fa07063a7f5fc437bcaa71156182bb3bf2f516.tar.xz
u-boot-34fa07063a7f5fc437bcaa71156182bb3bf2f516.zip
davinci: handle CONFIG_SYS_CLE_MASK and CONFIG_SYS_ALE_MASK
these variables are curently defined in several config files but the driver doesn't use them and defaults to hardcoded values in nand_defs.h It's interesting to be able to change this hardcoded valude when the hardware is not using the default adress signals to drive ALE and CLE and two configuration defines already exist for this purpose so use them. Signed-off-by: Eric BĂ©nard <eric@eukrea.com>
-rw-r--r--arch/arm/include/asm/arch-davinci/nand_defs.h9
-rw-r--r--include/configs/da830evm.h4
-rw-r--r--include/configs/da850evm.h4
-rw-r--r--include/configs/enbw_cmc.h4
-rw-r--r--include/configs/tnetv107x_evm.h4
5 files changed, 17 insertions, 8 deletions
diff --git a/arch/arm/include/asm/arch-davinci/nand_defs.h b/arch/arm/include/asm/arch-davinci/nand_defs.h
index 10f3a392ab..4a30813808 100644
--- a/arch/arm/include/asm/arch-davinci/nand_defs.h
+++ b/arch/arm/include/asm/arch-davinci/nand_defs.h
@@ -36,6 +36,15 @@
36#define MASK_ALE 0x08 36#define MASK_ALE 0x08
37#endif 37#endif
38 38
39#ifdef CONFIG_SYS_NAND_MASK_CLE
40#undef MASK_CLE
41#define MASK_CLE CONFIG_SYS_NAND_MASK_CLE
42#endif
43#ifdef CONFIG_SYS_NAND_MASK_ALE
44#undef MASK_ALE
45#define MASK_ALE CONFIG_SYS_NAND_MASK_ALE
46#endif
47
39#define NAND_READ_START 0x00 48#define NAND_READ_START 0x00
40#define NAND_READ_END 0x30 49#define NAND_READ_END 0x30
41#define NAND_STATUS 0x70 50#define NAND_STATUS 0x70
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index f7ac256a0f..198892ba57 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -109,8 +109,8 @@
109#define CONFIG_SYS_NAND_CS 3 109#define CONFIG_SYS_NAND_CS 3
110#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE 110#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
111#define CONFIG_SYS_NAND_PAGE_2K 111#define CONFIG_SYS_NAND_PAGE_2K
112#define CONFIG_SYS_CLE_MASK 0x10 112#define CONFIG_SYS_NAND_MASK_CLE 0x10
113#define CONFIG_SYS_ALE_MASK 0x8 113#define CONFIG_SYS_NAND_MASK_ALE 0x8
114#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ 114#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
115#endif 115#endif
116 116
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 583568d309..c420967411 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -199,8 +199,8 @@
199#define CONFIG_SYS_NAND_PAGE_2K 199#define CONFIG_SYS_NAND_PAGE_2K
200#define CONFIG_SYS_NAND_CS 3 200#define CONFIG_SYS_NAND_CS 3
201#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE 201#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
202#define CONFIG_SYS_CLE_MASK 0x10 202#define CONFIG_SYS_NAND_MASK_CLE 0x10
203#define CONFIG_SYS_ALE_MASK 0x8 203#define CONFIG_SYS_NAND_MASK_ALE 0x8
204#undef CONFIG_SYS_NAND_HW_ECC 204#undef CONFIG_SYS_NAND_HW_ECC
205#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ 205#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
206#define CONFIG_SYS_NAND_HW_ECC_OOBFIRST 206#define CONFIG_SYS_NAND_HW_ECC_OOBFIRST
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index 2d63b670cd..97bc9729a1 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -118,8 +118,8 @@
118#define CONFIG_SYS_NAND_PAGE_2K 118#define CONFIG_SYS_NAND_PAGE_2K
119#define CONFIG_SYS_NAND_CS 3 119#define CONFIG_SYS_NAND_CS 3
120#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE 120#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
121#define CONFIG_SYS_CLE_MASK 0x10 121#define CONFIG_SYS_NAND_MASK_CLE 0x10
122#define CONFIG_SYS_ALE_MASK 0x8 122#define CONFIG_SYS_NAND_MASK_ALE 0x8
123#undef CONFIG_SYS_NAND_HW_ECC 123#undef CONFIG_SYS_NAND_HW_ECC
124#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ 124#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
125 125
diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h
index d6371fce4d..cabc06e5ba 100644
--- a/include/configs/tnetv107x_evm.h
+++ b/include/configs/tnetv107x_evm.h
@@ -82,8 +82,8 @@
82#define CONFIG_SYS_NAND_CS 2 82#define CONFIG_SYS_NAND_CS 2
83#define CONFIG_SYS_NAND_USE_FLASH_BBT 83#define CONFIG_SYS_NAND_USE_FLASH_BBT
84#define CONFIG_SYS_NAND_BASE TNETV107X_ASYNC_EMIF_DATA_CE0_BASE 84#define CONFIG_SYS_NAND_BASE TNETV107X_ASYNC_EMIF_DATA_CE0_BASE
85#define CONFIG_SYS_CLE_MASK 0x10 85#define CONFIG_SYS_NAND_MASK_CLE 0x10
86#define CONFIG_SYS_ALE_MASK 0x8 86#define CONFIG_SYS_NAND_MASK_ALE 0x8
87#define CONFIG_SYS_MAX_NAND_DEVICE 1 87#define CONFIG_SYS_MAX_NAND_DEVICE 1
88#define CONFIG_MTD_PARTITIONS 88#define CONFIG_MTD_PARTITIONS
89#define CONFIG_CMD_MTDPARTS 89#define CONFIG_CMD_MTDPARTS