Merge tag 'ti-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti

[oweals/u-boot.git] / include / video_font.h

diff --git a/include/video_font.h b/include/video_font.h
index 6e341cf759b2c38fc156936891e49f549c62e2cd..5e23f70f859f0d60f191ecf5e0a045d62febedc9 100644 (file)
--- a/include/video_font.h
+++ b/include/video_font.h
@@ -1,13 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2000
  * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _VIDEO_FONT_
 #define _VIDEO_FONT_
 
+#ifdef CONFIG_VIDEO_FONT_4X6
+#include <video_font_4x6.h>
+#else
 #include <video_font_data.h>
+#endif
 
 #endif /* _VIDEO_FONT_ */