diff --git a/debian/changelog b/debian/changelog index 112471320..50da6c1c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,13 @@ linux (3.10.5-2) UNRELEASED; urgency=low [ Ben Hutchings ] * [x86] Enable ASUS_OLED as module (Closes: #680016) + [ Thorsten Glaser ] + * [m68k] debian/patches/bugfix/m68k/atari-irqs.patch: patch from mailing list + to silence IRQ problems on Atari platforms with multi-platform kernel + * [m68k] debian/patches/bugfix/m68k/type-fix-div64.patch: patch from Andreas + Schwab to handle do_div being called with a non-u32 second argument + * [m68k] begin working on d-i kernel configs (just enough to not FTBFS) + -- Ben Hutchings Fri, 09 Aug 2013 15:54:02 +0200 linux (3.10.5-1) unstable; urgency=low diff --git a/debian/installer/m68k/kernel-versions b/debian/installer/m68k/kernel-versions index 5c3677486..86e3e98f3 100644 --- a/debian/installer/m68k/kernel-versions +++ b/debian/installer/m68k/kernel-versions @@ -1,4 +1,2 @@ # arch version flavour installedname suffix build-depends -m68k - amiga - y - -m68k - atari - y - -m68k - mac - y - +m68k - m68k - - - diff --git a/debian/installer/m68k/modules/m68k-mac/btrfs-modules b/debian/installer/m68k/modules/m68k-mac/btrfs-modules deleted file mode 100644 index e261e1388..000000000 --- a/debian/installer/m68k/modules/m68k-mac/btrfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/cdrom-core-modules b/debian/installer/m68k/modules/m68k-mac/cdrom-core-modules deleted file mode 100644 index 3ff69b48f..000000000 --- a/debian/installer/m68k/modules/m68k-mac/cdrom-core-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/crc-modules b/debian/installer/m68k/modules/m68k-mac/crc-modules deleted file mode 100644 index 7e00de705..000000000 --- a/debian/installer/m68k/modules/m68k-mac/crc-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/crypto-modules b/debian/installer/m68k/modules/m68k-mac/crypto-modules deleted file mode 100644 index 3a1e862b4..000000000 --- a/debian/installer/m68k/modules/m68k-mac/crypto-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/fat-modules b/debian/installer/m68k/modules/m68k-mac/fat-modules deleted file mode 100644 index 274584eb6..000000000 --- a/debian/installer/m68k/modules/m68k-mac/fat-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/fuse-modules b/debian/installer/m68k/modules/m68k-mac/fuse-modules deleted file mode 100644 index 0b6ba0c8c..000000000 --- a/debian/installer/m68k/modules/m68k-mac/fuse-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/isofs-modules b/debian/installer/m68k/modules/m68k-mac/isofs-modules deleted file mode 100644 index da4fa9a3c..000000000 --- a/debian/installer/m68k/modules/m68k-mac/isofs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/jfs-modules b/debian/installer/m68k/modules/m68k-mac/jfs-modules deleted file mode 100644 index 7e4d912b9..000000000 --- a/debian/installer/m68k/modules/m68k-mac/jfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/kernel-image b/debian/installer/m68k/modules/m68k-mac/kernel-image deleted file mode 100644 index 1bb8bf6d7..000000000 --- a/debian/installer/m68k/modules/m68k-mac/kernel-image +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/debian/installer/m68k/modules/m68k-mac/md-modules b/debian/installer/m68k/modules/m68k-mac/md-modules deleted file mode 100644 index 26115e10b..000000000 --- a/debian/installer/m68k/modules/m68k-mac/md-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/nbd-modules b/debian/installer/m68k/modules/m68k-mac/nbd-modules deleted file mode 100644 index 3c9b3e5d4..000000000 --- a/debian/installer/m68k/modules/m68k-mac/nbd-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/nic-shared-modules b/debian/installer/m68k/modules/m68k-mac/nic-shared-modules deleted file mode 100644 index 3cf0df91c..000000000 --- a/debian/installer/m68k/modules/m68k-mac/nic-shared-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include "../m68k/nic-shared-modules" -libphy diff --git a/debian/installer/m68k/modules/m68k-mac/ppp-modules b/debian/installer/m68k/modules/m68k-mac/ppp-modules deleted file mode 100644 index 1f26aa1ee..000000000 --- a/debian/installer/m68k/modules/m68k-mac/ppp-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/scsi-modules b/debian/installer/m68k/modules/m68k-mac/scsi-modules deleted file mode 100644 index b9219d34e..000000000 --- a/debian/installer/m68k/modules/m68k-mac/scsi-modules +++ /dev/null @@ -1 +0,0 @@ -#include "../m68k/scsi-modules" diff --git a/debian/installer/m68k/modules/m68k-mac/squashfs-modules b/debian/installer/m68k/modules/m68k-mac/squashfs-modules deleted file mode 100644 index 42d77887a..000000000 --- a/debian/installer/m68k/modules/m68k-mac/squashfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/udf-modules b/debian/installer/m68k/modules/m68k-mac/udf-modules deleted file mode 100644 index b90d7ee9b..000000000 --- a/debian/installer/m68k/modules/m68k-mac/udf-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/zlib-modules b/debian/installer/m68k/modules/m68k-mac/zlib-modules deleted file mode 100644 index e02ad64bf..000000000 --- a/debian/installer/m68k/modules/m68k-mac/zlib-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k/core-modules b/debian/installer/m68k/modules/m68k/core-modules new file mode 100644 index 000000000..f05d06298 --- /dev/null +++ b/debian/installer/m68k/modules/m68k/core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/m68k/modules/m68k/ext2-modules b/debian/installer/m68k/modules/m68k/ext2-modules new file mode 100644 index 000000000..c407140bf --- /dev/null +++ b/debian/installer/m68k/modules/m68k/ext2-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/m68k/modules/m68k/ext3-modules b/debian/installer/m68k/modules/m68k/ext3-modules new file mode 100644 index 000000000..55ef7d7bc --- /dev/null +++ b/debian/installer/m68k/modules/m68k/ext3-modules @@ -0,0 +1,2 @@ +#include + diff --git a/debian/installer/m68k/modules/m68k/ext4-modules b/debian/installer/m68k/modules/m68k/ext4-modules new file mode 100644 index 000000000..394c577ce --- /dev/null +++ b/debian/installer/m68k/modules/m68k/ext4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/m68k/modules/m68k/jfs-modules b/debian/installer/m68k/modules/m68k/jfs-modules deleted file mode 100644 index 7e4d912b9..000000000 --- a/debian/installer/m68k/modules/m68k/jfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k/nic-shared-modules b/debian/installer/m68k/modules/m68k/nic-shared-modules index 6822f9712..4f74c1f9e 100644 --- a/debian/installer/m68k/modules/m68k/nic-shared-modules +++ b/debian/installer/m68k/modules/m68k/nic-shared-modules @@ -1,11 +1,19 @@ +#include +82596 ? 8390 ? +8390p ? +7990 ? a2065 ? apne ? ariadne ? ariadne2 ? +atarilance ? dummy hydra ? +mac89x0 ? +macsonic ? zorro8390 ? ne ? atari_ethernec ? +smc91x ? libphy diff --git a/debian/installer/m68k/package-list b/debian/installer/m68k/package-list index 953293287..5066e0557 100644 --- a/debian/installer/m68k/package-list +++ b/debian/installer/m68k/package-list @@ -3,6 +3,7 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # -Package: kernel-image -Provides: loop-modules, ext2-modules, ext3-modules -#Provides_mac: loop-modules, ext2-modules, ext3-modules, hfs-modules + +#Package: ide-modules +# add kernel/drivers/* I think +# also SCSI drivers are now modular… diff --git a/debian/patches/bugfix/m68k/atari-irqs.patch b/debian/patches/bugfix/m68k/atari-irqs.patch new file mode 100644 index 000000000..0ff36ed57 --- /dev/null +++ b/debian/patches/bugfix/m68k/atari-irqs.patch @@ -0,0 +1,18 @@ +From: Thorsten Glaser +Description: m68k: handle Atari interrupts in multi-platform kernels +Origin: http://thread.gmane.org/gmane.linux.debian.devel.kernel/91476/focus=5003 +Forwarded: http://thread.gmane.org/gmane.linux.ports.m68k/5009 + +--- a/arch/m68k/include/asm/irqflags.h ++++ b/arch/m68k/include/asm/irqflags.h +@@ -67,6 +67,10 @@ static inline void arch_local_irq_restor + + static inline bool arch_irqs_disabled_flags(unsigned long flags) + { ++ if (MACH_IS_ATARI) { ++ /* Ignore HSYNC = ipl 2 on Atari */ ++ return (flags & ~(ALLOWINT | 0x200)) != 0; ++ } + return (flags & ~ALLOWINT) != 0; + } + diff --git a/debian/patches/bugfix/m68k/ethernat-kconfig.patch b/debian/patches/bugfix/m68k/ethernat-kconfig.patch index ce8885cf5..dab726e66 100644 --- a/debian/patches/bugfix/m68k/ethernat-kconfig.patch +++ b/debian/patches/bugfix/m68k/ethernat-kconfig.patch @@ -1,5 +1,6 @@ -# DP: cherry-picked from commit edee09224891c259071238d5a8d2be5e3ca7f09c -# DP: make SMC91X selectible for ATARI_ETHERNAT +Author: Michael Schmitz +Description: Make SMC91X driver selectable for ATARI_ETHERNAT boards +Origin: http://git.kernel.org/cgit/linux/kernel/git/geert/linux-m68k.git/commit/?id=edee09224891c259071238d5a8d2be5e3ca7f09c --- a/drivers/net/ethernet/smsc/Kconfig +++ b/drivers/net/ethernet/smsc/Kconfig diff --git a/debian/patches/bugfix/m68k/type-fix-div64.patch b/debian/patches/bugfix/m68k/type-fix-div64.patch new file mode 100644 index 000000000..585ddda3c --- /dev/null +++ b/debian/patches/bugfix/m68k/type-fix-div64.patch @@ -0,0 +1,38 @@ +From: Andreas Schwab +Message-ID: <871u633t27.fsf@igel.home> +Date: Fri, 09 Aug 2013 15:14:08 +0200 +Subject: [PATCH] m68k: truncate base in do_div +Origin: http://thread.gmane.org/gmane.linux.ports.m68k/5008 + +Explicitly truncate the second operand of do_div to 32 bits to guard +against bogus code calling it with a 64bit divisor. + +Signed-off-by: Andreas Schwab +--- + arch/m68k/include/asm/div64.h | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/arch/m68k/include/asm/div64.h ++++ b/arch/m68k/include/asm/div64.h +@@ -15,16 +15,17 @@ + unsigned long long n64; \ + } __n; \ + unsigned long __rem, __upper; \ ++ unsigned long __base = (base); \ + \ + __n.n64 = (n); \ + if ((__upper = __n.n32[0])) { \ + asm ("divul.l %2,%1:%0" \ +- : "=d" (__n.n32[0]), "=d" (__upper) \ +- : "d" (base), "0" (__n.n32[0])); \ ++ : "=d" (__n.n32[0]), "=d" (__upper) \ ++ : "d" (__base), "0" (__n.n32[0])); \ + } \ + asm ("divu.l %2,%1:%0" \ +- : "=d" (__n.n32[1]), "=d" (__rem) \ +- : "d" (base), "1" (__upper), "0" (__n.n32[1])); \ ++ : "=d" (__n.n32[1]), "=d" (__rem) \ ++ : "d" (__base), "1" (__upper), "0" (__n.n32[1])); \ + (n) = __n.n64; \ + __rem; \ + }) diff --git a/debian/patches/series b/debian/patches/series index 5cd2362e2..4d4d4149a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -114,3 +114,9 @@ bugfix/all/nl80211-fix-another-nl80211_fam-attrbuf-race.patch bugfix/all/ext4-fix-retry-handling-in-ext4_ext_truncate.patch bugfix/all/atl1c-Fix-misuse-of-netdev_alloc_skb-in-refilling-rx.patch bugfix/all/SCSI-Don-t-attempt-to-send-extended-INQUIRY-command-.patch + +# m68k IRQ bugfix +bugfix/m68k/atari-irqs.patch + +# m68k workaround for div64 called with wrong type args +bugfix/m68k/type-fix-div64.patch