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/bfin_adi_common.h | |
parent | 51c14cd128f4355514397dc3c8647fb14f7d8ff4 (diff) | |
parent | 3865b9ebe73eb6246ff2ab6ae7957f507eb539f7 (diff) | |
download | talos-obmc-uboot-a52142855a1345c233af8bb76fb1ad4d3048e008.tar.gz talos-obmc-uboot-a52142855a1345c233af8bb76fb1ad4d3048e008.zip |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include/configs/bfin_adi_common.h')
-rw-r--r-- | include/configs/bfin_adi_common.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 13076072e4..502ddad96b 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -97,11 +97,6 @@ /* * Env Settings */ -#ifndef CONFIG_BOOTDELAY -# if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART) -# else -# endif -#endif #ifndef CONFIG_BOOTCOMMAND # define CONFIG_BOOTCOMMAND "run ramboot" #endif |