aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/configs
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@gmail.com>2012-09-14 12:25:00 -0400
committerRalf Baechle <ralf@linux-mips.org>2012-10-11 05:11:20 -0400
commit851d4f5d387d1db856f01d9e7167014187a48fb4 (patch)
tree01f57f86d509d9cd3b40cd51bb0a0503b931553a /arch/mips/configs
parent24e8c1a611a706f51d4d9dc39b2c9977e25a54c4 (diff)
MIPS: Alchemy: Merge PB1100/1500 support into DB1000 code.
The PB1100/1500 are similar to their DB-cousins but with a few more devices on the bus. This patch adds PB1100/1500 support to the existing DB1100/1500 code. Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com> Cc: lnux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/4338/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/configs')
-rw-r--r--arch/mips/configs/pb1100_defconfig124
-rw-r--r--arch/mips/configs/pb1500_defconfig141
2 files changed, 0 insertions, 265 deletions
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
deleted file mode 100644
index 75eb1b1f316c..000000000000
--- a/arch/mips/configs/pb1100_defconfig
+++ /dev/null
@@ -1,124 +0,0 @@
1CONFIG_MIPS_ALCHEMY=y
2CONFIG_MIPS_PB1100=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
5CONFIG_HZ_100=y
6# CONFIG_SECCOMP is not set
7CONFIG_EXPERIMENTAL=y
8CONFIG_LOCALVERSION="-pb1100"
9CONFIG_KERNEL_LZMA=y
10CONFIG_SYSVIPC=y
11CONFIG_POSIX_MQUEUE=y
12CONFIG_TINY_RCU=y
13CONFIG_LOG_BUF_SHIFT=14
14CONFIG_EXPERT=y
15# CONFIG_SYSCTL_SYSCALL is not set
16# CONFIG_KALLSYMS is not set
17# CONFIG_PCSPKR_PLATFORM is not set
18# CONFIG_VM_EVENT_COUNTERS is not set
19# CONFIG_COMPAT_BRK is not set
20CONFIG_SLAB=y
21CONFIG_MODULES=y
22CONFIG_MODULE_UNLOAD=y
23# CONFIG_LBDAF is not set
24# CONFIG_BLK_DEV_BSG is not set
25# CONFIG_IOSCHED_DEADLINE is not set
26# CONFIG_IOSCHED_CFQ is not set
27CONFIG_PCCARD=y
28CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
29CONFIG_PM=y
30CONFIG_PM_RUNTIME=y
31CONFIG_NET=y
32CONFIG_PACKET=y
33CONFIG_UNIX=y
34CONFIG_INET=y
35CONFIG_IP_MULTICAST=y
36CONFIG_IP_PNP=y
37CONFIG_IP_PNP_DHCP=y
38CONFIG_IP_PNP_BOOTP=y
39CONFIG_IP_PNP_RARP=y
40# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
41# CONFIG_INET_XFRM_MODE_TUNNEL is not set
42# CONFIG_INET_XFRM_MODE_BEET is not set
43# CONFIG_INET_DIAG is not set
44# CONFIG_IPV6 is not set
45# CONFIG_WIRELESS is not set
46CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
47CONFIG_MTD=y
48CONFIG_MTD_PARTITIONS=y
49CONFIG_MTD_CHAR=y
50CONFIG_MTD_BLOCK=y
51CONFIG_MTD_CFI=y
52CONFIG_MTD_CFI_AMDSTD=y
53CONFIG_MTD_PHYSMAP=y
54CONFIG_BLK_DEV_LOOP=y
55CONFIG_BLK_DEV_UB=y
56# CONFIG_MISC_DEVICES is not set
57CONFIG_IDE=y
58CONFIG_BLK_DEV_IDECS=y
59CONFIG_IDE_TASK_IOCTL=y
60# CONFIG_IDE_PROC_FS is not set
61CONFIG_NETDEVICES=y
62CONFIG_MARVELL_PHY=y
63CONFIG_DAVICOM_PHY=y
64CONFIG_QSEMI_PHY=y
65CONFIG_LXT_PHY=y
66CONFIG_CICADA_PHY=y
67CONFIG_VITESSE_PHY=y
68CONFIG_SMSC_PHY=y
69CONFIG_BROADCOM_PHY=y
70CONFIG_ICPLUS_PHY=y
71CONFIG_REALTEK_PHY=y
72CONFIG_NATIONAL_PHY=y
73CONFIG_STE10XP=y
74CONFIG_LSI_ET1011C_PHY=y
75CONFIG_NET_ETHERNET=y
76CONFIG_MII=y
77CONFIG_MIPS_AU1X00_ENET=y
78# CONFIG_NETDEV_1000 is not set
79# CONFIG_NETDEV_10000 is not set
80# CONFIG_WLAN is not set
81# CONFIG_INPUT_MOUSEDEV is not set
82CONFIG_INPUT_EVDEV=y
83# CONFIG_INPUT_KEYBOARD is not set
84# CONFIG_INPUT_MOUSE is not set
85# CONFIG_SERIO is not set
86CONFIG_VT_HW_CONSOLE_BINDING=y
87CONFIG_SERIAL_8250=y
88CONFIG_SERIAL_8250_CONSOLE=y
89# CONFIG_LEGACY_PTYS is not set
90# CONFIG_HW_RANDOM is not set
91# CONFIG_HWMON is not set
92# CONFIG_VGA_CONSOLE is not set
93CONFIG_HIDRAW=y
94CONFIG_USB_HIDDEV=y
95CONFIG_USB=y
96# CONFIG_USB_DEVICE_CLASS is not set
97CONFIG_USB_DYNAMIC_MINORS=y
98CONFIG_USB_SUSPEND=y
99CONFIG_USB_OHCI_HCD=y
100CONFIG_RTC_CLASS=y
101CONFIG_RTC_DRV_AU1XXX=y
102CONFIG_EXT2_FS=y
103# CONFIG_PROC_PAGE_MONITOR is not set
104CONFIG_TMPFS=y
105CONFIG_JFFS2_FS=y
106CONFIG_JFFS2_SUMMARY=y
107CONFIG_JFFS2_FS_XATTR=y
108# CONFIG_JFFS2_FS_POSIX_ACL is not set
109# CONFIG_JFFS2_FS_SECURITY is not set
110CONFIG_JFFS2_COMPRESSION_OPTIONS=y
111CONFIG_JFFS2_LZO=y
112CONFIG_JFFS2_RUBIN=y
113CONFIG_SQUASHFS=y
114CONFIG_NFS_FS=y
115CONFIG_NFS_V3=y
116CONFIG_ROOT_NFS=y
117CONFIG_STRIP_ASM_SYMS=y
118CONFIG_DEBUG_KERNEL=y
119# CONFIG_SCHED_DEBUG is not set
120# CONFIG_FTRACE is not set
121CONFIG_DEBUG_ZBOOT=y
122CONFIG_KEYS=y
123CONFIG_KEYS_DEBUG_PROC_KEYS=y
124CONFIG_SECURITYFS=y
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
deleted file mode 100644
index fa00487146f8..000000000000
--- a/arch/mips/configs/pb1500_defconfig
+++ /dev/null
@@ -1,141 +0,0 @@
1CONFIG_MIPS_ALCHEMY=y
2CONFIG_MIPS_PB1500=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
5CONFIG_HZ_100=y
6# CONFIG_SECCOMP is not set
7CONFIG_EXPERIMENTAL=y
8CONFIG_LOCALVERSION="-pb1500"
9CONFIG_KERNEL_LZMA=y
10CONFIG_SYSVIPC=y
11CONFIG_POSIX_MQUEUE=y
12CONFIG_TINY_RCU=y
13CONFIG_LOG_BUF_SHIFT=14
14CONFIG_EXPERT=y
15# CONFIG_SYSCTL_SYSCALL is not set
16# CONFIG_KALLSYMS is not set
17# CONFIG_PCSPKR_PLATFORM is not set
18# CONFIG_VM_EVENT_COUNTERS is not set
19# CONFIG_COMPAT_BRK is not set
20CONFIG_SLAB=y
21CONFIG_MODULES=y
22CONFIG_MODULE_UNLOAD=y
23# CONFIG_IOSCHED_DEADLINE is not set
24# CONFIG_IOSCHED_CFQ is not set
25CONFIG_PCI=y
26CONFIG_PCCARD=y
27# CONFIG_CARDBUS is not set
28CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
29CONFIG_PM=y
30CONFIG_PM_RUNTIME=y
31CONFIG_NET=y
32CONFIG_PACKET=y
33CONFIG_UNIX=y
34CONFIG_INET=y
35CONFIG_IP_MULTICAST=y
36CONFIG_IP_PNP=y
37CONFIG_IP_PNP_DHCP=y
38CONFIG_IP_PNP_BOOTP=y
39CONFIG_IP_PNP_RARP=y
40# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
41# CONFIG_INET_XFRM_MODE_TUNNEL is not set
42# CONFIG_INET_XFRM_MODE_BEET is not set
43# CONFIG_INET_DIAG is not set
44# CONFIG_IPV6 is not set
45# CONFIG_WIRELESS is not set
46CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
47CONFIG_MTD=y
48CONFIG_MTD_PARTITIONS=y
49CONFIG_MTD_CHAR=y
50CONFIG_MTD_BLOCK=y
51CONFIG_MTD_CFI=y
52CONFIG_MTD_CFI_AMDSTD=y
53CONFIG_MTD_PHYSMAP=y
54CONFIG_BLK_DEV_LOOP=y
55CONFIG_BLK_DEV_UB=y
56# CONFIG_MISC_DEVICES is not set
57CONFIG_IDE=y
58CONFIG_BLK_DEV_IDECS=y
59CONFIG_BLK_DEV_IDECD=y
60CONFIG_IDE_TASK_IOCTL=y
61# CONFIG_IDEPCI_PCIBUS_ORDER is not set
62CONFIG_BLK_DEV_HPT366=y
63CONFIG_NETDEVICES=y
64CONFIG_MARVELL_PHY=y
65CONFIG_DAVICOM_PHY=y
66CONFIG_QSEMI_PHY=y
67CONFIG_LXT_PHY=y
68CONFIG_CICADA_PHY=y
69CONFIG_VITESSE_PHY=y
70CONFIG_SMSC_PHY=y
71CONFIG_BROADCOM_PHY=y
72CONFIG_ICPLUS_PHY=y
73CONFIG_REALTEK_PHY=y
74CONFIG_NATIONAL_PHY=y
75CONFIG_STE10XP=y
76CONFIG_LSI_ET1011C_PHY=y
77CONFIG_NET_ETHERNET=y
78CONFIG_MII=y
79CONFIG_MIPS_AU1X00_ENET=y
80# CONFIG_NETDEV_1000 is not set
81# CONFIG_NETDEV_10000 is not set
82# CONFIG_WLAN is not set
83# CONFIG_INPUT_MOUSEDEV is not set
84CONFIG_INPUT_EVDEV=y
85# CONFIG_INPUT_KEYBOARD is not set
86# CONFIG_INPUT_MOUSE is not set
87# CONFIG_SERIO is not set
88CONFIG_VT_HW_CONSOLE_BINDING=y
89CONFIG_SERIAL_8250=y
90CONFIG_SERIAL_8250_CONSOLE=y
91# CONFIG_SERIAL_8250_PCI is not set
92# CONFIG_LEGACY_PTYS is not set
93# CONFIG_HW_RANDOM is not set
94# CONFIG_HWMON is not set
95# CONFIG_VGA_ARB is not set
96CONFIG_FB=y
97CONFIG_FIRMWARE_EDID=y
98CONFIG_FB_MODE_HELPERS=y
99CONFIG_FB_TILEBLITTING=y
100CONFIG_FB_S1D13XXX=y
101CONFIG_USB_HIDDEV=y
102CONFIG_USB=y
103# CONFIG_USB_DEVICE_CLASS is not set
104CONFIG_USB_DYNAMIC_MINORS=y
105CONFIG_USB_OTG_WHITELIST=y
106CONFIG_USB_OHCI_HCD=y
107CONFIG_RTC_CLASS=y
108CONFIG_RTC_DRV_AU1XXX=y
109CONFIG_EXT2_FS=y
110CONFIG_ISO9660_FS=y
111CONFIG_JOLIET=y
112CONFIG_ZISOFS=y
113CONFIG_UDF_FS=y
114CONFIG_VFAT_FS=y
115# CONFIG_PROC_PAGE_MONITOR is not set
116CONFIG_TMPFS=y
117CONFIG_JFFS2_FS=y
118CONFIG_JFFS2_SUMMARY=y
119CONFIG_JFFS2_COMPRESSION_OPTIONS=y
120CONFIG_JFFS2_LZO=y
121CONFIG_JFFS2_RUBIN=y
122CONFIG_SQUASHFS=y
123CONFIG_NFS_FS=y
124CONFIG_NFS_V3=y
125CONFIG_ROOT_NFS=y
126CONFIG_NLS_CODEPAGE_437=y
127CONFIG_NLS_CODEPAGE_850=y
128CONFIG_NLS_CODEPAGE_852=y
129CONFIG_NLS_CODEPAGE_1250=y
130CONFIG_NLS_ASCII=y
131CONFIG_NLS_ISO8859_1=y
132CONFIG_NLS_ISO8859_15=y
133CONFIG_NLS_UTF8=y
134CONFIG_STRIP_ASM_SYMS=y
135CONFIG_DEBUG_KERNEL=y
136# CONFIG_SCHED_DEBUG is not set
137# CONFIG_FTRACE is not set
138CONFIG_DEBUG_ZBOOT=y
139CONFIG_KEYS=y
140CONFIG_KEYS_DEBUG_PROC_KEYS=y
141CONFIG_SECURITYFS=y