UBUNTU: [Config] Dropped i386 generic

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 files changed, 14 insertions, 72 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index dfead0281e0..4a7be135ee6 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -71,7 +71,6 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TWL4030=m
 # CONFIG_HARDIRQS_SW_RESEND is not set
@@ -84,12 +83,10 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_IDE is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INTEL_TXT=y
 CONFIG_INTR_REMAP=y
-CONFIG_IOMMU_HELPER=y
 # CONFIG_IRQ_PER_CPU is not set
 CONFIG_IWMC3200TOP_DEBUGFS=y
 CONFIG_KGDB=y
@@ -246,7 +243,6 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_X86_X2APIC=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=500
-CONFIG_XEN_PRIVILEGED_GUEST=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_ZONE_DMA32=y
 CONFIG_ZONE_DMA_FLAG=1
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 0491e333b07..9fd9a236ca3 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -61,7 +61,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HZ=128
 CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_IWMC3200TOP_DEBUGFS is not set
 CONFIG_KGDB=y
 # CONFIG_KSM is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index ca9cef7dbfa..643e7365e93 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -61,7 +61,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HZ=128
 CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_HELPER_AUTO is not set
-# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_IWMC3200TOP_DEBUGFS is not set
 CONFIG_KGDB=y
 # CONFIG_KSM is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 15d87baf401..5afefb70baa 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -549,7 +549,6 @@ CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_INTEL_MID=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
-CONFIG_BATTERY_OLPC=m
 CONFIG_BATTERY_PMU=m
 CONFIG_BATTERY_SBS=m
 CONFIG_BAYCOM_EPP=m
@@ -1715,9 +1714,6 @@ CONFIG_FB_NVIDIA_BACKLIGHT=y
 # CONFIG_FB_NVIDIA_DEBUG is not set
 CONFIG_FB_NVIDIA_I2C=y
 CONFIG_FB_OF=y
-CONFIG_FB_OLPC_DCON=m
-CONFIG_FB_OLPC_DCON_1=y
-CONFIG_FB_OLPC_DCON_1_5=y
 CONFIG_FB_OMAP2=m
 CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
 CONFIG_FB_OMAP2_NUM_FBS=3
@@ -1886,6 +1882,7 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_74X164=m
 CONFIG_GPIO_ADP5520=m
 CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_INTEL_PMIC=y
@@ -2070,6 +2067,8 @@ CONFIG_HID_WIIMOTE=m
 CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
 CONFIG_HIGHPTE=y
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
@@ -2233,7 +2232,7 @@ CONFIG_I2C_PCA_ISA=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_PIIX4=m
 CONFIG_I2C_POWERMAC=y
-CONFIG_I2C_PXA=m
+# CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_SCMI=m
 CONFIG_I2C_SI470X=m
 CONFIG_I2C_SI4713=m
@@ -2479,6 +2478,7 @@ CONFIG_INTEL_SCU_IPC=y
 CONFIG_INTEL_SCU_IPC_UTIL=m
 CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUG is not set
+CONFIG_IOMMU_HELPER=y
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IOSCHED_CFQ=y
@@ -3269,7 +3269,6 @@ CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_OLPC=y
 CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -3816,15 +3815,9 @@ CONFIG_OF_MDIO=y
 CONFIG_OF_NET=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
-CONFIG_OF_PROMTREE=y
 # CONFIG_OF_SELFTEST is not set
 CONFIG_OF_SPI=y
 CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_OLPC=y
-CONFIG_OLPC_XO15_SCI=y
-CONFIG_OLPC_XO1_PM=y
-CONFIG_OLPC_XO1_RTC=y
-CONFIG_OLPC_XO1_SCI=y
 CONFIG_OMAP2_DSS=y
 # CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
 CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
@@ -4018,13 +4011,11 @@ CONFIG_PCI_GOANY=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GOOLPC is not set
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_OLPC=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_QUIRKS=y
@@ -6116,9 +6107,7 @@ CONFIG_VME_USER=m
 CONFIG_VMIVME_7805=m
 # CONFIG_VMSPLIT_1G is not set
 # CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
 CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VMWARE_BALLOON=m
 CONFIG_VMWARE_PVSCSI=m
 CONFIG_VMXNET3=m
@@ -6298,6 +6287,7 @@ CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_PRIVILEGED_GUEST=y
 CONFIG_XEN_PVHVM=y
 CONFIG_XEN_SAVE_RESTORE=y
 CONFIG_XEN_SCRUB_PAGES=y
@@ -6321,7 +6311,6 @@ CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_LL_TEMAC=m
 # CONFIG_XMON is not set
 CONFIG_XO15_EBOOK=m
-CONFIG_XO1_RFKILL=m
 CONFIG_XOR_BLOCKS=m
 CONFIG_XPS=y
 CONFIG_XPS_USB_HCD_XILINX=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index f9527f4185b..5b5fed8f786 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -5,7 +5,9 @@
 CONFIG_ACPI_BLACKLIST_YEAR=2000
 CONFIG_AIC79XX_RESET_DELAY_MS=5000
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ASYNC_TX_DMA=y
@@ -132,6 +134,7 @@ CONFIG_PANEL_GENERIC_DPI=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
 CONFIG_PDC_ADMA=y
+CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PM_DEBUG=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_PREEMPT_NONE is not set
@@ -155,6 +158,8 @@ CONFIG_SCSI_IPR=m
 # CONFIG_SCSI_IPR_TRACE is not set
 CONFIG_SCSI_OSD_INITIATOR=m
 CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_SYM53C8XX_2=y
 CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_PCI=y
@@ -177,6 +182,7 @@ CONFIG_SPI_SPIDEV=m
 CONFIG_STACK_TRACER=y
 # CONFIG_STANDALONE is not set
 CONFIG_STE10XP=y
+CONFIG_SYS_HYPERVISOR=y
 CONFIG_TABLET_USB_WACOM=m
 CONFIG_TCG_TIS=m
 CONFIG_TCG_TPM=y
diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
deleted file mode 100644
index 71cac35c949..00000000000
--- a/debian.master/config/i386/config.flavour.generic
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Config options for config.flavour.generic automatically generated by splitconfig.pl
-#
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_GPIO_CS5535=y
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_I2C_PXA_PCI=y
-CONFIG_INTEL_IDLE=y
-# CONFIG_IOMMU_HELPER is not set
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_SYM53C8XX_2=m
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_XEN_PRIVILEGED_GUEST is not set
diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae
index 0fdc77ce9cf..0f1a9d1a709 100644
--- a/debian.master/config/i386/config.flavour.generic-pae
+++ b/debian.master/config/i386/config.flavour.generic-pae
@@ -1,18 +1,6 @@
 #
 # Config options for config.flavour.generic-pae automatically generated by splitconfig.pl
 #
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_GPIO_CS5535=m
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
-# CONFIG_I2C_PXA_PCI is not set
 CONFIG_INTEL_IDLE=y
-CONFIG_IOMMU_HELPER=y
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_PHYSICAL_START=0x1000000
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_XEN_PRIVILEGED_GUEST=y
diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual
index 08c2b930777..8a4e8b6a0be 100644
--- a/debian.master/config/i386/config.flavour.virtual
+++ b/debian.master/config/i386/config.flavour.virtual
@@ -1,18 +1,6 @@
 #
 # Config options for config.flavour.virtual automatically generated by splitconfig.pl
 #
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_GPIO_CS5535=m
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
-# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_INTEL_IDLE is not set
-CONFIG_IOMMU_HELPER=y
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_XEN_PRIVILEGED_GUEST=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 66c3acf28c0..97dd5b53ca2 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -72,10 +72,8 @@ CONFIG_HIGHMEM=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_HELPER_AUTO=y
-# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_IBMEBUS is not set
 # CONFIG_IDE is not set
-CONFIG_IOMMU_HELPER=y
 # CONFIG_IRQ_ALL_CPUS is not set
 CONFIG_IRQ_PER_CPU=y
 # CONFIG_ISA is not set
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 9d41ffa3b87..1c05d98b793 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -84,10 +84,8 @@ CONFIG_HVC_CONSOLE=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_HELPER_AUTO=y
-# CONFIG_I2C_PXA_PCI is not set
 CONFIG_IBMEBUS=y
 CONFIG_IDE=y
-CONFIG_IOMMU_HELPER=y
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_IRQ_PER_CPU=y
 CONFIG_IWMC3200TOP_DEBUGFS=y
diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
index b4b42341b1b..9826715591f 100644
--- a/debian.master/control.d/vars.generic
+++ b/debian.master/control.d/vars.generic
@@ -1,4 +1,4 @@
-arch="i386 amd64"
+arch="amd64"
 supported="Generic"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"
diff --git a/debian.master/d-i/kernel-versions.in b/debian.master/d-i/kernel-versions.in
index 574f0d22007..8c6b7d233f7 100644
--- a/debian.master/d-i/kernel-versions.in
+++ b/debian.master/d-i/kernel-versions.in
@@ -2,7 +2,6 @@
 amd64	PKGVER-ABINUM	generic		PKGVER-ABINUM-generic		-	
 amd64	PKGVER-ABINUM	virtual		PKGVER-ABINUM-virtual		-	
 
-i386	PKGVER-ABINUM	generic		PKGVER-ABINUM-generic		-	
 i386	PKGVER-ABINUM	generic-pae	PKGVER-ABINUM-generic-pae	-	
 i386	PKGVER-ABINUM	virtual		PKGVER-ABINUM-virtual		-	
 
diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk
index 6e5d301cd3b..a219546e4cb 100644
--- a/debian.master/rules.d/i386.mk
+++ b/debian.master/rules.d/i386.mk
@@ -3,7 +3,7 @@ build_arch	= i386
 header_arch	= x86_64
 asm_link	= x86
 defconfig	= defconfig
-flavours        = generic generic-pae virtual
+flavours        = generic-pae virtual
 build_image	= bzImage
 kernel_file	= arch/$(build_arch)/boot/bzImage
 install_file	= vmlinuz