diff options
Diffstat (limited to 'arch/powerpc/configs/44x')
-rw-r--r-- | arch/powerpc/configs/44x/arches_defconfig | 9 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/bamboo_defconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/bluestone_defconfig | 9 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/canyonlands_defconfig | 9 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/ebony_defconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/eiger_defconfig | 9 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/icon_defconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/katmai_defconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/redwood_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/sam440ep_defconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/sequoia_defconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/taishan_defconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/warp_defconfig | 5 |
13 files changed, 50 insertions, 37 deletions
diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig index 3ed16d5c909d..329f9a3b892e 100644 --- a/arch/powerpc/configs/44x/arches_defconfig +++ b/arch/powerpc/configs/44x/arches_defconfig | |||
@@ -44,10 +44,11 @@ CONFIG_BLK_DEV_RAM=y | |||
44 | CONFIG_BLK_DEV_RAM_SIZE=35000 | 44 | CONFIG_BLK_DEV_RAM_SIZE=35000 |
45 | # CONFIG_MISC_DEVICES is not set | 45 | # CONFIG_MISC_DEVICES is not set |
46 | CONFIG_NETDEVICES=y | 46 | CONFIG_NETDEVICES=y |
47 | CONFIG_NET_ETHERNET=y | 47 | CONFIG_ETHERNET=y |
48 | CONFIG_IBM_NEW_EMAC=y | 48 | CONFIG_NET_VENDOR_IBM=y |
49 | CONFIG_IBM_NEW_EMAC_RXB=256 | 49 | CONFIG_IBM_EMAC=y |
50 | CONFIG_IBM_NEW_EMAC_TXB=256 | 50 | CONFIG_IBM_EMAC_RXB=256 |
51 | CONFIG_IBM_EMAC_TXB=256 | ||
51 | # CONFIG_NETDEV_1000 is not set | 52 | # CONFIG_NETDEV_1000 is not set |
52 | # CONFIG_NETDEV_10000 is not set | 53 | # CONFIG_NETDEV_10000 is not set |
53 | # CONFIG_INPUT is not set | 54 | # CONFIG_INPUT is not set |
diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig index b1b7d2c5c059..cef7d62560c4 100644 --- a/arch/powerpc/configs/44x/bamboo_defconfig +++ b/arch/powerpc/configs/44x/bamboo_defconfig | |||
@@ -32,8 +32,9 @@ CONFIG_PROC_DEVICETREE=y | |||
32 | CONFIG_BLK_DEV_RAM=y | 32 | CONFIG_BLK_DEV_RAM=y |
33 | CONFIG_BLK_DEV_RAM_SIZE=35000 | 33 | CONFIG_BLK_DEV_RAM_SIZE=35000 |
34 | CONFIG_NETDEVICES=y | 34 | CONFIG_NETDEVICES=y |
35 | CONFIG_NET_ETHERNET=y | 35 | CONFIG_ETHERNET=y |
36 | CONFIG_IBM_NEW_EMAC=y | 36 | CONFIG_NET_VENDOR_IBM=y |
37 | CONFIG_IBM_EMAC=y | ||
37 | # CONFIG_INPUT is not set | 38 | # CONFIG_INPUT is not set |
38 | # CONFIG_SERIO is not set | 39 | # CONFIG_SERIO is not set |
39 | # CONFIG_VT is not set | 40 | # CONFIG_VT is not set |
diff --git a/arch/powerpc/configs/44x/bluestone_defconfig b/arch/powerpc/configs/44x/bluestone_defconfig index 30a0a8e08fdd..20c8d26d7fc0 100644 --- a/arch/powerpc/configs/44x/bluestone_defconfig +++ b/arch/powerpc/configs/44x/bluestone_defconfig | |||
@@ -38,10 +38,11 @@ CONFIG_PROC_DEVICETREE=y | |||
38 | CONFIG_BLK_DEV_RAM=y | 38 | CONFIG_BLK_DEV_RAM=y |
39 | CONFIG_BLK_DEV_RAM_SIZE=35000 | 39 | CONFIG_BLK_DEV_RAM_SIZE=35000 |
40 | CONFIG_NETDEVICES=y | 40 | CONFIG_NETDEVICES=y |
41 | CONFIG_NET_ETHERNET=y | 41 | CONFIG_ETHERNET=y |
42 | CONFIG_IBM_NEW_EMAC=y | 42 | CONFIG_NET_VENDOR_IBM=y |
43 | CONFIG_IBM_NEW_EMAC_RXB=256 | 43 | CONFIG_IBM_EMAC=y |
44 | CONFIG_IBM_NEW_EMAC_TXB=256 | 44 | CONFIG_IBM_EMAC_RXB=256 |
45 | CONFIG_IBM_EMAC_TXB=256 | ||
45 | CONFIG_SERIAL_8250=y | 46 | CONFIG_SERIAL_8250=y |
46 | CONFIG_SERIAL_8250_CONSOLE=y | 47 | CONFIG_SERIAL_8250_CONSOLE=y |
47 | CONFIG_SERIAL_8250_NR_UARTS=2 | 48 | CONFIG_SERIAL_8250_NR_UARTS=2 |
diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig index a46942aac695..d5be93e6e92d 100644 --- a/arch/powerpc/configs/44x/canyonlands_defconfig +++ b/arch/powerpc/configs/44x/canyonlands_defconfig | |||
@@ -49,10 +49,11 @@ CONFIG_BLK_DEV_RAM=y | |||
49 | CONFIG_BLK_DEV_RAM_SIZE=35000 | 49 | CONFIG_BLK_DEV_RAM_SIZE=35000 |
50 | # CONFIG_MISC_DEVICES is not set | 50 | # CONFIG_MISC_DEVICES is not set |
51 | CONFIG_NETDEVICES=y | 51 | CONFIG_NETDEVICES=y |
52 | CONFIG_NET_ETHERNET=y | 52 | CONFIG_ETHERNET=y |
53 | CONFIG_IBM_NEW_EMAC=y | 53 | CONFIG_NET_VENDOR_IBM=y |
54 | CONFIG_IBM_NEW_EMAC_RXB=256 | 54 | CONFIG_IBM_EMAC=y |
55 | CONFIG_IBM_NEW_EMAC_TXB=256 | 55 | CONFIG_IBM_EMAC_RXB=256 |
56 | CONFIG_IBM_EMAC_TXB=256 | ||
56 | # CONFIG_NETDEV_1000 is not set | 57 | # CONFIG_NETDEV_1000 is not set |
57 | # CONFIG_NETDEV_10000 is not set | 58 | # CONFIG_NETDEV_10000 is not set |
58 | # CONFIG_INPUT is not set | 59 | # CONFIG_INPUT is not set |
diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig index 07d77e51f1ba..f9269fc4ffcc 100644 --- a/arch/powerpc/configs/44x/ebony_defconfig +++ b/arch/powerpc/configs/44x/ebony_defconfig | |||
@@ -40,8 +40,9 @@ CONFIG_PROC_DEVICETREE=y | |||
40 | CONFIG_BLK_DEV_RAM=y | 40 | CONFIG_BLK_DEV_RAM=y |
41 | CONFIG_BLK_DEV_RAM_SIZE=35000 | 41 | CONFIG_BLK_DEV_RAM_SIZE=35000 |
42 | CONFIG_NETDEVICES=y | 42 | CONFIG_NETDEVICES=y |
43 | CONFIG_NET_ETHERNET=y | 43 | CONFIG_ETHERNET=y |
44 | CONFIG_IBM_NEW_EMAC=y | 44 | CONFIG_NET_VENDOR_IBM=y |
45 | CONFIG_IBM_EMAC=y | ||
45 | # CONFIG_INPUT is not set | 46 | # CONFIG_INPUT is not set |
46 | # CONFIG_SERIO is not set | 47 | # CONFIG_SERIO is not set |
47 | # CONFIG_VT is not set | 48 | # CONFIG_VT is not set |
diff --git a/arch/powerpc/configs/44x/eiger_defconfig b/arch/powerpc/configs/44x/eiger_defconfig index 2ce7e9aff09e..9be089038fd7 100644 --- a/arch/powerpc/configs/44x/eiger_defconfig +++ b/arch/powerpc/configs/44x/eiger_defconfig | |||
@@ -55,10 +55,11 @@ CONFIG_FUSION=y | |||
55 | CONFIG_FUSION_SAS=y | 55 | CONFIG_FUSION_SAS=y |
56 | CONFIG_I2O=y | 56 | CONFIG_I2O=y |
57 | CONFIG_NETDEVICES=y | 57 | CONFIG_NETDEVICES=y |
58 | CONFIG_NET_ETHERNET=y | 58 | CONFIG_ETHERNET=y |
59 | CONFIG_IBM_NEW_EMAC=y | 59 | CONFIG_NET_VENDOR_IBM=y |
60 | CONFIG_IBM_NEW_EMAC_RXB=256 | 60 | CONFIG_IBM_EMAC=y |
61 | CONFIG_IBM_NEW_EMAC_TXB=256 | 61 | CONFIG_IBM_EMAC_RXB=256 |
62 | CONFIG_IBM_EMAC_TXB=256 | ||
62 | CONFIG_E1000E=y | 63 | CONFIG_E1000E=y |
63 | # CONFIG_NETDEV_10000 is not set | 64 | # CONFIG_NETDEV_10000 is not set |
64 | # CONFIG_INPUT is not set | 65 | # CONFIG_INPUT is not set |
diff --git a/arch/powerpc/configs/44x/icon_defconfig b/arch/powerpc/configs/44x/icon_defconfig index 18730ff9de7c..82f73035a7ce 100644 --- a/arch/powerpc/configs/44x/icon_defconfig +++ b/arch/powerpc/configs/44x/icon_defconfig | |||
@@ -56,8 +56,9 @@ CONFIG_FUSION_SAS=y | |||
56 | CONFIG_FUSION_CTL=y | 56 | CONFIG_FUSION_CTL=y |
57 | CONFIG_FUSION_LOGGING=y | 57 | CONFIG_FUSION_LOGGING=y |
58 | CONFIG_NETDEVICES=y | 58 | CONFIG_NETDEVICES=y |
59 | CONFIG_NET_ETHERNET=y | 59 | CONFIG_ETHERNET=y |
60 | CONFIG_IBM_NEW_EMAC=y | 60 | CONFIG_NET_VENDOR_IBM=y |
61 | CONFIG_IBM_EMAC=y | ||
61 | # CONFIG_NETDEV_1000 is not set | 62 | # CONFIG_NETDEV_1000 is not set |
62 | # CONFIG_NETDEV_10000 is not set | 63 | # CONFIG_NETDEV_10000 is not set |
63 | # CONFIG_WLAN is not set | 64 | # CONFIG_WLAN is not set |
diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig index 34c09144a699..109562c3c6be 100644 --- a/arch/powerpc/configs/44x/katmai_defconfig +++ b/arch/powerpc/configs/44x/katmai_defconfig | |||
@@ -42,8 +42,9 @@ CONFIG_BLK_DEV_RAM=y | |||
42 | CONFIG_BLK_DEV_RAM_SIZE=35000 | 42 | CONFIG_BLK_DEV_RAM_SIZE=35000 |
43 | CONFIG_MACINTOSH_DRIVERS=y | 43 | CONFIG_MACINTOSH_DRIVERS=y |
44 | CONFIG_NETDEVICES=y | 44 | CONFIG_NETDEVICES=y |
45 | CONFIG_NET_ETHERNET=y | 45 | CONFIG_ETHERNET=y |
46 | CONFIG_IBM_NEW_EMAC=y | 46 | CONFIG_NET_VENDOR_IBM=y |
47 | CONFIG_IBM_EMAC=y | ||
47 | # CONFIG_INPUT is not set | 48 | # CONFIG_INPUT is not set |
48 | # CONFIG_SERIO is not set | 49 | # CONFIG_SERIO is not set |
49 | # CONFIG_VT is not set | 50 | # CONFIG_VT is not set |
diff --git a/arch/powerpc/configs/44x/redwood_defconfig b/arch/powerpc/configs/44x/redwood_defconfig index 01cc2b1a7f9a..48802811da76 100644 --- a/arch/powerpc/configs/44x/redwood_defconfig +++ b/arch/powerpc/configs/44x/redwood_defconfig | |||
@@ -53,11 +53,12 @@ CONFIG_FUSION=y | |||
53 | CONFIG_FUSION_SAS=y | 53 | CONFIG_FUSION_SAS=y |
54 | CONFIG_I2O=y | 54 | CONFIG_I2O=y |
55 | CONFIG_NETDEVICES=y | 55 | CONFIG_NETDEVICES=y |
56 | CONFIG_NET_ETHERNET=y | 56 | CONFIG_ETHERNET=y |
57 | CONFIG_IBM_NEW_EMAC=y | 57 | CONFIG_NET_VENDOR_IBM=y |
58 | CONFIG_IBM_NEW_EMAC_RXB=256 | 58 | CONFIG_IBM_EMAC=y |
59 | CONFIG_IBM_NEW_EMAC_TXB=256 | 59 | CONFIG_IBM_EMAC_RXB=256 |
60 | CONFIG_IBM_NEW_EMAC_DEBUG=y | 60 | CONFIG_IBM_EMAC_TXB=256 |
61 | CONFIG_IBM_EMAC_DEBUG=y | ||
61 | CONFIG_E1000E=y | 62 | CONFIG_E1000E=y |
62 | # CONFIG_NETDEV_10000 is not set | 63 | # CONFIG_NETDEV_10000 is not set |
63 | # CONFIG_INPUT is not set | 64 | # CONFIG_INPUT is not set |
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig index dfcffede16ad..ca088cd581af 100644 --- a/arch/powerpc/configs/44x/sam440ep_defconfig +++ b/arch/powerpc/configs/44x/sam440ep_defconfig | |||
@@ -44,8 +44,9 @@ CONFIG_ATA=y | |||
44 | # CONFIG_SATA_PMP is not set | 44 | # CONFIG_SATA_PMP is not set |
45 | CONFIG_SATA_SIL=y | 45 | CONFIG_SATA_SIL=y |
46 | CONFIG_NETDEVICES=y | 46 | CONFIG_NETDEVICES=y |
47 | CONFIG_NET_ETHERNET=y | 47 | CONFIG_ETHERNET=y |
48 | CONFIG_IBM_NEW_EMAC=y | 48 | CONFIG_NET_VENDOR_IBM=y |
49 | CONFIG_IBM_EMAC=y | ||
49 | # CONFIG_NETDEV_1000 is not set | 50 | # CONFIG_NETDEV_1000 is not set |
50 | # CONFIG_NETDEV_10000 is not set | 51 | # CONFIG_NETDEV_10000 is not set |
51 | CONFIG_INPUT_FF_MEMLESS=m | 52 | CONFIG_INPUT_FF_MEMLESS=m |
diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig index 47e399f2892f..b7a653b626db 100644 --- a/arch/powerpc/configs/44x/sequoia_defconfig +++ b/arch/powerpc/configs/44x/sequoia_defconfig | |||
@@ -46,8 +46,9 @@ CONFIG_PROC_DEVICETREE=y | |||
46 | CONFIG_BLK_DEV_RAM=y | 46 | CONFIG_BLK_DEV_RAM=y |
47 | CONFIG_BLK_DEV_RAM_SIZE=35000 | 47 | CONFIG_BLK_DEV_RAM_SIZE=35000 |
48 | CONFIG_NETDEVICES=y | 48 | CONFIG_NETDEVICES=y |
49 | CONFIG_NET_ETHERNET=y | 49 | CONFIG_ETHERNET=y |
50 | CONFIG_IBM_NEW_EMAC=y | 50 | CONFIG_NET_VENDOR_IBM=y |
51 | CONFIG_IBM_EMAC=y | ||
51 | # CONFIG_INPUT is not set | 52 | # CONFIG_INPUT is not set |
52 | # CONFIG_SERIO is not set | 53 | # CONFIG_SERIO is not set |
53 | # CONFIG_VT is not set | 54 | # CONFIG_VT is not set |
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig index a6a002ed5681..30de97f158a4 100644 --- a/arch/powerpc/configs/44x/taishan_defconfig +++ b/arch/powerpc/configs/44x/taishan_defconfig | |||
@@ -40,8 +40,9 @@ CONFIG_BLK_DEV_RAM=y | |||
40 | CONFIG_BLK_DEV_RAM_SIZE=35000 | 40 | CONFIG_BLK_DEV_RAM_SIZE=35000 |
41 | CONFIG_MACINTOSH_DRIVERS=y | 41 | CONFIG_MACINTOSH_DRIVERS=y |
42 | CONFIG_NETDEVICES=y | 42 | CONFIG_NETDEVICES=y |
43 | CONFIG_NET_ETHERNET=y | 43 | CONFIG_ETHERNET=y |
44 | CONFIG_IBM_NEW_EMAC=y | 44 | CONFIG_NET_VENDOR_IBM=y |
45 | CONFIG_IBM_EMAC=y | ||
45 | # CONFIG_INPUT is not set | 46 | # CONFIG_INPUT is not set |
46 | # CONFIG_SERIO is not set | 47 | # CONFIG_SERIO is not set |
47 | # CONFIG_VT is not set | 48 | # CONFIG_VT is not set |
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig index abf74dc1f79c..105bc56f4b2b 100644 --- a/arch/powerpc/configs/44x/warp_defconfig +++ b/arch/powerpc/configs/44x/warp_defconfig | |||
@@ -54,9 +54,10 @@ CONFIG_BLK_DEV_SD=y | |||
54 | CONFIG_SCSI_SPI_ATTRS=y | 54 | CONFIG_SCSI_SPI_ATTRS=y |
55 | # CONFIG_SCSI_LOWLEVEL is not set | 55 | # CONFIG_SCSI_LOWLEVEL is not set |
56 | CONFIG_NETDEVICES=y | 56 | CONFIG_NETDEVICES=y |
57 | CONFIG_NET_ETHERNET=y | 57 | CONFIG_ETHERNET=y |
58 | CONFIG_NET_VENDOR_IBM=y | ||
58 | CONFIG_MII=y | 59 | CONFIG_MII=y |
59 | CONFIG_IBM_NEW_EMAC=y | 60 | CONFIG_IBM_EMAC=y |
60 | # CONFIG_NETDEV_1000 is not set | 61 | # CONFIG_NETDEV_1000 is not set |
61 | # CONFIG_NETDEV_10000 is not set | 62 | # CONFIG_NETDEV_10000 is not set |
62 | # CONFIG_INPUT is not set | 63 | # CONFIG_INPUT is not set |