Skip to content

W
White Rabbit Switch - Software
Commit 38176695 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

patches: barebox update

parent 63cf096c
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 26 deletions
patches/barebox/0001-91samg45-removed-two-clock-that-failed-compilation.patch
View file @ 38176695
From dd404508e656aedc98594908b7ddcffecbd70ace Mon Sep 17 00:00:00 2001 From b683a282c45cdd052dae23645cb60cd2f7efddc2 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com> From: Alessandro Rubini <rubini@gnudd.com>
Date: Thu, 15 Sep 2011 23:52:38 +0200 Date: Thu, 15 Sep 2011 23:52:38 +0200
Subject: [PATCH] 91samg45: removed two clock that failed compilation Subject: [PATCH 1/5] 91samg45: removed two clock that failed compilation
--- ---
arch/arm/mach-at91/at91sam9g45.c | 4 ++-- arch/arm/mach-at91/at91sam9g45.c | 4 ++--
...@@ -23,5 +23,5 @@ index d4c27f8..7e59850 100644 ...@@ -23,5 +23,5 @@ index d4c27f8..7e59850 100644
static struct clk_lookup periph_clocks_lookups[] = { static struct clk_lookup periph_clocks_lookups[] = {
-- --
1.5.4.3 1.7.7.2
patches/barebox/0002-sam945-include-mtd-nand.h-in-device-file.patch
View file @ 38176695
From 9c2eb8aef57353d9a3f23803b630dfbab4d9ab8a Mon Sep 17 00:00:00 2001 From c2900034b5e6b634185c6af8e0172a5815ec79b9 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com> From: Alessandro Rubini <rubini@gnudd.com>
Date: Fri, 16 Sep 2011 01:12:15 +0200 Date: Fri, 16 Sep 2011 01:12:15 +0200
Subject: [PATCH] sam945: include mtd/nand.h in device file Subject: [PATCH 2/5] sam945: include mtd/nand.h in device file
--- ---
arch/arm/mach-at91/at91sam9g45_devices.c | 1 + arch/arm/mach-at91/at91sam9g45_devices.c | 1 +
...@@ -20,5 +20,5 @@ index f6e1eb4..992445a 100644 ...@@ -20,5 +20,5 @@ index f6e1eb4..992445a 100644
#include "generic.h" #include "generic.h"
-- --
1.5.4.3 1.7.7.2
patches/barebox/0003-arm-config-added-wrs3_defconfig.patch → patches/barebox/0003-arm-config-added-wrs3_defconfig-and-fixed-default-at.patch
View file @ 38176695
From 8dda05690997b602b2f8b5b8327e846710fd5806 Mon Sep 17 00:00:00 2001 From 67b9fe6e93ec3a0a94301380e9f56a1026b7f774 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com> From: Alessandro Rubini <rubini@gnudd.com>
Date: Thu, 15 Sep 2011 23:53:57 +0200 Date: Thu, 15 Sep 2011 23:53:57 +0200
Subject: [PATCH] arm config: added wrs3_defconfig Subject: [PATCH 3/5] arm config: added wrs3_defconfig and fixed default
at91/Kconfig
--- ---
arch/arm/configs/wrs3_defconfig | 306 +++++++++++++++++++++++++++++++++++++++ arch/arm/configs/wrs3_defconfig | 305 +++++++++++++++++++++++++++++++++++++++
1 files changed, 306 insertions(+), 0 deletions(-) arch/arm/mach-at91/Kconfig | 2 +-
2 files changed, 306 insertions(+), 1 deletions(-)
create mode 100644 arch/arm/configs/wrs3_defconfig create mode 100644 arch/arm/configs/wrs3_defconfig
diff --git a/arch/arm/configs/wrs3_defconfig b/arch/arm/configs/wrs3_defconfig diff --git a/arch/arm/configs/wrs3_defconfig b/arch/arm/configs/wrs3_defconfig
new file mode 100644 new file mode 100644
index 0000000..632b61d index 0000000..c289768
--- /dev/null --- /dev/null
+++ b/arch/arm/configs/wrs3_defconfig +++ b/arch/arm/configs/wrs3_defconfig
@@ -0,0 +1,306 @@ @@ -0,0 +1,305 @@
+# +#
+# Automatically generated make config: don't edit +# Automatically generated make config: don't edit
+# Linux/arm 2011.09.0 Barebox Configuration +# Linux/arm 2011.09.0 Barebox Configuration
+# Fri Sep 16 01:08:38 2011 +# Tue Jan 24 21:02:43 2012
+# +#
+# CONFIG_BOARD_LINKER_SCRIPT is not set +# CONFIG_BOARD_LINKER_SCRIPT is not set
+CONFIG_GENERIC_LINKER_SCRIPT=y +CONFIG_GENERIC_LINKER_SCRIPT=y
...@@ -49,7 +51,7 @@ index 0000000..632b61d ...@@ -49,7 +51,7 @@ index 0000000..632b61d
+# +#
+# CONFIG_BOOT_ENDIANNESS_SWITCH is not set +# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
+CONFIG_ARCH_TEXT_BASE=0x73f00000 +CONFIG_ARCH_TEXT_BASE=0x73f00000
+CONFIG_BOARDINFO="Ronetix PM9G45" +CONFIG_BOARDINFO="CERN White Rabbit Switch V3"
+ +
+# +#
+# Atmel AT91 System-on-Chip +# Atmel AT91 System-on-Chip
...@@ -104,7 +106,7 @@ index 0000000..632b61d ...@@ -104,7 +106,7 @@ index 0000000..632b61d
+# CONFIG_EXPERIMENTAL is not set +# CONFIG_EXPERIMENTAL is not set
+CONFIG_MALLOC_DLMALLOC=y +CONFIG_MALLOC_DLMALLOC=y
+# CONFIG_KALLSYMS is not set +# CONFIG_KALLSYMS is not set
+CONFIG_PROMPT="pm9g45:" +CONFIG_PROMPT="WRS-3> "
+CONFIG_BAUDRATE=115200 +CONFIG_BAUDRATE=115200
+CONFIG_LONGHELP=y +CONFIG_LONGHELP=y
+CONFIG_CBSIZE=1024 +CONFIG_CBSIZE=1024
...@@ -207,7 +209,7 @@ index 0000000..632b61d ...@@ -207,7 +209,7 @@ index 0000000..632b61d
+# flash +# flash
+# +#
+CONFIG_CMD_FLASH=y +CONFIG_CMD_FLASH=y
+CONFIG_CMD_UBI=y +# CONFIG_CMD_UBI is not set
+ +
+# +#
+# booting +# booting
...@@ -281,7 +283,7 @@ index 0000000..632b61d ...@@ -281,7 +283,7 @@ index 0000000..632b61d
+CONFIG_MTD_NAND_VERIFY_WRITE=y +CONFIG_MTD_NAND_VERIFY_WRITE=y
+# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_IDS=y
+CONFIG_UBI=y +# CONFIG_UBI is not set
+# CONFIG_ATA is not set +# CONFIG_ATA is not set
+# CONFIG_USB is not set +# CONFIG_USB is not set
+# CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET is not set
...@@ -308,7 +310,6 @@ index 0000000..632b61d ...@@ -308,7 +310,6 @@ index 0000000..632b61d
+CONFIG_FS_RAMFS=y +CONFIG_FS_RAMFS=y
+CONFIG_FS_DEVFS=y +CONFIG_FS_DEVFS=y
+# CONFIG_FS_FAT is not set +# CONFIG_FS_FAT is not set
+CONFIG_PARTITION_NEED_MTD=y
+CONFIG_ZLIB=y +CONFIG_ZLIB=y
+CONFIG_BZLIB=y +CONFIG_BZLIB=y
+CONFIG_CRC32=y +CONFIG_CRC32=y
...@@ -320,6 +321,19 @@ index 0000000..632b61d ...@@ -320,6 +321,19 @@ index 0000000..632b61d
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set +# CONFIG_GENERIC_FIND_NEXT_BIT is not set
+CONFIG_PROCESS_ESCAPE_SEQUENCE=y +CONFIG_PROCESS_ESCAPE_SEQUENCE=y
+CONFIG_LZO_DECOMPRESS=y +CONFIG_LZO_DECOMPRESS=y
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index ee46002..7d245d5 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
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
-- --
1.5.4.3 1.7.7.2
patches/barebox/0004-new-config-for-barebox-env.patch
View file @ 38176695
From 8b83039b5eeb580cbda14cbc7a84525d02e5a717 Mon Sep 17 00:00:00 2001 From 8dd9093a82d3901bd6194aa2e36aee822f7a18f2 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com> From: Alessandro Rubini <rubini@gnudd.com>
Date: Thu, 12 Jan 2012 20:07:48 +0100 Date: Thu, 12 Jan 2012 20:07:48 +0100
Subject: [PATCH] new config for barebox env Subject: [PATCH 4/5] new config for barebox env
--- ---
arch/arm/boards/pm9g45/env/config | 43 ++++-------------------------------- arch/arm/boards/pm9g45/env/config | 45 +++++-------------------------------
1 files changed, 5 insertions(+), 38 deletions(-) 1 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/arch/arm/boards/pm9g45/env/config b/arch/arm/boards/pm9g45/env/config diff --git a/arch/arm/boards/pm9g45/env/config b/arch/arm/boards/pm9g45/env/config
index b8ca18d..ed683fe 100644 index b8ca18d..45ae02b 100644
--- a/arch/arm/boards/pm9g45/env/config --- a/arch/arm/boards/pm9g45/env/config
+++ b/arch/arm/boards/pm9g45/env/config +++ b/arch/arm/boards/pm9g45/env/config
@@ -1,42 +1,9 @@ @@ -1,42 +1,11 @@
#!/bin/sh #!/bin/sh
- -
-# use 'dhcp' to do dhcp in barebox and in kernel -# use 'dhcp' to do dhcp in barebox and in kernel
...@@ -55,10 +55,12 @@ index b8ca18d..ed683fe 100644 ...@@ -55,10 +55,12 @@ index b8ca18d..ed683fe 100644
- -
-# set a fancy prompt (if support is compiled in) -# set a fancy prompt (if support is compiled in)
-PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m " -PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m "
+timeout -a $autoboot_timeout
+if [ $? != 0 ]; then exit; fi
+dhcp +dhcp
+tftp wrboot +tftp wrboot
+./wrboot +./wrboot
-- --
1.7.0.4 1.7.7.2
patches/barebox/0005-nand-wrs-it-s-16-bits-not-8.patch 0 → 100644
View file @ 38176695
From 028fafe92791963b95094abdc4c975a8f166228e 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
---
arch/arm/boards/pm9g45/init.c | 6 +++---
1 files 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
--- 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 = {
.ale = 21,
.cle = 22,
/* .det_pin = ... not connected */
- .rdy_pin = AT91_PIN_PD3,
+ .rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
- .bus_width_16 = 0,
+ .bus_width_16 = 1,
};
static struct sam9_smc_config pm_nand_smc_config = {
@@ -69,7 +69,7 @@ static struct sam9_smc_config pm_nand_smc_config = {
static void pm_add_device_nand(void)
{
- pm_nand_smc_config.mode |= AT91_SMC_DBW_8;
+ pm_nand_smc_config.mode |= AT91_SMC_DBW_16;
/* configure chip-select 3 (NAND) */
sam9_smc_configure(3, &pm_nand_smc_config);
--
1.7.7.2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment