Skip to content

Commit

Permalink
m68knommu: fix missing LCD splash screen data initializer
Browse files Browse the repository at this point in the history
[ Upstream commit 3f605ee ]

The kernel test robot reports that the "screen_bits" splash screen data
is missing for the dragen platform:

    arch/m68k/68000/dragen2.c:73:16: error: 'screen_bits' undeclared (first use in this function)
      73 |  LSSA = (long) screen_bits;
         |                ^~~~~~~~~~~
    arch/m68k/68000/dragen2.c:73:16: note: each undeclared identifier is reported only once for each function it appears in

Digging around a bit I found the screen_bits data structure was originally
in a screen.h file that was generated from a screen.xbm file. That was
removed in commit 0c0e6db ("m68k: drop unused parts of 68VZ328
Makefile").

Other splash screen initializers for 68000 targets are kept here as the
C data structures so lets do the same for this one. Add the missing
screen.h file and include it in the dragen specific startup code.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Greg Ungerer authored and gregkh committed Jul 20, 2021
1 parent efd33d3 commit 669eb77
Show file tree
Hide file tree
Showing 2 changed files with 805 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/m68k/68000/dragen2.c
Expand Up @@ -11,6 +11,7 @@
#include <linux/init.h>
#include <asm/machdep.h>
#include <asm/MC68VZ328.h>
#include "screen.h"

/***************************************************************************/
/* Init Drangon Engine hardware */
Expand Down

0 comments on commit 669eb77

Please sign in to comment.