[kernel] r22732 - dists/trunk/linux/debian/config/armhf

[Ian James Campbell]

Author: ijc
Date: Sat Jun  6 11:18:13 2015
New Revision: 22732

Log:
Cleanup armhf config, merge config and config.lpae

With armmp now being the baseline flavour the (rather arbitrary) split between
config and config.armmp doesn't make much sense. Move the contents of config
into config.armmp.

Implemented (mostly) automatically with:
$ ../kconfigeditor2/process.py .
-> Results in no change
$ cat debian/config/armhf/config  debian/config/armhf/config.armmp | sponge debian/config/armhf/config.armmp
$ rm debian/config/armhf/config
$ vi debian/config/armhf/defines
$ ../kconfigeditor2/process.py .

Deleted:
   dists/trunk/linux/debian/config/armhf/config
Modified:
   dists/trunk/linux/debian/config/armhf/config.armmp
   dists/trunk/linux/debian/config/armhf/defines

Modified: dists/trunk/linux/debian/config/armhf/config.armmp
==============================================================================
--- dists/trunk/linux/debian/config/armhf/config.armmp	Sat Jun  6 10:52:11 2015	(r22731)
+++ dists/trunk/linux/debian/config/armhf/config.armmp	Sat Jun  6 11:18:13 2015	(r22732)
@@ -22,6 +22,9 @@
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
 ## end choice
+CONFIG_ATAGS_PROC=y
+#. Enable floating point unit
+CONFIG_VFP=y
 CONFIG_NEON=y
 
 ##
@@ -342,6 +345,13 @@
 CONFIG_INPUT_TWL6040_VIBRA=m
 
 ##
+## file: drivers/input/mouse/Kconfig
+##
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+
+##
 ## file: drivers/input/serio/Kconfig
 ##
 CONFIG_SERIO_AMBAKMI=m
@@ -599,6 +609,16 @@
 CONFIG_SKFP=m
 
 ##
+## file: drivers/net/hamradio/Kconfig
+##
+# CONFIG_BPQETHER is not set
+# CONFIG_BAYCOM_SER_FDX is not set
+# CONFIG_BAYCOM_SER_HDX is not set
+# CONFIG_BAYCOM_PAR is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_YAM is not set
+
+##
 ## file: drivers/net/phy/Kconfig
 ##
 CONFIG_MDIO_SUN4I=y

Modified: dists/trunk/linux/debian/config/armhf/defines
==============================================================================
--- dists/trunk/linux/debian/config/armhf/defines	Sat Jun  6 10:52:11 2015	(r22731)
+++ dists/trunk/linux/debian/config/armhf/defines	Sat Jun  6 11:18:13 2015	(r22732)
@@ -11,7 +11,6 @@
 suggests: fdutils
 configs:
  kernelarch-arm/config
- armhf/config
 install-stem: vmlinuz
 
 [relations]