Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a86dc812 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

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: default avatarPaul Burton <paul.burton@imgtec.com>
Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6578/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 54ff4a1d

arch/mips/configs/malta_defconfig

+1 −6
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ CONFIG_MIPS_MALTA=y 
CONFIG_CPU_LITTLE_ENDIAN=y

CONFIG_CPU_MIPS32_R2=y

CONFIG_MIPS_MT_SMP=y

CONFIG_NR_CPUS=2

CONFIG_HZ_100=y

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y
@@ -42,7 +43,6 @@ CONFIG_INET_IPCOMP=m 
CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_TCP_MD5SIG=y

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -68,7 +68,6 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_CT_NETLINK=m

CONFIG_NETFILTER_TPROXY=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -125,7 +124,6 @@ CONFIG_IP_VS_SH=m 
CONFIG_IP_VS_SED=m

CONFIG_IP_VS_NQ=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -185,7 +183,6 @@ CONFIG_ATALK=m 
CONFIG_DEV_APPLETALK=m

CONFIG_IPDDP=m

CONFIG_IPDDP_ENCAP=y

CONFIG_IPDDP_DECAP=y

CONFIG_PHONET=m

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m
@@ -228,7 +225,6 @@ CONFIG_RFKILL=m 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CONNECTOR=m

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_OOPS=m

CONFIG_MTD_CFI=y
@@ -328,7 +324,6 @@ CONFIG_LIBERTAS=m 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO_I8042 is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_HWMON is not set

arch/mips/configs/malta_kvm_defconfig

+2 −7
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y 
CONFIG_CPU_MIPS32_R2=y

CONFIG_PAGE_SIZE_16KB=y

CONFIG_MIPS_MT_SMP=y

CONFIG_NR_CPUS=2

CONFIG_HZ_100=y

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y
@@ -44,7 +45,6 @@ CONFIG_INET_IPCOMP=m 
CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_TCP_MD5SIG=y

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -70,7 +70,6 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_CT_NETLINK=m

CONFIG_NETFILTER_TPROXY=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -127,7 +126,6 @@ CONFIG_IP_VS_SH=m 
CONFIG_IP_VS_SED=m

CONFIG_IP_VS_NQ=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -187,7 +185,6 @@ CONFIG_ATALK=m 
CONFIG_DEV_APPLETALK=m

CONFIG_IPDDP=m

CONFIG_IPDDP_ENCAP=y

CONFIG_IPDDP_DECAP=y

CONFIG_PHONET=m

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m
@@ -230,7 +227,6 @@ CONFIG_RFKILL=m 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CONNECTOR=m

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_OOPS=m

CONFIG_MTD_CFI=y
@@ -300,6 +296,7 @@ CONFIG_IFB=m 
CONFIG_MACVLAN=m

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_VHOST_NET=m

CONFIG_PCNET32=y

CONFIG_CHELSIO_T3=m

CONFIG_AX88796=m
@@ -329,7 +326,6 @@ CONFIG_LIBERTAS=m 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO_I8042 is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_HWMON is not set
@@ -453,4 +449,3 @@ CONFIG_VIRTUALIZATION=y 
CONFIG_KVM=m

CONFIG_KVM_MIPS_DYN_TRANS=y

CONFIG_KVM_MIPS_DEBUG_COP0_COUNTERS=y
 
CONFIG_VHOST_NET=m

arch/mips/configs/malta_kvm_guest_defconfig

+0 −6
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ CONFIG_INET_IPCOMP=m 
CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_TCP_MD5SIG=y

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -70,7 +69,6 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_CT_NETLINK=m

CONFIG_NETFILTER_TPROXY=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -127,7 +125,6 @@ CONFIG_IP_VS_SH=m 
CONFIG_IP_VS_SED=m

CONFIG_IP_VS_NQ=m

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_IP_NF_QUEUE=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_MATCH_AH=m

CONFIG_IP_NF_MATCH_ECN=m
@@ -187,7 +184,6 @@ CONFIG_ATALK=m 
CONFIG_DEV_APPLETALK=m

CONFIG_IPDDP=m

CONFIG_IPDDP_ENCAP=y

CONFIG_IPDDP_DECAP=y

CONFIG_PHONET=m

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m
@@ -230,7 +226,6 @@ CONFIG_RFKILL=m 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CONNECTOR=m

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_OOPS=m

CONFIG_MTD_CFI=y
@@ -331,7 +326,6 @@ CONFIG_LIBERTAS=m 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO_I8042 is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_HWMON is not set

arch/mips/configs/maltaaprp_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ CONFIG_INET_AH=m 
CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

# CONFIG_INET_LRO is not set

CONFIG_IPV6_PRIVACY=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m
@@ -55,7 +54,6 @@ CONFIG_ATALK=m 
CONFIG_DEV_APPLETALK=m

CONFIG_IPDDP=m

CONFIG_IPDDP_ENCAP=y

CONFIG_IPDDP_DECAP=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_HTB=m

arch/mips/configs/maltasmtc_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ CONFIG_INET_AH=m 
CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

# CONFIG_INET_LRO is not set

CONFIG_IPV6_PRIVACY=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_IPCOMP=m
@@ -56,7 +55,6 @@ CONFIG_ATALK=m 
CONFIG_DEV_APPLETALK=m

CONFIG_IPDDP=m

CONFIG_IPDDP_ENCAP=y

CONFIG_IPDDP_DECAP=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_CBQ=m

CONFIG_NET_SCH_HTB=m