linux: please review and merge m68k patch
Source: linux
Tags: patch
Dear Linux Kernel maintainers,
I would kindly like to request a review and merge of the patch
for updating the m68k kernel configs.
As I wrote in <[🔎] Pine.BSM.4.64L.1307201716460.31890@herc.mirbsd.org>
and other messages in the thread, we’ve been having a problem
with post-3.2 versions being too large to boot, so I did a few
things:
• switch to using initrd, by waldi’s suggestion
• merge all kernel flavours into one, to keep maintenance
effort and buildd times low (we can probably build it
in a day instead of a wekk (!) now)
• update the m68k part of the config
• disable a few things, some with the option to enable
them later (e.g. USB support, once the hw drivers for
that entered mainline and are stable enough)
• made basically everything except
– video and keyboard
– stuff that is bool instead of tristate (e.g. two SCSI drivers)
– stuff on which those depend
into modules
• bring us to gcc-4.8 while here
Even if this may have some minor issues still, it’ll be better
than building kernel images that fail to boot at all, that’s why
I’m having relatively low issues with it entering sid with not
a lot of testing. I’ll update this bugreport with testing feedback
of course, but review can already be done.
Sizes, for comparison:
text data bss dec hex filename
3618327 163392 283392 4065111 3e0757 x-vmlinuz-3.2.0-4-atari
4092152 221024 296100 4609276 4654fc x-vmlinuz-3.8-1-amiga
2685136 216788 157132 3059056 2ead70 linux-3.10.1/debian/build/build_m68k_none_m68k/vmlinux
An initrd weighs in about 3.9 MB in my first test ("most" modules).
I’ve used this changelog entry:
linux (3.10.1-1+m68k.2) unreleased; urgency=low
* Update m68k configs:
- disable some functionality due to size constraints
- switch to using initrd
- drop all flavours; build a generic image that runs on
multiple subarchitectores (old Amiga, Atari, Macintosh tested;
old BVME6000, MVME147, MVME16x, new Apollo, Q40/Q60 untested)
- use gcc-4.8
-- Thorsten Glaser <tg@mirbsd.de> Tue, 23 Jul 2013 19:45:03 +0000
I’ve attached a debdiff sans generated and d-ports specific changes.
Thanks in advance,
//mirabilos
--
18:47⎜<mirabilos:#!/bin/mksh> well channels… you see, I see everything in the
same window anyway 18:48⎜<xpt:#!/bin/mksh> i know, you have some kind of
telnet with automatic pong 18:48⎜<mirabilos:#!/bin/mksh> haha, yes :D
18:49⎜<mirabilos:#!/bin/mksh> though that's more tinyirc – sirc is more comfydiff -Nru linux-3.10.1/debian/config/defines linux-3.10.1/debian/config/defines
--- linux-3.10.1/debian/config/defines 2013-07-15 02:19:47.000000000 +0000
+++ linux-3.10.1/debian/config/defines 2013-07-23 14:56:20.000000000 +0000
@@ -45,6 +45,7 @@
gcc-4.4: gcc-4.4
gcc-4.6: gcc-4.6
gcc-4.7: gcc-4.7
+gcc-4.8: gcc-4.8
# initramfs-generators
initramfs-fallback: linux-initramfs-tool
diff -Nru linux-3.10.1/debian/config/m68k/config linux-3.10.1/debian/config/m68k/config
--- linux-3.10.1/debian/config/m68k/config 2013-05-04 02:44:45.000000000 +0000
+++ linux-3.10.1/debian/config/m68k/config 2013-07-23 19:43:47.000000000 +0000
@@ -1,34 +1,140 @@
##
+## file: arch/m68k/Kconfig.bus
+##
+CONFIG_ZORRO=y
+CONFIG_AMIGA_PCMCIA=y
+CONFIG_ATARI_ROM_ISA=y
+
+##
## file: arch/m68k/Kconfig.cpu
##
+CONFIG_M68020=y
+CONFIG_M68030=y
+CONFIG_M68040=y
+CONFIG_M68060=y
+# CONFIG_M68KFPU_EMU is not set
# CONFIG_ADVANCED is not set
##
## file: arch/m68k/Kconfig.devices
##
+CONFIG_HEARTBEAT=y
CONFIG_PROC_HARDWARE=y
+CONFIG_NATFEAT=y
+CONFIG_NFBLOCK=m
+CONFIG_NFCON=y
+CONFIG_NFETH=m
+CONFIG_ATARI_ETHERNAT=y
+CONFIG_ATARI_ETHERNEC=y
+CONFIG_ATARI_DSP56K=m
+CONFIG_AMIGA_BUILTIN_SERIAL=y
+CONFIG_SERIAL_CONSOLE=y
+
+##
+## file: arch/m68k/Kconfig.machine
+##
+CONFIG_AMIGA=y
+CONFIG_ATARI=y
+CONFIG_MAC=y
+CONFIG_APOLLO=y
+CONFIG_VME=y
+CONFIG_MVME147=y
+CONFIG_MVME16x=y
+CONFIG_BVME6000=y
+# CONFIG_HP300 is not set
+# CONFIG_SUN3X is not set
+CONFIG_Q40=y
+# CONFIG_SUN3 is not set
+
+##
+## file: block/Kconfig
+##
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+##
+## file: block/Kconfig.iosched
+##
+CONFIG_IOSCHED_DEADLINE=m
+CONFIG_IOSCHED_CFQ=m
##
## file: block/partitions/Kconfig
##
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
CONFIG_MSDOS_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=y
+CONFIG_SUN_PARTITION=y
+CONFIG_SYSV68_PARTITION=y
+# CONFIG_KARMA_PARTITION is not set
+
+##
+## file: drivers/accessibility/Kconfig
+##
+# CONFIG_ACCESSIBILITY is not set
+
+##
+## file: drivers/bcma/Kconfig
+##
+# CONFIG_BCMA is not set
##
## file: drivers/block/Kconfig
##
-CONFIG_BLK_DEV_RAM_SIZE=4096
-# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_BLK_DEV_FD=m
+CONFIG_AMIGA_FLOPPY=m
+CONFIG_ATARI_FLOPPY=m
+CONFIG_BLK_DEV_SWIM=m
+CONFIG_AMIGA_Z2RAM=y
+# CONFIG_PARIDE is not set
+CONFIG_CDROM_PKTCDVD=m
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_RBD is not set
+
+##
+## file: drivers/block/drbd/Kconfig
+##
+# CONFIG_BLK_DEV_DRBD is not set
+
+##
+## file: drivers/block/mtip32xx/Kconfig
+##
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
##
## file: drivers/char/Kconfig
##
-CONFIG_GEN_RTC_X=y
-# CONFIG_DTLK is not set
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+CONFIG_NVRAM=y
##
-## file: drivers/char/ipmi/Kconfig
+## file: drivers/connector/Kconfig
##
-# CONFIG_IPMI_HANDLER is not set
+CONFIG_CONNECTOR=m
+
+##
+## file: drivers/cpufreq/Kconfig
+##
+# CONFIG_CPU_FREQ is not set
+
+##
+## file: drivers/crypto/Kconfig
+##
+# CONFIG_CRYPTO_HW is not set
+
+##
+## file: drivers/firewire/Kconfig
+##
+# CONFIG_FIREWIRE is not set
##
## file: drivers/gpu/drm/Kconfig
@@ -38,7 +144,7 @@
##
## file: drivers/hwmon/Kconfig
##
-# CONFIG_SENSORS_F71805F is not set
+# CONFIG_HWMON is not set
##
## file: drivers/i2c/Kconfig
@@ -46,6 +152,27 @@
# CONFIG_I2C is not set
##
+## file: drivers/ide/Kconfig
+##
+CONFIG_IDE=m
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECD=m
+CONFIG_BLK_DEV_IDETAPE=m
+CONFIG_IDE_GENERIC=m
+CONFIG_BLK_DEV_PLATFORM=m
+CONFIG_BLK_DEV_GAYLE=m
+CONFIG_BLK_DEV_BUDDHA=m
+CONFIG_BLK_DEV_FALCON_IDE=m
+CONFIG_BLK_DEV_MAC_IDE=m
+CONFIG_BLK_DEV_Q40IDE=m
+
+##
+## file: drivers/iio/Kconfig
+##
+# CONFIG_IIO is not set
+
+##
## file: drivers/infiniband/Kconfig
##
# CONFIG_INFINIBAND is not set
@@ -53,7 +180,7 @@
##
## file: drivers/input/Kconfig
##
-# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_MOUSEDEV=m
##
## file: drivers/input/gameport/Kconfig
@@ -61,23 +188,99 @@
# CONFIG_GAMEPORT is not set
##
+## file: drivers/input/joystick/Kconfig
+##
+CONFIG_INPUT_JOYSTICK=y
+# CONFIG_JOYSTICK_ANALOG is not set
+# CONFIG_JOYSTICK_A3D is not set
+# CONFIG_JOYSTICK_ADI is not set
+# CONFIG_JOYSTICK_COBRA is not set
+# CONFIG_JOYSTICK_GF2K is not set
+# CONFIG_JOYSTICK_GRIP is not set
+# CONFIG_JOYSTICK_GRIP_MP is not set
+# CONFIG_JOYSTICK_GUILLEMOT is not set
+# CONFIG_JOYSTICK_INTERACT is not set
+# CONFIG_JOYSTICK_SIDEWINDER is not set
+# CONFIG_JOYSTICK_TMDC is not set
+# CONFIG_JOYSTICK_IFORCE is not set
+# CONFIG_JOYSTICK_IFORCE_232 is not set
+# CONFIG_JOYSTICK_WARRIOR is not set
+# CONFIG_JOYSTICK_MAGELLAN is not set
+# CONFIG_JOYSTICK_SPACEORB is not set
+# CONFIG_JOYSTICK_SPACEBALL is not set
+# CONFIG_JOYSTICK_STINGER is not set
+# CONFIG_JOYSTICK_TWIDJOY is not set
+# CONFIG_JOYSTICK_ZHENHUA is not set
+CONFIG_JOYSTICK_DB9=m
+# CONFIG_JOYSTICK_GAMECON is not set
+# CONFIG_JOYSTICK_TURBOGRAFX is not set
+CONFIG_JOYSTICK_AMIGA=m
+# CONFIG_JOYSTICK_JOYDUMP is not set
+
+##
## file: drivers/input/keyboard/Kconfig
##
CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+CONFIG_KEYBOARD_AMIGA=y
+CONFIG_KEYBOARD_ATARI=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+
+##
+## file: drivers/input/misc/Kconfig
+##
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_M68K_BEEP=m
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PCF50633_PMU is not set
##
## file: drivers/input/mouse/Kconfig
##
CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_VSXXXAA is not set
+CONFIG_MOUSE_PS2=m
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_CYPRESS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_PS2_OLPC is not set
+CONFIG_MOUSE_SERIAL=m
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+CONFIG_MOUSE_AMIGA=m
+CONFIG_MOUSE_ATARI=m
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_MOUSE_SYNAPTICS_USB is not set
##
## file: drivers/input/serio/Kconfig
##
-# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO_Q40KBD=y
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_ALTERA_PS2 is not set
+
+##
+## file: drivers/input/tablet/Kconfig
+##
+# CONFIG_INPUT_TABLET is not set
##
## file: drivers/input/touchscreen/Kconfig
@@ -85,6 +288,59 @@
# CONFIG_INPUT_TOUCHSCREEN is not set
##
+## file: drivers/iommu/Kconfig
+##
+# CONFIG_IOMMU_SUPPORT is not set
+
+##
+## file: drivers/leds/Kconfig
+##
+# CONFIG_NEW_LEDS is not set
+
+##
+## file: drivers/macintosh/Kconfig
+##
+CONFIG_ADB=y
+CONFIG_ADB_MACII=y
+CONFIG_ADB_MACIISI=y
+CONFIG_ADB_IOP=y # switched on for the benefit of IIfx, Q900, Q950
+CONFIG_ADB_PMU68K=y
+CONFIG_ADB_CUDA=y
+CONFIG_INPUT_ADBHID=y
+CONFIG_MAC_EMUMOUSEBTN=m
+
+##
+## file: drivers/media/Kconfig
+##
+# CONFIG_MEDIA_SUPPORT is not set
+
+##
+## file: drivers/memstick/Kconfig
+##
+# CONFIG_MEMSTICK is not set
+
+##
+## file: drivers/mfd/Kconfig
+##
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_SM501 is not set
+
+##
+## file: drivers/misc/Kconfig
+##
+# CONFIG_ENCLOSURE_SERVICES is not set
+
+##
+## file: drivers/misc/c2port/Kconfig
+##
+# CONFIG_C2PORT is not set
+
+##
+## file: drivers/misc/eeprom/Kconfig
+##
+# CONFIG_EEPROM_93CX6 is not set
+
+##
## file: drivers/mmc/Kconfig
##
# CONFIG_MMC is not set
@@ -95,12 +351,73 @@
# CONFIG_MTD is not set
##
-## file: drivers/net/Kconfig
+## file: drivers/net/appletalk/Kconfig
+##
+CONFIG_DEV_APPLETALK=m
+
+##
+## file: drivers/net/arcnet/Kconfig
##
-CONFIG_NETDEVICES=y
-# CONFIG_BONDING is not set
-# CONFIG_NETPOLL_TRAP is not set
-# CONFIG_TUN is not set
+# CONFIG_ARCNET is not set
+
+##
+## file: drivers/net/ethernet/Kconfig
+##
+# CONFIG_DNET is not set
+# CONFIG_ETHOC is not set
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_HYDRA=m
+CONFIG_MAC8390=y
+CONFIG_APNE=m
+CONFIG_ZORRO8390=m
+
+##
+## file: drivers/net/ethernet/amd/Kconfig
+##
+CONFIG_A2065=m
+CONFIG_ARIADNE=m
+CONFIG_ATARILANCE=m
+CONFIG_MVME147_NET=m
+
+##
+## file: drivers/net/ethernet/apple/Kconfig
+##
+CONFIG_MACMACE=y
+
+##
+## file: drivers/net/ethernet/cirrus/Kconfig
+##
+CONFIG_MAC89x0=m
+
+##
+## file: drivers/net/ethernet/i825xx/Kconfig
+##
+CONFIG_BVME6000_NET=m
+CONFIG_MVME16x_NET=m
+
+##
+## file: drivers/net/ethernet/micrel/Kconfig
+##
+# CONFIG_KS8851_MLL is not set
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
+CONFIG_MACSONIC=m
+
+##
+## file: drivers/net/ethernet/wiznet/Kconfig
+##
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+
+##
+## file: drivers/net/plip/Kconfig
+##
+CONFIG_PLIP=m
##
## file: drivers/net/wan/Kconfig
@@ -108,17 +425,91 @@
# CONFIG_WAN is not set
##
-## file: drivers/net/wireless/ipw2x00/Kconfig
+## file: drivers/net/wireless/Kconfig
+##
+# CONFIG_WLAN is not set
+
+##
+## file: drivers/parport/Kconfig
##
-# CONFIG_IPW2100 is not set
+# CONFIG_PARPORT_PC is not set
+CONFIG_PARPORT_AMIGA=m
+CONFIG_PARPORT_MFC3=m
+CONFIG_PARPORT_ATARI=m
+# CONFIG_PARPORT_AX88796 is not set
+
+##
+## file: drivers/pnp/Kconfig
+##
+# CONFIG_PNP is not set
+
+##
+## file: drivers/power/Kconfig
+##
+# CONFIG_POWER_SUPPLY is not set
+
+##
+## file: drivers/ptp/Kconfig
+##
+# CONFIG_PTP_1588_CLOCK is not set
+
+##
+## file: drivers/regulator/Kconfig
+##
+# CONFIG_REGULATOR is not set
+
+##
+## file: drivers/rtc/Kconfig
+##
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+CONFIG_RTC_DRV_RP5C01=y
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_WM831X is not set
+# CONFIG_RTC_DRV_WM8350 is not set
+CONFIG_RTC_DRV_GENERIC=y
##
## file: drivers/scsi/Kconfig
##
+#. for MAC_SCSI and MVME147_SCSI that are not tristate
CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_ISCSI_TCP is not set
+CONFIG_SCSI_SPI_ATTRS=m
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_LIBFC is not set
+CONFIG_A3000_SCSI=m
+CONFIG_A2091_SCSI=m
+CONFIG_GVP11_SCSI=m
+CONFIG_SCSI_A4000T=m
+CONFIG_SCSI_ZORRO7XX=m
+CONFIG_ATARI_SCSI=m
+CONFIG_MAC_SCSI=y
+CONFIG_SCSI_MAC_ESP=m
+CONFIG_MVME147_SCSI=y
+CONFIG_MVME16x_SCSI=m
+CONFIG_BVME6000_SCSI=m
+
+##
+## file: drivers/spi/Kconfig
+##
+# CONFIG_SPI is not set
+
+##
+## file: drivers/ssb/Kconfig
+##
+# CONFIG_SSB is not set
##
## file: drivers/staging/Kconfig
@@ -131,11 +522,81 @@
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_N_GSM is not set
+
+##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_PMACZILOG=y
+CONFIG_SERIAL_PMACZILOG_TTYS=y
+CONFIG_SERIAL_PMACZILOG_CONSOLE=y
##
## file: drivers/tty/serial/8250/Kconfig
##
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+##
+## file: drivers/usb/Kconfig
+##
+# CONFIG_USB_SUPPORT is not set
+
+##
+## file: drivers/vhost/Kconfig
+##
+# CONFIG_VHOST_NET is not set
+
+##
+## file: drivers/video/Kconfig
+##
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB_FOREIGN_ENDIAN=y
+CONFIG_FB_BOTH_ENDIAN=y
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+CONFIG_FB_APOLLO=y
+CONFIG_FB_Q40=y
+CONFIG_FB_CIRRUS=y
+CONFIG_FB_PM2=m
+CONFIG_FB_AMIGA=y
+CONFIG_FB_AMIGA_OCS=y
+CONFIG_FB_AMIGA_ECS=y
+CONFIG_FB_AMIGA_AGA=y
+CONFIG_FB_FM2=y
+CONFIG_FB_ATARI=y
+CONFIG_FB_VALKYRIE=y
+CONFIG_FB_MAC=y
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_ATY=y
+# CONFIG_FB_ATY_BACKLIGHT is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_VIRTUAL is not set
+
+##
+## file: drivers/video/backlight/Kconfig
+##
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+##
+## file: drivers/video/console/Kconfig
+##
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_FONT_6x11=y
+CONFIG_FONT_PEARL_8x8=y
+
+##
+## file: drivers/video/logo/Kconfig
+##
+# CONFIG_LOGO is not set
##
## file: drivers/w1/Kconfig
@@ -148,6 +609,11 @@
# CONFIG_WATCHDOG is not set
##
+## file: drivers/zorro/Kconfig
+##
+CONFIG_ZORRO_NAMES=y
+
+##
## file: fs/Kconfig.binfmt
##
CONFIG_BINFMT_ELF=y
@@ -155,33 +621,232 @@
CONFIG_BINFMT_MISC=m
##
+## file: fs/adfs/Kconfig
+##
+# CONFIG_ADFS_FS is not set
+
+##
+## file: fs/afs/Kconfig
+##
+# CONFIG_AFS_FS is not set
+
+##
+## file: fs/befs/Kconfig
+##
+# CONFIG_BEFS_FS is not set
+
+##
+## file: fs/bfs/Kconfig
+##
+# CONFIG_BFS_FS is not set
+
+##
+## file: fs/ceph/Kconfig
+##
+# CONFIG_CEPH_FS is not set
+
+##
+## file: fs/dlm/Kconfig
+##
+# CONFIG_DLM is not set
+
+##
+## file: fs/efs/Kconfig
+##
+# CONFIG_EFS_FS is not set
+
+##
+## file: fs/exofs/Kconfig
+##
+# CONFIG_EXOFS_FS is not set
+
+##
## file: fs/ext2/Kconfig
##
-# CONFIG_EXT2_FS is not set
+# CONFIG_EXT2_FS_SECURITY is not set
##
## file: fs/ext3/Kconfig
##
-# CONFIG_EXT3_FS is not set
+# CONFIG_EXT3_FS_SECURITY is not set
##
## file: fs/ext4/Kconfig
##
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
+# CONFIG_EXT4_USE_FOR_EXT23 is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+
+##
+## file: fs/f2fs/Kconfig
+##
+# CONFIG_F2FS_FS is not set
+
+##
+## file: fs/freevxfs/Kconfig
+##
+# CONFIG_VXFS_FS is not set
+
+##
+## file: fs/fuse/Kconfig
+##
+CONFIG_AUFS_BR_FUSE=y
+
+##
+## file: fs/gfs2/Kconfig
+##
+# CONFIG_GFS2_FS is not set
+
+##
+## file: fs/jbd/Kconfig
+##
+CONFIG_JBD=m
+
+##
+## file: fs/jbd2/Kconfig
+##
+CONFIG_JBD2=m
+
+##
+## file: fs/jfs/Kconfig
+##
+# CONFIG_JFS_FS is not set
+
+##
+## file: fs/logfs/Kconfig
+##
+# CONFIG_LOGFS is not set
+
+##
+## file: fs/nfs/Kconfig
+##
+CONFIG_NFS_SWAP=y
+
+##
+## file: fs/nls/Kconfig
+##
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+
+##
+## file: fs/ntfs/Kconfig
+##
+# CONFIG_NTFS_FS is not set
+
+##
+## file: fs/ocfs2/Kconfig
+##
+# CONFIG_OCFS2_FS is not set
+
+##
+## file: fs/omfs/Kconfig
+##
+# CONFIG_OMFS_FS is not set
+
+##
+## file: fs/qnx4/Kconfig
+##
+# CONFIG_QNX4FS_FS is not set
+
+##
+## file: fs/reiserfs/Kconfig
+##
+# CONFIG_REISERFS_FS_SECURITY is not set
+
+##
+## file: fs/ubifs/Kconfig
+##
+# CONFIG_UBIFS_FS is not set
##
## file: init/Kconfig
##
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=16
+#. for now
+# CONFIG_CGROUPS is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_MODULE_SIG is not set
+
+##
+## file: kernel/Kconfig.hz
+##
+## choice: Timer frequency
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+
+##
+## file: kernel/power/Kconfig
+##
+# CONFIG_SUSPEND is not set
+# CONFIG_HIBERNATION is not set
+# CONFIG_PM_SLEEP is not set
+# CONFIG_PM_RUNTIME is not set
+# CONFIG_PM is not set
+# CONFIG_PM_TRACE is not set
+
+##
+## file: kernel/Kconfig.preempt
+##
+## choice: Preemption Model
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+## end choice
+
+##
+## file: kernel/time/Kconfig
+##
+CONFIG_HZ_PERIODIC=y
+# CONFIG_NO_HZ is not set
+# CONFIG_NO_HZ_IDLE is not set
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_HIGH_RES_TIMERS is not set
##
## file: lib/Kconfig.debug
##
-# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_TIMER_STATS is not set
# CONFIG_FRAME_POINTER is not set
##
+## file: lib/xz/Kconfig
+##
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+
+##
+## file: mm/Kconfig
+##
+# CONFIG_COMPACTION is not set
+# CONFIG_MIGRATION is not set
+# CONFIG_KSM is not set
+
+##
+## file: net/Kconfig
+##
+# CONFIG_WIRELESS is not set
+
+##
## file: net/atm/Kconfig
##
# CONFIG_ATM is not set
@@ -192,21 +857,50 @@
# CONFIG_HAMRADIO is not set
##
+## file: net/batman-adv/Kconfig
+##
+# CONFIG_BATMAN_ADV is not set
+
+##
## file: net/bluetooth/Kconfig
##
-#. TODO
# CONFIG_BT is not set
##
-## file: net/decnet/Kconfig
+## file: net/can/Kconfig
+##
+# CONFIG_CAN is not set
+
+##
+## file: net/ceph/Kconfig
+##
+# CONFIG_CEPH_LIB is not set
+
+##
+## file: net/dcb/Kconfig
##
-# CONFIG_DECNET is not set
+# CONFIG_DCB is not set
+
+##
+## file: net/ieee802154/Kconfig
+##
+# CONFIG_IEEE802154 is not set
##
## file: net/ipv4/Kconfig
##
-#. TODO
# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_TCP_MD5SIG is not set
+
+##
+## file: net/ipv6/Kconfig
+##
+CONFIG_IPV6=m
+
+##
+## file: net/ipx/Kconfig
+##
+CONFIG_IPX=m
##
## file: net/irda/Kconfig
@@ -224,14 +918,93 @@
# CONFIG_LLC2 is not set
##
-## file: net/sched/Kconfig
+## file: net/mac80211/Kconfig
+##
+# CONFIG_MAC80211 is not set
+
+##
+## file: net/nfc/Kconfig
+##
+# CONFIG_NFC is not set
+
+##
+## file: net/phonet/Kconfig
+##
+# CONFIG_PHONET is not set
+
+##
+## file: net/rds/Kconfig
+##
+# CONFIG_RDS is not set
+
+##
+## file: net/rfkill/Kconfig
+##
+# CONFIG_RFKILL is not set
+
+##
+## file: net/rxrpc/Kconfig
+##
+# CONFIG_AF_RXRPC is not set
+
+##
+## file: net/sctp/Kconfig
+##
+# CONFIG_IP_SCTP is not set
+
+##
+## file: net/tipc/Kconfig
+##
+# CONFIG_TIPC is not set
+
+##
+## file: net/wimax/Kconfig
+##
+# CONFIG_WIMAX is not set
+
+##
+## file: net/wireless/Kconfig
##
-#. TODO
-# CONFIG_NET_SCHED is not set
+# CONFIG_CFG80211 is not set
##
-## file: net/xfrm/Kconfig
+## file: security/Kconfig
##
-#. TODO
-CONFIG_NET_KEY=y
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+##
+## file: sound/Kconfig
+##
+# CONFIG_SND is not set
+
+##
+## file: sound/oss/dmasound/Kconfig
+##
+CONFIG_DMASOUND_ATARI=m
+CONFIG_DMASOUND_PAULA=m
+CONFIG_DMASOUND_Q40=m
+
+##
+## file: unknown
+##
+CONFIG_ATARI_MFPSER=m
+CONFIG_ATARI_MIDI=m
+CONFIG_ATARI_SCC=y
+CONFIG_ATARI_SCC_DMA=y
+CONFIG_STRAM_PROC=y
+CONFIG_BLK_DEV_IDEDOUBLER=y
+CONFIG_BLZ1230_SCSI=y
+CONFIG_BLZ2060_SCSI=y
+CONFIG_CYBERSTORMII_SCSI=y
+CONFIG_CYBERSTORM_SCSI=y
+CONFIG_FASTLANE_SCSI=y
+# CONFIG_FB_CYBER is not set
+# CONFIG_FB_RETINAZ3 is not set
+# CONFIG_FB_VIRGE is not set
+CONFIG_MULTIFACE_III_TTY=m
+# CONFIG_OKTAGON_SCSI is not set
+CONFIG_SCSI_AMIGA7XX=y
+# CONFIG_SCSI_NCR53C7xx_FAST is not set
+# CONFIG_WHIPPET_SERIAL is not set
+CONFIG_MVME147_SCC=y
diff -Nru linux-3.10.1/debian/config/m68k/config.amiga linux-3.10.1/debian/config/m68k/config.amiga
--- linux-3.10.1/debian/config/m68k/config.amiga 2013-05-30 02:45:35.000000000 +0000
+++ linux-3.10.1/debian/config/m68k/config.amiga 1970-01-01 00:00:00.000000000 +0000
@@ -1,296 +0,0 @@
-##
-## file: arch/m68k/Kconfig.bus
-##
-CONFIG_ZORRO=y
-CONFIG_AMIGA_PCMCIA=y
-
-##
-## file: arch/m68k/Kconfig.cpu
-##
-CONFIG_M68020=y
-CONFIG_M68030=y
-CONFIG_M68040=y
-CONFIG_M68060=y
-CONFIG_M68KFPU_EMU=y
-CONFIG_M68KFPU_EMU_EXTRAPREC=y
-# CONFIG_M68KFPU_EMU_ONLY is not set
-
-##
-## file: arch/m68k/Kconfig.devices
-##
-# CONFIG_HEARTBEAT is not set
-CONFIG_AMIGA_BUILTIN_SERIAL=y
-CONFIG_SERIAL_CONSOLE=y
-
-##
-## file: arch/m68k/Kconfig.machine
-##
-CONFIG_AMIGA=y
-# CONFIG_ATARI is not set
-# CONFIG_MAC is not set
-# CONFIG_APOLLO is not set
-# CONFIG_VME is not set
-# CONFIG_HP300 is not set
-# CONFIG_SUN3X is not set
-# CONFIG_Q40 is not set
-# CONFIG_SUN3 is not set
-
-##
-## file: block/partitions/Kconfig
-##
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_AMIGA_PARTITION=y
-
-##
-## file: drivers/block/Kconfig
-##
-CONFIG_AMIGA_FLOPPY=y
-CONFIG_AMIGA_Z2RAM=y
-# CONFIG_PARIDE is not set
-
-##
-## file: drivers/char/Kconfig
-##
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-# CONFIG_PPDEV is not set
-CONFIG_GEN_RTC=m
-
-##
-## file: drivers/firewire/Kconfig
-##
-# CONFIG_FIREWIRE is not set
-
-##
-## file: drivers/ide/Kconfig
-##
-CONFIG_IDE=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_BLK_DEV_IDECD=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_GAYLE=y
-CONFIG_BLK_DEV_BUDDHA=y
-
-##
-## file: drivers/input/joystick/Kconfig
-##
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_DB9 is not set
-# CONFIG_JOYSTICK_GAMECON is not set
-# CONFIG_JOYSTICK_TURBOGRAFX is not set
-CONFIG_JOYSTICK_AMIGA=m
-# CONFIG_JOYSTICK_JOYDUMP is not set
-
-##
-## file: drivers/input/joystick/iforce/Kconfig
-##
-# CONFIG_JOYSTICK_IFORCE is not set
-
-##
-## file: drivers/input/keyboard/Kconfig
-##
-CONFIG_KEYBOARD_AMIGA=y
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-
-##
-## file: drivers/input/misc/Kconfig
-##
-# CONFIG_INPUT_MISC is not set
-
-##
-## file: drivers/input/mouse/Kconfig
-##
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-CONFIG_MOUSE_AMIGA=y
-
-##
-## file: drivers/input/serio/Kconfig
-##
-CONFIG_SERIO=m
-CONFIG_SERIO_SERPORT=m
-# CONFIG_SERIO_PARKBD is not set
-
-##
-## file: drivers/net/arcnet/Kconfig
-##
-# CONFIG_ARCNET is not set
-
-##
-## file: drivers/net/ethernet/3com/Kconfig
-##
-# CONFIG_NET_VENDOR_3COM is not set
-
-##
-## file: drivers/net/ethernet/8390/Kconfig
-##
-CONFIG_HYDRA=m
-CONFIG_APNE=m
-CONFIG_ZORRO8390=m
-
-##
-## file: drivers/net/ethernet/amd/Kconfig
-##
-CONFIG_A2065=m
-CONFIG_ARIADNE=m
-
-##
-## file: drivers/net/ethernet/fujitsu/Kconfig
-##
-
-##
-## file: drivers/net/ethernet/hp/Kconfig
-##
-# CONFIG_HP100 is not set
-
-##
-## file: drivers/net/ethernet/racal/Kconfig
-##
-# CONFIG_NET_VENDOR_RACAL is not set
-
-##
-## file: drivers/net/plip/Kconfig
-##
-CONFIG_PLIP=m
-
-##
-## file: drivers/parport/Kconfig
-##
-CONFIG_PARPORT_AMIGA=m
-CONFIG_PARPORT_MFC3=m
-
-##
-## file: drivers/pnp/Kconfig
-##
-# CONFIG_PNP is not set
-
-##
-## file: drivers/scsi/Kconfig
-##
-CONFIG_SCSI_SPI_ATTRS=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_T128 is not set
-CONFIG_A3000_SCSI=y
-CONFIG_A2091_SCSI=y
-CONFIG_GVP11_SCSI=y
-CONFIG_SCSI_A4000T=y
-CONFIG_SCSI_ZORRO7XX=y
-
-##
-## file: drivers/tty/serial/8250/Kconfig
-##
-# CONFIG_SERIAL_8250 is not set
-
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_FB=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_CIRRUS=y
-# CONFIG_FB_PM2 is not set
-CONFIG_FB_AMIGA=y
-CONFIG_FB_AMIGA_OCS=y
-CONFIG_FB_AMIGA_ECS=y
-CONFIG_FB_AMIGA_AGA=y
-CONFIG_FB_FM2=y
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_VIRTUAL is not set
-
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_PEARL_8x8=y
-
-##
-## file: drivers/zorro/Kconfig
-##
-CONFIG_ZORRO_NAMES=y
-
-##
-## file: fs/affs/Kconfig
-##
-CONFIG_AFFS_FS=y
-
-##
-## file: init/Kconfig
-##
-#. TODO
-# CONFIG_AUDIT is not set
-
-##
-## file: net/ipx/Kconfig
-##
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-
-##
-## file: sound/Kconfig
-##
-# CONFIG_SND is not set
-
-##
-## file: sound/oss/dmasound/Kconfig
-##
-CONFIG_DMASOUND_PAULA=m
-
-##
-## file: unknown
-##
-CONFIG_BLK_DEV_IDEDOUBLER=y
-CONFIG_BLZ1230_SCSI=y
-CONFIG_BLZ2060_SCSI=y
-CONFIG_CYBERSTORMII_SCSI=y
-CONFIG_CYBERSTORM_SCSI=y
-CONFIG_FASTLANE_SCSI=y
-# CONFIG_FB_CYBER is not set
-# CONFIG_FB_RETINAZ3 is not set
-# CONFIG_FB_VIRGE is not set
-CONFIG_MULTIFACE_III_TTY=m
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_OKTAGON_SCSI is not set
-CONFIG_SCSI_AMIGA7XX=y
-# CONFIG_SCSI_NCR53C7xx_FAST is not set
-# CONFIG_WHIPPET_SERIAL is not set
-
diff -Nru linux-3.10.1/debian/config/m68k/config.atari linux-3.10.1/debian/config/m68k/config.atari
--- linux-3.10.1/debian/config/m68k/config.atari 2013-05-04 02:44:45.000000000 +0000
+++ linux-3.10.1/debian/config/m68k/config.atari 1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-##
-## file: arch/m68k/Kconfig.cpu
-##
-CONFIG_M68020=y
-CONFIG_M68030=y
-CONFIG_M68040=y
-CONFIG_M68060=y
-CONFIG_M68KFPU_EMU=y
-CONFIG_M68KFPU_EMU_EXTRAPREC=y
-# CONFIG_M68KFPU_EMU_ONLY is not set
-
-##
-## file: arch/m68k/Kconfig.devices
-##
-CONFIG_HEARTBEAT=y
-CONFIG_NATFEAT=y
-CONFIG_NFBLOCK=y
-CONFIG_NFCON=y
-CONFIG_NFETH=y
-CONFIG_ATARI_DSP56K=m
-CONFIG_SERIAL_CONSOLE=y
-
-##
-## file: arch/m68k/Kconfig.machine
-##
-# CONFIG_AMIGA is not set
-CONFIG_ATARI=y
-# CONFIG_MAC is not set
-# CONFIG_APOLLO is not set
-# CONFIG_VME is not set
-# CONFIG_HP300 is not set
-# CONFIG_SUN3X is not set
-# CONFIG_Q40 is not set
-# CONFIG_SUN3 is not set
-
-##
-## file: block/partitions/Kconfig
-##
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_ATARI_PARTITION=y
-
-##
-## file: drivers/block/Kconfig
-##
-CONFIG_ATARI_FLOPPY=y
-# CONFIG_PARIDE is not set
-# CONFIG_BLK_DEV_HD is not set
-
-##
-## file: drivers/char/Kconfig
-##
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-# CONFIG_PPDEV is not set
-CONFIG_NVRAM=y
-CONFIG_RTC=y
-CONFIG_GEN_RTC=y
-
-##
-## file: drivers/ide/Kconfig
-##
-CONFIG_IDE=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_BLK_DEV_IDECD=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_FALCON_IDE=y
-
-##
-## file: drivers/input/joystick/Kconfig
-##
-# CONFIG_INPUT_JOYSTICK is not set
-
-##
-## file: drivers/input/keyboard/Kconfig
-##
-CONFIG_KEYBOARD_ATARI=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-
-##
-## file: drivers/input/misc/Kconfig
-##
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_M68K_BEEP=m
-CONFIG_INPUT_UINPUT=m
-
-##
-## file: drivers/input/mouse/Kconfig
-##
-CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
-CONFIG_MOUSE_ATARI=y
-
-##
-## file: drivers/input/serio/Kconfig
-##
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_LIBPS2=y
-
-##
-## file: drivers/net/ethernet/amd/Kconfig
-##
-CONFIG_ATARILANCE=y
-
-##
-## file: drivers/net/plip/Kconfig
-##
-# CONFIG_PLIP is not set
-
-##
-## file: drivers/net/ppp/Kconfig
-##
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-
-##
-## file: drivers/parport/Kconfig
-##
-# CONFIG_PARPORT is not set
-CONFIG_PARPORT_ATARI=m
-
-##
-## file: drivers/rtc/Kconfig
-##
-CONFIG_RTC_DRV_GENERIC=y
-
-##
-## file: drivers/scsi/Kconfig
-##
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-CONFIG_ATARI_SCSI=y
-
-##
-## file: drivers/tty/serial/8250/Kconfig
-##
-# CONFIG_SERIAL_8250 is not set
-
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_FB=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_ATARI=y
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_ATY=y
-# CONFIG_FB_VIRTUAL is not set
-
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-##
-## file: net/ipx/Kconfig
-##
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-
-##
-## file: sound/Kconfig
-##
-# CONFIG_SND is not set
-
-##
-## file: sound/oss/dmasound/Kconfig
-##
-CONFIG_DMASOUND_ATARI=m
-
-##
-## file: unknown
-##
-CONFIG_ATARI_ETHERNEC=m
-CONFIG_ATARI_MFPSER=m
-CONFIG_ATARI_MIDI=m
-CONFIG_ATARI_ROM_ISA=y
-CONFIG_ATARI_SCC=y
-CONFIG_ATARI_SCC_DMA=y
-CONFIG_STRAM_PROC=y
-
diff -Nru linux-3.10.1/debian/config/m68k/config.bvme6000 linux-3.10.1/debian/config/m68k/config.bvme6000
--- linux-3.10.1/debian/config/m68k/config.bvme6000 2013-05-04 02:44:45.000000000 +0000
+++ linux-3.10.1/debian/config/m68k/config.bvme6000 1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-##
-## file: arch/m68k/Kconfig.cpu
-##
-# CONFIG_M68020 is not set
-# CONFIG_M68030 is not set
-CONFIG_M68040=y
-CONFIG_M68060=y
-# CONFIG_M68KFPU_EMU is not set
-
-##
-## file: arch/m68k/Kconfig.devices
-##
-CONFIG_SERIAL_CONSOLE=y
-
-##
-## file: arch/m68k/Kconfig.machine
-##
-# CONFIG_AMIGA is not set
-# CONFIG_ATARI is not set
-# CONFIG_MAC is not set
-# CONFIG_APOLLO is not set
-CONFIG_VME=y
-# CONFIG_MVME147 is not set
-# CONFIG_MVME16x is not set
-CONFIG_BVME6000=y
-# CONFIG_HP300 is not set
-# CONFIG_SUN3X is not set
-# CONFIG_Q40 is not set
-# CONFIG_SUN3 is not set
-
-##
-## file: block/partitions/Kconfig
-##
-# CONFIG_PARTITION_ADVANCED is not set
-
-##
-## file: drivers/char/Kconfig
-##
-CONFIG_GEN_RTC=m
-
-##
-## file: drivers/firewire/Kconfig
-##
-# CONFIG_FIREWIRE is not set
-
-##
-## file: drivers/input/joystick/Kconfig
-##
-# CONFIG_INPUT_JOYSTICK is not set
-
-##
-## file: drivers/input/keyboard/Kconfig
-##
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-
-##
-## file: drivers/input/misc/Kconfig
-##
-# CONFIG_INPUT_MISC is not set
-
-##
-## file: drivers/input/mouse/Kconfig
-##
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_SERIAL=m
-
-##
-## file: drivers/input/serio/Kconfig
-##
-CONFIG_SERIO=m
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_LIBPS2=m
-
-##
-## file: drivers/net/ethernet/i825xx/Kconfig
-##
-CONFIG_BVME6000_NET=y
-
-##
-## file: drivers/scsi/Kconfig
-##
-CONFIG_BVME6000_SCSI=y
-
-##
-## file: drivers/tty/serial/8250/Kconfig
-##
-CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-##
-## file: drivers/video/Kconfig
-##
-# CONFIG_FB is not set
-
-##
-## file: fs/nfs/Kconfig
-##
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-
-##
-## file: lib/Kconfig
-##
-#. TODO
-CONFIG_CRC32=m
-
-##
-## file: net/ipv4/Kconfig
-##
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-
-##
-## file: net/ipx/Kconfig
-##
-# CONFIG_IPX is not set
-
-##
-## file: sound/Kconfig
-##
-# CONFIG_SOUND is not set
-
diff -Nru linux-3.10.1/debian/config/m68k/config.mac linux-3.10.1/debian/config/m68k/config.mac
--- linux-3.10.1/debian/config/m68k/config.mac 2013-05-04 02:44:45.000000000 +0000
+++ linux-3.10.1/debian/config/m68k/config.mac 1970-01-01 00:00:00.000000000 +0000
@@ -1,200 +0,0 @@
-##
-## file: arch/m68k/Kconfig.cpu
-##
-CONFIG_M68020=y
-CONFIG_M68030=y
-CONFIG_M68040=y
-# CONFIG_M68060 is not set
-CONFIG_M68KFPU_EMU=y
-CONFIG_M68KFPU_EMU_EXTRAPREC=y
-# CONFIG_M68KFPU_EMU_ONLY is not set
-
-##
-## file: arch/m68k/Kconfig.devices
-##
-# CONFIG_HEARTBEAT is not set
-CONFIG_SERIAL_CONSOLE=y
-
-##
-## file: arch/m68k/Kconfig.machine
-##
-# CONFIG_AMIGA is not set
-# CONFIG_ATARI is not set
-CONFIG_MAC=y
-# CONFIG_APOLLO is not set
-# CONFIG_VME is not set
-# CONFIG_HP300 is not set
-# CONFIG_SUN3X is not set
-# CONFIG_Q40 is not set
-# CONFIG_SUN3 is not set
-
-##
-## file: block/partitions/Kconfig
-##
-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=y
-CONFIG_SUN_PARTITION=y
-
-##
-## file: drivers/block/Kconfig
-##
-CONFIG_BLK_DEV_SWIM=m
-
-##
-## file: drivers/char/Kconfig
-##
-CONFIG_GEN_RTC=m
-
-##
-## file: drivers/ide/Kconfig
-##
-CONFIG_IDE=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_BLK_DEV_IDECD=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_MAC_IDE=y
-
-##
-## file: drivers/input/joystick/Kconfig
-##
-# CONFIG_INPUT_JOYSTICK is not set
-
-##
-## file: drivers/input/keyboard/Kconfig
-##
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-
-##
-## file: drivers/input/misc/Kconfig
-##
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-
-##
-## file: drivers/input/mouse/Kconfig
-##
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_SERIAL=m
-
-##
-## file: drivers/input/serio/Kconfig
-##
-CONFIG_SERIO=m
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_LIBPS2=m
-
-##
-## file: drivers/macintosh/Kconfig
-##
-CONFIG_ADB=y
-CONFIG_ADB_MACII=y
-# CONFIG_ADB_MACIISI is not set
-CONFIG_ADB_IOP=y # switched on for the benefit of IIfx, Q900, Q950
-CONFIG_ADB_PMU68K=y
-CONFIG_ADB_CUDA=y
-CONFIG_INPUT_ADBHID=y
-CONFIG_MAC_EMUMOUSEBTN=y
-# CONFIG_WINDFARM is not set
-
-##
-## file: drivers/net/appletalk/Kconfig
-##
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-
-##
-## file: drivers/net/ethernet/8390/Kconfig
-##
-CONFIG_MAC8390=y
-
-##
-## file: drivers/net/ethernet/apple/Kconfig
-##
-CONFIG_MACMACE=y
-
-##
-## file: drivers/net/ethernet/cirrus/Kconfig
-##
-CONFIG_MAC89x0=y
-
-##
-## file: drivers/net/ethernet/natsemi/Kconfig
-##
-CONFIG_MACSONIC=y # switched back on as requested by Finn Thain
-
-##
-## file: drivers/parport/Kconfig
-##
-# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set
-
-##
-## file: drivers/scsi/Kconfig
-##
-CONFIG_MAC_SCSI=y
-CONFIG_SCSI_MAC_ESP=y
-
-##
-## file: drivers/tty/serial/8250/Kconfig
-##
-# CONFIG_SERIAL_8250 is not set
-
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_FB=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_VALKYRIE=y
-CONFIG_FB_MAC=y
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_VIRTUAL is not set
-
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_6x11=y
-
-##
-## file: fs/hfs/Kconfig
-##
-CONFIG_HFS_FS=y
-
-##
-## file: fs/hfsplus/Kconfig
-##
-CONFIG_HFSPLUS_FS=y
-
-##
-## file: init/Kconfig
-##
-#. TODO
-# CONFIG_AUDIT is not set
-
-##
-## file: net/ipx/Kconfig
-##
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-
-##
-## file: sound/Kconfig
-##
-# CONFIG_SOUND is not set
-
diff -Nru linux-3.10.1/debian/config/m68k/config.mvme147 linux-3.10.1/debian/config/m68k/config.mvme147
--- linux-3.10.1/debian/config/m68k/config.mvme147 2013-05-04 02:44:45.000000000 +0000
+++ linux-3.10.1/debian/config/m68k/config.mvme147 1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-##
-## file: arch/m68k/Kconfig.cpu
-##
-# CONFIG_M68020 is not set
-CONFIG_M68030=y
-# CONFIG_M68040 is not set
-# CONFIG_M68060 is not set
-# CONFIG_M68KFPU_EMU is not set
-
-##
-## file: arch/m68k/Kconfig.devices
-##
-CONFIG_SERIAL_CONSOLE=y
-
-##
-## file: arch/m68k/Kconfig.machine
-##
-# CONFIG_AMIGA is not set
-# CONFIG_ATARI is not set
-# CONFIG_MAC is not set
-# CONFIG_APOLLO is not set
-CONFIG_VME=y
-CONFIG_MVME147=y
-# CONFIG_MVME16x is not set
-# CONFIG_BVME6000 is not set
-# CONFIG_HP300 is not set
-# CONFIG_SUN3X is not set
-# CONFIG_Q40 is not set
-# CONFIG_SUN3 is not set
-
-##
-## file: block/partitions/Kconfig
-##
-# CONFIG_PARTITION_ADVANCED is not set
-
-##
-## file: drivers/char/Kconfig
-##
-CONFIG_GEN_RTC=m
-
-##
-## file: drivers/input/joystick/Kconfig
-##
-# CONFIG_INPUT_JOYSTICK is not set
-
-##
-## file: drivers/input/keyboard/Kconfig
-##
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-
-##
-## file: drivers/input/misc/Kconfig
-##
-# CONFIG_INPUT_MISC is not set
-
-##
-## file: drivers/input/mouse/Kconfig
-##
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_SERIAL=m
-
-##
-## file: drivers/input/serio/Kconfig
-##
-CONFIG_SERIO=m
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_LIBPS2=m
-
-##
-## file: drivers/net/ethernet/amd/Kconfig
-##
-CONFIG_MVME147_NET=y
-
-##
-## file: drivers/scsi/Kconfig
-##
-CONFIG_MVME147_SCSI=y
-
-##
-## file: drivers/tty/serial/8250/Kconfig
-##
-# CONFIG_SERIAL_8250 is not set
-
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_FB=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_VIRTUAL is not set
-
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-##
-## file: fs/nfs/Kconfig
-##
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-
-##
-## file: net/ipv4/Kconfig
-##
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-
-##
-## file: net/ipx/Kconfig
-##
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-
-##
-## file: sound/Kconfig
-##
-# CONFIG_SOUND is not set
-
-##
-## file: unknown
-##
-CONFIG_MVME147_SCC=y
-
diff -Nru linux-3.10.1/debian/config/m68k/config.mvme16x linux-3.10.1/debian/config/m68k/config.mvme16x
--- linux-3.10.1/debian/config/m68k/config.mvme16x 2013-05-04 02:44:45.000000000 +0000
+++ linux-3.10.1/debian/config/m68k/config.mvme16x 1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-##
-## file: arch/m68k/Kconfig.cpu
-##
-# CONFIG_M68020 is not set
-# CONFIG_M68030 is not set
-CONFIG_M68040=y
-CONFIG_M68060=y
-# CONFIG_M68KFPU_EMU is not set
-
-##
-## file: arch/m68k/Kconfig.devices
-##
-CONFIG_SERIAL_CONSOLE=y
-
-##
-## file: arch/m68k/Kconfig.machine
-##
-# CONFIG_AMIGA is not set
-# CONFIG_ATARI is not set
-# CONFIG_MAC is not set
-# CONFIG_APOLLO is not set
-CONFIG_VME=y
-# CONFIG_MVME147 is not set
-CONFIG_MVME16x=y
-# CONFIG_BVME6000 is not set
-# CONFIG_HP300 is not set
-# CONFIG_SUN3X is not set
-# CONFIG_Q40 is not set
-# CONFIG_SUN3 is not set
-
-##
-## file: block/partitions/Kconfig
-##
-# CONFIG_PARTITION_ADVANCED is not set
-
-##
-## file: drivers/char/Kconfig
-##
-CONFIG_GEN_RTC=m
-
-##
-## file: drivers/firewire/Kconfig
-##
-# CONFIG_FIREWIRE is not set
-
-##
-## file: drivers/input/joystick/Kconfig
-##
-# CONFIG_INPUT_JOYSTICK is not set
-
-##
-## file: drivers/input/keyboard/Kconfig
-##
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-
-##
-## file: drivers/input/misc/Kconfig
-##
-# CONFIG_INPUT_MISC is not set
-
-##
-## file: drivers/input/mouse/Kconfig
-##
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_SERIAL=m
-
-##
-## file: drivers/input/serio/Kconfig
-##
-CONFIG_SERIO=m
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_LIBPS2=m
-
-##
-## file: drivers/net/ethernet/i825xx/Kconfig
-##
-CONFIG_MVME16x_NET=y
-
-##
-## file: drivers/scsi/Kconfig
-##
-CONFIG_MVME16x_SCSI=y
-
-##
-## file: drivers/tty/serial/8250/Kconfig
-##
-# CONFIG_SERIAL_8250 is not set
-
-##
-## file: drivers/video/Kconfig
-##
-CONFIG_FB=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_VIRTUAL is not set
-
-##
-## file: drivers/video/console/Kconfig
-##
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-##
-## file: fs/nfs/Kconfig
-##
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-
-##
-## file: net/ipv4/Kconfig
-##
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-
-##
-## file: net/ipx/Kconfig
-##
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-
-##
-## file: sound/Kconfig
-##
-# CONFIG_SOUND is not set
-
diff -Nru linux-3.10.1/debian/config/m68k/defines linux-3.10.1/debian/config/m68k/defines
--- linux-3.10.1/debian/config/m68k/defines 2013-05-04 02:44:45.000000000 +0000
+++ linux-3.10.1/debian/config/m68k/defines 2013-07-23 15:42:42.000000000 +0000
@@ -1,34 +1,12 @@
[base]
-compiler: gcc-4.6
+compiler: gcc-4.8
cflags: -ffreestanding
flavours:
- amiga
- atari
- bvme6000
- mac
- mvme147
- mvme16x
+ m68k
kernel-arch: m68k
[image]
-initramfs: false
suggests: vmelilo, fdutils
-[amiga_description]
-hardware: Amiga
-
-[atari_description]
-hardware: Atari
-
-[bvme6000_description]
-hardware: BVM BVME4000 and BVME6000
-
-[mac_description]
-hardware: Macintosh
-
-[mvme147_description]
-hardware: Motorola MVME147
-
-[mvme16x_description]
-hardware: Motorola MVME162/6/7, MVME172/7
-
+[m68k_description]
+hardware: Motorola MC68020+ family
Reply to: