patches/barebox: removed needless patch, regenerated others

5b1a173a · Alessandro Rubini · d9a03f17 · 5b1a173a · 5b1a173a · 5b1a173a
Commit 5b1a173a authored Aug 02, 2012 by Alessandro Rubini
10 changed files
--- a/patches/barebox/0001-sam945-include-mtd-nand.h-in-device-file.patch
+++ b/patches/barebox/0001-sam945-include-mtd-nand.h-in-device-file.patch
-From 4f2b2bbb26148c9f5df629264cbdff40db4ad23d Mon Sep 17 00:00:00 2001
+From e3ea3052ee7cd6ad45e3456a05e9bbf124c226cb Mon Sep 17 00:00:00 2001
 From: Alessandro Rubini <rubini@gnudd.com>
 Date: Fri, 16 Sep 2011 01:12:15 +0200
-Subject: [PATCH 1/9] sam945: include mtd/nand.h in device file
+Subject: [PATCH 1/8] sam945: include mtd/nand.h in device file

 ---
 arch/arm/mach-at91/at91sam9g45_devices.c |    1 +
- 1 file changed, 1 insertion(+)
+ 1 files changed, 1 insertions(+), 0 deletions(-)

 diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
 index ca96f58..86c6b86 100644
@@ -20,5 +20,5 @@ index ca96f58..86c6b86 100644
 #include "generic.h"
 
 -- 
-1.7.9.5
+1.7.7.2

--- a/patches/barebox/0002-arm-config-added-wrs3_defconfig-and-fixed-default-at.patch
+++ b/patches/barebox/0002-arm-config-added-wrs3_defconfig-and-fixed-default-at.patch
-From 8347bb31200c92255b18cc76979c6abea1819409 Mon Sep 17 00:00:00 2001
+From a273273231f1544b8b9a01f5a27293b849c641e7 Mon Sep 17 00:00:00 2001
 From: Alessandro Rubini <rubini@gnudd.com>
 Date: Thu, 15 Sep 2011 23:53:57 +0200
-Subject: [PATCH 2/9] arm config: added wrs3_defconfig and fixed default
+Subject: [PATCH 2/8] arm config: added wrs3_defconfig and fixed default
 at91/Kconfig

 ---
 arch/arm/configs/wrs3_defconfig |  305 +++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-at91/Kconfig      |    2 +-
- 2 files changed, 306 insertions(+), 1 deletion(-)
+ 2 files changed, 306 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/configs/wrs3_defconfig

 diff --git a/arch/arm/configs/wrs3_defconfig b/arch/arm/configs/wrs3_defconfig
@@ -335,5 +335,5 @@ index 1bec3e5..85becd0 100644
 	default "Calao TNY-A9260" if MACH_TNY_A9260
 	default "Calao TNY-A9263" if MACH_TNY_A9263
 -- 
-1.7.9.5
+1.7.7.2

--- a/patches/barebox/0003-nand-wrs-it-s-16-bits-not-8.patch
+++ b/patches/barebox/0003-nand-wrs-it-s-16-bits-not-8.patch
-From 62bcf3fbd32c123ffdf19895cc902b844c217414 Mon Sep 17 00:00:00 2001
+From adb77bf754050ddd0339ce2b966c652bea4dc394 Mon Sep 17 00:00:00 2001
 From: Alessandro Rubini <rubini@gnudd.com>
 Date: Tue, 6 Mar 2012 01:26:28 +0100
-Subject: [PATCH 3/9] nand wrs: it's 16-bits not 8
+Subject: [PATCH 3/8] nand wrs: it's 16-bits not 8

 ---
 arch/arm/boards/pm9g45/init.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ 1 files changed, 3 insertions(+), 3 deletions(-)

 diff --git a/arch/arm/boards/pm9g45/init.c b/arch/arm/boards/pm9g45/init.c
 index 9b22276..9ecd628 100644
@@ -33,5 +33,5 @@ index 9b22276..9ecd628 100644
 	/* configure chip-select 3 (NAND) */
 	sam9_smc_configure(3, &pm_nand_smc_config);
 -- 
-1.7.9.5
+1.7.7.2

--- a/patches/barebox/0004-add-DHCP-retries-by-tom.patch
+++ b/patches/barebox/0004-add-DHCP-retries-by-tom.patch
-From 62f41545be940803c0f7639963183181ca04e721 Mon Sep 17 00:00:00 2001
+From a28e0d77a1cd896a049dfd5b7a28d28f72cf73b6 Mon Sep 17 00:00:00 2001
 From: Benoit Rat <benoit@sevensols.com>
 Date: Tue, 15 May 2012 17:08:41 +0200
-Subject: [PATCH 4/9] add DHCP retries by tom
+Subject: [PATCH 4/8] add DHCP retries by tom

 ---
 net/dhcp.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
+ 1 files changed, 13 insertions(+), 0 deletions(-)

 diff --git a/net/dhcp.c b/net/dhcp.c
 index ad32b53..88febea 100644
@@ -54,5 +54,5 @@ index ad32b53..88febea 100644
 				goto out1;
 		}
 -- 
-1.7.9.5
+1.7.7.2

--- a/patches/barebox/0005-build-Add-a-script-to-compile-with-WRS-env-variables.patch
+++ b/patches/barebox/0005-build-Add-a-script-to-compile-with-WRS-env-variables.patch
-From faf08754590a65054cef411286ccc14f3a60642c Mon Sep 17 00:00:00 2001
-From: Benoit Rat <benoit@sevensols.com>
-Date: Mon, 28 May 2012 12:22:48 +0200
-Subject: [PATCH 5/9] build: Add a script to compile with WRS env variables, &
- ignore barebox_default_env
-
---
- .gitignore |    2 +-
- build.sh   |   13 +++++++++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
- create mode 100755 build.sh
-
-diff --git a/.gitignore b/.gitignore
-index cc1f2e2..82963f3 100644
--- a/.gitignore
-+++ b/.gitignore
-@@ -36,7 +36,7 @@ barebox.netx
- barebox.map
- System.map
- Module.symvers
-barebox_default_env
-+barebox_default_env*
- 
- #
- # Generated include files
-diff --git a/build.sh b/build.sh
-new file mode 100755
-index 0000000..d913edb
--- /dev/null
-+++ b/build.sh
-@@ -0,0 +1,13 @@
-+#!/bin/bash
-+
-+# To use this script you need to setup the `WRS_OUTPUT_DIR` variable by doing:
-+# 
-+# 	export WRS_OUTPUT_DIR=/path/to/wrs/output/dir		
-+# 
-+# You should call the script like this:
-+# 		
-+# 		./build.sh wrs3_defconfig
-+# 		./build.sh all
-+
-+
-+make LINUX=${WRS_OUTPUT_DIR}/build/linux-2.6.39/ CROSS_COMPILE=${WRS_OUTPUT_DIR}/build/buildroot-2011.11/output/host/usr/bin/arm-linux- ARCH=arm $1
-- 
-1.7.9.5
-
--- a/patches/barebox/0006-gpio-add-function-to-check-them.patch
+++ b/patches/barebox/0006-gpio-add-function-to-check-them.patch
-From c813f205325e95fac8e31ee616e43cacdc3dbd04 Mon Sep 17 00:00:00 2001
+From 6ea20bbe79dd86fd5d95bff00f8b685a2aa38ce9 Mon Sep 17 00:00:00 2001
 From: Benoit Rat <benoit@sevensols.com>
 Date: Mon, 28 May 2012 12:23:13 +0200
-Subject: [PATCH 6/9] gpio: add function to check them
+Subject: [PATCH 5/8] gpio: add function to check them

 ---
 arch/arm/boards/pm9g45/init.c |   21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
+ 1 files changed, 21 insertions(+), 0 deletions(-)

 diff --git a/arch/arm/boards/pm9g45/init.c b/arch/arm/boards/pm9g45/init.c
 index 9ecd628..a84e431 100644
@@ -47,5 +47,5 @@ index 9ecd628..a84e431 100644
 	return 0;
 }
 -- 
-1.7.9.5
+1.7.7.2

--- a/patches/barebox/0007-startup-load-default-environment-when-loading-env-fa.patch
+++ b/patches/barebox/0007-startup-load-default-environment-when-loading-env-fa.patch
-From 868b709e683fd848afb0cdd8c17218e76d1cdcd6 Mon Sep 17 00:00:00 2001
+From 505eadc6d9766c0e0732ef09548a750847708e00 Mon Sep 17 00:00:00 2001
 From: Benoit Rat <benoit@sevensols.com>
 Date: Mon, 2 Jul 2012 12:59:15 +0200
-Subject: [PATCH 7/9] startup: load default environment when loading env
+Subject: [PATCH 6/8] startup: load default environment when loading env
 failed

 ---
 common/startup.c |    7 +++++++
- 1 file changed, 7 insertions(+)
+ 1 files changed, 7 insertions(+), 0 deletions(-)

 diff --git a/common/startup.c b/common/startup.c
 index abd1b77..2992c43 100644
@@ -27,5 +27,5 @@ index abd1b77..2992c43 100644
 #endif
 	/* main_loop() can return to retry autoboot, if so just run it again. */
 -- 
-1.7.9.5
+1.7.7.2

--- a/patches/barebox/0008-nand-Fix-wrongly-removed-line-for-16bits-NAND.patch
+++ b/patches/barebox/0008-nand-Fix-wrongly-removed-line-for-16bits-NAND.patch
-From 5b2b91f674f727fc1b40878e3f4a9ee721008eb2 Mon Sep 17 00:00:00 2001
+From 889d0e4db5a3aba95688411700c217cef1554a52 Mon Sep 17 00:00:00 2001
 From: Benoit Rat <benoit@sevensols.com>
 Date: Mon, 2 Jul 2012 13:00:43 +0200
-Subject: [PATCH 8/9] nand: Fix wrongly removed line for 16bits NAND
+Subject: [PATCH 7/8] nand: Fix wrongly removed line for 16bits NAND

 ---
 drivers/mtd/nand/atmel_nand.c |   26 ++++++++++++++++++++++----
- 1 file changed, 22 insertions(+), 4 deletions(-)
+ 1 files changed, 22 insertions(+), 4 deletions(-)

 diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
 index 96624a1..bad75a9 100644
@@ -60,5 +60,5 @@ index 96624a1..bad75a9 100644
 	atmel_nand_enable(host);
 
 -- 
-1.7.9.5
+1.7.7.2

--- a/patches/barebox/0009-wrs-init-config-script-with-menu-support-v3.2.patch
+++ b/patches/barebox/0009-wrs-init-config-script-with-menu-support-v3.2.patch
-From 01f37c9783d48906f3ea2a672be734c5ebd3f9d2 Mon Sep 17 00:00:00 2001
+From a0a89716ee84c0bc09697211e5ce234bcbdd58c2 Mon Sep 17 00:00:00 2001
 From: Alessandro Rubini <rubini@gnudd.com>
 Date: Mon, 9 Jul 2012 13:40:30 +0200
-Subject: [PATCH 9/9] wrs: init & config script with menu (support v3.2)
+Subject: [PATCH 8/8] wrs: init & config script with menu (support v3.2)

 Author:    Benoit Rat <benoit@sevensols.com>
 ---
@@ -336,5 +336,5 @@ index a84e431..bbdf297 100644
 	dev_add_bb_dev("env_raw", "env0");
 
 -- 
-1.7.9.5
+1.7.7.2

--- a/patches/barebox/README.md
+++ b/patches/barebox/README.md
-Generation
-============
-
-These patches are generated using the following git:
-
-	<https://github.com/neub/wrs-sw-barebox/tree/patcheable-wrs>
-	
-and by executing:
-
-	git format-patch v2012.05.0	
-	
-However you can see the history of the development without any rebase by following:
-
-	<https://github.com/neub/wrs-sw-barebox/tree/wrs>	
-	
-
-Application
-=============	
-
-1. You first need to download the binary file: barebox-2012.05.0.tar.bz2
-* Then you need to extract it to a folder, and go into it
-* Initialize a git repo: `git init .`
-* And finally you can apply the patches: git am 00*.patch