| Message ID | 1449912428-3715-1-git-send-email-matwey.kornilov@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | Tom Rini |
| Headers | show |
On 2015-12-12, matwey.kornilov@gmail.com wrote: > config_distro_defaults.h is already included in configs/ti_am335x_common.h (by means of ti_armv7_common.h) > We don't need to #undef CONFIG_BOOTDELAY because it drops default bootdelay which already defined on this line. Is it still possible to get this into 2016.01? I've been carrying it as a patch in u-boot for a few RC versions now, without it the beaglebone black didn't automatically boot. Or was this fixed in some other way in recent versions? Tested-by: Vagrant Cascadian <vagrant@debian.org> Thanks! live well, vagrant > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> > --- > include/configs/am335x_evm.h | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h > index c51db8c..cf6a606 100644 > --- a/include/configs/am335x_evm.h > +++ b/include/configs/am335x_evm.h > @@ -18,10 +18,6 @@ > > #include <configs/ti_am335x_common.h> > > -/* Don't override the distro default bootdelay */ > -#undef CONFIG_BOOTDELAY > -#include <config_distro_defaults.h> > - > #ifndef CONFIG_SPL_BUILD > #ifndef CONFIG_FIT > # define CONFIG_FIT
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index c51db8c..cf6a606 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -18,10 +18,6 @@ #include <configs/ti_am335x_common.h> -/* Don't override the distro default bootdelay */ -#undef CONFIG_BOOTDELAY -#include <config_distro_defaults.h> - #ifndef CONFIG_SPL_BUILD #ifndef CONFIG_FIT # define CONFIG_FIT
config_distro_defaults.h is already included in configs/ti_am335x_common.h (by means of ti_armv7_common.h) We don't need to #undef CONFIG_BOOTDELAY because it drops default bootdelay which already defined on this line. Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- include/configs/am335x_evm.h | 4 ---- 1 file changed, 4 deletions(-)