On Sat, Feb 11, 2012 at 03:21:56PM +0100, Bernhard Walle wrote: > The patches are obsolete as they are mainline. Verified on a NSLU2 > (xscale-arm) little endian board/configuration.
Applied. It's always nice to remove some patches :-) Michael > Signed-off-by: Bernhard Walle <[email protected]> > --- > .../0001-revert-toolchain-problem.patch | 313 > -------------------- > ...uild-Pass-no-undefined-as-a-linker-option.patch | 29 -- > patches/kexec-tools-2.0.2/series | 2 - > rules/kexec-tools.make | 6 +- > 4 files changed, 3 insertions(+), 347 deletions(-) > delete mode 100644 > patches/kexec-tools-2.0.2/0001-revert-toolchain-problem.patch > delete mode 100644 > patches/kexec-tools-2.0.2/0002-build-Pass-no-undefined-as-a-linker-option.patch > delete mode 100644 patches/kexec-tools-2.0.2/series > > diff --git a/patches/kexec-tools-2.0.2/0001-revert-toolchain-problem.patch > b/patches/kexec-tools-2.0.2/0001-revert-toolchain-problem.patch > deleted file mode 100644 > index fa0702c..0000000 > --- a/patches/kexec-tools-2.0.2/0001-revert-toolchain-problem.patch > +++ /dev/null > @@ -1,313 +0,0 @@ > -commit dbe1163152ef6fca2a1bd22e11e219f58fd40c08 > -Author: Maxim Uvarov <[email protected]> > -Date: Mon Sep 6 19:03:22 2010 +0400 > - > - Revert "powerpc new toolchains fix (crt.S)" > - > - This reverts commit 45e8f29639d9f97b74389e5bd28c7a5cccbf3e2a. > - purgatory/arch/ppc/crt.S and purgatory/arch/ppc/misc.S are the same > - files. > - Signed-off-by: Maxim Uvarov <[email protected]> > - Signed-off-by: Simon Horman <[email protected]> > - > -diff --git a/configure.ac b/configure.ac > -index 7f6acc6..2960c25 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -159,15 +159,6 @@ if test "$with_xen" = yes ; then > - AC_MSG_NOTICE([Xen support disabled]))) > - fi > - > --dnl new toolchains > --if test "$ARCH" = ppc; then > --AC_ARG_WITH([oldtoolchain], > -- AC_HELP_STRING([--with-oldtoolchain],[compile without crt.S > -- required for new toolchains]), > -- AC_DEFINE(PPC_OLDTOOLCHAIN, 1, > -- [Define to compile with old toolchains])) > --fi > -- > - dnl ---Sanity checks > - if test "$CC" = "no"; then AC_MSG_ERROR([cc not found]); fi > - if test "$CPP" = "no"; then AC_MSG_ERROR([cpp not found]); fi > -diff --git a/purgatory/arch/ppc/Makefile b/purgatory/arch/ppc/Makefile > -index 4020778..72289a0 100644 > ---- a/purgatory/arch/ppc/Makefile > -+++ b/purgatory/arch/ppc/Makefile > -@@ -6,7 +6,6 @@ ppc_PURGATORY_SRCS += purgatory/arch/ppc/v2wrap_32.S > - ppc_PURGATORY_SRCS += purgatory/arch/ppc/misc.S > - ppc_PURGATORY_SRCS += purgatory/arch/ppc/purgatory-ppc.c > - ppc_PURGATORY_SRCS += purgatory/arch/ppc/console-ppc.c > --ppc_PURGATORY_SRCS += purgatory/arch/ppc/crt.S > - > - dist += purgatory/arch/ppc/Makefile $(ppc_PURGATORY_SRCS) \ > - purgatory/arch/ppc/purgatory-ppc.h purgatory/arch/ppc/ppc_asm.h > -diff --git a/purgatory/arch/ppc/crt.S b/purgatory/arch/ppc/crt.S > -deleted file mode 100644 > -index 70f4d61..0000000 > ---- a/purgatory/arch/ppc/crt.S > -+++ /dev/null > -@@ -1,263 +0,0 @@ > --/* This is from linux-2.6/arch/powerpc/lib/crtsavres.S: > -- * > -- * Special support for eabi and SVR4 > -- * > -- * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, > Inc. > -- * Copyright 2008 Freescale Semiconductor, Inc. > -- * Written By Michael Meissner > -- * > -- * Based on gcc/config/rs6000/crtsavres.asm from gcc > -- * > -- * This file is free software; you can redistribute it and/or modify it > -- * under the terms of the GNU General Public License as published by the > -- * Free Software Foundation; either version 2, or (at your option) any > -- * later version. > -- * > -- * In addition to the permissions in the GNU General Public License, the > -- * Free Software Foundation gives you unlimited permission to link the > -- * compiled version of this file with other programs, and to distribute > -- * those programs without any restriction coming from the use of this > -- * file. (The General Public License restrictions do apply in other > -- * respects; for example, they cover modification of the file, and > -- * distribution when not linked into another program.) > -- * > -- * This file is distributed in the hope that it will be useful, but > -- * WITHOUT ANY WARRANTY; without even the implied warranty of > -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -- * General Public License for more details. > -- * > -- * You should have received a copy of the GNU General Public License > -- * along with this program; see the file COPYING. If not, write to > -- * the Free Software Foundation, 51 Franklin Street, Fifth Floor, > -- * Boston, MA 02110-1301, USA. > -- * > -- * As a special exception, if you link this library with files > -- * compiled with GCC to produce an executable, this does not cause > -- * the resulting executable to be covered by the GNU General Public > License. > -- * This exception does not however invalidate any other reasons why > -- * the executable file might be covered by the GNU General Public > License. > -- */ > --#include "config.h" > -- > --/* On PowerPC64 Linux, these functions are provided by the linker. */ > --#ifndef PPC_OLDTOOLCHAIN > --#ifndef __powerpc64__ > --#define _GLOBAL(name) \ > -- .type name,@function; \ > -- .globl name; \ > --name: > -- > --/* Routines for saving integer registers, called by the compiler. */ > --/* Called with r11 pointing to the stack header word of the caller of the */ > --/* function, just beyond the end of the integer save area. */ > -- > --_GLOBAL(_savegpr_14) > --_GLOBAL(_save32gpr_14) > -- stw 14,-72(11) /* save gp registers */ > --_GLOBAL(_savegpr_15) > --_GLOBAL(_save32gpr_15) > -- stw 15,-68(11) > --_GLOBAL(_savegpr_16) > --_GLOBAL(_save32gpr_16) > -- stw 16,-64(11) > --_GLOBAL(_savegpr_17) > --_GLOBAL(_save32gpr_17) > -- stw 17,-60(11) > --_GLOBAL(_savegpr_18) > --_GLOBAL(_save32gpr_18) > -- stw 18,-56(11) > --_GLOBAL(_savegpr_19) > --_GLOBAL(_save32gpr_19) > -- stw 19,-52(11) > --_GLOBAL(_savegpr_20) > --_GLOBAL(_save32gpr_20) > -- stw 20,-48(11) > --_GLOBAL(_savegpr_21) > --_GLOBAL(_save32gpr_21) > -- stw 21,-44(11) > --_GLOBAL(_savegpr_22) > --_GLOBAL(_save32gpr_22) > -- stw 22,-40(11) > --_GLOBAL(_savegpr_23) > --_GLOBAL(_save32gpr_23) > -- stw 23,-36(11) > --_GLOBAL(_savegpr_24) > --_GLOBAL(_save32gpr_24) > -- stw 24,-32(11) > --_GLOBAL(_savegpr_25) > --_GLOBAL(_save32gpr_25) > -- stw 25,-28(11) > --_GLOBAL(_savegpr_26) > --_GLOBAL(_save32gpr_26) > -- stw 26,-24(11) > --_GLOBAL(_savegpr_27) > --_GLOBAL(_save32gpr_27) > -- stw 27,-20(11) > --_GLOBAL(_savegpr_28) > --_GLOBAL(_save32gpr_28) > -- stw 28,-16(11) > --_GLOBAL(_savegpr_29) > --_GLOBAL(_save32gpr_29) > -- stw 29,-12(11) > --_GLOBAL(_savegpr_30) > --_GLOBAL(_save32gpr_30) > -- stw 30,-8(11) > --_GLOBAL(_savegpr_31) > --_GLOBAL(_save32gpr_31) > -- stw 31,-4(11) > -- blr > -- > --/* Routines for restoring integer registers, called by the compiler. */ > --/* Called with r11 pointing to the stack header word of the caller of the */ > --/* function, just beyond the end of the integer restore area. */ > -- > --_GLOBAL(_restgpr_14) > --_GLOBAL(_rest32gpr_14) > -- lwz 14,-72(11) /* restore gp registers */ > --_GLOBAL(_restgpr_15) > --_GLOBAL(_rest32gpr_15) > -- lwz 15,-68(11) > --_GLOBAL(_restgpr_16) > --_GLOBAL(_rest32gpr_16) > -- lwz 16,-64(11) > --_GLOBAL(_restgpr_17) > --_GLOBAL(_rest32gpr_17) > -- lwz 17,-60(11) > --_GLOBAL(_restgpr_18) > --_GLOBAL(_rest32gpr_18) > -- lwz 18,-56(11) > --_GLOBAL(_restgpr_19) > --_GLOBAL(_rest32gpr_19) > -- lwz 19,-52(11) > --_GLOBAL(_restgpr_20) > --_GLOBAL(_rest32gpr_20) > -- lwz 20,-48(11) > --_GLOBAL(_restgpr_21) > --_GLOBAL(_rest32gpr_21) > -- lwz 21,-44(11) > --_GLOBAL(_restgpr_22) > --_GLOBAL(_rest32gpr_22) > -- lwz 22,-40(11) > --_GLOBAL(_restgpr_23) > --_GLOBAL(_rest32gpr_23) > -- lwz 23,-36(11) > --_GLOBAL(_restgpr_24) > --_GLOBAL(_rest32gpr_24) > -- lwz 24,-32(11) > --_GLOBAL(_restgpr_25) > --_GLOBAL(_rest32gpr_25) > -- lwz 25,-28(11) > --_GLOBAL(_restgpr_26) > --_GLOBAL(_rest32gpr_26) > -- lwz 26,-24(11) > --_GLOBAL(_restgpr_27) > --_GLOBAL(_rest32gpr_27) > -- lwz 27,-20(11) > --_GLOBAL(_restgpr_28) > --_GLOBAL(_rest32gpr_28) > -- lwz 28,-16(11) > --_GLOBAL(_restgpr_29) > --_GLOBAL(_rest32gpr_29) > -- lwz 29,-12(11) > --_GLOBAL(_restgpr_30) > --_GLOBAL(_rest32gpr_30) > -- lwz 30,-8(11) > --_GLOBAL(_restgpr_31) > --_GLOBAL(_rest32gpr_31) > -- lwz 31,-4(11) > -- blr > -- > --/* Routines for restoring integer registers, called by the compiler. */ > --/* Called with r11 pointing to the stack header word of the caller of the */ > --/* function, just beyond the end of the integer restore area. */ > -- > --_GLOBAL(_restgpr_14_x) > --_GLOBAL(_rest32gpr_14_x) > -- lwz 14,-72(11) /* restore gp registers */ > --_GLOBAL(_restgpr_15_x) > --_GLOBAL(_rest32gpr_15_x) > -- lwz 15,-68(11) > --_GLOBAL(_restgpr_16_x) > --_GLOBAL(_rest32gpr_16_x) > -- lwz 16,-64(11) > --_GLOBAL(_restgpr_17_x) > --_GLOBAL(_rest32gpr_17_x) > -- lwz 17,-60(11) > --_GLOBAL(_restgpr_18_x) > --_GLOBAL(_rest32gpr_18_x) > -- lwz 18,-56(11) > --_GLOBAL(_restgpr_19_x) > --_GLOBAL(_rest32gpr_19_x) > -- lwz 19,-52(11) > --_GLOBAL(_restgpr_20_x) > --_GLOBAL(_rest32gpr_20_x) > -- lwz 20,-48(11) > --_GLOBAL(_restgpr_21_x) > --_GLOBAL(_rest32gpr_21_x) > -- lwz 21,-44(11) > --_GLOBAL(_restgpr_22_x) > --_GLOBAL(_rest32gpr_22_x) > -- lwz 22,-40(11) > --_GLOBAL(_restgpr_23_x) > --_GLOBAL(_rest32gpr_23_x) > -- lwz 23,-36(11) > --_GLOBAL(_restgpr_24_x) > --_GLOBAL(_rest32gpr_24_x) > -- lwz 24,-32(11) > --_GLOBAL(_restgpr_25_x) > --_GLOBAL(_rest32gpr_25_x) > -- lwz 25,-28(11) > --_GLOBAL(_restgpr_26_x) > --_GLOBAL(_rest32gpr_26_x) > -- lwz 26,-24(11) > --_GLOBAL(_restgpr_27_x) > --_GLOBAL(_rest32gpr_27_x) > -- lwz 27,-20(11) > --_GLOBAL(_restgpr_28_x) > --_GLOBAL(_rest32gpr_28_x) > -- lwz 28,-16(11) > --_GLOBAL(_restgpr_29_x) > --_GLOBAL(_rest32gpr_29_x) > -- lwz 29,-12(11) > --_GLOBAL(_restgpr_30_x) > --_GLOBAL(_rest32gpr_30_x) > -- lwz 30,-8(11) > --_GLOBAL(_restgpr_31_x) > --_GLOBAL(_rest32gpr_31_x) > -- lwz 0,4(11) > -- lwz 31,-4(11) > -- mtlr 0 > -- mr 1,11 > -- blr > -- > --/* This is from linux-2.6/arch/powerpc/kernel/misc_32.S > -- * > -- * This file contains miscellaneous low-level functions. > -- * Copyright (C) 1995-1996 Gary Thomas ([email protected]) > -- * > -- * Largely rewritten by Cort Dougan ([email protected]) > -- * and Paul Mackerras. > -- * > -- * kexec bits: > -- * Copyright (C) 2002-2003 Eric Biederman <[email protected]> > -- * GameCube/ppc32 port Copyright (C) 2004 Albert Herranz > -- * > -- * This program is free software; you can redistribute it and/or > -- * modify it under the terms of the GNU General Public License > -- * as published by the Free Software Foundation; either version > -- * 2 of the License, or (at your option) any later version. > -- * > -- */ > -- > --_GLOBAL(__lshrdi3) > -- subfic 6,5,32 > -- srw 4,4,5 # LSW = count > 31 ? 0 : LSW >> count > -- addi 7,5,32 # could be xori, or addi with -32 > -- slw 6,3,6 # t1 = count > 31 ? 0 : MSW << (32-count) > -- srw 7,3,7 # t2 = count < 32 ? 0 : MSW >> (count-32) > -- or 4,4,6 # LSW |= t1 > -- srw 3,3,5 # MSW = MSW >> count > -- or 4,4,7 # LSW |= t2 > -- blr > --#endif > --#endif > diff --git > a/patches/kexec-tools-2.0.2/0002-build-Pass-no-undefined-as-a-linker-option.patch > > b/patches/kexec-tools-2.0.2/0002-build-Pass-no-undefined-as-a-linker-option.patch > deleted file mode 100644 > index 3a80f3f..0000000 > --- > a/patches/kexec-tools-2.0.2/0002-build-Pass-no-undefined-as-a-linker-option.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -From 8880e5b8a295788dcae8f5cc038de92cd97b6807 Mon Sep 17 00:00:00 2001 > -From: Simon Horman <[email protected]> > -Date: Wed, 30 Mar 2011 08:34:39 +0900 > -Subject: [PATCH] build: Pass --no-undefined as a linker option > - > -gcc-4.6 does not accept --no-undefined as a compiler option > - > -Reported-by: Civil <[email protected]> > -Acked-by: "Eric W. Biederman" <[email protected]> > -Signed-off-by: Simon Horman <[email protected]> > ---- > - purgatory/Makefile | 4 ++-- > - 1 files changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/purgatory/Makefile b/purgatory/Makefile > -index ea0c19a..ee1679c 100644 > ---- a/purgatory/Makefile > -+++ b/purgatory/Makefile > -@@ -56,8 +56,8 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ > - -I$(srcdir)/include \ > - -I$(shell $(CC) -print-file-name=include) > - $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ > -- --no-undefined -nostartfiles -nostdlib -nodefaultlibs \ > -- -e purgatory_start -r > -+ -Wl,--no-undefined -nostartfiles -nostdlib \ > -+ -nodefaultlibs -e purgatory_start -r > - > - $(PURGATORY): $(PURGATORY_OBJS) > - $(MKDIR) -p $(@D) > diff --git a/patches/kexec-tools-2.0.2/series > b/patches/kexec-tools-2.0.2/series > deleted file mode 100644 > index 616bf4c..0000000 > --- a/patches/kexec-tools-2.0.2/series > +++ /dev/null > @@ -1,2 +0,0 @@ > -0001-revert-toolchain-problem.patch > -0002-build-Pass-no-undefined-as-a-linker-option.patch > diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make > index d451463..b95bdcd 100644 > --- a/rules/kexec-tools.make > +++ b/rules/kexec-tools.make > @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_KEXEC_TOOLS) += kexec-tools > # > # Paths and names > # > -KEXEC_TOOLS_VERSION := 2.0.2 > -KEXEC_TOOLS_MD5 := 35d05fed1c97008ac34c5bfb929295eb > +KEXEC_TOOLS_VERSION := 2.0.3 > +KEXEC_TOOLS_MD5 := b3ced2097ce3981abba38ceedc84f939 > KEXEC_TOOLS := kexec-tools-$(KEXEC_TOOLS_VERSION) > KEXEC_TOOLS_SUFFIX := tar.bz2 > -KEXEC_TOOLS_URL := $(call ptx/mirror, KERNEL, > kernel/people/horms/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX)) > +KEXEC_TOOLS_URL := $(call ptx/mirror, KERNEL, > utils/kernel/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX)) > KEXEC_TOOLS_SOURCE := $(SRCDIR)/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX) > KEXEC_TOOLS_DIR := $(BUILDDIR)/$(KEXEC_TOOLS) > > -- > 1.7.9 > > > -- > ptxdist mailing list > [email protected] > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list [email protected]
