From 0c5c03d095485f7521d96cd44314f9a0ee826232 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Wed, 10 Jun 2009 10:57:52 +0000
Subject: 	* patches: remove 'generic'-layer

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10711 33e552b5-05e3-0310-8538-816dae2090ed
---
 patches/mkelfImage-2.7/convert_params.diff         | 30 +++++++++++++++++
 patches/mkelfImage-2.7/generic/convert_params.diff | 30 -----------------
 .../generic/ldflags-cppflags-fix.diff              | 38 ----------------------
 patches/mkelfImage-2.7/generic/series              |  2 --
 patches/mkelfImage-2.7/ldflags-cppflags-fix.diff   | 38 ++++++++++++++++++++++
 patches/mkelfImage-2.7/series                      |  2 ++
 6 files changed, 70 insertions(+), 70 deletions(-)
 create mode 100644 patches/mkelfImage-2.7/convert_params.diff
 delete mode 100644 patches/mkelfImage-2.7/generic/convert_params.diff
 delete mode 100644 patches/mkelfImage-2.7/generic/ldflags-cppflags-fix.diff
 delete mode 100644 patches/mkelfImage-2.7/generic/series
 create mode 100644 patches/mkelfImage-2.7/ldflags-cppflags-fix.diff
 create mode 100644 patches/mkelfImage-2.7/series

(limited to 'patches/mkelfImage-2.7')

diff --git a/patches/mkelfImage-2.7/convert_params.diff b/patches/mkelfImage-2.7/convert_params.diff
new file mode 100644
index 000000000..a673ac826
--- /dev/null
+++ b/patches/mkelfImage-2.7/convert_params.diff
@@ -0,0 +1,30 @@
+--- 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/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
diff --git a/patches/mkelfImage-2.7/ldflags-cppflags-fix.diff b/patches/mkelfImage-2.7/ldflags-cppflags-fix.diff
new file mode 100644
index 000000000..e80861e17
--- /dev/null
+++ b/patches/mkelfImage-2.7/ldflags-cppflags-fix.diff
@@ -0,0 +1,38 @@
+#
+# 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/series b/patches/mkelfImage-2.7/series
new file mode 100644
index 000000000..b1805f73b
--- /dev/null
+++ b/patches/mkelfImage-2.7/series
@@ -0,0 +1,2 @@
+convert_params.diff
+ldflags-cppflags-fix.diff
-- 
cgit v1.2.3