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

Tom Rini
2 parents 2db8c2d61a 6721bb5ad8
Showing 3 changed files Side-by-side Diff
Makefile
arch/blackfin/include/asm/config.h
include/configs/bfin_adi_common.h
@@ -840,7 +840,7 @@
  
 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
@@ -178,5 +178,7 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_ARCH_MISC_INIT
  
+#define CONFIG_CPU CONFIG_BFIN_CPU
+
 #endif
@@ -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
...	...	@@ -840,7 +840,7 @@
840	840
841	841	u-boot.ldr: u-boot
842	842	$(CREATE_LDR_ENV)
843		- $(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS)
	843	+ $(LDR) -T $(CONFIG_CPU) -c $@ $< $(LDR_FLAGS)
844	844	$(BOARD_SIZE_CHECK)
845	845
846	846	OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
...	...	@@ -178,5 +178,7 @@
178	178	#define CONFIG_DISPLAY_CPUINFO
179	179	#define CONFIG_ARCH_MISC_INIT
180	180
	181	+#define CONFIG_CPU CONFIG_BFIN_CPU
	182	+
181	183	#endif
...	...	@@ -39,6 +39,7 @@
39	39	# define CONFIG_CMD_FAT
40	40	# define CONFIG_CMD_MMC
41	41	# define CONFIG_DOS_PARTITION
	42	+# define CONFIG_SYS_MMC_MAX_BLK_COUNT 127
42	43	# endif
43	44	# ifdef CONFIG_MMC_SPI
44	45	# define CONFIG_CMD_MMC_SPI