barebox: Update the previous patches to work with v2012.05.0

ec2ef78c · Benoit Rat · Alessandro Rubini · 8ac0eedd · ec2ef78c · ec2ef78c
Commit ec2ef78c authored Jul 11, 2012 by Benoit Rat Committed by Alessandro Rubini Jul 16, 2012
7 changed files
--- a/build/download-info
+++ b/build/download-info
@@ -11,8 +11,8 @@ at91bootstrap-3-3.0.tar.gz       059a3e99cd93727c642ab7843c714887 \
 http://repository.timesys.com/buildsources/a/at91bootstrap-3/at91bootstrap-3-3.0/at91bootstrap-3-3.0.tar.gz

 # boot loader
-barebox-2011.09.0.tar.bz2        0ea4940b7c5af5c50dcf75d4170a319d \
-   http://www.barebox.org/./download/barebox-2011.09.0.tar.bz2
+barebox-2012.05.0.tar.bz2       208495f31b832eb6ae0c887787431def \
+   http://www.barebox.org/download/barebox-2012.05.0.tar.bz2

 # kernel
 linux-2.6.39.tar.bz2            1aab7a741abe08d42e8eccf20de61e05 \

--- a/build/scripts/wrs_build_barebox
+++ b/build/scripts/wrs_build_barebox
@@ -11,7 +11,7 @@ fi
 wrs_check_vars WRS_OUTPUT_DIR WRS_DOWNLOAD_DIR CROSS_COMPILE

 wrs_echo "--- Barebox"
-tarname="barebox-2011.09.0.tar.bz2"
+tarname="barebox-2012.05.0.tar.bz2"
 wrs_download $tarname

 mkdir -p $WRS_OUTPUT_DIR/build || wrs_die "mkdir build"
@@ -19,7 +19,7 @@ mkdir -p $WRS_OUTPUT_DIR/images || wrs_die "mkdir images"

 # go to the build dir and compile it
 cd $WRS_OUTPUT_DIR/build
-dirname="barebox-2011.09.0"
+dirname="barebox-2012.05.0"
 rm -rf $dirname
 tar xjf ${WRS_DOWNLOAD_DIR}/$tarname || wrs_die "untar $tarname"
 cd $dirname
@@ -39,4 +39,4 @@ make -s $WRS_MAKE_J || wrs_die "compile barebox"
 cp barebox barebox.bin $WRS_OUTPUT_DIR/images \
    || wrs_die "copying barebox image"

-exit 0
\ No newline at end of file
+exit 0
--- a/patches/barebox/0001-91samg45-removed-two-clock-that-failed-compilation.patch
+++ b/patches/barebox/0001-91samg45-removed-two-clock-that-failed-compilation.patch
-From b683a282c45cdd052dae23645cb60cd2f7efddc2 Mon Sep 17 00:00:00 2001
-From: Alessandro Rubini <rubini@gnudd.com>
-Date: Thu, 15 Sep 2011 23:52:38 +0200
-Subject: [PATCH 1/5] 91samg45: removed two clock that failed compilation
-
---
- arch/arm/mach-at91/at91sam9g45.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
-index d4c27f8..7e59850 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
-+++ b/arch/arm/mach-at91/at91sam9g45.c
-@@ -182,8 +182,8 @@ static struct clk *periph_clocks[] __initdata = {
- 	&udphs_clk,
- 	&mmc1_clk,
- 	// irq0
-	&ohci_clk,
-	&tcb1_clk,
-+	//&ohci_clk,
-+	//&tcb1_clk,
- };
- 
- static struct clk_lookup periph_clocks_lookups[] = {
-- 
-1.7.7.2
-
--- a/patches/barebox/0002-sam945-include-mtd-nand.h-in-device-file.patch
+++ b/patches/barebox/0002-sam945-include-mtd-nand.h-in-device-file.patch
-From c2900034b5e6b634185c6af8e0172a5815ec79b9 Mon Sep 17 00:00:00 2001
+From 4f2b2bbb26148c9f5df629264cbdff40db4ad23d Mon Sep 17 00:00:00 2001
 From: Alessandro Rubini <rubini@gnudd.com>
 Date: Fri, 16 Sep 2011 01:12:15 +0200
-Subject: [PATCH 2/5] sam945: include mtd/nand.h in device file
+Subject: [PATCH 1/9] sam945: include mtd/nand.h in device file

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

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

--- a/patches/barebox/0003-arm-config-added-wrs3_defconfig-and-fixed-default-at.patch
+++ b/patches/barebox/0003-arm-config-added-wrs3_defconfig-and-fixed-default-at.patch
-From 67b9fe6e93ec3a0a94301380e9f56a1026b7f774 Mon Sep 17 00:00:00 2001
+From 8347bb31200c92255b18cc76979c6abea1819409 Mon Sep 17 00:00:00 2001
 From: Alessandro Rubini <rubini@gnudd.com>
 Date: Thu, 15 Sep 2011 23:53:57 +0200
-Subject: [PATCH 3/5] arm config: added wrs3_defconfig and fixed default
+Subject: [PATCH 2/9] 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 deletions(-)
+ 2 files changed, 306 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/configs/wrs3_defconfig

 diff --git a/arch/arm/configs/wrs3_defconfig b/arch/arm/configs/wrs3_defconfig
@@ -322,18 +322,18 @@ index 0000000..c289768
 +CONFIG_PROCESS_ESCAPE_SEQUENCE=y
 +CONFIG_LZO_DECOMPRESS=y
 diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
-index ee46002..7d245d5 100644
+index 1bec3e5..85becd0 100644
 --- a/arch/arm/mach-at91/Kconfig
 +++ b/arch/arm/mach-at91/Kconfig
-@@ -16,7 +16,7 @@ config BOARDINFO
- 	default "Bucyrus MMC-CPU" if MACH_MMCCPU
+@@ -20,7 +20,7 @@ config BOARDINFO
+ 	default "Calao USB-A9G20" if MACH_USB_A9G20
 	default "Ronetix PM9261" if MACH_PM9261
 	default "Ronetix PM9263" if MACH_PM9263
 -	default "Ronetix PM9G45" if MACH_PM9G45
 +	default "CERN White Rabbit Switch V3" if MACH_PM9G45
- 
- config HAVE_NAND_ATMEL_BUSWIDTH_16
- 	bool
+ 	default "Aizo dSS11" if MACH_DSS11
+ 	default "Calao TNY-A9260" if MACH_TNY_A9260
+ 	default "Calao TNY-A9263" if MACH_TNY_A9263
 -- 
-1.7.7.2
+1.7.9.5

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

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

 diff --git a/arch/arm/boards/pm9g45/init.c b/arch/arm/boards/pm9g45/init.c
-index 35c9ce9..7d0fb4c 100644
+index 9b22276..9ecd628 100644
 --- a/arch/arm/boards/pm9g45/init.c
 +++ b/arch/arm/boards/pm9g45/init.c
 @@ -44,9 +44,9 @@ static struct atmel_nand_data nand_pdata = {
@@ -33,5 +33,5 @@ index 35c9ce9..7d0fb4c 100644
 	/* configure chip-select 3 (NAND) */
 	sam9_smc_configure(3, &pm_nand_smc_config);
 -- 
-1.7.7.2
+1.7.9.5

--- a/patches/barebox/0004-new-config-for-barebox-env.patch
+++ b/patches/barebox/0004-new-config-for-barebox-env.patch
-From 8dd9093a82d3901bd6194aa2e36aee822f7a18f2 Mon Sep 17 00:00:00 2001
-From: Alessandro Rubini <rubini@gnudd.com>
-Date: Thu, 12 Jan 2012 20:07:48 +0100
-Subject: [PATCH 4/5] new config for barebox env
-
---
- arch/arm/boards/pm9g45/env/config |   45 +++++-------------------------------
- 1 files changed, 7 insertions(+), 38 deletions(-)
-
-diff --git a/arch/arm/boards/pm9g45/env/config b/arch/arm/boards/pm9g45/env/config
-index b8ca18d..45ae02b 100644
--- a/arch/arm/boards/pm9g45/env/config
-+++ b/arch/arm/boards/pm9g45/env/config
-@@ -1,42 +1,11 @@
- #!/bin/sh
-
-# use 'dhcp' to do dhcp in barebox and in kernel
-# use 'none' if you want to skip kernel ip autoconfiguration
-ip=dhcp
-
-# or set your networking parameters here
-#eth0.ipaddr=a.b.c.d
-#eth0.netmask=a.b.c.d
-#eth0.gateway=a.b.c.d
-#eth0.serverip=a.b.c.d
-
-# can be either 'nfs', 'tftp' or 'nand'
-kernel_loc=tftp
-# can be either 'net', 'nand' or 'initrd'
-rootfs_loc=net
-
-# can be either 'jffs2' or 'ubifs'
-rootfs_type=ubifs
-rootfsimage=root.$rootfs_type
-
-# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
-#kernelimage_type=zimage
-#kernelimage=zImage
-kernelimage_type=uimage
-kernelimage=uImage
-#kernelimage_type=raw
-#kernelimage=Image
-#kernelimage_type=raw_lzo
-#kernelimage=Image.lzo
-
-nand_device=atmel_nand
-nand_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)"
-rootfs_mtdblock_nand=3
-
-+eth0.ethaddr=02:0B:AD:C0:FF:EE
- autoboot_timeout=3
-
-+PS1="barebox-wrs> "
- bootargs="console=ttyS0,115200"
-
-# set a fancy prompt (if support is compiled in)
-PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m "
-+timeout -a $autoboot_timeout
-+if [ $? != 0 ]; then exit; fi
-+dhcp
-+tftp wrboot
-+./wrboot
- 
-- 
-1.7.7.2
-