[linux] 02/07: [mips*] Move some common options to per-kernel-arch config
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Mon May 23 21:38:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit b3a4c37834b875349ac66b370a424bed8198905e
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Mon May 23 11:52:23 2016 +0100
[mips*] Move some common options to per-kernel-arch config
---
debian/config/kernelarch-mips/config | 26 ++++++++++++++++++++++++
debian/config/kernelarch-mips/config.4kc-malta | 7 -------
debian/config/kernelarch-mips/config.5kc-malta | 9 --------
debian/config/kernelarch-mips/config.loongson-2e | 13 ------------
debian/config/kernelarch-mips/config.loongson-2f | 13 ------------
debian/config/kernelarch-mips/config.loongson-3 | 12 -----------
debian/config/kernelarch-mips/config.octeon | 8 --------
7 files changed, 26 insertions(+), 62 deletions(-)
diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config
index 5372e40..d8f9ea8 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -3,7 +3,11 @@
##
CONFIG_KEXEC=y
CONFIG_SECCOMP=y
+CONFIG_PCI=y
# CONFIG_RAPIDIO is not set
+#. Ignored in 32-bit configurations
+CONFIG_MIPS32_O32=y
+CONFIG_MIPS32_N32=y
##
## file: arch/mips/Kconfig.debug
@@ -11,6 +15,11 @@ CONFIG_SECCOMP=y
CONFIG_EARLY_PRINTK=y
##
+## file: drivers/ata/Kconfig
+##
+CONFIG_ATA=y
+
+##
## file: drivers/net/ethernet/sun/Kconfig
##
# CONFIG_NIU is not set
@@ -22,6 +31,23 @@ CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
##
+## file: drivers/tty/serial/8250/Kconfig
+##
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+
+##
+## file: drivers/usb/Kconfig
+##
+CONFIG_USB=m
+
+##
+## file: drivers/usb/host/Kconfig
+##
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_OHCI_HCD=m
+
+##
## file: drivers/video/console/Kconfig
##
# CONFIG_VGA_CONSOLE is not set
diff --git a/debian/config/kernelarch-mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta
index 7116bfd..01b2e8e 100644
--- a/debian/config/kernelarch-mips/config.4kc-malta
+++ b/debian/config/kernelarch-mips/config.4kc-malta
@@ -13,12 +13,10 @@ CONFIG_32BIT=y
## choice: Kernel page size
CONFIG_PAGE_SIZE_4KB=y
## end choice
-CONFIG_PCI=y
##
## file: drivers/ata/Kconfig
##
-CONFIG_ATA=y
CONFIG_SATA_AHCI=y
CONFIG_SATA_SIL24=y
CONFIG_SATA_SX4=y
@@ -387,8 +385,6 @@ CONFIG_SERIAL_JSM=m
##
## file: drivers/tty/serial/8250/Kconfig
##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
@@ -398,7 +394,6 @@ CONFIG_SERIAL_8250_RSA=y
##
## file: drivers/usb/Kconfig
##
-CONFIG_USB=m
CONFIG_USB_USS720=m
##
@@ -410,9 +405,7 @@ CONFIG_USB_SPEEDTOUCH=m
##
## file: drivers/usb/host/Kconfig
##
-CONFIG_USB_EHCI_HCD=m
CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_OHCI_HCD=m
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_SL811_HCD=m
diff --git a/debian/config/kernelarch-mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta
index 91ce433..4992d8e 100644
--- a/debian/config/kernelarch-mips/config.5kc-malta
+++ b/debian/config/kernelarch-mips/config.5kc-malta
@@ -13,14 +13,10 @@ CONFIG_64BIT=y
## choice: Kernel page size
CONFIG_PAGE_SIZE_4KB=y
## end choice
-CONFIG_PCI=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
##
## file: drivers/ata/Kconfig
##
-CONFIG_ATA=y
CONFIG_SATA_AHCI=y
CONFIG_SATA_SIL24=y
CONFIG_SATA_SX4=y
@@ -389,8 +385,6 @@ CONFIG_SERIAL_JSM=m
##
## file: drivers/tty/serial/8250/Kconfig
##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
@@ -400,7 +394,6 @@ CONFIG_SERIAL_8250_RSA=y
##
## file: drivers/usb/Kconfig
##
-CONFIG_USB=m
CONFIG_USB_USS720=m
##
@@ -412,9 +405,7 @@ CONFIG_USB_SPEEDTOUCH=m
##
## file: drivers/usb/host/Kconfig
##
-CONFIG_USB_EHCI_HCD=m
CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_OHCI_HCD=m
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_SL811_HCD=m
diff --git a/debian/config/kernelarch-mips/config.loongson-2e b/debian/config/kernelarch-mips/config.loongson-2e
index f7d0ba7..2e385df 100644
--- a/debian/config/kernelarch-mips/config.loongson-2e
+++ b/debian/config/kernelarch-mips/config.loongson-2e
@@ -8,9 +8,6 @@ CONFIG_MACH_LOONGSON64=y
# CONFIG_32BIT is not set
CONFIG_64BIT=y
## end choice
-CONFIG_PCI=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
##
## file: arch/mips/loongson64/Kconfig
@@ -22,7 +19,6 @@ CONFIG_LEMOTE_FULOONG2E=y
##
## file: drivers/ata/Kconfig
##
-CONFIG_ATA=y
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_PATA_VIA=y
@@ -81,21 +77,12 @@ CONFIG_VT_CONSOLE=y
##
## file: drivers/tty/serial/8250/Kconfig
##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
# CONFIG_SERIAL_8250_EXTENDED is not set
##
-## file: drivers/usb/Kconfig
-##
-CONFIG_USB=m
-
-##
## file: drivers/usb/host/Kconfig
##
-CONFIG_USB_EHCI_HCD=m
CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_OHCI_HCD=m
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
diff --git a/debian/config/kernelarch-mips/config.loongson-2f b/debian/config/kernelarch-mips/config.loongson-2f
index 825cb89..44db431 100644
--- a/debian/config/kernelarch-mips/config.loongson-2f
+++ b/debian/config/kernelarch-mips/config.loongson-2f
@@ -8,9 +8,6 @@ CONFIG_MACH_LOONGSON64=y
# CONFIG_32BIT is not set
CONFIG_64BIT=y
## end choice
-CONFIG_PCI=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
##
## file: arch/mips/loongson64/Kconfig
@@ -23,7 +20,6 @@ CONFIG_CS5536_MFGPT=y
##
## file: drivers/ata/Kconfig
##
-CONFIG_ATA=y
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_PATA_AMD=y
@@ -103,21 +99,12 @@ CONFIG_VT_CONSOLE=y
##
## file: drivers/tty/serial/8250/Kconfig
##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
# CONFIG_SERIAL_8250_EXTENDED is not set
##
-## file: drivers/usb/Kconfig
-##
-CONFIG_USB=m
-
-##
## file: drivers/usb/host/Kconfig
##
-CONFIG_USB_EHCI_HCD=m
CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_OHCI_HCD=m
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3
index 6534868..056e053 100644
--- a/debian/config/kernelarch-mips/config.loongson-3
+++ b/debian/config/kernelarch-mips/config.loongson-3
@@ -10,8 +10,6 @@ CONFIG_HOTPLUG_CPU=y
CONFIG_64BIT=y
## end choice
CONFIG_SMP=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
##
## file: arch/mips/loongson64/Kconfig
@@ -23,7 +21,6 @@ CONFIG_LOONGSON_MACH3X=y
##
## file: drivers/ata/Kconfig
##
-CONFIG_ATA=y
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_SATA_AHCI=y
@@ -83,21 +80,12 @@ CONFIG_VT_CONSOLE=y
##
## file: drivers/tty/serial/8250/Kconfig
##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
# CONFIG_SERIAL_8250_EXTENDED is not set
##
-## file: drivers/usb/Kconfig
-##
-CONFIG_USB=m
-
-##
## file: drivers/usb/host/Kconfig
##
-CONFIG_USB_EHCI_HCD=m
CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_OHCI_HCD=m
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index 4201616..e6578da 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -11,9 +11,6 @@ CONFIG_64BIT=y
## end choice
CONFIG_SMP=y
CONFIG_NR_CPUS=32
-CONFIG_PCI=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
##
## file: arch/mips/cavium-octeon/Kconfig
@@ -39,7 +36,6 @@ CONFIG_CRYPTO_SHA512_OCTEON=m
##
## file: drivers/ata/Kconfig
##
-CONFIG_ATA=y
CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_AHCI_OCTEON=m
CONFIG_ATA_SFF=y
@@ -158,8 +154,6 @@ CONFIG_OCTEON_USB=y
##
## file: drivers/tty/serial/8250/Kconfig
##
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=2
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
CONFIG_SERIAL_8250_DW=y
@@ -167,9 +161,7 @@ CONFIG_SERIAL_8250_DW=y
##
## file: drivers/usb/host/Kconfig
##
-CONFIG_USB_EHCI_HCD=m
CONFIG_USB_OCTEON_EHCI=y
-CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OCTEON_OHCI=y
##
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list