Merge branch 'master' of git://git.denx.de/u-boot-blackfin

diff --git a/MAKEALL b/MAKEALL
index 8ad7e922203de15f104b5bf179c3218ca9e4dcf5..db11f134b8b517b98499d7ebf2f7289f7fd35312 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -599,9 +599,7 @@ LIST_avr32="$(boards_by_arch avr32)"
 ## 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 f8e13d782ad30079c5b04e1d91130d3e7128ad69..f9f83eb12f323dc4aa366d159a71aedbfdf23003 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1176,14 +1176,6 @@ NIOS2_GENERIC = nios2-generic
 $(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 64ddfa2977f4270f6a40a6d2746599ba1208d25b..6c2a6672ff314816a27a6806a76ee0b122cadc8a 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -413,6 +413,7 @@ bct-brettl2 blackfin        blackfin
 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 4412177ff09c42c36ec77eff5f486191256cc8ce..1c035cfcadad70948244e0ba5851a0048de5d51e 100644 (file)
--- 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 608788a66f9f72fc264e4d404c9bc2d819b1d9d5..03c64339d624026e00530500dc8543781ed646c5 100644 (file)
--- 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