diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-24 09:31:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-24 09:31:35 -0500 |
| commit | 40253dd12a64086885097d253b665c9876635e76 (patch) | |
| tree | ab93904ec84b33c1e9336baa8eae710dd957683f /include/configs/socfpga_mcvevk.h | |
| parent | 8182b41994f0b1824c31652d64171ffa596517fc (diff) | |
| parent | e662573822d24dcdc079d29ff397cb8bacf97b27 (diff) | |
Merge git://git.denx.de/u-boot-socfpga
Conflicts:
include/configs/axs101.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/socfpga_mcvevk.h')
| -rw-r--r-- | include/configs/socfpga_mcvevk.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index cd63faf2fc..e7b56754cf 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -45,8 +45,6 @@ /* Environment is in MMC */ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 /* device 0 */ -#define CONFIG_ENV_OFFSET 512 /* just after the MBR */ /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ |