[linux] 01/01: [x86] Replace 586 flavour with 686

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Sun Oct 4 03:03:43 UTC 2015 

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 14294d93c19dec0b3368fc902d480e6c6107ee19
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Oct 4 03:59:59 2015 +0100

    [x86] Replace 586 flavour with 686
    
    Enable support for OLPC and other Geode-based systems in the 686 flavour.
---
 debian/changelog                |   2 +
 debian/config/i386/config.586   | 134 ----------------------------------------
 debian/config/i386/config.686   |  87 ++++++++++++++++++++++++++
 debian/config/i386/defines      |  10 +--
 debian/config/i386/none/defines |   2 +-
 5 files changed, 95 insertions(+), 140 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92c859c..56dd4d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ linux (4.3~rc3-1~exp1) experimental; urgency=medium
 
   [ Ben Hutchings ]
   * Disable CRAMFS; it was obsoleted by squashfs and initramfs
+  * [x86] Replace 586 flavour with 686
+    - Enable support for OLPC and other Geode-based systems in the 686 flavour
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 27 Sep 2015 21:02:54 +0100
 
diff --git a/debian/config/i386/config.586 b/debian/config/i386/config.586
deleted file mode 100644
index aa9934b..0000000
--- a/debian/config/i386/config.586
+++ /dev/null
@@ -1,134 +0,0 @@
-##
-## file: arch/x86/Kconfig
-##
-# CONFIG_SMP is not set
-CONFIG_X86_32_IRIS=m
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_IOAPIC=y
-# CONFIG_X86_MCE is not set
-CONFIG_MATH_EMULATION=y
-CONFIG_EISA=y
-CONFIG_OLPC=y
-CONFIG_OLPC_XO1_PM=y
-CONFIG_OLPC_XO1_RTC=y
-CONFIG_OLPC_XO1_SCI=y
-CONFIG_OLPC_XO15_SCI=y
-CONFIG_ALIX=y
-CONFIG_NET5501=y
-CONFIG_GEOS=y
-
-##
-## file: arch/x86/Kconfig.cpu
-##
-## choice: Processor family
-CONFIG_M586TSC=y
-# CONFIG_M686 is not set
-## end choice
-
-##
-## file: drivers/eisa/Kconfig
-##
-CONFIG_EISA_VLB_PRIMING=y
-CONFIG_EISA_PCI_EISA=y
-CONFIG_EISA_VIRTUAL_ROOT=y
-CONFIG_EISA_NAMES=y
-
-##
-## file: drivers/i2c/Kconfig
-##
-CONFIG_I2C_STUB=m
-
-##
-## file: drivers/i2c/busses/Kconfig
-##
-CONFIG_I2C_ELEKTOR=m
-
-##
-## file: drivers/idle/Kconfig
-##
-# CONFIG_INTEL_IDLE is not set
-
-##
-## file: drivers/input/keyboard/Kconfig
-##
-CONFIG_KEYBOARD_GPIO_POLLED=m
-
-##
-## file: drivers/input/mouse/Kconfig
-##
-CONFIG_MOUSE_PS2_OLPC=y
-
-##
-## file: drivers/leds/Kconfig
-##
-CONFIG_LEDS_GPIO=m
-
-##
-## file: drivers/mtd/chips/Kconfig
-##
-# CONFIG_MTD_XIP is not set
-
-##
-## file: drivers/net/ethernet/8390/Kconfig
-##
-CONFIG_NET_VENDOR_8390=y
-
-##
-## file: drivers/net/ethernet/i825xx/Kconfig
-##
-CONFIG_NET_VENDOR_I825XX=y
-
-##
-## file: drivers/net/ethernet/natsemi/Kconfig
-##
-CONFIG_NET_VENDOR_NATSEMI=y
-
-##
-## file: drivers/net/hamradio/Kconfig
-##
-CONFIG_DMASCC=m
-
-##
-## file: drivers/pci/hotplug/Kconfig
-##
-CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
-
-##
-## file: drivers/platform/x86/Kconfig
-##
-CONFIG_XO1_RFKILL=m
-CONFIG_XO15_EBOOK=m
-
-##
-## file: drivers/power/Kconfig
-##
-CONFIG_BATTERY_OLPC=m
-
-##
-## file: drivers/scsi/Kconfig
-##
-CONFIG_SCSI_NCR_D700=m
-CONFIG_SCSI_NCR_Q720=m
-CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
-CONFIG_SCSI_NCR53C8XX_MAX_TAGS=4
-CONFIG_SCSI_NCR53C8XX_SYNC=5
-CONFIG_SCSI_SIM710=m
-
-##
-## file: drivers/tty/Kconfig
-##
-CONFIG_MOXA_INTELLIO=m
-
-##
-## file: drivers/video/fbdev/geode/Kconfig
-##
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=m
-CONFIG_FB_GEODE_GX=m
-CONFIG_FB_GEODE_GX1=m
-
-##
-## file: mm/Kconfig
-##
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-
diff --git a/debian/config/i386/config.686 b/debian/config/i386/config.686
new file mode 100644
index 0000000..eccad2e
--- /dev/null
+++ b/debian/config/i386/config.686
@@ -0,0 +1,87 @@
+##
+## file: arch/x86/Kconfig
+##
+CONFIG_X86_32_IRIS=m
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_EISA is not set
+CONFIG_OLPC=y
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+CONFIG_OLPC_XO15_SCI=y
+CONFIG_ALIX=y
+CONFIG_NET5501=y
+CONFIG_GEOS=y
+
+##
+## file: arch/x86/Kconfig.cpu
+##
+## choice: Processor family
+# CONFIG_M486 is not set
+CONFIG_M686=y
+## end choice
+
+##
+## file: drivers/i2c/Kconfig
+##
+CONFIG_I2C_STUB=m
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+# CONFIG_I2C_ELEKTOR is not set
+
+##
+## file: drivers/input/keyboard/Kconfig
+##
+CONFIG_KEYBOARD_GPIO_POLLED=m
+
+##
+## file: drivers/input/mouse/Kconfig
+##
+CONFIG_MOUSE_PS2_OLPC=y
+
+##
+## file: drivers/leds/Kconfig
+##
+CONFIG_LEDS_GPIO=m
+
+##
+## file: drivers/net/hamradio/Kconfig
+##
+# CONFIG_DMASCC is not set
+
+##
+## file: drivers/pci/hotplug/Kconfig
+##
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+
+##
+## file: drivers/platform/x86/Kconfig
+##
+CONFIG_XO1_RFKILL=m
+CONFIG_XO15_EBOOK=m
+
+##
+## file: drivers/power/Kconfig
+##
+CONFIG_BATTERY_OLPC=m
+
+##
+## file: drivers/tty/Kconfig
+##
+# CONFIG_MOXA_INTELLIO is not set
+
+##
+## file: drivers/video/fbdev/geode/Kconfig
+##
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+
+##
+## file: lib/Kconfig.debug
+##
+# CONFIG_DEBUG_HIGHMEM is not set
+
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 20dc644..e5345e6 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -21,15 +21,15 @@ install-stem: vmlinuz
 [relations]
 headers%gcc-4.9: linux-compiler-gcc-4.9-x86
 
-[586_description]
+[686_description]
 hardware: older PCs
-hardware-long: PCs with a single processor not supporting PAE
-parts: up
+hardware-long: PCs with one or more processors not supporting PAE
 
-[586_image]
+[686_image]
 configs:
  kernelarch-x86/config-arch-32
- i386/config.586
+ i386/config.686
+recommends: libc6-i686
 
 [686-pae_build]
 debug-info: true
diff --git a/debian/config/i386/none/defines b/debian/config/i386/none/defines
index d9fb39d..45987b5 100644
--- a/debian/config/i386/none/defines
+++ b/debian/config/i386/none/defines
@@ -1,6 +1,6 @@
 [base]
 flavours:
- 586
+ 686
  686-pae
 
 [686-pae_description]

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