Eric Lee / smarc-uboot

Download as
Browse Code »

Commit 34fa07063a7f5fc437bcaa71156182bb3bf2f516

Authored by Eric Benard
Committed by Tom Rini
1 parent 81ac7e51cc
Exists in master and in 53 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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>

Showing 5 changed files with 17 additions and 8 deletions Side-by-side Diff

arch/arm/include/asm/arch-davinci/nand_defs.h
Diff comments   View file @ 34fa070
... ... @@ -36,6 +36,15 @@
36 36 #define MASK_ALE 0x08
37 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 48 #define NAND_READ_START 0x00
40 49 #define NAND_READ_END 0x30
41 50 #define NAND_STATUS 0x70
include/configs/da830evm.h
Diff comments   View file @ 34fa070
... ... @@ -109,8 +109,8 @@
109 109 #define CONFIG_SYS_NAND_CS 3
110 110 #define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
111 111 #define CONFIG_SYS_NAND_PAGE_2K
112   -#define CONFIG_SYS_CLE_MASK 0x10
113   -#define CONFIG_SYS_ALE_MASK 0x8
  112 +#define CONFIG_SYS_NAND_MASK_CLE 0x10
  113 +#define CONFIG_SYS_NAND_MASK_ALE 0x8
114 114 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
115 115 #endif
116 116  
include/configs/da850evm.h
Diff comments   View file @ 34fa070
... ... @@ -199,8 +199,8 @@
199 199 #define CONFIG_SYS_NAND_PAGE_2K
200 200 #define CONFIG_SYS_NAND_CS 3
201 201 #define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
202   -#define CONFIG_SYS_CLE_MASK 0x10
203   -#define CONFIG_SYS_ALE_MASK 0x8
  202 +#define CONFIG_SYS_NAND_MASK_CLE 0x10
  203 +#define CONFIG_SYS_NAND_MASK_ALE 0x8
204 204 #undef CONFIG_SYS_NAND_HW_ECC
205 205 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
206 206 #define CONFIG_SYS_NAND_HW_ECC_OOBFIRST
include/configs/enbw_cmc.h
Diff comments   View file @ 34fa070
... ... @@ -118,8 +118,8 @@
118 118 #define CONFIG_SYS_NAND_PAGE_2K
119 119 #define CONFIG_SYS_NAND_CS 3
120 120 #define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
121   -#define CONFIG_SYS_CLE_MASK 0x10
122   -#define CONFIG_SYS_ALE_MASK 0x8
  121 +#define CONFIG_SYS_NAND_MASK_CLE 0x10
  122 +#define CONFIG_SYS_NAND_MASK_ALE 0x8
123 123 #undef CONFIG_SYS_NAND_HW_ECC
124 124 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
125 125  
include/configs/tnetv107x_evm.h
Diff comments   View file @ 34fa070
... ... @@ -82,8 +82,8 @@
82 82 #define CONFIG_SYS_NAND_CS 2
83 83 #define CONFIG_SYS_NAND_USE_FLASH_BBT
84 84 #define CONFIG_SYS_NAND_BASE TNETV107X_ASYNC_EMIF_DATA_CE0_BASE
85   -#define CONFIG_SYS_CLE_MASK 0x10
86   -#define CONFIG_SYS_ALE_MASK 0x8
  85 +#define CONFIG_SYS_NAND_MASK_CLE 0x10
  86 +#define CONFIG_SYS_NAND_MASK_ALE 0x8
87 87 #define CONFIG_SYS_MAX_NAND_DEVICE 1
88 88 #define CONFIG_MTD_PARTITIONS
89 89 #define CONFIG_CMD_MTDPARTS