Commit e7db856bf96213ba3f6b716be9fa264e184f74e2

Authored by Adam Ford
Committed by Tom Rini
1 parent d294335e5d

Convert CONFIG_NAND_ATMEL to Kconfig

This converts the following to Kconfig:
   CONFIG_NAND_ATMEL

Signed-off-by: Adam Ford <aford173@gmail.com>

Showing 92 changed files with 137 additions and 26 deletions Side-by-side Diff

configs/at91sam9260ek_dataflash_cs0_defconfig
... ... @@ -34,6 +34,8 @@
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_ATMEL=y
37 39 CONFIG_DM_SPI_FLASH=y
38 40 CONFIG_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9260ek_dataflash_cs1_defconfig
... ... @@ -34,6 +34,8 @@
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_ATMEL=y
37 39 CONFIG_DM_SPI_FLASH=y
38 40 CONFIG_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9260ek_nandflash_defconfig
... ... @@ -34,6 +34,8 @@
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_ATMEL=y
37 39 CONFIG_DM_SPI_FLASH=y
38 40 CONFIG_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9261ek_dataflash_cs0_defconfig
... ... @@ -35,6 +35,8 @@
35 35 CONFIG_DM_GPIO=y
36 36 CONFIG_AT91_GPIO=y
37 37 # CONFIG_MMC is not set
  38 +CONFIG_NAND=y
  39 +CONFIG_NAND_ATMEL=y
38 40 CONFIG_DM_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9261ek_dataflash_cs3_defconfig
... ... @@ -35,6 +35,8 @@
35 35 CONFIG_DM_GPIO=y
36 36 CONFIG_AT91_GPIO=y
37 37 # CONFIG_MMC is not set
  38 +CONFIG_NAND=y
  39 +CONFIG_NAND_ATMEL=y
38 40 CONFIG_DM_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9261ek_nandflash_defconfig
... ... @@ -35,6 +35,8 @@
35 35 CONFIG_DM_GPIO=y
36 36 CONFIG_AT91_GPIO=y
37 37 # CONFIG_MMC is not set
  38 +CONFIG_NAND=y
  39 +CONFIG_NAND_ATMEL=y
38 40 CONFIG_DM_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9263ek_dataflash_cs0_defconfig
... ... @@ -39,6 +39,8 @@
39 39 CONFIG_AT91_GPIO=y
40 40 CONFIG_DM_MMC=y
41 41 CONFIG_GENERIC_ATMEL_MCI=y
  42 +CONFIG_NAND=y
  43 +CONFIG_NAND_ATMEL=y
42 44 CONFIG_DM_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH=y
44 46 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9263ek_dataflash_defconfig
... ... @@ -39,6 +39,8 @@
39 39 CONFIG_AT91_GPIO=y
40 40 CONFIG_DM_MMC=y
41 41 CONFIG_GENERIC_ATMEL_MCI=y
  42 +CONFIG_NAND=y
  43 +CONFIG_NAND_ATMEL=y
42 44 CONFIG_DM_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH=y
44 46 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9263ek_nandflash_defconfig
... ... @@ -39,6 +39,8 @@
39 39 CONFIG_AT91_GPIO=y
40 40 CONFIG_DM_MMC=y
41 41 CONFIG_GENERIC_ATMEL_MCI=y
  42 +CONFIG_NAND=y
  43 +CONFIG_NAND_ATMEL=y
42 44 CONFIG_DM_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH=y
44 46 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9263ek_norflash_boot_defconfig
... ... @@ -38,6 +38,8 @@
38 38 CONFIG_DM_MMC=y
39 39 CONFIG_GENERIC_ATMEL_MCI=y
40 40 CONFIG_MTD_NOR_FLASH=y
  41 +CONFIG_NAND=y
  42 +CONFIG_NAND_ATMEL=y
41 43 CONFIG_DM_SPI_FLASH=y
42 44 CONFIG_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9263ek_norflash_defconfig
... ... @@ -38,6 +38,8 @@
38 38 CONFIG_DM_MMC=y
39 39 CONFIG_GENERIC_ATMEL_MCI=y
40 40 CONFIG_MTD_NOR_FLASH=y
  41 +CONFIG_NAND=y
  42 +CONFIG_NAND_ATMEL=y
41 43 CONFIG_DM_SPI_FLASH=y
42 44 CONFIG_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g10ek_dataflash_cs0_defconfig
... ... @@ -35,6 +35,8 @@
35 35 CONFIG_DM_GPIO=y
36 36 CONFIG_AT91_GPIO=y
37 37 # CONFIG_MMC is not set
  38 +CONFIG_NAND=y
  39 +CONFIG_NAND_ATMEL=y
38 40 CONFIG_DM_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g10ek_dataflash_cs3_defconfig
... ... @@ -35,6 +35,8 @@
35 35 CONFIG_DM_GPIO=y
36 36 CONFIG_AT91_GPIO=y
37 37 # CONFIG_MMC is not set
  38 +CONFIG_NAND=y
  39 +CONFIG_NAND_ATMEL=y
38 40 CONFIG_DM_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g10ek_nandflash_defconfig
... ... @@ -35,6 +35,8 @@
35 35 CONFIG_DM_GPIO=y
36 36 CONFIG_AT91_GPIO=y
37 37 # CONFIG_MMC is not set
  38 +CONFIG_NAND=y
  39 +CONFIG_NAND_ATMEL=y
38 40 CONFIG_DM_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g20ek_2mmc_defconfig
... ... @@ -36,6 +36,8 @@
36 36 CONFIG_AT91_GPIO=y
37 37 CONFIG_DM_MMC=y
38 38 CONFIG_GENERIC_ATMEL_MCI=y
  39 +CONFIG_NAND=y
  40 +CONFIG_NAND_ATMEL=y
39 41 CONFIG_DM_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH=y
41 43 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g20ek_2mmc_nandflash_defconfig
... ... @@ -36,6 +36,8 @@
36 36 CONFIG_AT91_GPIO=y
37 37 CONFIG_DM_MMC=y
38 38 CONFIG_GENERIC_ATMEL_MCI=y
  39 +CONFIG_NAND=y
  40 +CONFIG_NAND_ATMEL=y
39 41 CONFIG_DM_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH=y
41 43 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g20ek_dataflash_cs0_defconfig
... ... @@ -34,6 +34,8 @@
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_ATMEL=y
37 39 CONFIG_DM_SPI_FLASH=y
38 40 CONFIG_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g20ek_dataflash_cs1_defconfig
... ... @@ -34,6 +34,8 @@
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_ATMEL=y
37 39 CONFIG_DM_SPI_FLASH=y
38 40 CONFIG_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9g20ek_nandflash_defconfig
... ... @@ -34,6 +34,8 @@
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_ATMEL=y
37 39 CONFIG_DM_SPI_FLASH=y
38 40 CONFIG_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9m10g45ek_mmc_defconfig
... ... @@ -38,6 +38,8 @@
38 38 CONFIG_AT91_GPIO=y
39 39 CONFIG_DM_MMC=y
40 40 CONFIG_GENERIC_ATMEL_MCI=y
  41 +CONFIG_NAND=y
  42 +CONFIG_NAND_ATMEL=y
41 43 CONFIG_DM_ETH=y
42 44 CONFIG_MACB=y
43 45 CONFIG_PINCTRL=y
configs/at91sam9m10g45ek_nandflash_defconfig
... ... @@ -38,6 +38,8 @@
38 38 CONFIG_AT91_GPIO=y
39 39 CONFIG_DM_MMC=y
40 40 CONFIG_GENERIC_ATMEL_MCI=y
  41 +CONFIG_NAND=y
  42 +CONFIG_NAND_ATMEL=y
41 43 CONFIG_DM_ETH=y
42 44 CONFIG_MACB=y
43 45 CONFIG_PINCTRL=y
configs/at91sam9n12ek_mmc_defconfig
... ... @@ -38,6 +38,8 @@
38 38 CONFIG_AT91_GPIO=y
39 39 CONFIG_DM_MMC=y
40 40 CONFIG_GENERIC_ATMEL_MCI=y
  41 +CONFIG_NAND=y
  42 +CONFIG_NAND_ATMEL=y
41 43 CONFIG_DM_SPI_FLASH=y
42 44 CONFIG_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9n12ek_nandflash_defconfig
... ... @@ -38,6 +38,8 @@
38 38 CONFIG_AT91_GPIO=y
39 39 CONFIG_DM_MMC=y
40 40 CONFIG_GENERIC_ATMEL_MCI=y
  41 +CONFIG_NAND=y
  42 +CONFIG_NAND_ATMEL=y
41 43 CONFIG_DM_SPI_FLASH=y
42 44 CONFIG_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9n12ek_spiflash_defconfig
... ... @@ -38,6 +38,8 @@
38 38 CONFIG_AT91_GPIO=y
39 39 CONFIG_DM_MMC=y
40 40 CONFIG_GENERIC_ATMEL_MCI=y
  41 +CONFIG_NAND=y
  42 +CONFIG_NAND_ATMEL=y
41 43 CONFIG_DM_SPI_FLASH=y
42 44 CONFIG_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9rlek_dataflash_defconfig
... ... @@ -37,6 +37,8 @@
37 37 CONFIG_AT91_GPIO=y
38 38 CONFIG_DM_MMC=y
39 39 CONFIG_GENERIC_ATMEL_MCI=y
  40 +CONFIG_NAND=y
  41 +CONFIG_NAND_ATMEL=y
40 42 CONFIG_DM_SPI_FLASH=y
41 43 CONFIG_SPI_FLASH=y
42 44 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9rlek_mmc_defconfig
... ... @@ -37,6 +37,8 @@
37 37 CONFIG_AT91_GPIO=y
38 38 CONFIG_DM_MMC=y
39 39 CONFIG_GENERIC_ATMEL_MCI=y
  40 +CONFIG_NAND=y
  41 +CONFIG_NAND_ATMEL=y
40 42 CONFIG_DM_SPI_FLASH=y
41 43 CONFIG_SPI_FLASH=y
42 44 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9rlek_nandflash_defconfig
... ... @@ -37,6 +37,8 @@
37 37 CONFIG_AT91_GPIO=y
38 38 CONFIG_DM_MMC=y
39 39 CONFIG_GENERIC_ATMEL_MCI=y
  40 +CONFIG_NAND=y
  41 +CONFIG_NAND_ATMEL=y
40 42 CONFIG_DM_SPI_FLASH=y
41 43 CONFIG_SPI_FLASH=y
42 44 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9x5ek_dataflash_defconfig
... ... @@ -39,6 +39,8 @@
39 39 CONFIG_AT91_GPIO=y
40 40 CONFIG_DM_MMC=y
41 41 CONFIG_GENERIC_ATMEL_MCI=y
  42 +CONFIG_NAND=y
  43 +CONFIG_NAND_ATMEL=y
42 44 CONFIG_DM_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH=y
44 46 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9x5ek_mmc_defconfig
... ... @@ -39,6 +39,8 @@
39 39 CONFIG_AT91_GPIO=y
40 40 CONFIG_DM_MMC=y
41 41 CONFIG_GENERIC_ATMEL_MCI=y
  42 +CONFIG_NAND=y
  43 +CONFIG_NAND_ATMEL=y
42 44 CONFIG_DM_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH=y
44 46 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9x5ek_nandflash_defconfig
... ... @@ -39,6 +39,8 @@
39 39 CONFIG_AT91_GPIO=y
40 40 CONFIG_DM_MMC=y
41 41 CONFIG_GENERIC_ATMEL_MCI=y
  42 +CONFIG_NAND=y
  43 +CONFIG_NAND_ATMEL=y
42 44 CONFIG_DM_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH=y
44 46 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9x5ek_spiflash_defconfig
... ... @@ -39,6 +39,8 @@
39 39 CONFIG_AT91_GPIO=y
40 40 CONFIG_DM_MMC=y
41 41 CONFIG_GENERIC_ATMEL_MCI=y
  42 +CONFIG_NAND=y
  43 +CONFIG_NAND_ATMEL=y
42 44 CONFIG_DM_SPI_FLASH=y
43 45 CONFIG_SPI_FLASH=y
44 46 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9xeek_dataflash_cs0_defconfig
... ... @@ -34,6 +34,8 @@
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_ATMEL=y
37 39 CONFIG_DM_SPI_FLASH=y
38 40 CONFIG_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9xeek_dataflash_cs1_defconfig
... ... @@ -34,6 +34,8 @@
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_ATMEL=y
37 39 CONFIG_DM_SPI_FLASH=y
38 40 CONFIG_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH_ATMEL=y
configs/at91sam9xeek_nandflash_defconfig
... ... @@ -34,6 +34,8 @@
34 34 CONFIG_DM_GPIO=y
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_ATMEL=y
37 39 CONFIG_DM_SPI_FLASH=y
38 40 CONFIG_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH_ATMEL=y
configs/axm_defconfig
... ... @@ -37,6 +37,8 @@
37 37 CONFIG_OF_EMBED=y
38 38 CONFIG_ENV_IS_IN_NAND=y
39 39 # CONFIG_MMC is not set
  40 +CONFIG_NAND=y
  41 +CONFIG_NAND_ATMEL=y
40 42 CONFIG_SPI_FLASH=y
41 43 CONFIG_SPI_FLASH_STMICRO=y
42 44 CONFIG_PHYLIB=y
configs/corvus_defconfig
... ... @@ -40,6 +40,8 @@
40 40 CONFIG_CLK_AT91=y
41 41 CONFIG_DFU_NAND=y
42 42 # CONFIG_MMC is not set
  43 +CONFIG_NAND=y
  44 +CONFIG_NAND_ATMEL=y
43 45 CONFIG_PHYLIB=y
44 46 CONFIG_ATMEL_USART=y
45 47 CONFIG_USB=y
configs/ethernut5_defconfig
... ... @@ -49,6 +49,8 @@
49 49 CONFIG_DM_GPIO=y
50 50 CONFIG_AT91_GPIO=y
51 51 CONFIG_MTD_NOR_FLASH=y
  52 +CONFIG_NAND=y
  53 +CONFIG_NAND_ATMEL=y
52 54 CONFIG_DM_SPI_FLASH=y
53 55 CONFIG_SPI_FLASH=y
54 56 CONFIG_SPI_FLASH_ATMEL=y
configs/gurnard_defconfig
... ... @@ -24,6 +24,8 @@
24 24 CONFIG_CMD_FAT=y
25 25 CONFIG_OF_CONTROL=y
26 26 CONFIG_ENV_IS_IN_NAND=y
  27 +CONFIG_NAND=y
  28 +CONFIG_NAND_ATMEL=y
27 29 CONFIG_PHYLIB=y
28 30 CONFIG_TIMER=y
29 31 CONFIG_ATMEL_PIT_TIMER=y
configs/meesc_defconfig
... ... @@ -25,6 +25,8 @@
25 25 CONFIG_DM_GPIO=y
26 26 CONFIG_AT91_GPIO=y
27 27 # CONFIG_MMC is not set
  28 +CONFIG_NAND=y
  29 +CONFIG_NAND_ATMEL=y
28 30 CONFIG_DM_SPI_FLASH=y
29 31 CONFIG_SPI_FLASH=y
30 32 CONFIG_SPI_FLASH_ATMEL=y
configs/pm9261_defconfig
... ... @@ -35,6 +35,8 @@
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
37 37 CONFIG_MTD_NOR_FLASH=y
  38 +CONFIG_NAND=y
  39 +CONFIG_NAND_ATMEL=y
38 40 CONFIG_DM_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH_ATMEL=y
configs/pm9263_defconfig
... ... @@ -35,6 +35,8 @@
35 35 CONFIG_AT91_GPIO=y
36 36 # CONFIG_MMC is not set
37 37 CONFIG_MTD_NOR_FLASH=y
  38 +CONFIG_NAND=y
  39 +CONFIG_NAND_ATMEL=y
38 40 CONFIG_DM_SPI_FLASH=y
39 41 CONFIG_SPI_FLASH=y
40 42 CONFIG_SPI_FLASH_ATMEL=y
configs/pm9g45_defconfig
... ... @@ -21,6 +21,8 @@
21 21 CONFIG_CMD_JFFS2=y
22 22 CONFIG_ENV_IS_IN_NAND=y
23 23 # CONFIG_MMC is not set
  24 +CONFIG_NAND=y
  25 +CONFIG_NAND_ATMEL=y
24 26 CONFIG_USB=y
25 27 CONFIG_USB_STORAGE=y
configs/sama5d2_ptc_ek_mmc_defconfig
... ... @@ -45,6 +45,8 @@
45 45 CONFIG_DM_MMC=y
46 46 CONFIG_MMC_SDHCI=y
47 47 CONFIG_MMC_SDHCI_ATMEL=y
  48 +CONFIG_NAND=y
  49 +CONFIG_NAND_ATMEL=y
48 50 CONFIG_DM_ETH=y
49 51 CONFIG_MACB=y
50 52 CONFIG_PINCTRL=y
configs/sama5d2_ptc_ek_nandflash_defconfig
... ... @@ -45,6 +45,8 @@
45 45 CONFIG_DM_MMC=y
46 46 CONFIG_MMC_SDHCI=y
47 47 CONFIG_MMC_SDHCI_ATMEL=y
  48 +CONFIG_NAND=y
  49 +CONFIG_NAND_ATMEL=y
48 50 CONFIG_DM_ETH=y
49 51 CONFIG_MACB=y
50 52 CONFIG_PINCTRL=y
configs/sama5d36ek_cmp_mmc_defconfig
... ... @@ -40,6 +40,8 @@
40 40 CONFIG_AT91_GPIO=y
41 41 CONFIG_DM_MMC=y
42 42 CONFIG_GENERIC_ATMEL_MCI=y
  43 +CONFIG_NAND=y
  44 +CONFIG_NAND_ATMEL=y
43 45 CONFIG_DM_SPI_FLASH=y
44 46 CONFIG_SPI_FLASH=y
45 47 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d36ek_cmp_nandflash_defconfig
... ... @@ -40,6 +40,8 @@
40 40 CONFIG_AT91_GPIO=y
41 41 CONFIG_DM_MMC=y
42 42 CONFIG_GENERIC_ATMEL_MCI=y
  43 +CONFIG_NAND=y
  44 +CONFIG_NAND_ATMEL=y
43 45 CONFIG_DM_SPI_FLASH=y
44 46 CONFIG_SPI_FLASH=y
45 47 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d36ek_cmp_spiflash_defconfig
... ... @@ -40,6 +40,8 @@
40 40 CONFIG_AT91_GPIO=y
41 41 CONFIG_DM_MMC=y
42 42 CONFIG_GENERIC_ATMEL_MCI=y
  43 +CONFIG_NAND=y
  44 +CONFIG_NAND_ATMEL=y
43 45 CONFIG_DM_SPI_FLASH=y
44 46 CONFIG_SPI_FLASH=y
45 47 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d3_xplained_mmc_defconfig
... ... @@ -57,6 +57,8 @@
57 57 CONFIG_AT91_GPIO=y
58 58 CONFIG_DM_MMC=y
59 59 CONFIG_GENERIC_ATMEL_MCI=y
  60 +CONFIG_NAND=y
  61 +CONFIG_NAND_ATMEL=y
60 62 CONFIG_DM_ETH=y
61 63 CONFIG_MACB=y
62 64 CONFIG_PINCTRL=y
configs/sama5d3_xplained_nandflash_defconfig
... ... @@ -54,6 +54,8 @@
54 54 CONFIG_AT91_GPIO=y
55 55 CONFIG_DM_MMC=y
56 56 CONFIG_GENERIC_ATMEL_MCI=y
  57 +CONFIG_NAND=y
  58 +CONFIG_NAND_ATMEL=y
57 59 CONFIG_DM_ETH=y
58 60 CONFIG_MACB=y
59 61 CONFIG_PINCTRL=y
configs/sama5d3xek_mmc_defconfig
... ... @@ -61,6 +61,8 @@
61 61 CONFIG_DM_MMC=y
62 62 CONFIG_GENERIC_ATMEL_MCI=y
63 63 CONFIG_MTD_NOR_FLASH=y
  64 +CONFIG_NAND=y
  65 +CONFIG_NAND_ATMEL=y
64 66 CONFIG_DM_SPI_FLASH=y
65 67 CONFIG_SPI_FLASH=y
66 68 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d3xek_nandflash_defconfig
... ... @@ -56,6 +56,8 @@
56 56 CONFIG_DM_MMC=y
57 57 CONFIG_GENERIC_ATMEL_MCI=y
58 58 CONFIG_MTD_NOR_FLASH=y
  59 +CONFIG_NAND=y
  60 +CONFIG_NAND_ATMEL=y
59 61 CONFIG_DM_SPI_FLASH=y
60 62 CONFIG_SPI_FLASH=y
61 63 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d3xek_spiflash_defconfig
... ... @@ -56,6 +56,8 @@
56 56 CONFIG_DM_MMC=y
57 57 CONFIG_GENERIC_ATMEL_MCI=y
58 58 CONFIG_MTD_NOR_FLASH=y
  59 +CONFIG_NAND=y
  60 +CONFIG_NAND_ATMEL=y
59 61 CONFIG_DM_SPI_FLASH=y
60 62 CONFIG_SPI_FLASH=y
61 63 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d4_xplained_mmc_defconfig
... ... @@ -55,6 +55,8 @@
55 55 CONFIG_I2C_EEPROM=y
56 56 CONFIG_DM_MMC=y
57 57 CONFIG_GENERIC_ATMEL_MCI=y
  58 +CONFIG_NAND=y
  59 +CONFIG_NAND_ATMEL=y
58 60 CONFIG_DM_SPI_FLASH=y
59 61 CONFIG_SPI_FLASH=y
60 62 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d4_xplained_nandflash_defconfig
... ... @@ -52,6 +52,8 @@
52 52 CONFIG_I2C_EEPROM=y
53 53 CONFIG_DM_MMC=y
54 54 CONFIG_GENERIC_ATMEL_MCI=y
  55 +CONFIG_NAND=y
  56 +CONFIG_NAND_ATMEL=y
55 57 CONFIG_DM_SPI_FLASH=y
56 58 CONFIG_SPI_FLASH=y
57 59 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d4_xplained_spiflash_defconfig
... ... @@ -55,6 +55,8 @@
55 55 CONFIG_I2C_EEPROM=y
56 56 CONFIG_DM_MMC=y
57 57 CONFIG_GENERIC_ATMEL_MCI=y
  58 +CONFIG_NAND=y
  59 +CONFIG_NAND_ATMEL=y
58 60 CONFIG_DM_SPI_FLASH=y
59 61 CONFIG_SPI_FLASH=y
60 62 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d4ek_mmc_defconfig
... ... @@ -55,6 +55,8 @@
55 55 CONFIG_AT91_GPIO=y
56 56 CONFIG_DM_MMC=y
57 57 CONFIG_GENERIC_ATMEL_MCI=y
  58 +CONFIG_NAND=y
  59 +CONFIG_NAND_ATMEL=y
58 60 CONFIG_DM_SPI_FLASH=y
59 61 CONFIG_SPI_FLASH=y
60 62 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d4ek_nandflash_defconfig
... ... @@ -52,6 +52,8 @@
52 52 CONFIG_AT91_GPIO=y
53 53 CONFIG_DM_MMC=y
54 54 CONFIG_GENERIC_ATMEL_MCI=y
  55 +CONFIG_NAND=y
  56 +CONFIG_NAND_ATMEL=y
55 57 CONFIG_DM_SPI_FLASH=y
56 58 CONFIG_SPI_FLASH=y
57 59 CONFIG_SPI_FLASH_ATMEL=y
configs/sama5d4ek_spiflash_defconfig
... ... @@ -52,6 +52,8 @@
52 52 CONFIG_AT91_GPIO=y
53 53 CONFIG_DM_MMC=y
54 54 CONFIG_GENERIC_ATMEL_MCI=y
  55 +CONFIG_NAND=y
  56 +CONFIG_NAND_ATMEL=y
55 57 CONFIG_DM_SPI_FLASH=y
56 58 CONFIG_SPI_FLASH=y
57 59 CONFIG_SPI_FLASH_ATMEL=y
configs/smartweb_defconfig
... ... @@ -43,6 +43,8 @@
43 43 CONFIG_CLK_AT91=y
44 44 CONFIG_DFU_NAND=y
45 45 # CONFIG_MMC is not set
  46 +CONFIG_NAND=y
  47 +CONFIG_NAND_ATMEL=y
46 48 CONFIG_PHYLIB=y
47 49 CONFIG_USB=y
48 50 CONFIG_DM_USB=y
configs/snapper9260_defconfig
... ... @@ -27,6 +27,8 @@
27 27 CONFIG_ENV_IS_IN_NAND=y
28 28 CONFIG_CMD_PCA953X=y
29 29 # CONFIG_MMC is not set
  30 +CONFIG_NAND=y
  31 +CONFIG_NAND_ATMEL=y
30 32 CONFIG_USB=y
31 33 CONFIG_USB_STORAGE=y
configs/snapper9g20_defconfig
... ... @@ -26,6 +26,8 @@
26 26 CONFIG_ENV_IS_IN_NAND=y
27 27 CONFIG_CMD_PCA953X=y
28 28 # CONFIG_MMC is not set
  29 +CONFIG_NAND=y
  30 +CONFIG_NAND_ATMEL=y
29 31 CONFIG_USB=y
30 32 CONFIG_USB_STORAGE=y
configs/taurus_defconfig
... ... @@ -47,6 +47,8 @@
47 47 CONFIG_CLK_AT91=y
48 48 CONFIG_DFU_NAND=y
49 49 # CONFIG_MMC is not set
  50 +CONFIG_NAND=y
  51 +CONFIG_NAND_ATMEL=y
50 52 CONFIG_SPI_FLASH=y
51 53 CONFIG_SPI_FLASH_STMICRO=y
52 54 CONFIG_PHYLIB=y
configs/usb_a9263_dataflash_defconfig
... ... @@ -30,6 +30,8 @@
30 30 CONFIG_DM_GPIO=y
31 31 CONFIG_AT91_GPIO=y
32 32 # CONFIG_MMC is not set
  33 +CONFIG_NAND=y
  34 +CONFIG_NAND_ATMEL=y
33 35 CONFIG_DM_SPI_FLASH=y
34 36 CONFIG_SPI_FLASH=y
35 37 CONFIG_SPI_FLASH_ATMEL=y
configs/wb45n_defconfig
... ... @@ -23,6 +23,8 @@
23 23 CONFIG_CMD_MII=y
24 24 CONFIG_CMD_PING=y
25 25 CONFIG_ENV_IS_IN_NAND=y
  26 +CONFIG_NAND=y
  27 +CONFIG_NAND_ATMEL=y
26 28 CONFIG_LZMA=y
27 29 CONFIG_OF_LIBFDT=y
configs/wb50n_defconfig
... ... @@ -24,6 +24,8 @@
24 24 CONFIG_CMD_PING=y
25 25 CONFIG_ENV_IS_IN_NAND=y
26 26 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
  27 +CONFIG_NAND=y
  28 +CONFIG_NAND_ATMEL=y
27 29 CONFIG_PHYLIB=y
28 30 CONFIG_PHY_MICREL=y
29 31 CONFIG_PHY_MICREL_KSZ90X1=y
drivers/mtd/nand/Kconfig
... ... @@ -9,6 +9,13 @@
9 9 This option, if enabled, provides more flexible and linux-like
10 10 NAND initialization process.
11 11  
  12 +config NAND_ATMEL
  13 + bool "Support Atmel NAND controller"
  14 + imply SYS_NAND_USE_FLASH_BBT
  15 + help
  16 + Enable this driver for NAND flash platforms using an Atmel NAND
  17 + controller.
  18 +
12 19 config NAND_DENALI
13 20 bool
14 21 select SYS_NAND_SELF_INIT
include/configs/at91sam9260ek.h
... ... @@ -90,7 +90,6 @@
90 90  
91 91 /* NAND flash */
92 92 #ifdef CONFIG_CMD_NAND
93   -#define CONFIG_NAND_ATMEL
94 93 #define CONFIG_SYS_MAX_NAND_DEVICE 1
95 94 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
96 95 #define CONFIG_SYS_NAND_DBW_8
include/configs/at91sam9261ek.h
... ... @@ -59,7 +59,6 @@
59 59  
60 60 /* NAND flash */
61 61 #ifdef CONFIG_CMD_NAND
62   -#define CONFIG_NAND_ATMEL
63 62 #define CONFIG_SYS_MAX_NAND_DEVICE 1
64 63 #define CONFIG_SYS_NAND_BASE 0x40000000
65 64 #define CONFIG_SYS_NAND_DBW_8
include/configs/at91sam9263ek.h
... ... @@ -190,7 +190,6 @@
190 190  
191 191 /* NAND flash */
192 192 #ifdef CONFIG_CMD_NAND
193   -#define CONFIG_NAND_ATMEL
194 193 #define CONFIG_SYS_MAX_NAND_DEVICE 1
195 194 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
196 195 #define CONFIG_SYS_NAND_DBW_8 1
include/configs/at91sam9m10g45ek.h
... ... @@ -52,7 +52,6 @@
52 52  
53 53 /* NAND flash */
54 54 #ifdef CONFIG_CMD_NAND
55   -#define CONFIG_NAND_ATMEL
56 55 #define CONFIG_SYS_MAX_NAND_DEVICE 1
57 56 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
58 57 #define CONFIG_SYS_NAND_DBW_8
include/configs/at91sam9n12ek.h
... ... @@ -52,7 +52,6 @@
52 52  
53 53 /* NAND flash */
54 54 #ifdef CONFIG_CMD_NAND
55   -#define CONFIG_NAND_ATMEL
56 55 #define CONFIG_SYS_MAX_NAND_DEVICE 1
57 56 #define CONFIG_SYS_NAND_BASE 0x40000000
58 57 #define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
include/configs/at91sam9rlek.h
... ... @@ -50,7 +50,6 @@
50 50  
51 51 /* NAND flash */
52 52 #ifdef CONFIG_CMD_NAND
53   -#define CONFIG_NAND_ATMEL
54 53 #define CONFIG_SYS_MAX_NAND_DEVICE 1
55 54 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
56 55 #define CONFIG_SYS_NAND_DBW_8 1
include/configs/at91sam9x5ek.h
... ... @@ -45,7 +45,6 @@
45 45  
46 46 /* NAND flash */
47 47 #ifdef CONFIG_CMD_NAND
48   -#define CONFIG_NAND_ATMEL
49 48 #define CONFIG_SYS_MAX_NAND_DEVICE 1
50 49 #define CONFIG_SYS_NAND_BASE 0x40000000
51 50 #define CONFIG_SYS_NAND_DBW_8 1
include/configs/corvus.h
... ... @@ -64,7 +64,6 @@
64 64  
65 65 /* NAND flash */
66 66 #ifdef CONFIG_CMD_NAND
67   -#define CONFIG_NAND_ATMEL
68 67 #define CONFIG_SYS_MAX_NAND_DEVICE 1
69 68 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
70 69 #define CONFIG_SYS_NAND_DBW_8
include/configs/ethernut5.h
... ... @@ -63,7 +63,6 @@
63 63 #define CONFIG_SYS_MAX_NAND_DEVICE 1
64 64 #define CONFIG_SYS_NAND_BASE 0x40000000
65 65 #define CONFIG_SYS_NAND_DBW_8
66   -#define CONFIG_NAND_ATMEL
67 66 /* our ALE is AD21 */
68 67 #define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
69 68 /* our CLE is AD22 */
include/configs/meesc.h
... ... @@ -77,7 +77,6 @@
77 77  
78 78 /* NAND flash */
79 79 #ifdef CONFIG_CMD_NAND
80   -# define CONFIG_NAND_ATMEL
81 80 # define CONFIG_SYS_MAX_NAND_DEVICE 1
82 81 # define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 /* 0x40000000 */
83 82 # define CONFIG_SYS_NAND_DBW_8
include/configs/pm9261.h
... ... @@ -159,7 +159,6 @@
159 159 #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */
160 160  
161 161 /* NAND flash */
162   -#define CONFIG_NAND_ATMEL
163 162 #define CONFIG_SYS_MAX_NAND_DEVICE 1
164 163 #define CONFIG_SYS_NAND_BASE 0x40000000
165 164 #define CONFIG_SYS_NAND_DBW_8 1
include/configs/pm9263.h
... ... @@ -182,7 +182,6 @@
182 182  
183 183 /* NAND flash */
184 184 #ifdef CONFIG_CMD_NAND
185   -#define CONFIG_NAND_ATMEL
186 185 #define CONFIG_SYS_MAX_NAND_DEVICE 1
187 186 #define CONFIG_SYS_NAND_BASE 0x40000000
188 187 #define CONFIG_SYS_NAND_DBW_8 1
include/configs/pm9g45.h
... ... @@ -71,7 +71,6 @@
71 71  
72 72 /* NAND flash */
73 73 #ifdef CONFIG_CMD_NAND
74   -#define CONFIG_NAND_ATMEL
75 74 #define CONFIG_SYS_MAX_NAND_DEVICE 1
76 75 #define CONFIG_SYS_NAND_BASE 0x40000000
77 76 #define CONFIG_SYS_NAND_DBW_8 1
include/configs/sama5d2_ptc_ek.h
... ... @@ -29,7 +29,6 @@
29 29  
30 30 /* NAND Flash */
31 31 #ifdef CONFIG_CMD_NAND
32   -#define CONFIG_NAND_ATMEL
33 32 #define CONFIG_SYS_MAX_NAND_DEVICE 1
34 33 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
35 34 /* our ALE is AD21 */
include/configs/sama5d3_xplained.h
... ... @@ -36,7 +36,6 @@
36 36  
37 37 /* NAND flash */
38 38 #ifdef CONFIG_CMD_NAND
39   -#define CONFIG_NAND_ATMEL
40 39 #define CONFIG_SYS_MAX_NAND_DEVICE 1
41 40 #define CONFIG_SYS_NAND_BASE 0x60000000
42 41 /* our ALE is AD21 */
include/configs/sama5d3xek.h
... ... @@ -58,7 +58,6 @@
58 58  
59 59 /* NAND flash */
60 60 #ifdef CONFIG_CMD_NAND
61   -#define CONFIG_NAND_ATMEL
62 61 #define CONFIG_SYS_MAX_NAND_DEVICE 1
63 62 #define CONFIG_SYS_NAND_BASE 0x60000000
64 63 /* our ALE is AD21 */
include/configs/sama5d4_xplained.h
... ... @@ -33,7 +33,6 @@
33 33  
34 34 /* NAND flash */
35 35 #ifdef CONFIG_CMD_NAND
36   -#define CONFIG_NAND_ATMEL
37 36 #define CONFIG_SYS_MAX_NAND_DEVICE 1
38 37 #define CONFIG_SYS_NAND_BASE 0x80000000
39 38 /* our ALE is AD21 */
include/configs/sama5d4ek.h
... ... @@ -31,7 +31,6 @@
31 31  
32 32 /* NAND flash */
33 33 #ifdef CONFIG_CMD_NAND
34   -#define CONFIG_NAND_ATMEL
35 34 #define CONFIG_SYS_MAX_NAND_DEVICE 1
36 35 #define CONFIG_SYS_NAND_BASE 0x80000000
37 36 /* our ALE is AD21 */
include/configs/smartweb.h
... ... @@ -78,7 +78,6 @@
78 78 ROUND(3 * CONFIG_ENV_SIZE + (4 * SZ_1M), 0x1000)
79 79  
80 80 /* NAND flash settings */
81   -#define CONFIG_NAND_ATMEL
82 81 #define CONFIG_SYS_MAX_NAND_DEVICE 1
83 82 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
84 83 #define CONFIG_SYS_NAND_DBW_8
include/configs/snapper9260.h
... ... @@ -38,7 +38,6 @@
38 38 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + (1024 * 1024))
39 39  
40 40 /* NAND Flash */
41   -#define CONFIG_NAND_ATMEL
42 41 #define CONFIG_SYS_MAX_NAND_DEVICE 1
43 42 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
44 43 #define CONFIG_SYS_NAND_DBW_8
include/configs/snapper9g45.h
... ... @@ -36,7 +36,6 @@
36 36 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + (1024 * 1024))
37 37  
38 38 /* NAND Flash */
39   -#define CONFIG_NAND_ATMEL
40 39 #define CONFIG_ATMEL_NAND_HWECC
41 40 #define CONFIG_SYS_NAND_ECC_BASE ATMEL_BASE_ECC
42 41 #define CONFIG_SYS_MAX_NAND_DEVICE 1
include/configs/taurus.h
... ... @@ -72,7 +72,6 @@
72 72  
73 73 /* NAND flash */
74 74 #ifdef CONFIG_CMD_NAND
75   -#define CONFIG_NAND_ATMEL
76 75 #define CONFIG_SYS_MAX_NAND_DEVICE 1
77 76 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
78 77 #define CONFIG_SYS_NAND_DBW_8
include/configs/usb_a9263.h
... ... @@ -48,7 +48,6 @@
48 48  
49 49 /* NAND flash */
50 50 #ifdef CONFIG_CMD_NAND
51   -#define CONFIG_NAND_ATMEL
52 51 #define CONFIG_SYS_MAX_NAND_DEVICE 1
53 52 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
54 53 /* our ALE is AD21 */
include/configs/wb45n.h
... ... @@ -40,7 +40,6 @@
40 40 (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE)
41 41  
42 42 /* NAND flash */
43   -#define CONFIG_NAND_ATMEL
44 43 #define CONFIG_SYS_MAX_NAND_DEVICE 1
45 44 #define CONFIG_SYS_NAND_BASE 0x40000000
46 45 /* our ALE is AD21 */
include/configs/wb50n.h
... ... @@ -51,7 +51,6 @@
51 51 #define CONFIG_SYS_MEMTEST_END 0x22000000
52 52  
53 53 /* NAND flash */
54   -#define CONFIG_NAND_ATMEL
55 54 #define CONFIG_SYS_MAX_NAND_DEVICE 1
56 55 #define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
57 56 /* our ALE is AD21 */
scripts/config_whitelist.txt
... ... @@ -1367,7 +1367,6 @@
1367 1367 CONFIG_NANDFLASH_SIZE
1368 1368 CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
1369 1369 CONFIG_NAND_ACTL
1370   -CONFIG_NAND_ATMEL
1371 1370 CONFIG_NAND_CS_INIT
1372 1371 CONFIG_NAND_DATA_REG
1373 1372 CONFIG_NAND_DAVINCI