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 .

svn path=/dists/trunk/linux/; revision=22732

3 files changed, 20 insertions, 25 deletions

diff --git a/debian/config/armhf/config b/debian/config/armhf/config
deleted file mode 100644
index c7674a18faf3..000000000000
--- a/debian/config/armhf/config
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## file: arch/arm/Kconfig
-##
-CONFIG_ATAGS_PROC=y
-#. Enable floating point unit
-CONFIG_VFP=y
-
-##
-## file: drivers/input/mouse/Kconfig
-##
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-
-##
-## 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
-
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 3824cf23bf73..9231a4c878a1 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -22,6 +22,9 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 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_TWL4030_VIBRA=m
 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_FDDI=y
 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
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index 2fb3f856b955..fd62b693dcf1 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -11,7 +11,6 @@ image-file: arch/arm/boot/zImage
 suggests: fdutils
 configs:
  kernelarch-arm/config
- armhf/config
 install-stem: vmlinuz
 
 [relations]