diff --git a/debian/changelog b/debian/changelog index e8ffa2ff6..8e15427d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 13 Sep 2013 04:37:21 +0100 diff --git a/debian/config/armhf/config.mx5 b/debian/config/armhf/config.mx5 deleted file mode 100644 index 88849c033..000000000 --- a/debian/config/armhf/config.mx5 +++ /dev/null @@ -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 - diff --git a/debian/config/armhf/config.omap b/debian/config/armhf/config.omap deleted file mode 100644 index f69f15c59..000000000 --- a/debian/config/armhf/config.omap +++ /dev/null @@ -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 - diff --git a/debian/config/armhf/config.vexpress b/debian/config/armhf/config.vexpress deleted file mode 100644 index 5309421f2..000000000 --- a/debian/config/armhf/config.vexpress +++ /dev/null @@ -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 - diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines index 5405c1656..989613f0c 100644 --- a/debian/config/armhf/defines +++ b/debian/config/armhf/defines @@ -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 - diff --git a/debian/installer/armhf/kernel-versions b/debian/installer/armhf/kernel-versions index 55b5ade21..83716a364 100644 --- a/debian/installer/armhf/kernel-versions +++ b/debian/installer/armhf/kernel-versions @@ -1,4 +1,2 @@ # arch version flavour installedname suffix build-depends armhf - armmp - y - -armhf - mx5 - y - -armhf - vexpress - y - diff --git a/debian/installer/armhf/modules/armhf-mx5/ata-modules b/debian/installer/armhf/modules/armhf-mx5/ata-modules deleted file mode 100644 index 04d9c8841..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/ata-modules +++ /dev/null @@ -1 +0,0 @@ -libata diff --git a/debian/installer/armhf/modules/armhf-mx5/btrfs-modules b/debian/installer/armhf/modules/armhf-mx5/btrfs-modules deleted file mode 100644 index e261e1388..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/btrfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/core-modules b/debian/installer/armhf/modules/armhf-mx5/core-modules deleted file mode 100644 index f05d06298..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/core-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/crc-modules b/debian/installer/armhf/modules/armhf-mx5/crc-modules deleted file mode 100644 index 7e00de705..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/crc-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/crypto-dm-modules b/debian/installer/armhf/modules/armhf-mx5/crypto-dm-modules deleted file mode 100644 index 4c8f2354c..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/crypto-dm-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/crypto-modules b/debian/installer/armhf/modules/armhf-mx5/crypto-modules deleted file mode 100644 index 3a1e862b4..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/crypto-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/ext4-modules b/debian/installer/armhf/modules/armhf-mx5/ext4-modules deleted file mode 100644 index 394c577ce..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/ext4-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/fat-modules b/debian/installer/armhf/modules/armhf-mx5/fat-modules deleted file mode 100644 index 274584eb6..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/fat-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/fuse-modules b/debian/installer/armhf/modules/armhf-mx5/fuse-modules deleted file mode 100644 index 0b6ba0c8c..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/fuse-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/input-modules b/debian/installer/armhf/modules/armhf-mx5/input-modules deleted file mode 100644 index 1a248663b..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/input-modules +++ /dev/null @@ -1,4 +0,0 @@ -#include -usbhid - -usbmouse - -usbkbd - diff --git a/debian/installer/armhf/modules/armhf-mx5/isofs-modules b/debian/installer/armhf/modules/armhf-mx5/isofs-modules deleted file mode 100644 index da4fa9a3c..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/isofs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/jfs-modules b/debian/installer/armhf/modules/armhf-mx5/jfs-modules deleted file mode 100644 index 7e4d912b9..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/jfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/kernel-image b/debian/installer/armhf/modules/armhf-mx5/kernel-image deleted file mode 100644 index 1bb8bf6d7..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/kernel-image +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/debian/installer/armhf/modules/armhf-mx5/loop-modules b/debian/installer/armhf/modules/armhf-mx5/loop-modules deleted file mode 100644 index c1c948fa3..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/loop-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/md-modules b/debian/installer/armhf/modules/armhf-mx5/md-modules deleted file mode 100644 index 26115e10b..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/md-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/minix-modules b/debian/installer/armhf/modules/armhf-mx5/minix-modules deleted file mode 100644 index 82b984372..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/minix-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/mmc-modules b/debian/installer/armhf/modules/armhf-mx5/mmc-modules deleted file mode 100644 index 5f0b5d75a..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/mmc-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include -sdhci-esdhc-imx diff --git a/debian/installer/armhf/modules/armhf-mx5/mtd-modules b/debian/installer/armhf/modules/armhf-mx5/mtd-modules deleted file mode 100644 index 86c5fe288..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/mtd-modules +++ /dev/null @@ -1,4 +0,0 @@ -#include - -# SPI NOR flash for Efika -m25p80 diff --git a/debian/installer/armhf/modules/armhf-mx5/multipath-modules b/debian/installer/armhf/modules/armhf-mx5/multipath-modules deleted file mode 100644 index a8b69b253..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/multipath-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/nbd-modules b/debian/installer/armhf/modules/armhf-mx5/nbd-modules deleted file mode 100644 index 3c9b3e5d4..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/nbd-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules b/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules deleted file mode 100644 index cc84b14dc..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/nic-shared-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/nic-usb-modules b/debian/installer/armhf/modules/armhf-mx5/nic-usb-modules deleted file mode 100644 index c479669b4..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/nic-usb-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/nic-wireless-modules b/debian/installer/armhf/modules/armhf-mx5/nic-wireless-modules deleted file mode 100644 index 53fd18d7f..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/nic-wireless-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/pata-modules b/debian/installer/armhf/modules/armhf-mx5/pata-modules deleted file mode 100644 index 2ff7276d4..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/pata-modules +++ /dev/null @@ -1 +0,0 @@ -pata_imx diff --git a/debian/installer/armhf/modules/armhf-mx5/sata-modules b/debian/installer/armhf/modules/armhf-mx5/sata-modules deleted file mode 100644 index a2ff9d078..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/sata-modules +++ /dev/null @@ -1 +0,0 @@ -ahci_platform diff --git a/debian/installer/armhf/modules/armhf-mx5/scsi-core-modules b/debian/installer/armhf/modules/armhf-mx5/scsi-core-modules deleted file mode 100644 index 4cdf2474d..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/scsi-core-modules +++ /dev/null @@ -1,3 +0,0 @@ -#include -scsi_mod - -sd_mod - diff --git a/debian/installer/armhf/modules/armhf-mx5/squashfs-modules b/debian/installer/armhf/modules/armhf-mx5/squashfs-modules deleted file mode 100644 index 42d77887a..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/squashfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/udf-modules b/debian/installer/armhf/modules/armhf-mx5/udf-modules deleted file mode 100644 index b90d7ee9b..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/udf-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/uinput-modules b/debian/installer/armhf/modules/armhf-mx5/uinput-modules deleted file mode 100644 index 58a833779..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/uinput-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-mx5/usb-storage-modules b/debian/installer/armhf/modules/armhf-mx5/usb-storage-modules deleted file mode 100644 index 6938b5cf1..000000000 --- a/debian/installer/armhf/modules/armhf-mx5/usb-storage-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include -usb-storage - diff --git a/debian/installer/armhf/modules/armhf-vexpress/btrfs-modules b/debian/installer/armhf/modules/armhf-vexpress/btrfs-modules deleted file mode 100644 index e261e1388..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/btrfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/core-modules b/debian/installer/armhf/modules/armhf-vexpress/core-modules deleted file mode 100644 index f05d06298..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/core-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/crc-modules b/debian/installer/armhf/modules/armhf-vexpress/crc-modules deleted file mode 100644 index 7e00de705..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/crc-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/crypto-dm-modules b/debian/installer/armhf/modules/armhf-vexpress/crypto-dm-modules deleted file mode 100644 index 4c8f2354c..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/crypto-dm-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/crypto-modules b/debian/installer/armhf/modules/armhf-vexpress/crypto-modules deleted file mode 100644 index 3a1e862b4..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/crypto-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/ext4-modules b/debian/installer/armhf/modules/armhf-vexpress/ext4-modules deleted file mode 100644 index 394c577ce..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/ext4-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/fat-modules b/debian/installer/armhf/modules/armhf-vexpress/fat-modules deleted file mode 100644 index 274584eb6..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/fat-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/fuse-modules b/debian/installer/armhf/modules/armhf-vexpress/fuse-modules deleted file mode 100644 index 0b6ba0c8c..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/fuse-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/input-modules b/debian/installer/armhf/modules/armhf-vexpress/input-modules deleted file mode 100644 index 1a248663b..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/input-modules +++ /dev/null @@ -1,4 +0,0 @@ -#include -usbhid - -usbmouse - -usbkbd - diff --git a/debian/installer/armhf/modules/armhf-vexpress/isofs-modules b/debian/installer/armhf/modules/armhf-vexpress/isofs-modules deleted file mode 100644 index da4fa9a3c..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/isofs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/jfs-modules b/debian/installer/armhf/modules/armhf-vexpress/jfs-modules deleted file mode 100644 index 7e4d912b9..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/jfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/kernel-image b/debian/installer/armhf/modules/armhf-vexpress/kernel-image deleted file mode 100644 index 1bb8bf6d7..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/kernel-image +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/debian/installer/armhf/modules/armhf-vexpress/loop-modules b/debian/installer/armhf/modules/armhf-vexpress/loop-modules deleted file mode 100644 index c1c948fa3..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/loop-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/md-modules b/debian/installer/armhf/modules/armhf-vexpress/md-modules deleted file mode 100644 index 26115e10b..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/md-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/mmc-modules b/debian/installer/armhf/modules/armhf-vexpress/mmc-modules deleted file mode 100644 index 0349f6c9c..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/mmc-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include -tifm_sd - diff --git a/debian/installer/armhf/modules/armhf-vexpress/multipath-modules b/debian/installer/armhf/modules/armhf-vexpress/multipath-modules deleted file mode 100644 index a8b69b253..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/multipath-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/nbd-modules b/debian/installer/armhf/modules/armhf-vexpress/nbd-modules deleted file mode 100644 index 3c9b3e5d4..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/nbd-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/nic-modules b/debian/installer/armhf/modules/armhf-vexpress/nic-modules deleted file mode 100644 index d62600c75..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/nic-modules +++ /dev/null @@ -1 +0,0 @@ -smsc911x diff --git a/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules b/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules deleted file mode 100644 index cc84b14dc..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/nic-shared-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/nic-usb-modules b/debian/installer/armhf/modules/armhf-vexpress/nic-usb-modules deleted file mode 100644 index c479669b4..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/nic-usb-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/nic-wireless-modules b/debian/installer/armhf/modules/armhf-vexpress/nic-wireless-modules deleted file mode 100644 index 53fd18d7f..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/nic-wireless-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/scsi-core-modules b/debian/installer/armhf/modules/armhf-vexpress/scsi-core-modules deleted file mode 100644 index 4cdf2474d..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/scsi-core-modules +++ /dev/null @@ -1,3 +0,0 @@ -#include -scsi_mod - -sd_mod - diff --git a/debian/installer/armhf/modules/armhf-vexpress/squashfs-modules b/debian/installer/armhf/modules/armhf-vexpress/squashfs-modules deleted file mode 100644 index 42d77887a..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/squashfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/udf-modules b/debian/installer/armhf/modules/armhf-vexpress/udf-modules deleted file mode 100644 index b90d7ee9b..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/udf-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/uinput-modules b/debian/installer/armhf/modules/armhf-vexpress/uinput-modules deleted file mode 100644 index 58a833779..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/uinput-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/usb-modules b/debian/installer/armhf/modules/armhf-vexpress/usb-modules deleted file mode 100644 index c598dedd8..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/usb-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/armhf/modules/armhf-vexpress/usb-storage-modules b/debian/installer/armhf/modules/armhf-vexpress/usb-storage-modules deleted file mode 100644 index 6938b5cf1..000000000 --- a/debian/installer/armhf/modules/armhf-vexpress/usb-storage-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include -usb-storage - diff --git a/debian/installer/armhf/package-list b/debian/installer/armhf/package-list index 2115761bb..d0fd3855f 100644 --- a/debian/installer/armhf/package-list +++ b/debian/installer/armhf/package-list @@ -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