projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
configs
/
bcm7260_defconfig
diff --git
a/configs/bcm7260_defconfig
b/configs/bcm7260_defconfig
index 5b194b93e8983dd405fc571c98b89870e7b695ea..afb59ec8847e6b2195dbca850eeebc051827aeb3 100644
(file)
--- a/
configs/bcm7260_defconfig
+++ b/
configs/bcm7260_defconfig
@@
-2,7
+2,10
@@
CONFIG_ARM=y
CONFIG_ARCH_BCMSTB=y
CONFIG_SYS_TEXT_BASE=0x10100000
CONFIG_TARGET_BCM7260=y
CONFIG_ARCH_BCMSTB=y
CONFIG_SYS_TEXT_BASE=0x10100000
CONFIG_TARGET_BCM7260=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x814800
CONFIG_NR_DRAM_BANKS=1
CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_OFFSET_REDUND=0x824800
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=1
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_BOOTDELAY=1
@@
-18,4
+21,5
@@
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCMSTB=y
CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_BCMSTB=y
+CONFIG_MTD=y
# CONFIG_EFI_LOADER is not set
# CONFIG_EFI_LOADER is not set