[armhf] Remove flavours which are now covered by the armmp flavour

svn path=/dists/trunk/linux/; revision=20654
This commit is contained in:
Ian Campbell 2013-09-19 22:21:16 +00:00
parent 9d6505ea5c
commit f1c8c71b97
64 changed files with 2 additions and 728 deletions

2
debian/changelog vendored
View File

@ -36,6 +36,8 @@ linux (3.11.1-1~exp1) UNRELEASED; urgency=low
* [armhf] Enable CONFIG_PCI for multiplatform flavour.
- Enable standard NIC and SCSI modules and include in udebs.
* [armhf] Add multiplatform + LPAE flavour (armmp-lpae).
* [armhf] Remove mx5, omap and vexpress flavours. These are all supported
by the multiplatform flavour.
-- Ben Hutchings <ben@decadent.org.uk> Fri, 13 Sep 2013 04:37:21 +0100

View File

@ -1,174 +0,0 @@
##
## file: arch/arm/Kconfig
##
CONFIG_HIGHMEM=y
# CONFIG_HIGHPTE is not set
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
#. Enable NEON SIMD support
CONFIG_NEON=y
##
## file: arch/arm/Kconfig.debug
##
# CONFIG_DEBUG_LL is not set
##
## file: arch/arm/mach-imx/Kconfig
##
CONFIG_ARCH_MXC=y
#. CONFIG_MACH_MX51_EFIKAMX is gone
CONFIG_MACH_IMX51_DT=y
CONFIG_SOC_IMX53=y
##
## file: drivers/ata/Kconfig
##
CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_PATA_IMX=m
##
## file: drivers/cpufreq/Kconfig
##
CONFIG_GENERIC_CPUFREQ_CPU0=m
##
## file: drivers/dma/Kconfig
##
CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
# CONFIG_NET_DMA is not set
# CONFIG_ASYNC_TX_DMA is not set
##
## file: drivers/gpio/Kconfig
##
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
##
## file: drivers/hid/usbhid/Kconfig
##
CONFIG_USB_HID=y
##
## file: drivers/i2c/busses/Kconfig
##
CONFIG_I2C_IMX=y
##
## file: drivers/input/touchscreen/Kconfig
##
CONFIG_INPUT_TOUCHSCREEN=y
##
## file: drivers/leds/Kconfig
##
CONFIG_LEDS_GPIO=y
##
## file: drivers/leds/trigger/Kconfig
##
CONFIG_LEDS_TRIGGER_GPIO=y
##
## file: drivers/mfd/Kconfig
##
CONFIG_MFD_MC13XXX_SPI=y
##
## file: drivers/mmc/Kconfig
##
CONFIG_MMC=m
##
## file: drivers/mmc/card/Kconfig
##
CONFIG_MMC_BLOCK=m
##
## file: drivers/mmc/host/Kconfig
##
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_ESDHC_IMX=m
CONFIG_MMC_MXC=m
##
## file: drivers/mtd/Kconfig
##
#. Efika has SPI NOR MTD device
CONFIG_MTD=m
CONFIG_MTD_BLOCK=m
##
## file: drivers/net/wireless/mwifiex/Kconfig
##
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
##
## file: drivers/pwm/Kconfig
##
CONFIG_PWM=y
CONFIG_PWM_IMX=y
##
## file: drivers/regulator/Kconfig
##
CONFIG_REGULATOR=y
#. Provide dummy if lookup fails
CONFIG_REGULATOR_DUMMY=y
CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
CONFIG_REGULATOR_USERSPACE_CONSUMER=y
CONFIG_REGULATOR_MC13892=y
##
## file: drivers/rtc/Kconfig
##
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_MC13XXX=y
##
## file: drivers/spi/Kconfig
##
CONFIG_SPI_GPIO=y
CONFIG_SPI_IMX=y
##
## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
##
## file: drivers/usb/Kconfig
##
CONFIG_USB=y
##
## file: drivers/usb/host/Kconfig
##
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
##
## file: drivers/usb/phy/Kconfig
##
CONFIG_USB_ULPI=y
##
## file: drivers/watchdog/Kconfig
##
CONFIG_IMX2_WDT=y
##
## file: sound/soc/Kconfig
##
CONFIG_SND_SOC=m
##
## file: sound/soc/fsl/Kconfig
##
CONFIG_SND_IMX_SOC=m
CONFIG_SND_SOC_IMX_SGTL5000=m

View File

@ -1,331 +0,0 @@
##
## file: arch/arm/Kconfig
##
CONFIG_SMP=y
CONFIG_SMP_ON_UP=y
CONFIG_HIGHMEM=y
CONFIG_NEON=y
##
## file: arch/arm/mach-omap2/Kconfig
##
# CONFIG_ARCH_OMAP2 is not set
CONFIG_ARCH_OMAP3=y
CONFIG_ARCH_OMAP4=y
CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
##
## file: arch/arm/mm/Kconfig
##
CONFIG_ARM_THUMBEE=y
##
## file: arch/arm/plat-omap/Kconfig
##
CONFIG_OMAP_RESET_CLOCKS=y
CONFIG_OMAP_MUX=y
# CONFIG_OMAP_MUX_DEBUG is not set
CONFIG_OMAP_MUX_WARNINGS=y
# CONFIG_OMAP_MPU_TIMER is not set
CONFIG_OMAP_32K_TIMER=y
# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
CONFIG_OMAP_DM_TIMER=y
CONFIG_OMAP_SERIAL_WAKE=y
## choice: OMAP PM layer selection
CONFIG_OMAP_PM_NOOP=y
## end choice
##
## file: drivers/bluetooth/Kconfig
##
CONFIG_BT_WILINK=m
##
## file: drivers/cpufreq/Kconfig
##
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_STAT=y
##
## file: drivers/crypto/Kconfig
##
CONFIG_CRYPTO_DEV_OMAP_SHAM=m
CONFIG_CRYPTO_DEV_OMAP_AES=m
##
## file: drivers/dma/Kconfig
##
CONFIG_DMADEVICES=y
CONFIG_DMA_OMAP=y
##
## file: drivers/gpio/Kconfig
##
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_TWL4030=y
##
## file: drivers/i2c/busses/Kconfig
##
CONFIG_I2C_GPIO=y
CONFIG_I2C_OMAP=y
##
## file: drivers/iio/Kconfig
##
CONFIG_IIO=m
##
## file: drivers/iio/light/Kconfig
##
CONFIG_SENSORS_TSL2563=m
##
## file: drivers/input/keyboard/Kconfig
##
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_OMAP4=y
CONFIG_KEYBOARD_TWL4030=y
##
## file: drivers/input/misc/Kconfig
##
CONFIG_INPUT_TWL4030_PWRBUTTON=m
CONFIG_INPUT_TWL4030_VIBRA=m
##
## file: drivers/input/touchscreen/Kconfig
##
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_TSC2005=m
##
## file: drivers/iommu/Kconfig
##
# CONFIG_OMAP_IOMMU_DEBUG is not set
##
## file: drivers/leds/Kconfig
##
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_LP5523=m
##
## file: drivers/leds/trigger/Kconfig
##
CONFIG_LEDS_TRIGGER_GPIO=m
##
## file: drivers/mailbox/Kconfig
##
CONFIG_MAILBOX=y
CONFIG_OMAP2PLUS_MBOX=y
CONFIG_OMAP_MBOX_KFIFO_SIZE=256
##
## file: drivers/media/Kconfig
##
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
##
## file: drivers/media/platform/omap/Kconfig
##
CONFIG_VIDEO_OMAP2_VOUT=m
##
## file: drivers/media/radio/Kconfig
##
CONFIG_RADIO_ADAPTERS=y
CONFIG_I2C_SI4713=m
CONFIG_RADIO_SI4713=m
##
## file: drivers/media/radio/wl128x/Kconfig
##
CONFIG_RADIO_WL128X=m
##
## file: drivers/misc/ti-st/Kconfig
##
CONFIG_TI_ST=m
##
## file: drivers/mmc/Kconfig
##
CONFIG_MMC=y
##
## file: drivers/mmc/host/Kconfig
##
CONFIG_MMC_SDHCI=m
CONFIG_MMC_OMAP=y
CONFIG_MMC_OMAP_HS=y
CONFIG_MMC_SPI=m
##
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=y
##
## file: drivers/mtd/nand/Kconfig
##
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_OMAP2=y
##
## file: drivers/mtd/onenand/Kconfig
##
CONFIG_MTD_ONENAND=y
CONFIG_MTD_ONENAND_OMAP2=y
##
## file: drivers/net/wireless/ti/wl1251/Kconfig
##
CONFIG_WL1251=m
CONFIG_WL1251_SPI=m
##
## file: drivers/net/wireless/ti/wl12xx/Kconfig
##
CONFIG_WL12XX=m
##
## file: drivers/power/Kconfig
##
CONFIG_BATTERY_BQ27x00=m
CONFIG_CHARGER_ISP1704=m
##
## file: drivers/regulator/Kconfig
##
CONFIG_REGULATOR=y
CONFIG_REGULATOR_TWL4030=y
##
## file: drivers/rtc/Kconfig
##
CONFIG_RTC_DRV_TWL4030=m
##
## file: drivers/spi/Kconfig
##
CONFIG_SPI=y
CONFIG_SPI_GPIO=y
CONFIG_SPI_OMAP24XX=y
CONFIG_SPI_SPIDEV=y
##
## file: drivers/staging/iio/accel/Kconfig
##
CONFIG_LIS3L02DQ=m
##
## file: drivers/staging/tidspbridge/Kconfig
##
CONFIG_TIDSPBRIDGE=m
CONFIG_TIDSPBRIDGE_DVFS=y
CONFIG_TIDSPBRIDGE_RECOVERY=y
##
## file: drivers/usb/Kconfig
##
CONFIG_USB=y
##
## file: drivers/usb/gadget/Kconfig
##
CONFIG_USB_GADGET=y
## choice: USB Gadget Drivers
CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
CONFIG_USB_GADGETFS=m
CONFIG_USB_G_NOKIA=m
## end choice
##
## file: drivers/usb/host/Kconfig
##
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_HCD_OMAP=y
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_OMAP3=y
##
## file: drivers/usb/musb/Kconfig
##
CONFIG_USB_MUSB_HDRC=y
CONFIG_USB_MUSB_OMAP2PLUS=y
## choice: MUSB DMA mode
CONFIG_USB_INVENTRA_DMA=y
## end choice
##
## file: drivers/usb/phy/Kconfig
##
CONFIG_NOP_USB_XCEIV=y
CONFIG_OMAP_USB2=y
CONFIG_TWL4030_USB=y
CONFIG_TWL6030_USB=y
##
## file: drivers/video/Kconfig
##
CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
##
## file: drivers/video/console/Kconfig
##
CONFIG_FRAMEBUFFER_CONSOLE=y
##
## file: drivers/video/omap2/displays/Kconfig
##
CONFIG_PANEL_GENERIC_DPI=y
CONFIG_PANEL_ACX565AKM=y
##
## file: drivers/video/omap2/dss/Kconfig
##
CONFIG_OMAP2_DSS=y
CONFIG_OMAP2_DSS_VENC=y
CONFIG_OMAP4_DSS_HDMI=y
CONFIG_OMAP2_DSS_SDI=y
##
## file: drivers/video/omap2/omapfb/Kconfig
##
CONFIG_FB_OMAP2=y
##
## file: drivers/watchdog/Kconfig
##
CONFIG_OMAP_WATCHDOG=m
CONFIG_TWL4030_WATCHDOG=m
##
## file: kernel/power/Kconfig
##
CONFIG_SUSPEND=y
CONFIG_PM_RUNTIME=y
CONFIG_APM_EMULATION=y
##
## file: net/phonet/Kconfig
##
CONFIG_PHONET=m
##
## file: sound/soc/Kconfig
##
CONFIG_SND_SOC=m
##
## file: sound/soc/omap/Kconfig
##
CONFIG_SND_OMAP_SOC=m
CONFIG_SND_OMAP_SOC_RX51=m

View File

@ -1,118 +0,0 @@
##
## file: arch/Kconfig
##
CONFIG_OPROFILE=m
##
## file: arch/arm/Kconfig
##
CONFIG_SMP=y
## choice: Memory split
CONFIG_VMSPLIT_2G=y
## end choice
CONFIG_HOTPLUG_CPU=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_NEON=y
##
## file: arch/arm/mach-vexpress/Kconfig
##
CONFIG_ARCH_VEXPRESS=y
CONFIG_ARCH_VEXPRESS_CA9X4=y
##
## file: drivers/ata/Kconfig
##
CONFIG_PATA_PLATFORM=m
##
## file: drivers/i2c/Kconfig
##
CONFIG_I2C=m
##
## file: drivers/i2c/busses/Kconfig
##
# CONFIG_I2C_ISCH is not set
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_SIMTEC is not set
CONFIG_I2C_VERSATILE=m
##
## file: drivers/input/serio/Kconfig
##
CONFIG_SERIO_AMBAKMI=y
##
## file: drivers/mmc/Kconfig
##
CONFIG_MMC=y
##
## file: drivers/mmc/host/Kconfig
##
CONFIG_MMC_ARMMMCI=y
##
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=m
CONFIG_MTD_CMDLINE_PARTS=m
CONFIG_MTD_BLOCK=m
##
## file: drivers/mtd/chips/Kconfig
##
CONFIG_MTD_CFI=m
CONFIG_MTD_CFI_INTELEXT=m
CONFIG_MTD_CFI_AMDSTD=m
##
## file: drivers/mtd/maps/Kconfig
##
CONFIG_MTD_PHYSMAP=m
##
## file: drivers/net/ethernet/smsc/Kconfig
##
CONFIG_SMSC911X=m
##
## file: drivers/rtc/Kconfig
##
CONFIG_RTC_DRV_PL031=y
##
## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
##
## file: drivers/usb/Kconfig
##
CONFIG_USB=m
##
## file: drivers/usb/host/Kconfig
##
CONFIG_USB_ISP1760_HCD=m
##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
CONFIG_FB_ARMCLCD=y
##
## file: drivers/video/console/Kconfig
##
CONFIG_FRAMEBUFFER_CONSOLE=y
##
## file: sound/arm/Kconfig
##
CONFIG_SND_ARMAACI=m

View File

@ -2,9 +2,6 @@
flavours:
armmp
armmp-lpae
mx5
omap
vexpress
kernel-arch: arm
[image]
@ -32,27 +29,3 @@ configs:
armhf/config.armmp
armhf/config.lpae
[mx5_build]
image-file: arch/arm/boot/zImage
[mx5_description]
hardware: Freescale i.MX51/53
hardware-long: Freescale i.MX51 or i.MX53 based systems
[omap_build]
image-file: arch/arm/boot/zImage
[omap_description]
hardware: TI OMAP3+
hardware-long: Texas Instruments OMAP3 or OMAP4 based systems
[omap_image]
recommends: uboot-mkimage
[vexpress_build]
image-file: arch/arm/boot/zImage
[vexpress_description]
hardware: ARM Ltd. Versatile Express
hardware-long: ARM Ltd. Versatile Express family of processors

View File

@ -1,4 +1,2 @@
# arch version flavour installedname suffix build-depends
armhf - armmp - y -
armhf - mx5 - y -
armhf - vexpress - y -

View File

@ -1 +0,0 @@
libata

View File

@ -1 +0,0 @@
#include <btrfs-modules>

View File

@ -1 +0,0 @@
#include <core-modules>

View File

@ -1 +0,0 @@
#include <crc-modules>

View File

@ -1 +0,0 @@
#include <crypto-dm-modules>

View File

@ -1 +0,0 @@
#include <crypto-modules>

View File

@ -1 +0,0 @@
#include <ext4-modules>

View File

@ -1 +0,0 @@
#include <fat-modules>

View File

@ -1 +0,0 @@
#include <fuse-modules>

View File

@ -1,4 +0,0 @@
#include <input-modules>
usbhid -
usbmouse -
usbkbd -

View File

@ -1 +0,0 @@
#include <isofs-modules>

View File

@ -1 +0,0 @@
#include <jfs-modules>

View File

@ -1 +0,0 @@
# empty

View File

@ -1 +0,0 @@
#include <loop-modules>

View File

@ -1 +0,0 @@
#include <md-modules>

View File

@ -1 +0,0 @@
#include <minix-modules>

View File

@ -1,2 +0,0 @@
#include <mmc-modules>
sdhci-esdhc-imx

View File

@ -1,4 +0,0 @@
#include <mtd-modules>
# SPI NOR flash for Efika
m25p80

View File

@ -1 +0,0 @@
#include <multipath-modules>

View File

@ -1 +0,0 @@
#include <nbd-modules>

View File

@ -1 +0,0 @@
#include <nic-shared-modules>

View File

@ -1 +0,0 @@
#include <nic-usb-modules>

View File

@ -1 +0,0 @@
#include <nic-wireless-modules>

View File

@ -1 +0,0 @@
pata_imx

View File

@ -1 +0,0 @@
ahci_platform

View File

@ -1,3 +0,0 @@
#include <scsi-core-modules>
scsi_mod -
sd_mod -

View File

@ -1 +0,0 @@
#include <squashfs-modules>

View File

@ -1 +0,0 @@
#include <udf-modules>

View File

@ -1 +0,0 @@
#include <uinput-modules>

View File

@ -1,2 +0,0 @@
#include <usb-storage-modules>
usb-storage -

View File

@ -1 +0,0 @@
#include <btrfs-modules>

View File

@ -1 +0,0 @@
#include <core-modules>

View File

@ -1 +0,0 @@
#include <crc-modules>

View File

@ -1 +0,0 @@
#include <crypto-dm-modules>

View File

@ -1 +0,0 @@
#include <crypto-modules>

View File

@ -1 +0,0 @@
#include <ext4-modules>

View File

@ -1 +0,0 @@
#include <fat-modules>

View File

@ -1 +0,0 @@
#include <fuse-modules>

View File

@ -1,4 +0,0 @@
#include <input-modules>
usbhid -
usbmouse -
usbkbd -

View File

@ -1 +0,0 @@
#include <isofs-modules>

View File

@ -1 +0,0 @@
#include <jfs-modules>

View File

@ -1 +0,0 @@
# empty

View File

@ -1 +0,0 @@
#include <loop-modules>

View File

@ -1 +0,0 @@
#include <md-modules>

View File

@ -1,2 +0,0 @@
#include <mmc-modules>
tifm_sd -

View File

@ -1 +0,0 @@
#include <multipath-modules>

View File

@ -1 +0,0 @@
#include <nbd-modules>

View File

@ -1 +0,0 @@
smsc911x

View File

@ -1 +0,0 @@
#include <nic-shared-modules>

View File

@ -1 +0,0 @@
#include <nic-usb-modules>

View File

@ -1 +0,0 @@
#include <nic-wireless-modules>

View File

@ -1,3 +0,0 @@
#include <scsi-core-modules>
scsi_mod -
sd_mod -

View File

@ -1 +0,0 @@
#include <squashfs-modules>

View File

@ -1 +0,0 @@
#include <udf-modules>

View File

@ -1 +0,0 @@
#include <uinput-modules>

View File

@ -1 +0,0 @@
#include <usb-modules>

View File

@ -1,2 +0,0 @@
#include <usb-storage-modules>
usb-storage -

View File

@ -4,8 +4,6 @@
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
Package: kernel-image
Provides_mx5: rtc-modules
Provides_vexpress: rtc-modules
Package: pata-modules
Priority: extra