debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Ian Campbell 2015-06-06 11:18:13 +00:00
parent 55fe5a22eb
commit 30a68a9d2e
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
debian/config/armhf/config vendored
View File

@ -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

20
debian/config/armhf/config.armmp vendored
View File

@ -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
##
@ -341,6 +344,13 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=m
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
##
@ -598,6 +608,16 @@ CONFIG_TI_CPSW=m
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
##

1
debian/config/armhf/defines vendored
View File

@ -11,7 +11,6 @@ image-file: arch/arm/boot/zImage
suggests: fdutils
configs:
kernelarch-arm/config
armhf/config
install-stem: vmlinuz
[relations]