Message ID | 20151230014526.GB20262@localhost.localdomain |
---|---|
State | Accepted |
Commit | 65c5c81f27b61e513eac8edef36774ba2e6ba332 |
Delegated to: | Tom Rini |
Headers | show |
On Wed, Dec 30, 2015 at 02:45:26AM +0100, Ladislav Michl wrote: > Symbol is already defined in ti_armv7_common.h which is included > via ti_armv7_omap.h > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Reviewed-by: Tom Rini <trini@konsulko.com>
On Wed, Dec 30, 2015 at 02:45:26AM +0100, Ladislav Michl wrote: > Symbol is already defined in ti_armv7_common.h which is included > via ti_armv7_omap.h > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 1c71cb6..02fdcdc 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -73,7 +73,6 @@ #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_NAND_BASE 0x30000000 #endif
Symbol is already defined in ti_armv7_common.h which is included via ti_armv7_omap.h Signed-off-by: Ladislav Michl <ladis@linux-mips.org> --- include/configs/ti_omap3_common.h | 1 - 1 file changed, 1 deletion(-)