From f8d92fddb5cdd6e5738ec33b9dea76e7f2d3b06d Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 15 Jul 2019 00:31:20 -0400
Subject: patches: Fix "x" case in Kconfig CONFIG_* names

---
diff --git a/patches/01_add-mplus-fonts.patch b/patches/01_add-mplus-fonts.patch
index 1e1b46d..49078b0 100644
--- a/patches/01_add-mplus-fonts.patch
+++ b/patches/01_add-mplus-fonts.patch
@@ -61,42 +61,42 @@ diff -Naurp src.orig/lib/fonts/Kconfig src/lib/fonts/Kconfig
  	  big letters (like the letters used in the SPARC PROM). If the
  	  standard font is unreadable for you, say Y, otherwise say N.
  
-+config FONT_MPLUS_1M_REGULAR_8X12
++config FONT_MPLUS_1M_REGULAR_8x12
 +	bool "M+ 1m regular 8x12 font (not supported by all drivers)" if FONTS
 +	depends on FRAMEBUFFER_CONSOLE
 +	help
 +	  This is a sans-serif font with a sophisticated and relaxed design that
 +	  balances natural letterform and high legibility.
 +
-+config FONT_MPLUS_1M_REGULAR_10X14
++config FONT_MPLUS_1M_REGULAR_10x14
 +	bool "M+ 1m regular 10x14 font (not supported by all drivers)" if FONTS
 +	depends on FRAMEBUFFER_CONSOLE
 +	help
 +	  This is a sans-serif font with a sophisticated and relaxed design that
 +	  balances natural letterform and high legibility.
 +
-+config FONT_MPLUS_1M_REGULAR_12X17
++config FONT_MPLUS_1M_REGULAR_12x17
 +	bool "M+ 1m regular 12x17 font (not supported by all drivers)" if FONTS
 +	depends on FRAMEBUFFER_CONSOLE
 +	help
 +	  This is a sans-serif font with a sophisticated and relaxed design that
 +	  balances natural letterform and high legibility.
 +
-+config FONT_MPLUS_1M_REGULAR_16X22
++config FONT_MPLUS_1M_REGULAR_16x22
 +	bool "M+ 1m regular 16x22 font (not supported by all drivers)" if FONTS
 +	depends on FRAMEBUFFER_CONSOLE
 +	help
 +	  This is a sans-serif font with a sophisticated and relaxed design that
 +	  balances natural letterform and high legibility.
 +
-+config FONT_MPLUS_1M_REGULAR_24X34
++config FONT_MPLUS_1M_REGULAR_24x34
 +	bool "M+ 1m regular 24x34 font (not supported by all drivers)" if FONTS
 +	depends on FRAMEBUFFER_CONSOLE
 +	help
 +	  This is a sans-serif font with a sophisticated and relaxed design that
 +	  balances natural letterform and high legibility.
 +
-+config FONT_MPLUS_1M_REGULAR_32X44
++config FONT_MPLUS_1M_REGULAR_32x44
 +	bool "M+ 1m regular 32x44 font (not supported by all drivers)" if FONTS
 +	depends on FRAMEBUFFER_CONSOLE
 +	help
@@ -127,12 +127,12 @@ diff -Naurp src.orig/lib/fonts/Makefile src/lib/fonts/Makefile
  font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
  font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
  font-objs-$(CONFIG_FONT_6x10)      += font_6x10.o
-+font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_8X12)  += font_mplus_1m_regular_8x12.o
-+font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_10X14) += font_mplus_1m_regular_10x14.o
-+font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_12X17) += font_mplus_1m_regular_12x17.o
-+font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_16X22) += font_mplus_1m_regular_16x22.o
-+font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_24X34) += font_mplus_1m_regular_24x34.o
-+font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_32X44) += font_mplus_1m_regular_32x44.o
++font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_8x12)  += font_mplus_1m_regular_8x12.o
++font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_10x14) += font_mplus_1m_regular_10x14.o
++font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_12x17) += font_mplus_1m_regular_12x17.o
++font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_16x22) += font_mplus_1m_regular_16x22.o
++font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_24x34) += font_mplus_1m_regular_24x34.o
++font-objs-$(CONFIG_FONT_MPLUS_1M_REGULAR_32x44) += font_mplus_1m_regular_32x44.o
  
  font-objs += $(font-objs-y)
  
@@ -40003,27 +40003,27 @@ diff -Naurp src.orig/lib/fonts/fonts.c src/lib/fonts/fonts.c
  #undef NO_FONTS
      &font_6x10,
  #endif
-+#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_8X12
++#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_8x12
 +#undef NO_FONTS
 +    &font_mplus_1m_regular_8x12,
 +#endif
-+#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_10X14
++#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_10x14
 +#undef NO_FONTS
 +    &font_mplus_1m_regular_10x14,
 +#endif
-+#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_12X17
++#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_12x17
 +#undef NO_FONTS
 +    &font_mplus_1m_regular_12x17,
 +#endif
-+#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_16X22
++#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_16x22
 +#undef NO_FONTS
 +    &font_mplus_1m_regular_16x22,
 +#endif
-+#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_24X34
++#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_24x34
 +#undef NO_FONTS
 +    &font_mplus_1m_regular_24x34,
 +#endif
-+#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_32X44
++#ifdef CONFIG_FONT_MPLUS_1M_REGULAR_32x44
 +#undef NO_FONTS
 +    &font_mplus_1m_regular_32x44,
 +#endif
--
cgit v0.9.1