mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
This commit is contained in:
commit
490fdad586
3 changed files with 4 additions and 1 deletions
2
Makefile
2
Makefile
|
@ -840,7 +840,7 @@ u-boot.bin: u-boot FORCE
|
||||||
|
|
||||||
u-boot.ldr: u-boot
|
u-boot.ldr: u-boot
|
||||||
$(CREATE_LDR_ENV)
|
$(CREATE_LDR_ENV)
|
||||||
$(LDR) -T $(CONFIG_BFIN_CPU) -c $@ $< $(LDR_FLAGS)
|
$(LDR) -T $(CONFIG_CPU) -c $@ $< $(LDR_FLAGS)
|
||||||
$(BOARD_SIZE_CHECK)
|
$(BOARD_SIZE_CHECK)
|
||||||
|
|
||||||
OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
|
OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
|
||||||
|
|
|
@ -178,4 +178,6 @@
|
||||||
#define CONFIG_DISPLAY_CPUINFO
|
#define CONFIG_DISPLAY_CPUINFO
|
||||||
#define CONFIG_ARCH_MISC_INIT
|
#define CONFIG_ARCH_MISC_INIT
|
||||||
|
|
||||||
|
#define CONFIG_CPU CONFIG_BFIN_CPU
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
# define CONFIG_CMD_FAT
|
# define CONFIG_CMD_FAT
|
||||||
# define CONFIG_CMD_MMC
|
# define CONFIG_CMD_MMC
|
||||||
# define CONFIG_DOS_PARTITION
|
# define CONFIG_DOS_PARTITION
|
||||||
|
# define CONFIG_SYS_MMC_MAX_BLK_COUNT 127
|
||||||
# endif
|
# endif
|
||||||
# ifdef CONFIG_MMC_SPI
|
# ifdef CONFIG_MMC_SPI
|
||||||
# define CONFIG_CMD_MMC_SPI
|
# define CONFIG_CMD_MMC_SPI
|
||||||
|
|
Loading…
Reference in a new issue