- update configs for i486

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 9ff0bd2e4c5025e332c531ba74c2f26ddc12674f..c877867cf3fd150dd7c73dff3c55074cb36a13a9 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -5305,7 +5305,6 @@ COMEDI_TEST all=m
 COMEDI_PARPORT all=m
 COMEDI_SERIAL2002 all=m
 COMEDI_SKEL all=m
-COMEDI_ISA_DRIVERS all=m
 COMEDI_ACL7225B i386=m
 COMEDI_PCL711 i386=m
 COMEDI_PCL724 i386=m
@@ -6429,7 +6428,6 @@ TCM_VHOST all=m
 #- file drivers/char/agp/Kconfig goes here
 #- file drivers/gpu/vga/Kconfig goes here
 #- file drivers/gpu/drm/Kconfig goes here
-#- file drivers/gpu/misc/Kconfig goes here
 #- file drivers/gpu/stub/Kconfig goes here
 VGASTATE all=m
 VIDEO_OUTPUT_CONTROL all=m
@@ -6827,7 +6825,6 @@ FILE_LOCKING all=y
 #- file fs/quota/Kconfig goes here
 #- file fs/autofs4/Kconfig goes here
 #- file fs/fuse/Kconfig goes here
-#- file fs/overlayfs/Kconfig goes here
 GENERIC_ACL all=y
 #- file fs/fscache/Kconfig goes here
 #- file fs/cachefiles/Kconfig goes here
@@ -6868,7 +6865,6 @@ MISC_FILESYSTEMS all=y
 #- file fs/ufs/Kconfig goes here
 #- file fs/exofs/Kconfig goes here
 #- file fs/f2fs/Kconfig goes here
-#- file fs/aufs/Kconfig goes here
 #- file fs/exofs/Kconfig.ore goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
@@ -6915,11 +6911,6 @@ AFS_FS all=m
 AFS_DEBUG all=n
 AFS_FSCACHE all=y
 
-#-
-#- *** FILE: fs/aufs/Kconfig ***
-#-
-AUFS_PROC_MAP all=n
-
 #-
 #- *** FILE: fs/autofs4/Kconfig ***
 #-
@@ -8647,7 +8638,6 @@ DEFAULT_SECURITY all=""
 #-
 SECURITY_APPARMOR=y
 SECURITY_APPARMOR_BOOTPARAM_VALUE=1
-SECURITY_APPARMOR_COMPAT_24=y
 
 #-
 #- *** FILE: security/integrity/ima/Kconfig ***
@@ -9103,6 +9093,7 @@ AD7745 all=m
 ADT7310 all=m
 ADT75 all=m
 ATH6K_LEGACY all=n
+AUFS_PROC_MAP all=n
 BACKLIGHT_PROGEAR i386=m x86_64=m
 BATTERY_BQ20Z75 all=m
 BLK_DEV_UB all=n
@@ -9263,6 +9254,7 @@ SCSI_WAIT_SCAN all=m
 SCTP_HMAC_MD5 all=y
 SCTP_HMAC_NONE all=n
 SCTP_HMAC_SHA1 all=n
+SECURITY_APPARMOR_COMPAT_24=y
 SERIAL_8250_MCA i386=m
 SERIAL_MAX3107 all=m
 SERIAL_MAX3107_AAVA all=m

diff --git a/kernel-x86.config b/kernel-x86.config
index 680d2c0780f746b39afe36536f153562c61bfac7..4ebdfcd421bb18ec89d1b1150b3428ed34db4e7a 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -22,12 +22,15 @@ X86_EXTENDED_PLATFORM i386=y x86_64=y
 X86_NUMACHIP all=n
 X86_VSMP x86_64=n
 X86_UV i386=n x86_64=n
+X86_WANT_INTEL_MID i486=n i586=n i686=n
 X86_RDC321X i386=n
 X86_32_NON_STANDARD i386=y
 X86_NUMAQ i386=n
 X86_VISWS i386=n
+STA2X11 all=y
 X86_SUMMIT i386=n
 X86_ES7000 i386=n
+X86_32_IRIS i486=y i586=y i686=y
 SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
 PARAVIRT_GUEST x86=y
 PARAVIRT_TIME_ACCOUNTING x86=y
@@ -54,9 +57,9 @@ X86_UP_APIC i386=y
 X86_UP_IOAPIC i386=y
 X86_REROUTE_FOR_BROKEN_BOOT_IRQS i386=y x86_64=y
 X86_MCE x86=y
-X86_MCE_INTEL x86_64=y i686=y
-X86_MCE_AMD x86_64=y i686=y
-X86_ANCIENT_MCE i686=y
+X86_MCE_INTEL all=y
+X86_MCE_AMD all=y
+X86_ANCIENT_MCE all=y
 X86_MCE_INJECT x86=m
 VM86 i386=y
 TOSHIBA i386=m
@@ -127,6 +130,9 @@ EISA i386=y
 SCx200 i386=m
 SCx200HR_TIMER i386=m
 OLPC i386=n
+ALIX i486=y i586=y i686=y
+NET5501 i486=y i586=y i686=y
+GEOS i486=y i586=y i686=y
 #- file drivers/pcmcia/Kconfig goes here
 #- file drivers/pci/hotplug/Kconfig goes here
 #- file drivers/rapidio/Kconfig goes here
@@ -139,6 +145,7 @@ X86_X32 all=n
 #- file drivers/firmware/Kconfig goes here
 #- file fs/Kconfig goes here
 #- file arch/x86/Kconfig.debug goes here
+#- file kernel/vserver/Kconfig goes here
 #- file security/Kconfig goes here
 #- file crypto/Kconfig goes here
 #- file arch/x86/kvm/Kconfig goes here
@@ -163,6 +170,7 @@ MCRUSOE i386=n
 MEFFICEON i386=n
 MWINCHIPC6 i386=n
 MWINCHIP3D i386=n
+MELAN i386=n
 MGEODEGX1 i386=n
 MGEODE_LX i386=n
 MCYRIXIII i386=n
@@ -218,12 +226,33 @@ KVM_MMU_AUDIT x86=y
 #- file drivers/vhost/Kconfig goes here
 #- file drivers/lguest/Kconfig goes here
 
+#-
+#- *** FILE: arch/x86/lguest/Kconfig ***
+#-
+LGUEST_GUEST all=y
+
 #-
 #- *** FILE: arch/x86/xen/Kconfig ***
 #-
 XEN x86=y
 XEN_DEBUG_FS x86=n
 
+#-
+#- *** FILE: crypto/Kconfig ***
+#-
+#- file crypto/async_tx/Kconfig goes here
+#- Crypto core or helper
+#- Authenticated Encryption with Associated Data
+#- Block modes
+#- Hash modes
+#- Digest
+#- Ciphers
+CRYPTO_SERPENT_SSE2_586 all=m
+#- Compression
+#- Random Number Generation
+#- file drivers/crypto/Kconfig goes here
+#- file crypto/asymmetric_keys/Kconfig goes here
+
 #-
 #- *** FILE: drivers/cpufreq/Kconfig.x86 ***
 #-
@@ -246,12 +275,56 @@ X86_E_POWERSAVER i386=m
 #- shared options
 X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
 
+#-
+#- *** FILE: drivers/gpio/Kconfig ***
+#-
+#- Memory mapped GPIO drivers:
+GPIO_STA2X11 all=y
+#- I2C GPIO expanders:
+#- PCI GPIO expanders:
+#- SPI GPIO expanders:
+#- AC97 GPIO expanders:
+#- MODULbus GPIO expanders:
+#- USB GPIO expanders:
+
 #-
 #- *** FILE: drivers/iommu/Kconfig ***
 #-
 AMD_IOMMU x86_64=y
 AMD_IOMMU_STATS x86_64=n
 
+#-
+#- *** FILE: drivers/media/pci/sta2x11/Kconfig ***
+#-
+STA2X11_VIP all=m
+
+#-
+#- *** FILE: drivers/media/radio/Kconfig ***
+#-
+#- file drivers/media/radio/si470x/Kconfig goes here
+#- file drivers/media/radio/wl128x/Kconfig goes here
+V4L_RADIO_ISA_DRIVERS all=y
+
+#-
+#- *** FILE: drivers/net/ethernet/cirrus/Kconfig ***
+#-
+NET_VENDOR_CIRRUS all=y
+CS89x0_PLATFORM all=y
+
+#-
+#- *** FILE: drivers/staging/comedi/Kconfig ***
+#-
+COMEDI_ISA_DRIVERS all=y
+COMEDI_AMPLC_DIO200_ISA all=m
+COMEDI_AMPLC_PC236_ISA all=m
+COMEDI_AMPLC_PC263_ISA all=m
+COMEDI_DAS08_ISA all=m
+
+#-
+#- *** FILE: drivers/usb/gadget/Kconfig ***
+#-
+USB_FUSB300 all=m
+
 #-
 #- *** FILE: init/Kconfig ***
 #-