diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-29 14:07:50 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-29 14:07:50 +0100 |
| commit | e97f9d817e600cd6f43d1d0da76f5787e33a5c56 (patch) | |
| tree | 99603834683039fec18a31770f8a05879d432e6d /include/configs/omap5_uevm.h | |
| parent | c0cae2e24552d57f3e2f841ec235453413cd7389 (diff) | |
| parent | b1cde7e21f950e05d18c102976c3b7d232b65e13 (diff) | |
| download | talos-obmc-uboot-e97f9d817e600cd6f43d1d0da76f5787e33a5c56.tar.gz talos-obmc-uboot-e97f9d817e600cd6f43d1d0da76f5787e33a5c56.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/omap5_uevm.h')
| -rw-r--r-- | include/configs/omap5_uevm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 76c5106b45..51dff23623 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -4,7 +4,7 @@ * Sricharan R <r.sricharan@ti.com> * * Configuration settings for the TI EVM5430 board. - * See omap5_common.h for omap5 common settings. + * See ti_omap5_common.h for omap5 common settings. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -17,7 +17,7 @@ "uuid_disk=${uuid_gpt_disk};" \ "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}" -#include <configs/omap5_common.h> +#include <configs/ti_omap5_common.h> #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 UART3_BASE |
