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/omap3_cairo.h | |
| parent | 51c14cd128f4355514397dc3c8647fb14f7d8ff4 (diff) | |
| parent | 3865b9ebe73eb6246ff2ab6ae7957f507eb539f7 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include/configs/omap3_cairo.h')
| -rw-r--r-- | include/configs/omap3_cairo.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 96c3c4b958..82e0d5000c 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -73,8 +73,6 @@ #define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ -/* override default CONFIG_BOOTDELAY */ - #define CONFIG_EXTRA_ENV_SETTINGS \ "machid=ffffffff\0" \ "fdt_high=0x87000000\0" \ |