summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf@grond.atmel.com>2010-01-12 22:10:59 +0100
committerGravatar Ulf Samuelsson <ulf@grond.atmel.com>2010-01-12 22:10:59 +0100
commita23b4ddfd89e6543d1f19ae8feab2d33be0ed05f (patch)
tree98b6fe656c01d0edb35b97bc9acffd08c0b35886
parentf87c270d7129f943da272608325c22f5997b337d (diff)
downloadat91bootstrap-a23b4ddfd89e6543d1f19ae8feab2d33be0ed05f.tar.gz
at91bootstrap-a23b4ddfd89e6543d1f19ae8feab2d33be0ed05f.tar.bz2
Update defconfigs
-rw-r--r--board/afeb9260/afeb9260.c27
-rw-r--r--board/afeb9260/afeb9260_defconfig5
-rw-r--r--board/at91cap9adk/at91cap9adk_defconfig4
-rw-r--r--board/at91cap9adk/at91cap9df_defconfig4
-rw-r--r--board/at91cap9adk/at91cap9f_defconfig2
-rw-r--r--board/at91cap9stk/at91cap9stk_defconfig4
-rw-r--r--board/at91cap9stk/at91cap9stkdf_defconfig4
-rw-r--r--board/at91cap9stk/at91cap9stkf_defconfig2
-rw-r--r--board/at91sam9260ek/at91sam9260df_defconfig5
-rw-r--r--board/at91sam9260ek/at91sam9260dfc_defconfig5
-rw-r--r--board/at91sam9260ek/at91sam9260ek.c4
-rw-r--r--board/at91sam9260ek/at91sam9260ek_defconfig5
-rw-r--r--board/at91sam9260ek/at91sam9260nf_defconfig3
-rw-r--r--board/at91sam9261ek/at91sam9261df_defconfig4
-rw-r--r--board/at91sam9261ek/at91sam9261dfc_defconfig4
-rw-r--r--board/at91sam9261ek/at91sam9261ek_defconfig4
-rw-r--r--board/at91sam9261ek/at91sam9261nf_defconfig2
-rw-r--r--board/at91sam9263ek/at91sam9263dfc_defconfig4
-rw-r--r--board/at91sam9263ek/at91sam9263ek_defconfig4
-rw-r--r--board/at91sam9263ek/at91sam9263nf_defconfig4
-rw-r--r--board/at91sam9g10ek/at91sam9g10df_defconfig4
-rw-r--r--board/at91sam9g10ek/at91sam9g10ek_defconfig4
-rw-r--r--board/at91sam9g10ek/at91sam9g10nf_defconfig2
-rw-r--r--board/at91sam9g20ek/at91sam9g20df_defconfig11
-rw-r--r--board/at91sam9g20ek/at91sam9g20dfc_defconfig5
-rw-r--r--board/at91sam9g20ek/at91sam9g20ek.c3
-rw-r--r--board/at91sam9g20ek/at91sam9g20ek_defconfig5
-rw-r--r--board/at91sam9g20ek/at91sam9g20nf_defconfig3
-rw-r--r--board/at91sam9g45ek/at91sam9g45df_defconfig9
-rw-r--r--board/at91sam9g45ek/at91sam9g45ek.c4
-rw-r--r--board/at91sam9g45ek/at91sam9g45ek_defconfig9
-rw-r--r--board/at91sam9g45ek/at91sam9g45nf_defconfig7
-rw-r--r--board/at91sam9g45ekes/at91sam9g45dfes_defconfig7
-rw-r--r--board/at91sam9g45ekes/at91sam9g45ekes.c4
-rw-r--r--board/at91sam9g45ekes/at91sam9g45ekes_defconfig5
-rw-r--r--board/at91sam9g45ekes/at91sam9g45nfes_defconfig5
-rw-r--r--board/at91sam9m10ek/at91sam9m10df_defconfig5
-rw-r--r--board/at91sam9m10ek/at91sam9m10ek.c4
-rw-r--r--board/at91sam9m10ek/at91sam9m10ek_defconfig5
-rw-r--r--board/at91sam9m10ek/at91sam9m10nf_defconfig3
-rw-r--r--board/at91sam9rlek/at91sam9rldf_defconfig4
-rw-r--r--board/at91sam9rlek/at91sam9rlek_defconfig4
-rw-r--r--board/at91sam9rlek/at91sam9rlnf_defconfig2
-rw-r--r--board/at91sam9xeek/at91sam9xedf_defconfig5
-rw-r--r--board/at91sam9xeek/at91sam9xedfc_defconfig5
-rw-r--r--board/at91sam9xeek/at91sam9xeek.c4
-rw-r--r--board/at91sam9xeek/at91sam9xeek_defconfig5
-rw-r--r--board/at91sam9xeek/at91sam9xenf_defconfig3
48 files changed, 171 insertions, 65 deletions
diff --git a/board/afeb9260/afeb9260.c b/board/afeb9260/afeb9260.c
index 6b483df..3fa0e38 100644
--- a/board/afeb9260/afeb9260.c
+++ b/board/afeb9260/afeb9260.c
@@ -189,6 +189,8 @@ void sdramc_hw_init(void)
#endif /* CONFIG_SDRAM */
#ifdef CONFIG_DATAFLASH
+
+#if defined(CONFIG_DATAFLASH_RECOVERY)
/*------------------------------------------------------------------------------*/
/* \fn df_recovery */
/* \brief This function erases DataFlash Page 0 if BP4 is pressed */
@@ -213,11 +215,14 @@ void df_recovery(AT91PS_DF pDf)
df_page_erase(pDf, 0);
#endif
}
+#endif
/*------------------------------------------------------------------------------*/
/* \fn df_hw_init */
/* \brief This function performs DataFlash HW initialization */
/*------------------------------------------------------------------------------*/
+
+#if 1
void df_hw_init(void)
{
writel(0xf, 0xfffff444);
@@ -227,6 +232,28 @@ void df_hw_init(void)
writel(1 << 11, AT91C_BASE_PIOC + PIO_BSR(0));
writel(1 << 11, AT91C_BASE_PIOC + PIO_PDR(0));
}
+#else
+unsigned int df_init_tab[] =
+{
+ 0xf, 0xfffff444,
+ 0xf, 0xfffff460,
+ 0xf, 0xfffff470,
+ 0xf, 0xfffff404,
+ 1 << 11, AT91C_BASE_PIOC + PIO_BSR(0),
+ 1 << 11, AT91C_BASE_PIOC + PIO_PDR(0),
+};
+void df_hw_init(void)
+{
+ unsigned int i = 0;
+ unsigned int val,addr;
+ while(i < 12) {
+ val = df_init_tab[i++];
+ addr = df_init_tab[i++];
+ writel(val,addr);
+ }
+}
+#endif
+
#endif /* CONFIG_DATAFLASH */
/* We init NAND regardless of whatever */
diff --git a/board/afeb9260/afeb9260_defconfig b/board/afeb9260/afeb9260_defconfig
index 0a389da..ee84d2f 100644
--- a/board/afeb9260/afeb9260_defconfig
+++ b/board/afeb9260/afeb9260_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:44 2009
+# Tue Jan 12 22:00:55 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="afeb9260"
@@ -69,6 +69,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+# CONFIG_SMALL_DATAFLASH is not set
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
# CONFIG_SPI_BOOT_CS0 is not set
CONFIG_SPI_BOOT_CS1=y
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91cap9adk/at91cap9adk_defconfig b/board/at91cap9adk/at91cap9adk_defconfig
index eaa0923..b9edc91 100644
--- a/board/at91cap9adk/at91cap9adk_defconfig
+++ b/board/at91cap9adk/at91cap9adk_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:22 2009
+# Tue Jan 12 22:00:30 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91cap9adk"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91cap9adk/at91cap9df_defconfig b/board/at91cap9adk/at91cap9df_defconfig
index 0c2dc55..8ccd36d 100644
--- a/board/at91cap9adk/at91cap9df_defconfig
+++ b/board/at91cap9adk/at91cap9df_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:23 2009
+# Tue Jan 12 22:00:30 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91cap9df"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91cap9adk/at91cap9f_defconfig b/board/at91cap9adk/at91cap9f_defconfig
index e4c715d..7110cf1 100644
--- a/board/at91cap9adk/at91cap9f_defconfig
+++ b/board/at91cap9adk/at91cap9f_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:24 2009
+# Tue Jan 12 22:00:31 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91cap9f"
diff --git a/board/at91cap9stk/at91cap9stk_defconfig b/board/at91cap9stk/at91cap9stk_defconfig
index 1492580..dea9253 100644
--- a/board/at91cap9stk/at91cap9stk_defconfig
+++ b/board/at91cap9stk/at91cap9stk_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:24 2009
+# Tue Jan 12 22:00:32 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91cap9stk"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91cap9stk/at91cap9stkdf_defconfig b/board/at91cap9stk/at91cap9stkdf_defconfig
index d14ca06..b572d64 100644
--- a/board/at91cap9stk/at91cap9stkdf_defconfig
+++ b/board/at91cap9stk/at91cap9stkdf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:25 2009
+# Tue Jan 12 22:00:33 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91cap9stkdf"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91cap9stk/at91cap9stkf_defconfig b/board/at91cap9stk/at91cap9stkf_defconfig
index b093f8b..b024769 100644
--- a/board/at91cap9stk/at91cap9stkf_defconfig
+++ b/board/at91cap9stk/at91cap9stkf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:26 2009
+# Tue Jan 12 22:00:33 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91cap9stkf"
diff --git a/board/at91sam9260ek/at91sam9260df_defconfig b/board/at91sam9260ek/at91sam9260df_defconfig
index 150bf5f..5493f25 100644
--- a/board/at91sam9260ek/at91sam9260df_defconfig
+++ b/board/at91sam9260ek/at91sam9260df_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:42 2009
+# Tue Jan 12 22:00:53 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9260df"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+# CONFIG_SMALL_DATAFLASH is not set
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
# CONFIG_SPI_BOOT_CS0 is not set
CONFIG_SPI_BOOT_CS1=y
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9260ek/at91sam9260dfc_defconfig b/board/at91sam9260ek/at91sam9260dfc_defconfig
index e1ef271..5e744ad 100644
--- a/board/at91sam9260ek/at91sam9260dfc_defconfig
+++ b/board/at91sam9260ek/at91sam9260dfc_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:41 2009
+# Tue Jan 12 22:00:52 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9260dfc"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+# CONFIG_SMALL_DATAFLASH is not set
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9260ek/at91sam9260ek.c b/board/at91sam9260ek/at91sam9260ek.c
index a3c6af0..a33c753 100644
--- a/board/at91sam9260ek/at91sam9260ek.c
+++ b/board/at91sam9260ek/at91sam9260ek.c
@@ -175,7 +175,7 @@ void sdramc_hw_init(void)
#endif /* CONFIG_SDRAM */
#ifdef CONFIG_DATAFLASH
-
+#if defined(CONFIG_DATAFLASH_RECOVERY)
/*------------------------------------------------------------------------------*/
/* \fn df_recovery */
/* \brief This function erases DataFlash Page 0 if BP4 is pressed */
@@ -200,7 +200,7 @@ void df_recovery(AT91PS_DF pDf)
df_page_erase(pDf, 0);
#endif
}
-
+#endif
/*------------------------------------------------------------------------------*/
/* \fn df_hw_init */
/* \brief This function performs DataFlash HW initialization */
diff --git a/board/at91sam9260ek/at91sam9260ek_defconfig b/board/at91sam9260ek/at91sam9260ek_defconfig
index 7203767..af20f2d 100644
--- a/board/at91sam9260ek/at91sam9260ek_defconfig
+++ b/board/at91sam9260ek/at91sam9260ek_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:43 2009
+# Tue Jan 12 22:00:54 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9260ek"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+# CONFIG_SMALL_DATAFLASH is not set
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9260ek/at91sam9260nf_defconfig b/board/at91sam9260ek/at91sam9260nf_defconfig
index f516bd2..7df2bd6 100644
--- a/board/at91sam9260ek/at91sam9260nf_defconfig
+++ b/board/at91sam9260ek/at91sam9260nf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:43 2009
+# Tue Jan 12 22:00:55 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9260nf"
@@ -63,6 +63,7 @@ CONFIG_RAM_64MB=y
CONFIG_NANDFLASH=y
# CONFIG_SDCARD is not set
CONFIG_MEMORY="nandflash"
+ALLOW_DATAFLASH_RECOVERY=y
ALLOW_BOOT_FROM_DATAFLASH_CS0=y
ALLOW_BOOT_FROM_DATAFLASH_CS1=y
DATAFLASHCARD_ON_CS0=y
diff --git a/board/at91sam9261ek/at91sam9261df_defconfig b/board/at91sam9261ek/at91sam9261df_defconfig
index 27c87a7..05058be 100644
--- a/board/at91sam9261ek/at91sam9261df_defconfig
+++ b/board/at91sam9261ek/at91sam9261df_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:45 2009
+# Tue Jan 12 22:00:56 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9261df"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9261ek/at91sam9261dfc_defconfig b/board/at91sam9261ek/at91sam9261dfc_defconfig
index 70c2f79..42206b1 100644
--- a/board/at91sam9261ek/at91sam9261dfc_defconfig
+++ b/board/at91sam9261ek/at91sam9261dfc_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:46 2009
+# Tue Jan 12 22:00:57 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9261dfc"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9261ek/at91sam9261ek_defconfig b/board/at91sam9261ek/at91sam9261ek_defconfig
index 1753ac0..ee6f131 100644
--- a/board/at91sam9261ek/at91sam9261ek_defconfig
+++ b/board/at91sam9261ek/at91sam9261ek_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:46 2009
+# Tue Jan 12 22:00:57 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9261ek"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9261ek/at91sam9261nf_defconfig b/board/at91sam9261ek/at91sam9261nf_defconfig
index 3105acc..5754f52 100644
--- a/board/at91sam9261ek/at91sam9261nf_defconfig
+++ b/board/at91sam9261ek/at91sam9261nf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:47 2009
+# Tue Jan 12 22:00:58 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9261nf"
diff --git a/board/at91sam9263ek/at91sam9263dfc_defconfig b/board/at91sam9263ek/at91sam9263dfc_defconfig
index 1db192e..70f6e32 100644
--- a/board/at91sam9263ek/at91sam9263dfc_defconfig
+++ b/board/at91sam9263ek/at91sam9263dfc_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:48 2009
+# Tue Jan 12 22:00:59 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9263dfc"
@@ -72,6 +72,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9263ek/at91sam9263ek_defconfig b/board/at91sam9263ek/at91sam9263ek_defconfig
index a1aa851..f37f38a 100644
--- a/board/at91sam9263ek/at91sam9263ek_defconfig
+++ b/board/at91sam9263ek/at91sam9263ek_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:49 2009
+# Tue Jan 12 22:01:00 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9263ek"
@@ -72,6 +72,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9263ek/at91sam9263nf_defconfig b/board/at91sam9263ek/at91sam9263nf_defconfig
index 17d3c74..7b74304 100644
--- a/board/at91sam9263ek/at91sam9263nf_defconfig
+++ b/board/at91sam9263ek/at91sam9263nf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:50 2009
+# Tue Jan 12 22:01:01 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9263nf"
@@ -88,6 +88,6 @@ CONFIG_DEBUG=y
CONFIG_VERBOSE=y
CONFIG_HW_INIT=y
# CONFIG_USER_HW_INIT is not set
-CONFIG_THUMB=y
+# CONFIG_THUMB is not set
CONFIG_SX_AT91=y
CONFIG_RAW_AT91=y
diff --git a/board/at91sam9g10ek/at91sam9g10df_defconfig b/board/at91sam9g10ek/at91sam9g10df_defconfig
index 32d5a10..0e75885 100644
--- a/board/at91sam9g10ek/at91sam9g10df_defconfig
+++ b/board/at91sam9g10ek/at91sam9g10df_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:29 2009
+# Tue Jan 12 22:00:37 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g10df"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9g10ek/at91sam9g10ek_defconfig b/board/at91sam9g10ek/at91sam9g10ek_defconfig
index 279d47c..29022fb 100644
--- a/board/at91sam9g10ek/at91sam9g10ek_defconfig
+++ b/board/at91sam9g10ek/at91sam9g10ek_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:29 2009
+# Tue Jan 12 22:00:38 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g10ek"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9g10ek/at91sam9g10nf_defconfig b/board/at91sam9g10ek/at91sam9g10nf_defconfig
index da2d81e..2c69c8e 100644
--- a/board/at91sam9g10ek/at91sam9g10nf_defconfig
+++ b/board/at91sam9g10ek/at91sam9g10nf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:30 2009
+# Tue Jan 12 22:00:39 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g10nf"
diff --git a/board/at91sam9g20ek/at91sam9g20df_defconfig b/board/at91sam9g20ek/at91sam9g20df_defconfig
index ff04105..351b02a 100644
--- a/board/at91sam9g20ek/at91sam9g20df_defconfig
+++ b/board/at91sam9g20ek/at91sam9g20df_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:27 2009
+# Tue Jan 12 22:00:35 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g20df"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
# CONFIG_SPI_BOOT_CS0 is not set
CONFIG_SPI_BOOT_CS1=y
# CONFIG_SPI_BOOT_CS2 is not set
@@ -96,10 +99,10 @@ CONFIG_LOAD_UBOOT=y
CONFIG_IMG_ADDRESS="0x00008400"
CONFIG_IMG_SIZE="0x00040000"
CONFIG_JUMP_ADDR="0x23F00000"
-CONFIG_APP_CHECK=y
+# CONFIG_APP_CHECK is not set
# CONFIG_LONG_TEST is not set
-CONFIG_DEBUG=y
-CONFIG_VERBOSE=y
+# CONFIG_DEBUG is not set
+# CONFIG_VERBOSE is not set
CONFIG_HW_INIT=y
# CONFIG_USER_HW_INIT is not set
# CONFIG_THUMB is not set
diff --git a/board/at91sam9g20ek/at91sam9g20dfc_defconfig b/board/at91sam9g20ek/at91sam9g20dfc_defconfig
index 9000d27..8520a79 100644
--- a/board/at91sam9g20ek/at91sam9g20dfc_defconfig
+++ b/board/at91sam9g20ek/at91sam9g20dfc_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:26 2009
+# Tue Jan 12 22:00:34 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g20dfc"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9g20ek/at91sam9g20ek.c b/board/at91sam9g20ek/at91sam9g20ek.c
index 3d2a5a0..4687c7e 100644
--- a/board/at91sam9g20ek/at91sam9g20ek.c
+++ b/board/at91sam9g20ek/at91sam9g20ek.c
@@ -176,7 +176,7 @@ void sdramc_hw_init(void)
#endif /* CONFIG_SDRAM */
#ifdef CONFIG_DATAFLASH
-
+#if defined(CONFIG_DATAFLASH_RECOVERY)
/*------------------------------------------------------------------------------*/
/* \fn df_recovery */
/* \brief This function erases DataFlash Page 0 if BP4 is pressed */
@@ -201,6 +201,7 @@ void df_recovery(AT91PS_DF pDf)
df_page_erase(pDf, 0);
#endif
}
+#endif
/*------------------------------------------------------------------------------*/
/* \fn df_hw_init */
diff --git a/board/at91sam9g20ek/at91sam9g20ek_defconfig b/board/at91sam9g20ek/at91sam9g20ek_defconfig
index d02d984..2df7ec5 100644
--- a/board/at91sam9g20ek/at91sam9g20ek_defconfig
+++ b/board/at91sam9g20ek/at91sam9g20ek_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:27 2009
+# Tue Jan 12 22:00:36 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g20ek"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9g20ek/at91sam9g20nf_defconfig b/board/at91sam9g20ek/at91sam9g20nf_defconfig
index 18f4613..8338b3d 100644
--- a/board/at91sam9g20ek/at91sam9g20nf_defconfig
+++ b/board/at91sam9g20ek/at91sam9g20nf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:28 2009
+# Tue Jan 12 22:00:36 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g20nf"
@@ -63,6 +63,7 @@ CONFIG_RAM_64MB=y
CONFIG_NANDFLASH=y
# CONFIG_SDCARD is not set
CONFIG_MEMORY="nandflash"
+ALLOW_DATAFLASH_RECOVERY=y
ALLOW_BOOT_FROM_DATAFLASH_CS0=y
ALLOW_BOOT_FROM_DATAFLASH_CS1=y
DATAFLASHCARD_ON_CS0=y
diff --git a/board/at91sam9g45ek/at91sam9g45df_defconfig b/board/at91sam9g45ek/at91sam9g45df_defconfig
index ba0a5f0..6259b01 100644
--- a/board/at91sam9g45ek/at91sam9g45df_defconfig
+++ b/board/at91sam9g45ek/at91sam9g45df_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:33 2009
+# Tue Jan 12 22:00:42 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g45df"
@@ -21,7 +21,7 @@ CONFIG_CHIP="AT91SAM9G45"
CONFIG_BOARD="at91sam9g45ek"
CONFIG_MACH_TYPE="1830"
CONFIG_LINK_ADDR="0x000000"
-CONFIG_TOP_OF_MEMORY="0x301000"
+CONFIG_TOP_OF_MEMORY="0x304000"
CONFIG_BOOTSTRAP_MAXSIZE="13000"
# CONFIG_CRYSTAL_12_000MHZ is not set
# CONFIG_CRYSTAL_16_000MHZ is not set
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
@@ -95,7 +98,7 @@ CONFIG_LOAD_UBOOT=y
# CONFIG_LOAD_4MB is not set
CONFIG_IMG_ADDRESS="0x00008400"
CONFIG_IMG_SIZE="0x00040000"
-CONFIG_JUMP_ADDR="0x23F00000"
+CONFIG_JUMP_ADDR="0x73F00000"
CONFIG_APP_CHECK=y
# CONFIG_LONG_TEST is not set
CONFIG_DEBUG=y
diff --git a/board/at91sam9g45ek/at91sam9g45ek.c b/board/at91sam9g45ek/at91sam9g45ek.c
index d75d5b6..f993dce 100644
--- a/board/at91sam9g45ek/at91sam9g45ek.c
+++ b/board/at91sam9g45ek/at91sam9g45ek.c
@@ -181,7 +181,7 @@ void ddramc_hw_init(void)
#endif /* CONFIG_DDR2 */
#ifdef CONFIG_DATAFLASH
-
+#if defined(CONFIG_DATAFLASH_RECOVERY)
/*------------------------------------------------------------------------------*/
/* \fn df_recovery */
/* \brief This function erases DataFlash Page 0 if BP4 is pressed */
@@ -191,7 +191,7 @@ void df_recovery(AT91PS_DF pDf)
{
}
-
+#endif
/*------------------------------------------------------------------------------*/
/* \fn df_hw_init */
/* \brief This function performs DataFlash HW initialization */
diff --git a/board/at91sam9g45ek/at91sam9g45ek_defconfig b/board/at91sam9g45ek/at91sam9g45ek_defconfig
index 0612f56..a4ed8c8 100644
--- a/board/at91sam9g45ek/at91sam9g45ek_defconfig
+++ b/board/at91sam9g45ek/at91sam9g45ek_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:33 2009
+# Tue Jan 12 22:00:43 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g45ek"
@@ -21,7 +21,7 @@ CONFIG_CHIP="AT91SAM9G45"
CONFIG_BOARD="at91sam9g45ek"
CONFIG_MACH_TYPE="1830"
CONFIG_LINK_ADDR="0x000000"
-CONFIG_TOP_OF_MEMORY="0x301000"
+CONFIG_TOP_OF_MEMORY="0x304000"
CONFIG_BOOTSTRAP_MAXSIZE="13000"
# CONFIG_CRYSTAL_12_000MHZ is not set
# CONFIG_CRYSTAL_16_000MHZ is not set
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
@@ -95,7 +98,7 @@ CONFIG_LOAD_UBOOT=y
# CONFIG_LOAD_4MB is not set
CONFIG_IMG_ADDRESS="0x00008400"
CONFIG_IMG_SIZE="0x00040000"
-CONFIG_JUMP_ADDR="0x23F00000"
+CONFIG_JUMP_ADDR="0x73F00000"
CONFIG_APP_CHECK=y
# CONFIG_LONG_TEST is not set
CONFIG_DEBUG=y
diff --git a/board/at91sam9g45ek/at91sam9g45nf_defconfig b/board/at91sam9g45ek/at91sam9g45nf_defconfig
index 7b63fdc..5b7dde4 100644
--- a/board/at91sam9g45ek/at91sam9g45nf_defconfig
+++ b/board/at91sam9g45ek/at91sam9g45nf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:34 2009
+# Tue Jan 12 22:00:43 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g45nf"
@@ -21,7 +21,7 @@ CONFIG_CHIP="AT91SAM9G45"
CONFIG_BOARD="at91sam9g45ek"
CONFIG_MACH_TYPE="1830"
CONFIG_LINK_ADDR="0x000000"
-CONFIG_TOP_OF_MEMORY="0x301000"
+CONFIG_TOP_OF_MEMORY="0x304000"
CONFIG_BOOTSTRAP_MAXSIZE="13000"
# CONFIG_CRYSTAL_12_000MHZ is not set
# CONFIG_CRYSTAL_16_000MHZ is not set
@@ -63,6 +63,7 @@ CONFIG_RAM_128MB=y
CONFIG_NANDFLASH=y
# CONFIG_SDCARD is not set
CONFIG_MEMORY="nandflash"
+ALLOW_DATAFLASH_RECOVERY=y
ALLOW_BOOT_FROM_DATAFLASH_CS0=y
DATAFLASHCARD_ON_CS0=y
@@ -77,7 +78,7 @@ CONFIG_LOAD_UBOOT=y
# CONFIG_LOAD_4MB is not set
CONFIG_IMG_ADDRESS="0x00020000"
CONFIG_IMG_SIZE="0x00040000"
-CONFIG_JUMP_ADDR="0x23F00000"
+CONFIG_JUMP_ADDR="0x73F00000"
CONFIG_APP_CHECK=y
# CONFIG_LONG_TEST is not set
CONFIG_DEBUG=y
diff --git a/board/at91sam9g45ekes/at91sam9g45dfes_defconfig b/board/at91sam9g45ekes/at91sam9g45dfes_defconfig
index ee96363..a10a089 100644
--- a/board/at91sam9g45ekes/at91sam9g45dfes_defconfig
+++ b/board/at91sam9g45ekes/at91sam9g45dfes_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:31 2009
+# Tue Jan 12 22:00:39 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g45dfes"
@@ -21,7 +21,7 @@ CONFIG_CHIP="AT91SAM9G45"
CONFIG_BOARD="at91sam9g45ekes"
CONFIG_MACH_TYPE="2212"
CONFIG_LINK_ADDR="0x000000"
-CONFIG_TOP_OF_MEMORY="0x301000"
+CONFIG_TOP_OF_MEMORY="0x304000"
CONFIG_BOOTSTRAP_MAXSIZE="13000"
# CONFIG_CRYSTAL_12_000MHZ is not set
# CONFIG_CRYSTAL_16_000MHZ is not set
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9g45ekes/at91sam9g45ekes.c b/board/at91sam9g45ekes/at91sam9g45ekes.c
index 0a28186..f5dea43 100644
--- a/board/at91sam9g45ekes/at91sam9g45ekes.c
+++ b/board/at91sam9g45ekes/at91sam9g45ekes.c
@@ -181,7 +181,7 @@ void ddramc_hw_init(void)
#endif /* CONFIG_DDR2 */
#ifdef CONFIG_DATAFLASH
-
+#if defined(CONFIG_DATAFLASH_RECOVERY)
/*------------------------------------------------------------------------------*/
/* \fn df_recovery */
/* \brief This function erases DataFlash Page 0 if BP4 is pressed */
@@ -191,7 +191,7 @@ void df_recovery(AT91PS_DF pDf)
{
}
-
+#endif
/*------------------------------------------------------------------------------*/
/* \fn df_hw_init */
/* \brief This function performs DataFlash HW initialization */
diff --git a/board/at91sam9g45ekes/at91sam9g45ekes_defconfig b/board/at91sam9g45ekes/at91sam9g45ekes_defconfig
index c28664a..2102f25 100644
--- a/board/at91sam9g45ekes/at91sam9g45ekes_defconfig
+++ b/board/at91sam9g45ekes/at91sam9g45ekes_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:31 2009
+# Tue Jan 12 22:00:40 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g45ekes"
@@ -21,7 +21,7 @@ CONFIG_CHIP="AT91SAM9G45"
CONFIG_BOARD="at91sam9g45ekes"
CONFIG_MACH_TYPE="2212"
CONFIG_LINK_ADDR="0x000000"
-CONFIG_TOP_OF_MEMORY="0x301000"
+CONFIG_TOP_OF_MEMORY="0x304000"
CONFIG_BOOTSTRAP_MAXSIZE="13000"
# CONFIG_CRYSTAL_12_000MHZ is not set
# CONFIG_CRYSTAL_16_000MHZ is not set
@@ -63,6 +63,7 @@ CONFIG_RAM_128MB=y
CONFIG_NANDFLASH=y
# CONFIG_SDCARD is not set
CONFIG_MEMORY="nandflash"
+ALLOW_DATAFLASH_RECOVERY=y
ALLOW_BOOT_FROM_DATAFLASH_CS0=y
DATAFLASHCARD_ON_CS0=y
diff --git a/board/at91sam9g45ekes/at91sam9g45nfes_defconfig b/board/at91sam9g45ekes/at91sam9g45nfes_defconfig
index 9e35f58..10df4a9 100644
--- a/board/at91sam9g45ekes/at91sam9g45nfes_defconfig
+++ b/board/at91sam9g45ekes/at91sam9g45nfes_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:32 2009
+# Tue Jan 12 22:00:41 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9g45nfes"
@@ -21,7 +21,7 @@ CONFIG_CHIP="AT91SAM9G45"
CONFIG_BOARD="at91sam9g45ekes"
CONFIG_MACH_TYPE="2212"
CONFIG_LINK_ADDR="0x000000"
-CONFIG_TOP_OF_MEMORY="0x301000"
+CONFIG_TOP_OF_MEMORY="0x304000"
CONFIG_BOOTSTRAP_MAXSIZE="13000"
# CONFIG_CRYSTAL_12_000MHZ is not set
# CONFIG_CRYSTAL_16_000MHZ is not set
@@ -63,6 +63,7 @@ CONFIG_RAM_128MB=y
CONFIG_NANDFLASH=y
# CONFIG_SDCARD is not set
CONFIG_MEMORY="nandflash"
+ALLOW_DATAFLASH_RECOVERY=y
ALLOW_BOOT_FROM_DATAFLASH_CS0=y
DATAFLASHCARD_ON_CS0=y
diff --git a/board/at91sam9m10ek/at91sam9m10df_defconfig b/board/at91sam9m10ek/at91sam9m10df_defconfig
index cfc749c..5aff081 100644
--- a/board/at91sam9m10ek/at91sam9m10df_defconfig
+++ b/board/at91sam9m10ek/at91sam9m10df_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:34 2009
+# Tue Jan 12 22:00:44 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9m10df"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9m10ek/at91sam9m10ek.c b/board/at91sam9m10ek/at91sam9m10ek.c
index aabea59..df07369 100644
--- a/board/at91sam9m10ek/at91sam9m10ek.c
+++ b/board/at91sam9m10ek/at91sam9m10ek.c
@@ -181,7 +181,7 @@ void ddramc_hw_init(void)
#endif /* CONFIG_DDR2 */
#ifdef CONFIG_DATAFLASH
-
+#if defined(CONFIG_DATAFLASH_RECOVERY)
/*------------------------------------------------------------------------------*/
/* \fn df_recovery */
/* \brief This function erases DataFlash Page 0 if BP4 is pressed */
@@ -191,7 +191,7 @@ void df_recovery(AT91PS_DF pDf)
{
}
-
+#endif
/*------------------------------------------------------------------------------*/
/* \fn df_hw_init */
/* \brief This function performs DataFlash HW initialization */
diff --git a/board/at91sam9m10ek/at91sam9m10ek_defconfig b/board/at91sam9m10ek/at91sam9m10ek_defconfig
index a23f469..97948f9 100644
--- a/board/at91sam9m10ek/at91sam9m10ek_defconfig
+++ b/board/at91sam9m10ek/at91sam9m10ek_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:35 2009
+# Tue Jan 12 22:00:45 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9m10ek"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9m10ek/at91sam9m10nf_defconfig b/board/at91sam9m10ek/at91sam9m10nf_defconfig
index c1a815a..bcee3f6 100644
--- a/board/at91sam9m10ek/at91sam9m10nf_defconfig
+++ b/board/at91sam9m10ek/at91sam9m10nf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:36 2009
+# Tue Jan 12 22:00:46 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9m10nf"
@@ -63,6 +63,7 @@ CONFIG_RAM_128MB=y
CONFIG_NANDFLASH=y
# CONFIG_SDCARD is not set
CONFIG_MEMORY="nandflash"
+ALLOW_DATAFLASH_RECOVERY=y
ALLOW_BOOT_FROM_DATAFLASH_CS0=y
DATAFLASHCARD_ON_CS0=y
diff --git a/board/at91sam9rlek/at91sam9rldf_defconfig b/board/at91sam9rlek/at91sam9rldf_defconfig
index 465c530..af7ce6a 100644
--- a/board/at91sam9rlek/at91sam9rldf_defconfig
+++ b/board/at91sam9rlek/at91sam9rldf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:36 2009
+# Tue Jan 12 22:00:47 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9rldf"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9rlek/at91sam9rlek_defconfig b/board/at91sam9rlek/at91sam9rlek_defconfig
index 5435a69..9c27349 100644
--- a/board/at91sam9rlek/at91sam9rlek_defconfig
+++ b/board/at91sam9rlek/at91sam9rlek_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:37 2009
+# Tue Jan 12 22:00:48 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9rlek"
@@ -69,6 +69,8 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+# ALLOW_DATAFLASH_RECOVERY is not set
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9rlek/at91sam9rlnf_defconfig b/board/at91sam9rlek/at91sam9rlnf_defconfig
index 96ca09b..7a87fa6 100644
--- a/board/at91sam9rlek/at91sam9rlnf_defconfig
+++ b/board/at91sam9rlek/at91sam9rlnf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:38 2009
+# Tue Jan 12 22:00:48 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9rlnf"
diff --git a/board/at91sam9xeek/at91sam9xedf_defconfig b/board/at91sam9xeek/at91sam9xedf_defconfig
index 090cc8f..f60d5ea 100644
--- a/board/at91sam9xeek/at91sam9xedf_defconfig
+++ b/board/at91sam9xeek/at91sam9xedf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:39 2009
+# Tue Jan 12 22:00:50 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9xedf"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
# CONFIG_SPI_BOOT_CS0 is not set
CONFIG_SPI_BOOT_CS1=y
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9xeek/at91sam9xedfc_defconfig b/board/at91sam9xeek/at91sam9xedfc_defconfig
index 7a36048..fc83730 100644
--- a/board/at91sam9xeek/at91sam9xedfc_defconfig
+++ b/board/at91sam9xeek/at91sam9xedfc_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:38 2009
+# Tue Jan 12 22:00:49 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9xedfc"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9xeek/at91sam9xeek.c b/board/at91sam9xeek/at91sam9xeek.c
index 2bfa074..9abacb4 100644
--- a/board/at91sam9xeek/at91sam9xeek.c
+++ b/board/at91sam9xeek/at91sam9xeek.c
@@ -173,7 +173,7 @@ void sdramc_hw_init(void)
#endif /* CONFIG_SDRAM */
#ifdef CONFIG_DATAFLASH
-
+#if defined(CONFIG_DATAFLASH_RECOVERY)
/*------------------------------------------------------------------------------*/
/* \fn df_recovery */
/* \brief This function erases DataFlash Page 0 if BP4 is pressed */
@@ -198,7 +198,7 @@ void df_recovery(AT91PS_DF pDf)
df_page_erase(pDf, 0);
#endif
}
-
+#endif
/*------------------------------------------------------------------------------*/
/* \fn df_hw_init */
/* \brief This function performs DataFlash HW initialization */
diff --git a/board/at91sam9xeek/at91sam9xeek_defconfig b/board/at91sam9xeek/at91sam9xeek_defconfig
index 2ead97e..fa713e7 100644
--- a/board/at91sam9xeek/at91sam9xeek_defconfig
+++ b/board/at91sam9xeek/at91sam9xeek_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:40 2009
+# Tue Jan 12 22:00:51 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9xeek"
@@ -68,6 +68,9 @@ CONFIG_MEMORY="dataflash"
# SPI configuration
#
CONFIG_SPI_CLK=33000000
+CONFIG_SMALL_DATAFLASH=y
+CONFIG_DATAFLASH_RECOVERY=y
+ALLOW_DATAFLASH_RECOVERY=y
CONFIG_SPI_BOOT_CS0=y
# CONFIG_SPI_BOOT_CS1 is not set
# CONFIG_SPI_BOOT_CS2 is not set
diff --git a/board/at91sam9xeek/at91sam9xenf_defconfig b/board/at91sam9xeek/at91sam9xenf_defconfig
index b9ea318..874e393 100644
--- a/board/at91sam9xeek/at91sam9xenf_defconfig
+++ b/board/at91sam9xeek/at91sam9xenf_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Aug 21 18:57:41 2009
+# Tue Jan 12 22:00:52 2010
#
HAVE_DOT_CONFIG=y
CONFIG_BOARDNAME="at91sam9xenf"
@@ -63,6 +63,7 @@ CONFIG_RAM_64MB=y
CONFIG_NANDFLASH=y
# CONFIG_SDCARD is not set
CONFIG_MEMORY="nandflash"
+ALLOW_DATAFLASH_RECOVERY=y
ALLOW_BOOT_FROM_DATAFLASH_CS0=y
ALLOW_BOOT_FROM_DATAFLASH_CS1=y
DATAFLASHCARD_ON_CS0=y