diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 10:05:42 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-20 10:05:42 +0200 |
| commit | 05d134b084590684bcf4d832c0035952727b7cd9 (patch) | |
| tree | 8f5d5fd811634fa621792cad7ca361251c06cd88 /include/configs/MPC8536DS.h | |
| parent | 6130c14605de760bdcaef36b8a0d34eac2a955f0 (diff) | |
| parent | d7782d06534fe4fa47a49fa7c106de5ba85a9687 (diff) | |
| download | u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.zip u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.tar.gz u-boot-imx-05d134b084590684bcf4d832c0035952727b7cd9.tar.bz2 | |
Merge remote-tracking branch 'u-boot/master'
Conflicts:
boards.cfg
Conflicts were trivial once u-boot-arm/master boards.cfg was
reformatted (commit 6130c146) to match u-boot/master's own
reformatting (commit 1b37fa83).
Diffstat (limited to 'include/configs/MPC8536DS.h')
| -rw-r--r-- | include/configs/MPC8536DS.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index f15e162..72f5fde 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -11,6 +11,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define CONFIG_SYS_GENERIC_BOARD +#define CONFIG_DISPLAY_BOARDINFO #include "../board/freescale/common/ics307_clk.h" #ifdef CONFIG_36BIT |