diff options
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/at91cap9adk_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/at91sam9260ek_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/at91sam9261ek_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/at91sam9263ek_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/at91sam9g20ek_defconfig | 10 | ||||
-rw-r--r-- | arch/arm/configs/at91sam9rlek_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/cam60_defconfig | 8 | ||||
-rw-r--r-- | arch/arm/configs/qil-a9260_defconfig | 8 | ||||
-rw-r--r-- | arch/arm/configs/sam9_l9260_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/usb-a9260_defconfig | 8 | ||||
-rw-r--r-- | arch/arm/configs/usb-a9263_defconfig | 8 | ||||
-rw-r--r-- | arch/arm/configs/yl9200_defconfig | 2 |
12 files changed, 31 insertions, 31 deletions
diff --git a/arch/arm/configs/at91cap9adk_defconfig b/arch/arm/configs/at91cap9adk_defconfig index be2b2f38fd94..bf97801a1068 100644 --- a/arch/arm/configs/at91cap9adk_defconfig +++ b/arch/arm/configs/at91cap9adk_defconfig | |||
@@ -170,7 +170,7 @@ CONFIG_MACH_AT91CAP9ADK=y | |||
170 | # AT91 Board Options | 170 | # AT91 Board Options |
171 | # | 171 | # |
172 | CONFIG_MTD_AT91_DATAFLASH_CARD=y | 172 | CONFIG_MTD_AT91_DATAFLASH_CARD=y |
173 | # CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set | 173 | # CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set |
174 | 174 | ||
175 | # | 175 | # |
176 | # AT91 Feature Selections | 176 | # AT91 Feature Selections |
@@ -442,7 +442,7 @@ CONFIG_MTD_NAND=y | |||
442 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 442 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
443 | CONFIG_MTD_NAND_IDS=y | 443 | CONFIG_MTD_NAND_IDS=y |
444 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 444 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
445 | CONFIG_MTD_NAND_AT91=y | 445 | CONFIG_MTD_NAND_ATMEL=y |
446 | # CONFIG_MTD_NAND_NANDSIM is not set | 446 | # CONFIG_MTD_NAND_NANDSIM is not set |
447 | # CONFIG_MTD_NAND_PLATFORM is not set | 447 | # CONFIG_MTD_NAND_PLATFORM is not set |
448 | # CONFIG_MTD_ALAUDA is not set | 448 | # CONFIG_MTD_ALAUDA is not set |
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig index 2011adfa6758..38e6a0abeb4e 100644 --- a/arch/arm/configs/at91sam9260ek_defconfig +++ b/arch/arm/configs/at91sam9260ek_defconfig | |||
@@ -176,7 +176,7 @@ CONFIG_MACH_AT91SAM9260EK=y | |||
176 | # AT91 Board Options | 176 | # AT91 Board Options |
177 | # | 177 | # |
178 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set | 178 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set |
179 | # CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set | 179 | # CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set |
180 | 180 | ||
181 | # | 181 | # |
182 | # AT91 Feature Selections | 182 | # AT91 Feature Selections |
diff --git a/arch/arm/configs/at91sam9261ek_defconfig b/arch/arm/configs/at91sam9261ek_defconfig index 4049768962d2..93b779f94b41 100644 --- a/arch/arm/configs/at91sam9261ek_defconfig +++ b/arch/arm/configs/at91sam9261ek_defconfig | |||
@@ -169,7 +169,7 @@ CONFIG_MACH_AT91SAM9261EK=y | |||
169 | # AT91 Board Options | 169 | # AT91 Board Options |
170 | # | 170 | # |
171 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set | 171 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set |
172 | # CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set | 172 | # CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set |
173 | 173 | ||
174 | # | 174 | # |
175 | # AT91 Feature Selections | 175 | # AT91 Feature Selections |
@@ -433,7 +433,7 @@ CONFIG_MTD_NAND=y | |||
433 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 433 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
434 | CONFIG_MTD_NAND_IDS=y | 434 | CONFIG_MTD_NAND_IDS=y |
435 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 435 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
436 | CONFIG_MTD_NAND_AT91=y | 436 | CONFIG_MTD_NAND_ATMEL=y |
437 | # CONFIG_MTD_NAND_NANDSIM is not set | 437 | # CONFIG_MTD_NAND_NANDSIM is not set |
438 | # CONFIG_MTD_NAND_PLATFORM is not set | 438 | # CONFIG_MTD_NAND_PLATFORM is not set |
439 | # CONFIG_MTD_ALAUDA is not set | 439 | # CONFIG_MTD_ALAUDA is not set |
diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig index fa1c5aecb5a8..a7ddd94363ca 100644 --- a/arch/arm/configs/at91sam9263ek_defconfig +++ b/arch/arm/configs/at91sam9263ek_defconfig | |||
@@ -169,7 +169,7 @@ CONFIG_MACH_AT91SAM9263EK=y | |||
169 | # AT91 Board Options | 169 | # AT91 Board Options |
170 | # | 170 | # |
171 | CONFIG_MTD_AT91_DATAFLASH_CARD=y | 171 | CONFIG_MTD_AT91_DATAFLASH_CARD=y |
172 | # CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set | 172 | # CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set |
173 | 173 | ||
174 | # | 174 | # |
175 | # AT91 Feature Selections | 175 | # AT91 Feature Selections |
@@ -428,7 +428,7 @@ CONFIG_MTD_NAND=y | |||
428 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 428 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
429 | CONFIG_MTD_NAND_IDS=y | 429 | CONFIG_MTD_NAND_IDS=y |
430 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 430 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
431 | CONFIG_MTD_NAND_AT91=y | 431 | CONFIG_MTD_NAND_ATMEL=y |
432 | # CONFIG_MTD_NAND_NANDSIM is not set | 432 | # CONFIG_MTD_NAND_NANDSIM is not set |
433 | # CONFIG_MTD_NAND_PLATFORM is not set | 433 | # CONFIG_MTD_NAND_PLATFORM is not set |
434 | # CONFIG_MTD_ALAUDA is not set | 434 | # CONFIG_MTD_ALAUDA is not set |
diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig index c06863847364..df0d6ee672b3 100644 --- a/arch/arm/configs/at91sam9g20ek_defconfig +++ b/arch/arm/configs/at91sam9g20ek_defconfig | |||
@@ -168,7 +168,7 @@ CONFIG_MACH_AT91SAM9G20EK=y | |||
168 | # AT91 Board Options | 168 | # AT91 Board Options |
169 | # | 169 | # |
170 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set | 170 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set |
171 | # CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set | 171 | # CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16 is not set |
172 | 172 | ||
173 | # | 173 | # |
174 | # AT91 Feature Selections | 174 | # AT91 Feature Selections |
@@ -442,10 +442,10 @@ CONFIG_MTD_NAND=y | |||
442 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 442 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
443 | CONFIG_MTD_NAND_IDS=y | 443 | CONFIG_MTD_NAND_IDS=y |
444 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 444 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
445 | CONFIG_MTD_NAND_AT91=y | 445 | CONFIG_MTD_NAND_ATMEL=y |
446 | CONFIG_MTD_NAND_AT91_ECC_SOFT=y | 446 | CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y |
447 | # CONFIG_MTD_NAND_AT91_ECC_HW is not set | 447 | # CONFIG_MTD_NAND_ATMEL_ECC_HW is not set |
448 | # CONFIG_MTD_NAND_AT91_ECC_NONE is not set | 448 | # CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set |
449 | # CONFIG_MTD_NAND_NANDSIM is not set | 449 | # CONFIG_MTD_NAND_NANDSIM is not set |
450 | # CONFIG_MTD_NAND_PLATFORM is not set | 450 | # CONFIG_MTD_NAND_PLATFORM is not set |
451 | # CONFIG_MTD_ALAUDA is not set | 451 | # CONFIG_MTD_ALAUDA is not set |
diff --git a/arch/arm/configs/at91sam9rlek_defconfig b/arch/arm/configs/at91sam9rlek_defconfig index d8ec5f9ca6ec..1c76642272a1 100644 --- a/arch/arm/configs/at91sam9rlek_defconfig +++ b/arch/arm/configs/at91sam9rlek_defconfig | |||
@@ -392,7 +392,7 @@ CONFIG_MTD_NAND=y | |||
392 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 392 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
393 | CONFIG_MTD_NAND_IDS=y | 393 | CONFIG_MTD_NAND_IDS=y |
394 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 394 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
395 | CONFIG_MTD_NAND_AT91=y | 395 | CONFIG_MTD_NAND_ATMEL=y |
396 | # CONFIG_MTD_NAND_NANDSIM is not set | 396 | # CONFIG_MTD_NAND_NANDSIM is not set |
397 | # CONFIG_MTD_NAND_PLATFORM is not set | 397 | # CONFIG_MTD_NAND_PLATFORM is not set |
398 | # CONFIG_MTD_ONENAND is not set | 398 | # CONFIG_MTD_ONENAND is not set |
diff --git a/arch/arm/configs/cam60_defconfig b/arch/arm/configs/cam60_defconfig index f3cd4a95373a..f945105d6cd6 100644 --- a/arch/arm/configs/cam60_defconfig +++ b/arch/arm/configs/cam60_defconfig | |||
@@ -466,10 +466,10 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y | |||
466 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 466 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
467 | CONFIG_MTD_NAND_IDS=y | 467 | CONFIG_MTD_NAND_IDS=y |
468 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 468 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
469 | CONFIG_MTD_NAND_AT91=y | 469 | CONFIG_MTD_NAND_ATMEL=y |
470 | # CONFIG_MTD_NAND_AT91_ECC_SOFT is not set | 470 | # CONFIG_MTD_NAND_ATMEL_ECC_SOFT is not set |
471 | CONFIG_MTD_NAND_AT91_ECC_HW=y | 471 | CONFIG_MTD_NAND_ATMEL_ECC_HW=y |
472 | # CONFIG_MTD_NAND_AT91_ECC_NONE is not set | 472 | # CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set |
473 | # CONFIG_MTD_NAND_NANDSIM is not set | 473 | # CONFIG_MTD_NAND_NANDSIM is not set |
474 | # CONFIG_MTD_NAND_PLATFORM is not set | 474 | # CONFIG_MTD_NAND_PLATFORM is not set |
475 | # CONFIG_MTD_ALAUDA is not set | 475 | # CONFIG_MTD_ALAUDA is not set |
diff --git a/arch/arm/configs/qil-a9260_defconfig b/arch/arm/configs/qil-a9260_defconfig index ef903bed061e..5cbd81589647 100644 --- a/arch/arm/configs/qil-a9260_defconfig +++ b/arch/arm/configs/qil-a9260_defconfig | |||
@@ -458,10 +458,10 @@ CONFIG_MTD_NAND=y | |||
458 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 458 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
459 | CONFIG_MTD_NAND_IDS=y | 459 | CONFIG_MTD_NAND_IDS=y |
460 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 460 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
461 | CONFIG_MTD_NAND_AT91=y | 461 | CONFIG_MTD_NAND_ATMEL=y |
462 | CONFIG_MTD_NAND_AT91_ECC_SOFT=y | 462 | CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y |
463 | # CONFIG_MTD_NAND_AT91_ECC_HW is not set | 463 | # CONFIG_MTD_NAND_ATMEL_ECC_HW is not set |
464 | # CONFIG_MTD_NAND_AT91_ECC_NONE is not set | 464 | # CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set |
465 | # CONFIG_MTD_NAND_NANDSIM is not set | 465 | # CONFIG_MTD_NAND_NANDSIM is not set |
466 | # CONFIG_MTD_NAND_PLATFORM is not set | 466 | # CONFIG_MTD_NAND_PLATFORM is not set |
467 | # CONFIG_MTD_ALAUDA is not set | 467 | # CONFIG_MTD_ALAUDA is not set |
diff --git a/arch/arm/configs/sam9_l9260_defconfig b/arch/arm/configs/sam9_l9260_defconfig index 8688362bcf7b..1174e2764875 100644 --- a/arch/arm/configs/sam9_l9260_defconfig +++ b/arch/arm/configs/sam9_l9260_defconfig | |||
@@ -429,7 +429,7 @@ CONFIG_MTD_NAND=y | |||
429 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 429 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
430 | CONFIG_MTD_NAND_IDS=y | 430 | CONFIG_MTD_NAND_IDS=y |
431 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 431 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
432 | CONFIG_MTD_NAND_AT91=y | 432 | CONFIG_MTD_NAND_ATMEL=y |
433 | # CONFIG_MTD_NAND_NANDSIM is not set | 433 | # CONFIG_MTD_NAND_NANDSIM is not set |
434 | CONFIG_MTD_NAND_PLATFORM=y | 434 | CONFIG_MTD_NAND_PLATFORM=y |
435 | # CONFIG_MTD_ONENAND is not set | 435 | # CONFIG_MTD_ONENAND is not set |
diff --git a/arch/arm/configs/usb-a9260_defconfig b/arch/arm/configs/usb-a9260_defconfig index 3680bd2df26d..fcb4aaabd439 100644 --- a/arch/arm/configs/usb-a9260_defconfig +++ b/arch/arm/configs/usb-a9260_defconfig | |||
@@ -458,10 +458,10 @@ CONFIG_MTD_NAND=y | |||
458 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 458 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
459 | CONFIG_MTD_NAND_IDS=y | 459 | CONFIG_MTD_NAND_IDS=y |
460 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 460 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
461 | CONFIG_MTD_NAND_AT91=y | 461 | CONFIG_MTD_NAND_ATMEL=y |
462 | CONFIG_MTD_NAND_AT91_ECC_SOFT=y | 462 | CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y |
463 | # CONFIG_MTD_NAND_AT91_ECC_HW is not set | 463 | # CONFIG_MTD_NAND_ATMEL_ECC_HW is not set |
464 | # CONFIG_MTD_NAND_AT91_ECC_NONE is not set | 464 | # CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set |
465 | # CONFIG_MTD_NAND_NANDSIM is not set | 465 | # CONFIG_MTD_NAND_NANDSIM is not set |
466 | # CONFIG_MTD_NAND_PLATFORM is not set | 466 | # CONFIG_MTD_NAND_PLATFORM is not set |
467 | # CONFIG_MTD_ALAUDA is not set | 467 | # CONFIG_MTD_ALAUDA is not set |
diff --git a/arch/arm/configs/usb-a9263_defconfig b/arch/arm/configs/usb-a9263_defconfig index 48d455bc7363..b786e0407e8e 100644 --- a/arch/arm/configs/usb-a9263_defconfig +++ b/arch/arm/configs/usb-a9263_defconfig | |||
@@ -450,10 +450,10 @@ CONFIG_MTD_NAND=y | |||
450 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 450 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
451 | CONFIG_MTD_NAND_IDS=y | 451 | CONFIG_MTD_NAND_IDS=y |
452 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 452 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
453 | CONFIG_MTD_NAND_AT91=y | 453 | CONFIG_MTD_NAND_ATMEL=y |
454 | CONFIG_MTD_NAND_AT91_ECC_SOFT=y | 454 | CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y |
455 | # CONFIG_MTD_NAND_AT91_ECC_HW is not set | 455 | # CONFIG_MTD_NAND_ATMEL_ECC_HW is not set |
456 | # CONFIG_MTD_NAND_AT91_ECC_NONE is not set | 456 | # CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set |
457 | # CONFIG_MTD_NAND_NANDSIM is not set | 457 | # CONFIG_MTD_NAND_NANDSIM is not set |
458 | # CONFIG_MTD_NAND_PLATFORM is not set | 458 | # CONFIG_MTD_NAND_PLATFORM is not set |
459 | # CONFIG_MTD_ALAUDA is not set | 459 | # CONFIG_MTD_ALAUDA is not set |
diff --git a/arch/arm/configs/yl9200_defconfig b/arch/arm/configs/yl9200_defconfig index 26de37f74686..a9f41c24c9dc 100644 --- a/arch/arm/configs/yl9200_defconfig +++ b/arch/arm/configs/yl9200_defconfig | |||
@@ -421,7 +421,7 @@ CONFIG_MTD_NAND=y | |||
421 | # CONFIG_MTD_NAND_ECC_SMC is not set | 421 | # CONFIG_MTD_NAND_ECC_SMC is not set |
422 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 422 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
423 | CONFIG_MTD_NAND_IDS=y | 423 | CONFIG_MTD_NAND_IDS=y |
424 | CONFIG_MTD_NAND_AT91=y | 424 | CONFIG_MTD_NAND_ATMEL=y |
425 | # CONFIG_MTD_NAND_NANDSIM is not set | 425 | # CONFIG_MTD_NAND_NANDSIM is not set |
426 | CONFIG_MTD_NAND_PLATFORM=y | 426 | CONFIG_MTD_NAND_PLATFORM=y |
427 | # CONFIG_MTD_ALAUDA is not set | 427 | # CONFIG_MTD_ALAUDA is not set |