From b1a41a45b1b2c57d05f76c803ec1b45fba338410 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Tue, 2 Sep 2014 21:54:43 +0000 Subject: [PATCH] [ppc64el] debian/patches/debian/ppc64el-disable-zImage.patch: remove patch. The 'powerpc/boot: 64bit little endian wrapper' patch-set is in linux 3.16, thus the default make/image-y target is OK now. svn path=/dists/trunk/linux/; revision=21760 --- debian/changelog | 4 ++ .../debian/ppc64el-disable-zImage.patch | 49 ------------------- debian/patches/series | 1 - 3 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 debian/patches/debian/ppc64el-disable-zImage.patch diff --git a/debian/changelog b/debian/changelog index 5bdea9572..7fd6c254c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ linux (3.16.1-1) UNRELEASED; urgency=medium https://wiki.debian.org/DebianKernel/ARMMP for details. * [armel/kirkwood] Enable CONFIG_MTD_SPI_NOR for flash access. + * [ppc64el] debian/patches/debian/ppc64el-disable-zImage.patch: remove patch. + The 'powerpc/boot: 64bit little endian wrapper' patch-set is in linux 3.16, + thus the default make/image-y target is OK now. + -- Ben Hutchings Tue, 12 Aug 2014 02:58:45 +0100 linux (3.16-1~exp1) experimental; urgency=medium diff --git a/debian/patches/debian/ppc64el-disable-zImage.patch b/debian/patches/debian/ppc64el-disable-zImage.patch deleted file mode 100644 index a234961ea..000000000 --- a/debian/patches/debian/ppc64el-disable-zImage.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Mauricio Faria de Oliveira -Date: Wed, 4 Jun 2014 09:06:27 -0300 -Subject: ppc64el: kernel: patch: temporarily disable zImage - -Debian ppc64el will wait for the 'powerpc/boot: 64bit little endian wrapper' -(zImage) patches upstream rather than shipping 32-bit tools for zImage. The -patches are currently in Ben Herrenschmidt's linux-next tree [1]. - -The patches are not being carried over instead of this workaround because, -even without both, the build process does produces vmlinux, only failing for -zImage. So, it's ok to just work-around this for now, as we pick vmlinux. - -The workaround patch just avoids this build error: - - [...] - LD vmlinux - SYSMAP System.map - [...] - WRAP arch/powerpc/boot/zImage.pseries - ld: unrecognised emulation mode: elf32ppc - Supported emulations: elf64lppc elf32lppc elf32lppclinux elf32lppcsim - make[6]: *** [arch/powerpc/boot/zImage.pseries] Error 1 - make[5]: *** [zImage] Error 2 - -[1] https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/log/?qt=grep&q=powerpc%2Fboot - (15 commits with message prefix 'powerpc/boot:' dated of 2014-04-28) - -Signed-off-by: Mauricio Faria de Oliveira ---- -Index: linux-3.14.2/arch/powerpc/boot/Makefile -=================================================================== ---- linux-3.14.2.orig/arch/powerpc/boot/Makefile 2014-05-02 16:52:37.000000000 -0300 -+++ linux-3.14.2/arch/powerpc/boot/Makefile 2014-05-07 09:39:11.000000000 -0300 -@@ -344,6 +344,15 @@ - $(obj)/%.dtb: $(src)/dts/%.dts FORCE - $(call if_changed_dep,dtc) - -+# Debian ppc64el will wait for the 'powerpc/boot: 64bit little endian wrapper' -+# (zImage) patches upstream rather than shipping 32-bit tools for zImage. -+# This makes the next conditional block to pick vmlinux.strip as image-y. -+ifdef CONFIG_PPC64 -+ifdef CONFIG_CPU_LITTLE_ENDIAN -+image-y := -+endif -+endif -+ - # If there isn't a platform selected then just strip the vmlinux. - ifeq (,$(image-y)) - image-y := vmlinux.strip diff --git a/debian/patches/series b/debian/patches/series index 0a221d905..2484d05d2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,7 +6,6 @@ debian/ia64-hardcode-arch-script-output.patch debian/mips-disable-werror.patch debian/arch-sh4-fix-uimage-build.patch debian/powerpcspe-omit-uimage.patch -debian/ppc64el-disable-zImage.patch features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch # Fixes/improvements to firmware loading