diff --git a/debian/changelog b/debian/changelog index bfc0226df..384e08f5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ linux (3.15.3-1) UNRELEASED; urgency=medium * [mips,mipsel] Move common MIPS kernel config files to kernelarch-mips. * [mips,mipsel] Clean mipsel installer by using symlinks to the mips versions. + * [mips,mipsel] Add mips64 and mips64el support (Closes: #749688). -- maximilian attems Sat, 21 Jun 2014 14:58:01 +0200 diff --git a/debian/config/defines b/debian/config/defines index 89331c1f8..298d735ee 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -14,6 +14,8 @@ arches: m68k mips mipsel + mips64 + mips64el or1k powerpc powerpcspe diff --git a/debian/config/mips64/config b/debian/config/mips64/config new file mode 100644 index 000000000..1d9268526 --- /dev/null +++ b/debian/config/mips64/config @@ -0,0 +1,7 @@ +## +## file: arch/mips/Kconfig +## +## choice: Endianness selection +CONFIG_CPU_BIG_ENDIAN=y +# CONFIG_CPU_LITTLE_ENDIAN is not set +## end choice diff --git a/debian/config/mips64/defines b/debian/config/mips64/defines new file mode 100644 index 000000000..6a7b2e646 --- /dev/null +++ b/debian/config/mips64/defines @@ -0,0 +1,25 @@ +[base] +flavours: + sb1-bcm91250a + octeon +kernel-arch: mips + +[build] +image-file: vmlinux + +[image] +install-stem: vmlinux + +[sb1-bcm91250a_description] +hardware: BCM91250A +hardware-long: Broadcom BCM91250A systems (aka SWARM) + +[sb1-bcm91250a_image] +configs: kernelarch-mips/config.sb1-bcm91250a + +[octeon_description] +hardware: Octeon +hardware-long: Cavium Networks Octeon + +[octeon_image] +configs: kernelarch-mips/config.octeon diff --git a/debian/config/mips64el/config b/debian/config/mips64el/config new file mode 100644 index 000000000..7f124deb6 --- /dev/null +++ b/debian/config/mips64el/config @@ -0,0 +1,8 @@ +## +## file: arch/mips/Kconfig +## +## choice: Endianness selection +# CONFIG_CPU_BIG_ENDIAN is not set +CONFIG_CPU_LITTLE_ENDIAN=y +## end choice + diff --git a/debian/config/mips64el/defines b/debian/config/mips64el/defines new file mode 100644 index 000000000..78846a9fb --- /dev/null +++ b/debian/config/mips64el/defines @@ -0,0 +1,50 @@ +[base] +flavours: + sb1-bcm91250a + loongson-2e + loongson-2f + loongson-3 + octeon +kernel-arch: mips + +[build] +image-file: vmlinux + +[image] +install-stem: vmlinux + +[sb1-bcm91250a_description] +hardware: BCM91250A +hardware-long: Broadcom BCM91250A systems (aka SWARM) + +[sb1-bcm91250a_image] +configs: kernelarch-mips/config.sb1-bcm91250a + +[loongson-2e_description] +hardware: Loongson 2E +hardware-long: Lemote Loongson 2E systems + +[loongson-2e_image] +configs: kernelarch-mips/config.loongson-2e + +[loongson-2f_description] +hardware: Loongson 2F +hardware-long: Lemote Loongson 2F systems + +[loongson-2f_image] +recommends: libc6-loongson2f +configs: kernelarch-mips/config.loongson-2f + +[loongson-3_description] +hardware: Loongson 3A/3B +hardware-long: Loongson 3A or 3B based systems (e.g. from Loongson or Lemote) + +[loongson-3_image] +configs: kernelarch-mips/config.loongson-3 + +[octeon_description] +hardware: Octeon +hardware-long: Cavium Networks Octeon + +[octeon_image] +configs: kernelarch-mips/config.octeon diff --git a/debian/installer/mips64/kernel-versions b/debian/installer/mips64/kernel-versions new file mode 100644 index 000000000..6b07838b2 --- /dev/null +++ b/debian/installer/mips64/kernel-versions @@ -0,0 +1,3 @@ +# arch version flavour installedname suffix build-depends +mips64 - sb1-bcm91250a - y - +mips64 - octeon - y - diff --git a/debian/installer/mips64/modules/mips64 b/debian/installer/mips64/modules/mips64 new file mode 120000 index 000000000..d3bf739f6 --- /dev/null +++ b/debian/installer/mips64/modules/mips64 @@ -0,0 +1 @@ +../../mips/modules/mips \ No newline at end of file diff --git a/debian/installer/mips64/modules/mips64-octeon b/debian/installer/mips64/modules/mips64-octeon new file mode 120000 index 000000000..da584c69b --- /dev/null +++ b/debian/installer/mips64/modules/mips64-octeon @@ -0,0 +1 @@ +../../mips/modules/mips-octeon \ No newline at end of file diff --git a/debian/installer/mips64/modules/mips64-sb1-bcm91250a b/debian/installer/mips64/modules/mips64-sb1-bcm91250a new file mode 120000 index 000000000..6fb6062c6 --- /dev/null +++ b/debian/installer/mips64/modules/mips64-sb1-bcm91250a @@ -0,0 +1 @@ +../../mips/modules/mips-sb1-bcm91250a \ No newline at end of file diff --git a/debian/installer/mips64/package-list b/debian/installer/mips64/package-list new file mode 100644 index 000000000..c94fcfd67 --- /dev/null +++ b/debian/installer/mips64/package-list @@ -0,0 +1,7 @@ +# This file is used to build up the control file. The kernel version and +# "-di" are appended to the package names. Section can be left out. So can +# 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: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules diff --git a/debian/installer/mips64el/kernel-versions b/debian/installer/mips64el/kernel-versions new file mode 100644 index 000000000..89f7ef37c --- /dev/null +++ b/debian/installer/mips64el/kernel-versions @@ -0,0 +1,6 @@ +# arch version flavour installedname suffix build-depends +mips64el - sb1-bcm91250a - y - +mips64el - loongson-2e - y - +mips64el - loongson-2f - y - +mips64el - loongson-3 - y - +mips64el - octeon - y - diff --git a/debian/installer/mips64el/modules/mips64el-loongson-2e b/debian/installer/mips64el/modules/mips64el-loongson-2e new file mode 120000 index 000000000..b62930d39 --- /dev/null +++ b/debian/installer/mips64el/modules/mips64el-loongson-2e @@ -0,0 +1 @@ +../../mipsel/modules/mipsel-loongson-2e \ No newline at end of file diff --git a/debian/installer/mips64el/modules/mips64el-loongson-2f b/debian/installer/mips64el/modules/mips64el-loongson-2f new file mode 120000 index 000000000..58388bbd3 --- /dev/null +++ b/debian/installer/mips64el/modules/mips64el-loongson-2f @@ -0,0 +1 @@ +../../mipsel/modules/mipsel-loongson-2f \ No newline at end of file diff --git a/debian/installer/mips64el/modules/mips64el-loongson-3 b/debian/installer/mips64el/modules/mips64el-loongson-3 new file mode 120000 index 000000000..7f6e9670c --- /dev/null +++ b/debian/installer/mips64el/modules/mips64el-loongson-3 @@ -0,0 +1 @@ +../../mipsel/modules/mipsel-loongson-3 \ No newline at end of file diff --git a/debian/installer/mips64el/modules/mips64el-octeon b/debian/installer/mips64el/modules/mips64el-octeon new file mode 120000 index 000000000..da584c69b --- /dev/null +++ b/debian/installer/mips64el/modules/mips64el-octeon @@ -0,0 +1 @@ +../../mips/modules/mips-octeon \ No newline at end of file diff --git a/debian/installer/mips64el/modules/mips64el-sb1-bcm91250a b/debian/installer/mips64el/modules/mips64el-sb1-bcm91250a new file mode 120000 index 000000000..3de5b535e --- /dev/null +++ b/debian/installer/mips64el/modules/mips64el-sb1-bcm91250a @@ -0,0 +1 @@ +../../mipsel/modules/mipsel-sb1-bcm91250a \ No newline at end of file diff --git a/debian/installer/mips64el/package-list b/debian/installer/mips64el/package-list new file mode 100644 index 000000000..c94fcfd67 --- /dev/null +++ b/debian/installer/mips64el/package-list @@ -0,0 +1,7 @@ +# This file is used to build up the control file. The kernel version and +# "-di" are appended to the package names. Section can be left out. So can +# 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: ata-modules, ext2-modules, ext3-modules, ext4-modules, rtc-modules