summaryrefslogtreecommitdiff
path: root/multitech
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2013-10-25 17:10:19 -0500
committerJesse Gilles <jgilles@multitech.com>2013-10-25 17:10:19 -0500
commit1a402c01ebc575142afac5a44402fa46b02977d4 (patch)
treee326221caa410ede67874ca0caa6eab2f9960d4a /multitech
parent30ca0a413e66eb77a45e11216ab2f7e67ee4480a (diff)
at91bootstrap-3.5.3: update for mtocgd3 rev B
Diffstat (limited to 'multitech')
-rw-r--r--multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd3/at91bootstrap-3.5.3-mtocgd3.patch19
-rw-r--r--multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb2
2 files changed, 9 insertions, 12 deletions
diff --git a/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd3/at91bootstrap-3.5.3-mtocgd3.patch b/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd3/at91bootstrap-3.5.3-mtocgd3.patch
index 4e3aac0..8b7d82b 100644
--- a/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd3/at91bootstrap-3.5.3-mtocgd3.patch
+++ b/multitech/recipes/at91bootstrap/at91bootstrap-3.5.3/mtocgd3/at91bootstrap-3.5.3-mtocgd3.patch
@@ -1,7 +1,7 @@
Index: at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig
===================================================================
--- at91bootstrap-3.5.3.orig/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig 2013-04-11 05:07:35.000000000 -0500
-+++ at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig 2013-04-24 11:49:10.237842512 -0500
++++ at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig 2013-04-29 15:13:01.390913836 -0500
@@ -42,7 +42,8 @@
ALLOW_PIO3=y
CONFIG_HAS_PIO3=y
@@ -33,8 +33,8 @@ Index: at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig
Index: at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5ek.c
===================================================================
--- at91bootstrap-3.5.3.orig/board/at91sam9x5ek/at91sam9x5ek.c 2013-04-11 05:07:35.000000000 -0500
-+++ at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5ek.c 2013-04-24 11:53:09.981847111 -0500
-@@ -312,10 +312,9 @@
++++ at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5ek.c 2013-04-29 15:14:44.578915819 -0500
+@@ -312,10 +312,8 @@
reg = readl(AT91C_BASE_CCFG + CCFG_EBICSA);
reg |= AT91C_EBI_CS3A_SM;
@@ -42,22 +42,19 @@ Index: at91bootstrap-3.5.3/board/at91sam9x5ek/at91sam9x5ek.c
- reg &= ~AT91C_EBI_NFD0_ON_D16;
- else
- reg |= (AT91C_EBI_DDR_MP_EN | AT91C_EBI_NFD0_ON_D16);
-+ /* MTR2 Rev A NAND is on D0-D7, DDR_MP_EN must be disabled */
-+ reg &= ~AT91C_EBI_NFD0_ON_D16;
-+ reg &= ~AT91C_EBI_DDR_MP_EN;
++ /* MTR */
++ reg |= (AT91C_EBI_DDR_MP_EN | AT91C_EBI_NFD0_ON_D16);
reg &= ~AT91C_EBI_DRV;
writel(reg, AT91C_BASE_CCFG + CCFG_EBICSA);
-@@ -345,10 +344,8 @@
+@@ -345,9 +343,7 @@
AT91C_BASE_SMC + SMC_CTRL3);
/* Configure the PIO controller */
- if (get_cm_rev() == 'A')
- pio_configure(nand_pins_lo);
- else
-- pio_configure(nand_pins_hi);
-+ /* MTR2 */
-+ pio_configure(nand_pins_lo);
++ /* MTR */
+ pio_configure(nand_pins_hi);
writel((1 << AT91C_ID_PIOC_D), (PMC_PCER + AT91C_BASE_PMC));
- }
diff --git a/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb b/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb
index 7fa01bc..7a83579 100644
--- a/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb
+++ b/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb
@@ -1,6 +1,6 @@
require at91bootstrap_3.5.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "https://github.com/linux4sam/at91bootstrap/archive/v3.5.3.tar.gz \
file://at91bootstrap-3.5.2-add-install.patch \