diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-12 23:28:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-12 23:28:57 -0400 |
| commit | a52142855a1345c233af8bb76fb1ad4d3048e008 (patch) | |
| tree | aab71e32931aebbe7041e24274c62d7d1c66b4cc /include/configs/mx6_common.h | |
| parent | 51c14cd128f4355514397dc3c8647fb14f7d8ff4 (diff) | |
| parent | 3865b9ebe73eb6246ff2ab6ae7957f507eb539f7 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include/configs/mx6_common.h')
| -rw-r--r-- | include/configs/mx6_common.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 27f38f497e..fb49322f3b 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -59,9 +59,6 @@ #endif #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#ifndef CONFIG_BOOTDELAY -#endif - /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 |