From: Tom Rini <trini@ti.com>
Date: Mon, 10 Nov 2014 14:20:38 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-blackfin
X-Git-Tag: v2015.01-rc1~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=490fdad5862d919f26793a484e2be4530740407a;hp=2db8c2d61a05bb4a94bb341329c6de811757c111;p=platform%2Fkernel%2Fu-boot.git

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

diff --git a/Makefile b/Makefile
index 49fcdbb..2e03e13 100644
--- a/Makefile
+++ b/Makefile
@@ -840,7 +840,7 @@ u-boot.bin: u-boot FORCE
 
 u-boot.ldr:	u-boot
 		$(CREATE_LDR_ENV)
-		$(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS)
+		$(LDR) -T $(CONFIG_CPU) -c $@ $< $(LDR_FLAGS)
 		$(BOARD_SIZE_CHECK)
 
 OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h
index 836658a..73cbfa2 100644
--- a/arch/blackfin/include/asm/config.h
+++ b/arch/blackfin/include/asm/config.h
@@ -178,4 +178,6 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_ARCH_MISC_INIT
 
+#define CONFIG_CPU CONFIG_BFIN_CPU
+
 #endif
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index ea9acf6..07ec5f2 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -39,6 +39,7 @@
 #  define CONFIG_CMD_FAT
 #  define CONFIG_CMD_MMC
 #  define CONFIG_DOS_PARTITION
+#  define CONFIG_SYS_MMC_MAX_BLK_COUNT 127
 # endif
 # ifdef CONFIG_MMC_SPI
 #  define CONFIG_CMD_MMC_SPI