Merge branch 'master' of git://git.denx.de/u-boot-blackfin
diff --git a/MAKEALL b/MAKEALL
index 8ad7e92..db11f13 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -599,9 +599,7 @@
## Blackfin Systems
#########################################################################
-LIST_blackfin="$(boards_by_arch blackfin)
- bf527-ezkit-v2
-"
+LIST_blackfin="$(boards_by_arch blackfin)"
#########################################################################
## SH Systems
diff --git a/Makefile b/Makefile
index f8e13d7..f9f83eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1176,14 +1176,6 @@
$(NIOS2_GENERIC:%=%_config) : unconfig
@$(MKCONFIG) $@ nios2 nios2 nios2-generic altera
-#========================================================================
-# Blackfin
-#========================================================================
-
-bf527-ezkit-v2_config : unconfig
- @$(MKCONFIG) -t BF527_EZKIT_REV_2_1 \
- bf527-ezkit blackfin blackfin bf527-ezkit
-
#########################################################################
#########################################################################
diff --git a/boards.cfg b/boards.cfg
index 64ddfa2..6c2a667 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -413,6 +413,7 @@
bf518f-ezbrd blackfin blackfin
bf526-ezbrd blackfin blackfin
bf527-ezkit blackfin blackfin
+bf527-ezkit-v2 blackfin blackfin bf527-ezkit - - bf527-ezkit:BF527_EZKIT_REV_2_1
bf527-sdp blackfin blackfin
bf533-ezkit blackfin blackfin
bf533-stamp blackfin blackfin
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 4412177..1c035cf 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -180,6 +180,7 @@
* Misc Settings
*/
#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_BOARD_SIZE_LIMIT $$(( 512 * 1024 ))
#define CONFIG_RTC_BFIN
#define CONFIG_UART_CONSOLE 1
#define CONFIG_BFIN_SPI_IMG_SIZE 0x50000
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 608788a..03c6433 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -295,6 +295,9 @@
/*
* Misc Settings
*/
+#ifndef CONFIG_BOARD_SIZE_LIMIT
+# define CONFIG_BOARD_SIZE_LIMIT $$(( 256 * 1024 ))
+#endif
#define CONFIG_BFIN_SPI_GPIO_CS /* Only matters if BFIN_SPI is enabled */
#define CONFIG_LZMA