diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2009-06-10 10:57:52 +0000 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2009-06-10 10:57:52 +0000 |
| commit | 0c5c03d095485f7521d96cd44314f9a0ee826232 (patch) | |
| tree | 1df111a8270ba417537931cc6e1a4952b3000ee9 /patches/mkelfImage-2.7/generic | |
| parent | d3ee0775cadf505c4bae7b1df483d73bf8294815 (diff) | |
| download | ptxdist-0c5c03d095485f7521d96cd44314f9a0ee826232.tar.gz ptxdist-0c5c03d095485f7521d96cd44314f9a0ee826232.tar.xz | |
* patches: remove 'generic'-layer
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10711 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/mkelfImage-2.7/generic')
| -rw-r--r-- | patches/mkelfImage-2.7/generic/convert_params.diff | 30 | ||||
| -rw-r--r-- | patches/mkelfImage-2.7/generic/ldflags-cppflags-fix.diff | 38 | ||||
| -rw-r--r-- | patches/mkelfImage-2.7/generic/series | 2 |
3 files changed, 0 insertions, 70 deletions
diff --git a/patches/mkelfImage-2.7/generic/convert_params.diff b/patches/mkelfImage-2.7/generic/convert_params.diff deleted file mode 100644 index a673ac826..000000000 --- a/patches/mkelfImage-2.7/generic/convert_params.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- mkelfImage-2.7-orig/linux-i386/convert_params.c 2006-03-28 01:44:59.000000000 +0200 -+++ mkelfImage-2.7/linux-i386/convert_params.c 2006-05-30 22:28:39.000000000 +0200 -@@ -962,22 +962,22 @@ - return head; - } - }; -- return 0; -+ return (void*)-1; - } - - static int find_lb_table(struct param_info *info) - { - struct lb_header *head; -- head = 0; -- if (!head) { -+ head = (void*)-1; -+ if (head == (void*)-1) { - /* First try at address 0 */ - head = __find_lb_table((void *)0x00000, (void *)0x1000); - } -- if (!head) { -+ if (head == (void*)-1) { - /* Then try at address 0xf0000 */ - head = __find_lb_table((void *)0xf0000, (void *)0x100000); - } -- if (head) { -+ if (head != (void*)-1) { - info->has_linuxbios = 1; - info->lb_table = head; - return 1; diff --git a/patches/mkelfImage-2.7/generic/ldflags-cppflags-fix.diff b/patches/mkelfImage-2.7/generic/ldflags-cppflags-fix.diff deleted file mode 100644 index e80861e17..000000000 --- a/patches/mkelfImage-2.7/generic/ldflags-cppflags-fix.diff +++ /dev/null @@ -1,38 +0,0 @@ -# -# Submitted-By: Marc Kleine-Budde, 2007-01-26 -# -# Error: -# -# project is not using automake, thus not saving CPPFLAGS and LDFLAGS during configure -# -# Description: -# -# added MY_CPPFLAGS variable, to provide cppflags from outside during -# make. same goes for LDFLAGS -# -Index: Makefile -=================================================================== ---- a/Makefile.orig -+++ b/Makefile -@@ -14,7 +14,7 @@ pkgdatadir = $(datadir)/$(PACKAGE) - pkglibdir = $(libdir)/$(PACKAGE) - pkgincludedir = $(includedir)/$(PACKAGE) - --CPPFLAGS=-DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(RELEASE_DATE)"' -I include -+CPPFLAGS=-DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(RELEASE_DATE)"' -I include $(MY_CPPFLAGS) - HOST_CPPFLAGS=$(CPPFLAGS) - I386_CPPFLAGS=$(CPPFLAGS) -I arch/i386/include - IA64_CPPFLAGS=$(CPPFLAGS) -I arch/ia64/include -Index: Makefile.conf.in -=================================================================== ---- a/Makefile.conf.in.orig -+++ b/Makefile.conf.in -@@ -14,7 +14,7 @@ mandir=@mandir@ - includedir=@includedir@ - - DEFS=@DEFS@ --LIBS=@LIBS@ -+LIBS=@LIBS@ $(LDFLAGS) - HOST_CC=@HOST_CC@ - HOST_CFLAGS=@HOST_CFLAGS@ $(DEFS) - diff --git a/patches/mkelfImage-2.7/generic/series b/patches/mkelfImage-2.7/generic/series deleted file mode 100644 index b1805f73b..000000000 --- a/patches/mkelfImage-2.7/generic/series +++ /dev/null @@ -1,2 +0,0 @@ -convert_params.diff -ldflags-cppflags-fix.diff |