diff options
| author | Tom Rini <trini@ti.com> | 2014-11-10 09:20:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-10 16:25:28 -0500 |
| commit | 490fdad5862d919f26793a484e2be4530740407a (patch) | |
| tree | c6384a7069b7a49112691f7d5a1c441252da2401 | |
| parent | 2db8c2d61a05bb4a94bb341329c6de811757c111 (diff) | |
| parent | 6721bb5ad8744cae647cad9e917df649524ac54d (diff) | |
| download | blackbird-obmc-uboot-490fdad5862d919f26793a484e2be4530740407a.tar.gz blackbird-obmc-uboot-490fdad5862d919f26793a484e2be4530740407a.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/config.h | 2 | ||||
| -rw-r--r-- | include/configs/bfin_adi_common.h | 1 |
3 files changed, 4 insertions, 1 deletions
@@ -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 836658a1c4..73cbfa2cc8 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 ea9acf69d1..07ec5f2bd8 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 |
