aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/configs
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2014-02-20 09:00:24 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-03-26 18:09:21 -0400
commita86dc812881fab40175f4d3c3028acf8627a3804 (patch)
tree5d1c1c732ffdac911f274a7bbf60d5f3ca159f10 /arch/mips/configs
parent54ff4a1d17325a95926fee560e81d47de678dc03 (diff)
MIPS: Regenerate malta defconfigs
This patch simply regenerates the malta defconfigs such that they don't change after being used & saved as a defconfig again. ie. it is the result of running the following: for cfg in arch/mips/configs/malta*; do ARCH=mips make `basename ${cfg}` ARCH=mips make savedefconfig mv -v defconfig ${cfg} done Signed-off-by: Paul Burton <paul.burton@imgtec.com> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6578/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/configs')
-rw-r--r--arch/mips/configs/malta_defconfig7
-rw-r--r--arch/mips/configs/malta_kvm_defconfig9
-rw-r--r--arch/mips/configs/malta_kvm_guest_defconfig6
-rw-r--r--arch/mips/configs/maltaaprp_defconfig2
-rw-r--r--arch/mips/configs/maltasmtc_defconfig2
-rw-r--r--arch/mips/configs/maltasmvp_defconfig1
-rw-r--r--arch/mips/configs/maltaup_defconfig2
7 files changed, 3 insertions, 26 deletions
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index ce1d3eeeb737..bc494b2e0e45 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -2,6 +2,7 @@ CONFIG_MIPS_MALTA=y
2CONFIG_CPU_LITTLE_ENDIAN=y 2CONFIG_CPU_LITTLE_ENDIAN=y
3CONFIG_CPU_MIPS32_R2=y 3CONFIG_CPU_MIPS32_R2=y
4CONFIG_MIPS_MT_SMP=y 4CONFIG_MIPS_MT_SMP=y
5CONFIG_NR_CPUS=2
5CONFIG_HZ_100=y 6CONFIG_HZ_100=y
6CONFIG_SYSVIPC=y 7CONFIG_SYSVIPC=y
7CONFIG_NO_HZ=y 8CONFIG_NO_HZ=y
@@ -42,7 +43,6 @@ CONFIG_INET_IPCOMP=m
42CONFIG_INET_XFRM_MODE_TRANSPORT=m 43CONFIG_INET_XFRM_MODE_TRANSPORT=m
43CONFIG_INET_XFRM_MODE_TUNNEL=m 44CONFIG_INET_XFRM_MODE_TUNNEL=m
44CONFIG_TCP_MD5SIG=y 45CONFIG_TCP_MD5SIG=y
45CONFIG_IPV6_PRIVACY=y
46CONFIG_IPV6_ROUTER_PREF=y 46CONFIG_IPV6_ROUTER_PREF=y
47CONFIG_IPV6_ROUTE_INFO=y 47CONFIG_IPV6_ROUTE_INFO=y
48CONFIG_IPV6_OPTIMISTIC_DAD=y 48CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -68,7 +68,6 @@ CONFIG_NF_CONNTRACK_SANE=m
68CONFIG_NF_CONNTRACK_SIP=m 68CONFIG_NF_CONNTRACK_SIP=m
69CONFIG_NF_CONNTRACK_TFTP=m 69CONFIG_NF_CONNTRACK_TFTP=m
70CONFIG_NF_CT_NETLINK=m 70CONFIG_NF_CT_NETLINK=m
71CONFIG_NETFILTER_TPROXY=m
72CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 71CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
73CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 72CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
74CONFIG_NETFILTER_XT_TARGET_MARK=m 73CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -125,7 +124,6 @@ CONFIG_IP_VS_SH=m
125CONFIG_IP_VS_SED=m 124CONFIG_IP_VS_SED=m
126CONFIG_IP_VS_NQ=m 125CONFIG_IP_VS_NQ=m
127CONFIG_NF_CONNTRACK_IPV4=m 126CONFIG_NF_CONNTRACK_IPV4=m
128CONFIG_IP_NF_QUEUE=m
129CONFIG_IP_NF_IPTABLES=m 127CONFIG_IP_NF_IPTABLES=m
130CONFIG_IP_NF_MATCH_AH=m 128CONFIG_IP_NF_MATCH_AH=m
131CONFIG_IP_NF_MATCH_ECN=m 129CONFIG_IP_NF_MATCH_ECN=m
@@ -185,7 +183,6 @@ CONFIG_ATALK=m
185CONFIG_DEV_APPLETALK=m 183CONFIG_DEV_APPLETALK=m
186CONFIG_IPDDP=m 184CONFIG_IPDDP=m
187CONFIG_IPDDP_ENCAP=y 185CONFIG_IPDDP_ENCAP=y
188CONFIG_IPDDP_DECAP=y
189CONFIG_PHONET=m 186CONFIG_PHONET=m
190CONFIG_NET_SCHED=y 187CONFIG_NET_SCHED=y
191CONFIG_NET_SCH_CBQ=m 188CONFIG_NET_SCH_CBQ=m
@@ -228,7 +225,6 @@ CONFIG_RFKILL=m
228CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 225CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
229CONFIG_CONNECTOR=m 226CONFIG_CONNECTOR=m
230CONFIG_MTD=y 227CONFIG_MTD=y
231CONFIG_MTD_CHAR=y
232CONFIG_MTD_BLOCK=y 228CONFIG_MTD_BLOCK=y
233CONFIG_MTD_OOPS=m 229CONFIG_MTD_OOPS=m
234CONFIG_MTD_CFI=y 230CONFIG_MTD_CFI=y
@@ -328,7 +324,6 @@ CONFIG_LIBERTAS=m
328# CONFIG_INPUT_KEYBOARD is not set 324# CONFIG_INPUT_KEYBOARD is not set
329# CONFIG_INPUT_MOUSE is not set 325# CONFIG_INPUT_MOUSE is not set
330# CONFIG_SERIO_I8042 is not set 326# CONFIG_SERIO_I8042 is not set
331CONFIG_VT_HW_CONSOLE_BINDING=y
332CONFIG_SERIAL_8250=y 327CONFIG_SERIAL_8250=y
333CONFIG_SERIAL_8250_CONSOLE=y 328CONFIG_SERIAL_8250_CONSOLE=y
334# CONFIG_HWMON is not set 329# CONFIG_HWMON is not set
diff --git a/arch/mips/configs/malta_kvm_defconfig b/arch/mips/configs/malta_kvm_defconfig
index 341bb47204d6..041e41b39478 100644
--- a/arch/mips/configs/malta_kvm_defconfig
+++ b/arch/mips/configs/malta_kvm_defconfig
@@ -3,6 +3,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
3CONFIG_CPU_MIPS32_R2=y 3CONFIG_CPU_MIPS32_R2=y
4CONFIG_PAGE_SIZE_16KB=y 4CONFIG_PAGE_SIZE_16KB=y
5CONFIG_MIPS_MT_SMP=y 5CONFIG_MIPS_MT_SMP=y
6CONFIG_NR_CPUS=2
6CONFIG_HZ_100=y 7CONFIG_HZ_100=y
7CONFIG_SYSVIPC=y 8CONFIG_SYSVIPC=y
8CONFIG_NO_HZ=y 9CONFIG_NO_HZ=y
@@ -44,7 +45,6 @@ CONFIG_INET_IPCOMP=m
44CONFIG_INET_XFRM_MODE_TRANSPORT=m 45CONFIG_INET_XFRM_MODE_TRANSPORT=m
45CONFIG_INET_XFRM_MODE_TUNNEL=m 46CONFIG_INET_XFRM_MODE_TUNNEL=m
46CONFIG_TCP_MD5SIG=y 47CONFIG_TCP_MD5SIG=y
47CONFIG_IPV6_PRIVACY=y
48CONFIG_IPV6_ROUTER_PREF=y 48CONFIG_IPV6_ROUTER_PREF=y
49CONFIG_IPV6_ROUTE_INFO=y 49CONFIG_IPV6_ROUTE_INFO=y
50CONFIG_IPV6_OPTIMISTIC_DAD=y 50CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -70,7 +70,6 @@ CONFIG_NF_CONNTRACK_SANE=m
70CONFIG_NF_CONNTRACK_SIP=m 70CONFIG_NF_CONNTRACK_SIP=m
71CONFIG_NF_CONNTRACK_TFTP=m 71CONFIG_NF_CONNTRACK_TFTP=m
72CONFIG_NF_CT_NETLINK=m 72CONFIG_NF_CT_NETLINK=m
73CONFIG_NETFILTER_TPROXY=m
74CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 73CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
75CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 74CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
76CONFIG_NETFILTER_XT_TARGET_MARK=m 75CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -127,7 +126,6 @@ CONFIG_IP_VS_SH=m
127CONFIG_IP_VS_SED=m 126CONFIG_IP_VS_SED=m
128CONFIG_IP_VS_NQ=m 127CONFIG_IP_VS_NQ=m
129CONFIG_NF_CONNTRACK_IPV4=m 128CONFIG_NF_CONNTRACK_IPV4=m
130CONFIG_IP_NF_QUEUE=m
131CONFIG_IP_NF_IPTABLES=m 129CONFIG_IP_NF_IPTABLES=m
132CONFIG_IP_NF_MATCH_AH=m 130CONFIG_IP_NF_MATCH_AH=m
133CONFIG_IP_NF_MATCH_ECN=m 131CONFIG_IP_NF_MATCH_ECN=m
@@ -187,7 +185,6 @@ CONFIG_ATALK=m
187CONFIG_DEV_APPLETALK=m 185CONFIG_DEV_APPLETALK=m
188CONFIG_IPDDP=m 186CONFIG_IPDDP=m
189CONFIG_IPDDP_ENCAP=y 187CONFIG_IPDDP_ENCAP=y
190CONFIG_IPDDP_DECAP=y
191CONFIG_PHONET=m 188CONFIG_PHONET=m
192CONFIG_NET_SCHED=y 189CONFIG_NET_SCHED=y
193CONFIG_NET_SCH_CBQ=m 190CONFIG_NET_SCH_CBQ=m
@@ -230,7 +227,6 @@ CONFIG_RFKILL=m
230CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 227CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
231CONFIG_CONNECTOR=m 228CONFIG_CONNECTOR=m
232CONFIG_MTD=y 229CONFIG_MTD=y
233CONFIG_MTD_CHAR=y
234CONFIG_MTD_BLOCK=y 230CONFIG_MTD_BLOCK=y
235CONFIG_MTD_OOPS=m 231CONFIG_MTD_OOPS=m
236CONFIG_MTD_CFI=y 232CONFIG_MTD_CFI=y
@@ -300,6 +296,7 @@ CONFIG_IFB=m
300CONFIG_MACVLAN=m 296CONFIG_MACVLAN=m
301CONFIG_TUN=m 297CONFIG_TUN=m
302CONFIG_VETH=m 298CONFIG_VETH=m
299CONFIG_VHOST_NET=m
303CONFIG_PCNET32=y 300CONFIG_PCNET32=y
304CONFIG_CHELSIO_T3=m 301CONFIG_CHELSIO_T3=m
305CONFIG_AX88796=m 302CONFIG_AX88796=m
@@ -329,7 +326,6 @@ CONFIG_LIBERTAS=m
329# CONFIG_INPUT_KEYBOARD is not set 326# CONFIG_INPUT_KEYBOARD is not set
330# CONFIG_INPUT_MOUSE is not set 327# CONFIG_INPUT_MOUSE is not set
331# CONFIG_SERIO_I8042 is not set 328# CONFIG_SERIO_I8042 is not set
332CONFIG_VT_HW_CONSOLE_BINDING=y
333CONFIG_SERIAL_8250=y 329CONFIG_SERIAL_8250=y
334CONFIG_SERIAL_8250_CONSOLE=y 330CONFIG_SERIAL_8250_CONSOLE=y
335# CONFIG_HWMON is not set 331# CONFIG_HWMON is not set
@@ -453,4 +449,3 @@ CONFIG_VIRTUALIZATION=y
453CONFIG_KVM=m 449CONFIG_KVM=m
454CONFIG_KVM_MIPS_DYN_TRANS=y 450CONFIG_KVM_MIPS_DYN_TRANS=y
455CONFIG_KVM_MIPS_DEBUG_COP0_COUNTERS=y 451CONFIG_KVM_MIPS_DEBUG_COP0_COUNTERS=y
456CONFIG_VHOST_NET=m
diff --git a/arch/mips/configs/malta_kvm_guest_defconfig b/arch/mips/configs/malta_kvm_guest_defconfig
index 2b8558b71080..bf186df3e589 100644
--- a/arch/mips/configs/malta_kvm_guest_defconfig
+++ b/arch/mips/configs/malta_kvm_guest_defconfig
@@ -44,7 +44,6 @@ CONFIG_INET_IPCOMP=m
44CONFIG_INET_XFRM_MODE_TRANSPORT=m 44CONFIG_INET_XFRM_MODE_TRANSPORT=m
45CONFIG_INET_XFRM_MODE_TUNNEL=m 45CONFIG_INET_XFRM_MODE_TUNNEL=m
46CONFIG_TCP_MD5SIG=y 46CONFIG_TCP_MD5SIG=y
47CONFIG_IPV6_PRIVACY=y
48CONFIG_IPV6_ROUTER_PREF=y 47CONFIG_IPV6_ROUTER_PREF=y
49CONFIG_IPV6_ROUTE_INFO=y 48CONFIG_IPV6_ROUTE_INFO=y
50CONFIG_IPV6_OPTIMISTIC_DAD=y 49CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -70,7 +69,6 @@ CONFIG_NF_CONNTRACK_SANE=m
70CONFIG_NF_CONNTRACK_SIP=m 69CONFIG_NF_CONNTRACK_SIP=m
71CONFIG_NF_CONNTRACK_TFTP=m 70CONFIG_NF_CONNTRACK_TFTP=m
72CONFIG_NF_CT_NETLINK=m 71CONFIG_NF_CT_NETLINK=m
73CONFIG_NETFILTER_TPROXY=m
74CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 72CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
75CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 73CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
76CONFIG_NETFILTER_XT_TARGET_MARK=m 74CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -127,7 +125,6 @@ CONFIG_IP_VS_SH=m
127CONFIG_IP_VS_SED=m 125CONFIG_IP_VS_SED=m
128CONFIG_IP_VS_NQ=m 126CONFIG_IP_VS_NQ=m
129CONFIG_NF_CONNTRACK_IPV4=m 127CONFIG_NF_CONNTRACK_IPV4=m
130CONFIG_IP_NF_QUEUE=m
131CONFIG_IP_NF_IPTABLES=m 128CONFIG_IP_NF_IPTABLES=m
132CONFIG_IP_NF_MATCH_AH=m 129CONFIG_IP_NF_MATCH_AH=m
133CONFIG_IP_NF_MATCH_ECN=m 130CONFIG_IP_NF_MATCH_ECN=m
@@ -187,7 +184,6 @@ CONFIG_ATALK=m
187CONFIG_DEV_APPLETALK=m 184CONFIG_DEV_APPLETALK=m
188CONFIG_IPDDP=m 185CONFIG_IPDDP=m
189CONFIG_IPDDP_ENCAP=y 186CONFIG_IPDDP_ENCAP=y
190CONFIG_IPDDP_DECAP=y
191CONFIG_PHONET=m 187CONFIG_PHONET=m
192CONFIG_NET_SCHED=y 188CONFIG_NET_SCHED=y
193CONFIG_NET_SCH_CBQ=m 189CONFIG_NET_SCH_CBQ=m
@@ -230,7 +226,6 @@ CONFIG_RFKILL=m
230CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 226CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
231CONFIG_CONNECTOR=m 227CONFIG_CONNECTOR=m
232CONFIG_MTD=y 228CONFIG_MTD=y
233CONFIG_MTD_CHAR=y
234CONFIG_MTD_BLOCK=y 229CONFIG_MTD_BLOCK=y
235CONFIG_MTD_OOPS=m 230CONFIG_MTD_OOPS=m
236CONFIG_MTD_CFI=y 231CONFIG_MTD_CFI=y
@@ -331,7 +326,6 @@ CONFIG_LIBERTAS=m
331# CONFIG_INPUT_KEYBOARD is not set 326# CONFIG_INPUT_KEYBOARD is not set
332# CONFIG_INPUT_MOUSE is not set 327# CONFIG_INPUT_MOUSE is not set
333# CONFIG_SERIO_I8042 is not set 328# CONFIG_SERIO_I8042 is not set
334CONFIG_VT_HW_CONSOLE_BINDING=y
335CONFIG_SERIAL_8250=y 329CONFIG_SERIAL_8250=y
336CONFIG_SERIAL_8250_CONSOLE=y 330CONFIG_SERIAL_8250_CONSOLE=y
337# CONFIG_HWMON is not set 331# CONFIG_HWMON is not set
diff --git a/arch/mips/configs/maltaaprp_defconfig b/arch/mips/configs/maltaaprp_defconfig
index 93057a760dfa..90b17255e414 100644
--- a/arch/mips/configs/maltaaprp_defconfig
+++ b/arch/mips/configs/maltaaprp_defconfig
@@ -44,7 +44,6 @@ CONFIG_INET_AH=m
44CONFIG_INET_ESP=m 44CONFIG_INET_ESP=m
45CONFIG_INET_IPCOMP=m 45CONFIG_INET_IPCOMP=m
46# CONFIG_INET_LRO is not set 46# CONFIG_INET_LRO is not set
47CONFIG_IPV6_PRIVACY=y
48CONFIG_INET6_AH=m 47CONFIG_INET6_AH=m
49CONFIG_INET6_ESP=m 48CONFIG_INET6_ESP=m
50CONFIG_INET6_IPCOMP=m 49CONFIG_INET6_IPCOMP=m
@@ -55,7 +54,6 @@ CONFIG_ATALK=m
55CONFIG_DEV_APPLETALK=m 54CONFIG_DEV_APPLETALK=m
56CONFIG_IPDDP=m 55CONFIG_IPDDP=m
57CONFIG_IPDDP_ENCAP=y 56CONFIG_IPDDP_ENCAP=y
58CONFIG_IPDDP_DECAP=y
59CONFIG_NET_SCHED=y 57CONFIG_NET_SCHED=y
60CONFIG_NET_SCH_CBQ=m 58CONFIG_NET_SCH_CBQ=m
61CONFIG_NET_SCH_HTB=m 59CONFIG_NET_SCH_HTB=m
diff --git a/arch/mips/configs/maltasmtc_defconfig b/arch/mips/configs/maltasmtc_defconfig
index 4e54b75d89be..991da9f84364 100644
--- a/arch/mips/configs/maltasmtc_defconfig
+++ b/arch/mips/configs/maltasmtc_defconfig
@@ -45,7 +45,6 @@ CONFIG_INET_AH=m
45CONFIG_INET_ESP=m 45CONFIG_INET_ESP=m
46CONFIG_INET_IPCOMP=m 46CONFIG_INET_IPCOMP=m
47# CONFIG_INET_LRO is not set 47# CONFIG_INET_LRO is not set
48CONFIG_IPV6_PRIVACY=y
49CONFIG_INET6_AH=m 48CONFIG_INET6_AH=m
50CONFIG_INET6_ESP=m 49CONFIG_INET6_ESP=m
51CONFIG_INET6_IPCOMP=m 50CONFIG_INET6_IPCOMP=m
@@ -56,7 +55,6 @@ CONFIG_ATALK=m
56CONFIG_DEV_APPLETALK=m 55CONFIG_DEV_APPLETALK=m
57CONFIG_IPDDP=m 56CONFIG_IPDDP=m
58CONFIG_IPDDP_ENCAP=y 57CONFIG_IPDDP_ENCAP=y
59CONFIG_IPDDP_DECAP=y
60CONFIG_NET_SCHED=y 58CONFIG_NET_SCHED=y
61CONFIG_NET_SCH_CBQ=m 59CONFIG_NET_SCH_CBQ=m
62CONFIG_NET_SCH_HTB=m 60CONFIG_NET_SCH_HTB=m
diff --git a/arch/mips/configs/maltasmvp_defconfig b/arch/mips/configs/maltasmvp_defconfig
index d75931850392..1dafe793c42c 100644
--- a/arch/mips/configs/maltasmvp_defconfig
+++ b/arch/mips/configs/maltasmvp_defconfig
@@ -47,7 +47,6 @@ CONFIG_INET_AH=m
47CONFIG_INET_ESP=m 47CONFIG_INET_ESP=m
48CONFIG_INET_IPCOMP=m 48CONFIG_INET_IPCOMP=m
49# CONFIG_INET_LRO is not set 49# CONFIG_INET_LRO is not set
50CONFIG_IPV6_PRIVACY=y
51CONFIG_INET6_AH=m 50CONFIG_INET6_AH=m
52CONFIG_INET6_ESP=m 51CONFIG_INET6_ESP=m
53CONFIG_INET6_IPCOMP=m 52CONFIG_INET6_IPCOMP=m
diff --git a/arch/mips/configs/maltaup_defconfig b/arch/mips/configs/maltaup_defconfig
index 9868fc9c1133..b8a97a2b6a36 100644
--- a/arch/mips/configs/maltaup_defconfig
+++ b/arch/mips/configs/maltaup_defconfig
@@ -43,7 +43,6 @@ CONFIG_INET_AH=m
43CONFIG_INET_ESP=m 43CONFIG_INET_ESP=m
44CONFIG_INET_IPCOMP=m 44CONFIG_INET_IPCOMP=m
45# CONFIG_INET_LRO is not set 45# CONFIG_INET_LRO is not set
46CONFIG_IPV6_PRIVACY=y
47CONFIG_INET6_AH=m 46CONFIG_INET6_AH=m
48CONFIG_INET6_ESP=m 47CONFIG_INET6_ESP=m
49CONFIG_INET6_IPCOMP=m 48CONFIG_INET6_IPCOMP=m
@@ -54,7 +53,6 @@ CONFIG_ATALK=m
54CONFIG_DEV_APPLETALK=m 53CONFIG_DEV_APPLETALK=m
55CONFIG_IPDDP=m 54CONFIG_IPDDP=m
56CONFIG_IPDDP_ENCAP=y 55CONFIG_IPDDP_ENCAP=y
57CONFIG_IPDDP_DECAP=y
58CONFIG_NET_SCHED=y 56CONFIG_NET_SCHED=y
59CONFIG_NET_SCH_CBQ=m 57CONFIG_NET_SCH_CBQ=m
60CONFIG_NET_SCH_HTB=m 58CONFIG_NET_SCH_HTB=m