aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2014-04-17 03:21:46 -0400
committerSteven Miao <realmz6@gmail.com>2014-06-12 04:58:50 -0400
commit51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8 (patch)
tree9e337e48d9677262c8392a7c3387a9ef687a824a /arch/blackfin
parentff5ae12d84d3f7eaeb3850ff6de4289c0c849344 (diff)
blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
These defconfigs contain the CONFIG_M25P80 symbol, which is now dependent on the MTD_SPI_NOR symbol. Add CONFIG_MTD_SPI_NOR to the relevant defconfigs. At the same time, drop the now-nonexistent CONFIG_MTD_CHAR symbol. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Steven Miao <realmz6@gmail.com> Cc: adi-buildroot-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/configs/BF526-EZBRD_defconfig2
-rw-r--r--arch/blackfin/configs/BF527-EZKIT-V2_defconfig2
-rw-r--r--arch/blackfin/configs/BF527-EZKIT_defconfig2
-rw-r--r--arch/blackfin/configs/BF548-EZKIT_defconfig2
-rw-r--r--arch/blackfin/configs/BF609-EZKIT_defconfig2
-rw-r--r--arch/blackfin/configs/BlackStamp_defconfig3
-rw-r--r--arch/blackfin/configs/H8606_defconfig3
7 files changed, 7 insertions, 9 deletions
diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig
index 2f2c6acf210c..530ba7a6d7b0 100644
--- a/arch/blackfin/configs/BF526-EZBRD_defconfig
+++ b/arch/blackfin/configs/BF526-EZBRD_defconfig
@@ -53,7 +53,6 @@ CONFIG_IP_PNP=y
53CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 53CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
54# CONFIG_FW_LOADER is not set 54# CONFIG_FW_LOADER is not set
55CONFIG_MTD=y 55CONFIG_MTD=y
56CONFIG_MTD_CHAR=y
57CONFIG_MTD_BLOCK=y 56CONFIG_MTD_BLOCK=y
58CONFIG_MTD_CFI=y 57CONFIG_MTD_CFI=y
59CONFIG_MTD_CFI_INTELEXT=y 58CONFIG_MTD_CFI_INTELEXT=y
@@ -63,6 +62,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
63CONFIG_MTD_PHYSMAP=y 62CONFIG_MTD_PHYSMAP=y
64CONFIG_MTD_M25P80=y 63CONFIG_MTD_M25P80=y
65CONFIG_MTD_NAND=m 64CONFIG_MTD_NAND=m
65CONFIG_MTD_SPI_NOR=y
66CONFIG_BLK_DEV_RAM=y 66CONFIG_BLK_DEV_RAM=y
67CONFIG_SCSI=y 67CONFIG_SCSI=y
68# CONFIG_SCSI_PROC_FS is not set 68# CONFIG_SCSI_PROC_FS is not set
diff --git a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
index 91535c38e7f2..a21c79275eae 100644
--- a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
@@ -58,7 +58,6 @@ CONFIG_BFIN_SIR0=y
58CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 58CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
59# CONFIG_FW_LOADER is not set 59# CONFIG_FW_LOADER is not set
60CONFIG_MTD=y 60CONFIG_MTD=y
61CONFIG_MTD_CHAR=m
62CONFIG_MTD_BLOCK=y 61CONFIG_MTD_BLOCK=y
63CONFIG_MTD_JEDECPROBE=m 62CONFIG_MTD_JEDECPROBE=m
64CONFIG_MTD_RAM=y 63CONFIG_MTD_RAM=y
@@ -66,6 +65,7 @@ CONFIG_MTD_ROM=m
66CONFIG_MTD_COMPLEX_MAPPINGS=y 65CONFIG_MTD_COMPLEX_MAPPINGS=y
67CONFIG_MTD_M25P80=y 66CONFIG_MTD_M25P80=y
68CONFIG_MTD_NAND=m 67CONFIG_MTD_NAND=m
68CONFIG_MTD_SPI_NOR=y
69CONFIG_BLK_DEV_RAM=y 69CONFIG_BLK_DEV_RAM=y
70CONFIG_SCSI=y 70CONFIG_SCSI=y
71# CONFIG_SCSI_PROC_FS is not set 71# CONFIG_SCSI_PROC_FS is not set
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig
index af2738c7441b..5070a860d8c4 100644
--- a/arch/blackfin/configs/BF527-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT_defconfig
@@ -57,7 +57,6 @@ CONFIG_BFIN_SIR0=y
57CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 57CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
58# CONFIG_FW_LOADER is not set 58# CONFIG_FW_LOADER is not set
59CONFIG_MTD=y 59CONFIG_MTD=y
60CONFIG_MTD_CHAR=m
61CONFIG_MTD_BLOCK=y 60CONFIG_MTD_BLOCK=y
62CONFIG_MTD_JEDECPROBE=m 61CONFIG_MTD_JEDECPROBE=m
63CONFIG_MTD_RAM=y 62CONFIG_MTD_RAM=y
@@ -65,6 +64,7 @@ CONFIG_MTD_ROM=m
65CONFIG_MTD_COMPLEX_MAPPINGS=y 64CONFIG_MTD_COMPLEX_MAPPINGS=y
66CONFIG_MTD_M25P80=y 65CONFIG_MTD_M25P80=y
67CONFIG_MTD_NAND=m 66CONFIG_MTD_NAND=m
67CONFIG_MTD_SPI_NOR=y
68CONFIG_BLK_DEV_RAM=y 68CONFIG_BLK_DEV_RAM=y
69CONFIG_SCSI=y 69CONFIG_SCSI=y
70# CONFIG_SCSI_PROC_FS is not set 70# CONFIG_SCSI_PROC_FS is not set
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig
index e716fdfd2cf2..efb293057287 100644
--- a/arch/blackfin/configs/BF548-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig
@@ -64,7 +64,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
64CONFIG_FW_LOADER=m 64CONFIG_FW_LOADER=m
65CONFIG_MTD=y 65CONFIG_MTD=y
66CONFIG_MTD_CMDLINE_PARTS=y 66CONFIG_MTD_CMDLINE_PARTS=y
67CONFIG_MTD_CHAR=y
68CONFIG_MTD_BLOCK=y 67CONFIG_MTD_BLOCK=y
69CONFIG_MTD_CFI=y 68CONFIG_MTD_CFI=y
70CONFIG_MTD_CFI_INTELEXT=y 69CONFIG_MTD_CFI_INTELEXT=y
@@ -75,6 +74,7 @@ CONFIG_MTD_M25P80=y
75CONFIG_MTD_NAND=y 74CONFIG_MTD_NAND=y
76CONFIG_MTD_NAND_BF5XX=y 75CONFIG_MTD_NAND_BF5XX=y
77# CONFIG_MTD_NAND_BF5XX_HWECC is not set 76# CONFIG_MTD_NAND_BF5XX_HWECC is not set
77CONFIG_MTD_SPI_NOR=y
78CONFIG_BLK_DEV_RAM=y 78CONFIG_BLK_DEV_RAM=y
79# CONFIG_SCSI_PROC_FS is not set 79# CONFIG_SCSI_PROC_FS is not set
80CONFIG_BLK_DEV_SD=y 80CONFIG_BLK_DEV_SD=y
diff --git a/arch/blackfin/configs/BF609-EZKIT_defconfig b/arch/blackfin/configs/BF609-EZKIT_defconfig
index 4ca39ab6b2bf..a7e9bfd84183 100644
--- a/arch/blackfin/configs/BF609-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF609-EZKIT_defconfig
@@ -57,7 +57,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
57CONFIG_FW_LOADER=m 57CONFIG_FW_LOADER=m
58CONFIG_MTD=y 58CONFIG_MTD=y
59CONFIG_MTD_CMDLINE_PARTS=y 59CONFIG_MTD_CMDLINE_PARTS=y
60CONFIG_MTD_CHAR=y
61CONFIG_MTD_BLOCK=y 60CONFIG_MTD_BLOCK=y
62CONFIG_MTD_CFI=y 61CONFIG_MTD_CFI=y
63CONFIG_MTD_CFI_INTELEXT=y 62CONFIG_MTD_CFI_INTELEXT=y
@@ -65,6 +64,7 @@ CONFIG_MTD_CFI_STAA=y
65CONFIG_MTD_COMPLEX_MAPPINGS=y 64CONFIG_MTD_COMPLEX_MAPPINGS=y
66CONFIG_MTD_PHYSMAP=y 65CONFIG_MTD_PHYSMAP=y
67CONFIG_MTD_M25P80=y 66CONFIG_MTD_M25P80=y
67CONFIG_MTD_SPI_NOR=y
68CONFIG_MTD_UBI=m 68CONFIG_MTD_UBI=m
69CONFIG_SCSI=y 69CONFIG_SCSI=y
70CONFIG_BLK_DEV_SD=y 70CONFIG_BLK_DEV_SD=y
diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig
index 3853c473b443..f4a9200e1ab1 100644
--- a/arch/blackfin/configs/BlackStamp_defconfig
+++ b/arch/blackfin/configs/BlackStamp_defconfig
@@ -45,7 +45,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45# CONFIG_FW_LOADER is not set 45# CONFIG_FW_LOADER is not set
46CONFIG_MTD=y 46CONFIG_MTD=y
47CONFIG_MTD_CMDLINE_PARTS=y 47CONFIG_MTD_CMDLINE_PARTS=y
48CONFIG_MTD_CHAR=m
49CONFIG_MTD_BLOCK=y 48CONFIG_MTD_BLOCK=y
50CONFIG_MTD_CFI=m 49CONFIG_MTD_CFI=m
51CONFIG_MTD_CFI_AMDSTD=m 50CONFIG_MTD_CFI_AMDSTD=m
@@ -53,7 +52,7 @@ CONFIG_MTD_RAM=y
53CONFIG_MTD_ROM=m 52CONFIG_MTD_ROM=m
54CONFIG_MTD_COMPLEX_MAPPINGS=y 53CONFIG_MTD_COMPLEX_MAPPINGS=y
55CONFIG_MTD_M25P80=y 54CONFIG_MTD_M25P80=y
56# CONFIG_M25PXX_USE_FAST_READ is not set 55CONFIG_MTD_SPI_NOR=y
57CONFIG_BLK_DEV_LOOP=y 56CONFIG_BLK_DEV_LOOP=y
58CONFIG_BLK_DEV_NBD=y 57CONFIG_BLK_DEV_NBD=y
59CONFIG_BLK_DEV_RAM=y 58CONFIG_BLK_DEV_RAM=y
diff --git a/arch/blackfin/configs/H8606_defconfig b/arch/blackfin/configs/H8606_defconfig
index f754e490bbfd..0ff97d8d047a 100644
--- a/arch/blackfin/configs/H8606_defconfig
+++ b/arch/blackfin/configs/H8606_defconfig
@@ -36,13 +36,12 @@ CONFIG_IRTTY_SIR=m
36# CONFIG_WIRELESS is not set 36# CONFIG_WIRELESS is not set
37# CONFIG_FW_LOADER is not set 37# CONFIG_FW_LOADER is not set
38CONFIG_MTD=y 38CONFIG_MTD=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLOCK=y 39CONFIG_MTD_BLOCK=y
41CONFIG_MTD_RAM=y 40CONFIG_MTD_RAM=y
42CONFIG_MTD_ROM=y 41CONFIG_MTD_ROM=y
43CONFIG_MTD_COMPLEX_MAPPINGS=y 42CONFIG_MTD_COMPLEX_MAPPINGS=y
44CONFIG_MTD_M25P80=y 43CONFIG_MTD_M25P80=y
45# CONFIG_M25PXX_USE_FAST_READ is not set 44CONFIG_MTD_SPI_NOR=y
46CONFIG_BLK_DEV_RAM=y 45CONFIG_BLK_DEV_RAM=y
47CONFIG_MISC_DEVICES=y 46CONFIG_MISC_DEVICES=y
48CONFIG_EEPROM_AT25=y 47CONFIG_EEPROM_AT25=y
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-24 18:32:01 -0400