diff --git a/debian/changelog b/debian/changelog index 65840fd99..320e1390e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ linux (3.16.1-1) UNRELEASED; urgency=medium (Closes: #725703) * [x86] mgag200: Enable auto-loading, but require mode-setting to be explicitly enabled (as xserver-xorg-video-modesetting does) + * [armel] Remove obsolete mv78xx0 flavour [ Vagrant Cascadian ] * [armmp] Enable IMX_IPUV3_CORE (closes: #756810). diff --git a/debian/config/armel/config.mv78xx0 b/debian/config/armel/config.mv78xx0 deleted file mode 100644 index 130c5bbe6..000000000 --- a/debian/config/armel/config.mv78xx0 +++ /dev/null @@ -1,544 +0,0 @@ -## -## file: arch/arm/Kconfig -## -CONFIG_MMU=y -## choice: ARM system type -CONFIG_ARCH_MV78XX0=y -## end choice -CONFIG_PCI=y -CONFIG_HIGHMEM=y -CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="" -# CONFIG_XIP_KERNEL is not set -CONFIG_ATAGS_PROC=y -CONFIG_FPE_NWFPE=y -# CONFIG_FPE_NWFPE_XP is not set -# CONFIG_FPE_FASTFPE is not set -CONFIG_VFP=y -# CONFIG_ARTHUR is not set - -## -## file: arch/arm/mach-imx/Kconfig -## -# CONFIG_ARCH_MXC is not set - -## -## file: arch/arm/mach-mv78xx0/Kconfig -## -CONFIG_MACH_DB78X00_BP=y -CONFIG_MACH_RD78X00_MASA=y -CONFIG_MACH_TERASTATION_WXL=y - -## -## file: arch/arm/mm/Kconfig -## -CONFIG_CPU_FEROCEON_OLD_ID=y -CONFIG_ARM_THUMB=y -# CONFIG_CPU_ICACHE_DISABLE is not set -# CONFIG_CPU_DCACHE_DISABLE is not set -# CONFIG_CPU_DCACHE_WRITETHROUGH is not set - -## -## file: block/partitions/Kconfig -## -CONFIG_ACORN_PARTITION=y -# CONFIG_ACORN_PARTITION_CUMANA is not set -# CONFIG_ACORN_PARTITION_EESOX is not set -CONFIG_ACORN_PARTITION_ICS=y -# CONFIG_ACORN_PARTITION_ADFS is not set -# CONFIG_ACORN_PARTITION_POWERTEC is not set -CONFIG_ACORN_PARTITION_RISCIX=y -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y -CONFIG_ATARI_PARTITION=y -CONFIG_MAC_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -CONFIG_SGI_PARTITION=y -CONFIG_ULTRIX_PARTITION=y -CONFIG_SUN_PARTITION=y - -## -## file: drivers/ata/Kconfig -## -CONFIG_ATA=m -# CONFIG_SATA_AHCI is not set -# CONFIG_SATA_SIL24 is not set -CONFIG_ATA_SFF=y -# CONFIG_PDC_ADMA is not set -# CONFIG_SATA_QSTOR is not set -# CONFIG_SATA_SX4 is not set -# CONFIG_ATA_PIIX is not set -CONFIG_SATA_MV=m -# CONFIG_SATA_NV is not set -# CONFIG_SATA_PROMISE is not set -# CONFIG_SATA_SIL is not set -# CONFIG_SATA_SIS is not set -# CONFIG_SATA_SVW is not set -# CONFIG_SATA_ULI is not set -# CONFIG_SATA_VIA is not set -# CONFIG_SATA_VITESSE is not set -# CONFIG_PATA_ALI is not set -# CONFIG_PATA_AMD is not set -# CONFIG_PATA_ARTOP is not set -# CONFIG_PATA_ATIIXP is not set -# CONFIG_PATA_CMD64X is not set -# CONFIG_PATA_CS5520 is not set -# CONFIG_PATA_CS5530 is not set -# CONFIG_PATA_CYPRESS is not set -# CONFIG_PATA_EFAR is not set -# CONFIG_PATA_HPT366 is not set -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set -# CONFIG_PATA_HPT3X3 is not set -# CONFIG_PATA_IT8213 is not set -# CONFIG_PATA_IT821X is not set -# CONFIG_PATA_JMICRON is not set -# CONFIG_PATA_MARVELL is not set -# CONFIG_PATA_NETCELL is not set -# CONFIG_PATA_NINJA32 is not set -# CONFIG_PATA_NS87415 is not set -# CONFIG_PATA_OLDPIIX is not set -# CONFIG_PATA_OPTIDMA is not set -# CONFIG_PATA_PDC2027X is not set -# CONFIG_PATA_PDC_OLD is not set -# CONFIG_PATA_RADISYS is not set -# CONFIG_PATA_SC1200 is not set -# CONFIG_PATA_SCH is not set -# CONFIG_PATA_SERVERWORKS is not set -# CONFIG_PATA_SIL680 is not set -# CONFIG_PATA_SIS is not set -# CONFIG_PATA_TRIFLEX is not set -# CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set -# CONFIG_PATA_CMD640_PCI is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_NS87410 is not set -# CONFIG_PATA_OPTI is not set -# CONFIG_PATA_RZ1000 is not set -# CONFIG_ATA_GENERIC is not set - -## -## file: drivers/bluetooth/Kconfig -## -# CONFIG_BT_HCIUART is not set -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIVHCI=m - -## -## file: drivers/crypto/Kconfig -## -CONFIG_CRYPTO_DEV_MV_CESA=m - -## -## file: drivers/dma/Kconfig -## -CONFIG_DMADEVICES=y -CONFIG_MV_XOR=y -# CONFIG_NET_DMA is not set - -## -## file: drivers/gpio/Kconfig -## -CONFIG_GPIO_SYSFS=y - -## -## file: drivers/gpu/drm/Kconfig -## -# CONFIG_DRM is not set - -## -## file: drivers/hwmon/Kconfig -## -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_GPIO_FAN=m -CONFIG_SENSORS_LM75=m - -## -## file: drivers/i2c/Kconfig -## -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y - -## -## file: drivers/i2c/busses/Kconfig -## -CONFIG_I2C_MV64XXX=y - -## -## file: drivers/input/gameport/Kconfig -## -CONFIG_GAMEPORT=m - -## -## file: drivers/input/joystick/Kconfig -## -CONFIG_INPUT_JOYSTICK=y - -## -## file: drivers/input/keyboard/Kconfig -## -CONFIG_KEYBOARD_GPIO=m - -## -## file: drivers/input/touchscreen/Kconfig -## -CONFIG_INPUT_TOUCHSCREEN=y - -## -## file: drivers/isdn/Kconfig -## -CONFIG_ISDN=y -CONFIG_ISDN_CAPI=m - -## -## file: drivers/isdn/capi/Kconfig -## -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPIDRV=m - -## -## file: drivers/isdn/hardware/avm/Kconfig -## -CONFIG_CAPI_AVM=y -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_AVMB1_C4=m - -## -## file: drivers/isdn/hardware/eicon/Kconfig -## -CONFIG_CAPI_EICON=y -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m - -## -## file: drivers/leds/Kconfig -## -CONFIG_LEDS_GPIO=y - -## -## file: drivers/leds/trigger/Kconfig -## -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y - -## -## file: drivers/mtd/Kconfig -## -CONFIG_MTD=y -# CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_CMDLINE_PARTS=y -# CONFIG_MTD_AFS_PARTS is not set -CONFIG_MTD_BLOCK=y -CONFIG_FTL=m -CONFIG_NFTL=m -# CONFIG_NFTL_RW is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -# CONFIG_MTD_OOPS is not set - -## -## file: drivers/mtd/chips/Kconfig -## -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_ADV_OPTIONS=y -## choice: Flash cmd/query data swapping -CONFIG_MTD_CFI_NOSWAP=y -# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set -# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set -## end choice -CONFIG_MTD_CFI_GEOMETRY=y -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -CONFIG_MTD_CFI_I4=y -# CONFIG_MTD_CFI_I8 is not set -# CONFIG_MTD_OTP is not set -#. Needed e.g. on QNAP devices -CONFIG_MTD_CFI_INTELEXT=y -#. Needed e.g. on the D-Link DNS-323 -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_CFI_STAA=m -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set - -## -## file: drivers/mtd/devices/Kconfig -## -# CONFIG_MTD_PMC551 is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLOCK2MTD is not set - -## -## file: drivers/mtd/maps/Kconfig -## -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_IMPA7 is not set -# CONFIG_MTD_INTEL_VR_NOR is not set -# CONFIG_MTD_PLATRAM is not set - -## -## file: drivers/mtd/nand/Kconfig -## -CONFIG_MTD_NAND=y -# CONFIG_MTD_NAND_DISKONCHIP is not set -# CONFIG_MTD_NAND_CAFE is not set -CONFIG_MTD_NAND_ORION=y - -## -## file: drivers/mtd/onenand/Kconfig -## -# CONFIG_MTD_ONENAND is not set - -## -## file: drivers/net/arcnet/Kconfig -## -# CONFIG_ARCNET is not set - -## -## file: drivers/net/ethernet/atheros/Kconfig -## -# CONFIG_ATL1 is not set - -## -## file: drivers/net/ethernet/broadcom/Kconfig -## -# CONFIG_BNX2 is not set -# CONFIG_TIGON3 is not set -# CONFIG_BNX2X is not set - -## -## file: drivers/net/ethernet/dlink/Kconfig -## -# CONFIG_DL2K is not set - -## -## file: drivers/net/ethernet/icplus/Kconfig -## -# CONFIG_IP1000 is not set - -## -## file: drivers/net/ethernet/intel/Kconfig -## -# CONFIG_E1000 is not set -# CONFIG_E1000E is not set -# CONFIG_IGB is not set - -## -## file: drivers/net/ethernet/marvell/Kconfig -## -CONFIG_MV643XX_ETH=m -# CONFIG_SKGE is not set -# CONFIG_SKY2 is not set - -## -## file: drivers/net/ethernet/natsemi/Kconfig -## -# CONFIG_NS83820 is not set - -## -## file: drivers/net/ethernet/packetengines/Kconfig -## -# CONFIG_HAMACHI is not set -# CONFIG_YELLOWFIN is not set - -## -## file: drivers/net/ethernet/qlogic/Kconfig -## -# CONFIG_QLA3XXX is not set - -## -## file: drivers/net/ethernet/realtek/Kconfig -## -# CONFIG_R8169 is not set - -## -## file: drivers/net/ethernet/sis/Kconfig -## -# CONFIG_SIS190 is not set - -## -## file: drivers/net/ethernet/via/Kconfig -## -# CONFIG_VIA_VELOCITY is not set - -## -## file: drivers/pcmcia/Kconfig -## -# CONFIG_PCCARD is not set - -## -## file: drivers/rtc/Kconfig -## -CONFIG_RTC_DRV_DS1307=y -CONFIG_RTC_DRV_RS5C372=y -CONFIG_RTC_DRV_PCF8563=y -CONFIG_RTC_DRV_M41T80=y -CONFIG_RTC_DRV_S35390A=y - -## -## file: drivers/scsi/Kconfig -## -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_AACRAID is not set -# CONFIG_SCSI_DPT_I2O is not set -# CONFIG_SCSI_ARCMSR is not set -# CONFIG_SCSI_HPTIOP is not set -# CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_FUTURE_DOMAIN is not set -# CONFIG_SCSI_IPS is not set -# CONFIG_SCSI_INITIO is not set -# CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_STEX is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_LPFC is not set -# CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_DC390T is not set -# CONFIG_SCSI_NSP32 is not set - -## -## file: drivers/scsi/aic7xxx/Kconfig.aic79xx -## -# CONFIG_SCSI_AIC79XX is not set - -## -## file: drivers/scsi/aic7xxx/Kconfig.aic7xxx -## -# CONFIG_SCSI_AIC7XXX is not set - -## -## file: drivers/scsi/aic94xx/Kconfig -## -# CONFIG_SCSI_AIC94XX is not set - -## -## file: drivers/scsi/megaraid/Kconfig.megaraid -## -# CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_LEGACY is not set -# CONFIG_MEGARAID_SAS is not set - -## -## file: drivers/scsi/mvsas/Kconfig -## -# CONFIG_SCSI_MVSAS is not set - -## -## file: drivers/scsi/qla2xxx/Kconfig -## -# CONFIG_SCSI_QLA_FC is not set - -## -## file: drivers/scsi/qla4xxx/Kconfig -## -# CONFIG_SCSI_QLA_ISCSI is not set - -## -## file: drivers/ssb/Kconfig -## -# CONFIG_SSB is not set - -## -## file: drivers/tty/serial/8250/Kconfig -## -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -# CONFIG_SERIAL_8250_EXTENDED is not set - -## -## file: drivers/usb/Kconfig -## -CONFIG_USB_SUPPORT=y -CONFIG_USB=m - -## -## file: drivers/usb/atm/Kconfig -## -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m - -## -## file: drivers/usb/host/Kconfig -## -CONFIG_USB_EHCI_HCD=m -# CONFIG_USB_ISP116X_HCD is not set -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_UHCI_HCD=m -CONFIG_USB_SL811_HCD=m - -## -## file: drivers/video/console/Kconfig -## -# CONFIG_VGA_CONSOLE is not set - -## -## file: drivers/video/fbdev/Kconfig -## -CONFIG_FB=m - -## -## file: drivers/virtio/Kconfig -## -# CONFIG_VIRTIO_PCI is not set -# CONFIG_VIRTIO_BALLOON is not set - -## -## file: drivers/watchdog/Kconfig -## -CONFIG_ORION_WATCHDOG=m - -## -## file: mm/Kconfig -## -## choice: Memory model -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -## end choice - -## -## file: net/atm/Kconfig -## -CONFIG_ATM=m - -## -## file: net/ax25/Kconfig -## -CONFIG_HAMRADIO=y -CONFIG_AX25=m -# CONFIG_AX25_DAMA_SLAVE is not set -CONFIG_NETROM=m -CONFIG_ROSE=m - diff --git a/debian/config/armel/defines b/debian/config/armel/defines index c4e701b85..1624ae5b0 100644 --- a/debian/config/armel/defines +++ b/debian/config/armel/defines @@ -2,7 +2,6 @@ flavours: ixp4xx kirkwood - mv78xx0 orion5x versatile kernel-arch: arm @@ -41,10 +40,6 @@ recommends: uboot-mkimage # QNAP TS-119/TS-219: 2097152 - 8 - 64 = 2097080 check-size: 2097080 -[mv78xx0_description] -hardware: Marvell 78xx0 -hardware-long: Marvell DB-78xx0-BP Development Board - [orion5x_description] hardware: Marvell Orion hardware-long: Marvell Orion 5181, 5182 and 5281 based systems (QNAP TS-109/TS-209, etc)