| Message ID | 1372363940-13023-1-git-send-email-khilman@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jun 27, 2013 at 10:12 PM, Kevin Hilman <khilman@linaro.org> wrote: > commit 1affee67 (lib: Move fonts from drivers/video/console/ to lib/fonts/) > moved fonts from drivers/video/console/ to lib/fonts, but the ARM zImage > build still references the old location. > > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Olof Johansson <olof@lixom.net> > Signed-off-by: Kevin Hilman <khilman@linaro.org> > --- > Found due to build failures on ARM in next-20130627. > > Rather than go through the ARM tree, this should probably be included > with the original series from Geert. Thanks! Sorry for missing this. There's a similar one in the unicore32 boot code, and a few stale references in comments and documentation. I'll fold all of these in the original commit. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 13499a8..7ac1610 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -27,7 +27,7 @@ OBJS += misc.o decompress.o ifeq ($(CONFIG_DEBUG_UNCOMPRESS),y) OBJS += debug.o endif -FONTC = $(srctree)/drivers/video/console/font_acorn_8x8.c +FONTC = $(srctree)/lib/fonts/font_acorn_8x8.c # string library code (-Os is enforced to keep it much smaller) OBJS += string.o
commit 1affee67 (lib: Move fonts from drivers/video/console/ to lib/fonts/) moved fonts from drivers/video/console/ to lib/fonts, but the ARM zImage build still references the old location. Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Olof Johansson <olof@lixom.net> Signed-off-by: Kevin Hilman <khilman@linaro.org> --- Found due to build failures on ARM in next-20130627. Rather than go through the ARM tree, this should probably be included with the original series from Geert. arch/arm/boot/compressed/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)