From 2d0fb4f693745b9d076edde7c2a9c7359c4d7119 Mon Sep 17 00:00:00 2001 From: "H. Nikolaus Schaller" Date: Tue, 5 Jan 2016 13:08:21 +0100 Subject: [PATCH] LC15 and Pyra+LC15: show different Board: message by u-boot Signed-off-by: H. Nikolaus Schaller --- board/goldelico/letux-cortex15/lc15.c | 20 ++++++++++++++++++++ board/pandora/pyra+lc15/pyra+lc15.c | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/board/goldelico/letux-cortex15/lc15.c b/board/goldelico/letux-cortex15/lc15.c index 2be6228d52f..a01605e7c37 100644 --- a/board/goldelico/letux-cortex15/lc15.c +++ b/board/goldelico/letux-cortex15/lc15.c @@ -1,5 +1,25 @@ +/* + * basically the same as the OMAP5432EVM + */ + +/* move away definition by included file */ +#ifndef sysinfo +#define sysinfo sysinfo_disabled + +#include "../../ti/omap5_uevm/evm.c" + +#undef sysinfo + +const struct omap_sysinfo sysinfo = { + "Board: Letux Cortex 15\n" +}; + +#else + #include "../../ti/omap5_uevm/evm.c" +#endif + // add eMMC/uSD switch logic here // so that we can boot from the internal uSD // and release the boot button diff --git a/board/pandora/pyra+lc15/pyra+lc15.c b/board/pandora/pyra+lc15/pyra+lc15.c index 8950b464a0f..0685d4261a3 100644 --- a/board/pandora/pyra+lc15/pyra+lc15.c +++ b/board/pandora/pyra+lc15/pyra+lc15.c @@ -1,16 +1,22 @@ /* - * basically the same as the letux Cortex 15 + * basically the same as the Letux Cortex 15 * except that we change the UART3 pinmux because it is wired up * differently */ /* move away definition by included file */ #define set_muxconf_regs_essential set_muxconf_regs_essential_disabled +#define sysinfo sysinfo_disabled #include "../../goldelico/letux-cortex15/lc15.c" +#undef sysinfo #undef set_muxconf_regs_essential +const struct omap_sysinfo sysinfo = { + "Board: Pyra with Letux Cortex 15\n" +}; + const struct pad_conf_entry core_padconf_array_essential_alternate[] = { {EMMC_CLK, (PTU | IEN | M0)}, /* EMMC_CLK */ -- 2.39.5