diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-26 20:58:49 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-26 20:58:49 +0200 |
| commit | 9685951464c9c17f075d50081b1ee15659f5740d (patch) | |
| tree | bd66ab073c369a3e790487f7010007b14275c061 | |
| parent | 7ad1a5f69d6da7335aa884f76d76df6f5130cd4b (diff) | |
| parent | 58d7570cd3c5e9b215b6358f293872b66ac2a1cb (diff) | |
| download | talos-obmc-uboot-9685951464c9c17f075d50081b1ee15659f5740d.tar.gz talos-obmc-uboot-9685951464c9c17f075d50081b1ee15659f5740d.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
| -rwxr-xr-x | MAKEALL | 4 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | boards.cfg | 1 | ||||
| -rw-r--r-- | include/configs/bf548-ezkit.h | 1 | ||||
| -rw-r--r-- | include/configs/bfin_adi_common.h | 3 |
5 files changed, 6 insertions, 11 deletions
@@ -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 @@ -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 64ddfa2977..6c2a6672ff 100644 --- 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 4412177ff0..1c035cfcad 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 608788a66f..03c64339d6 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 |
