diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-12-22 16:19:59 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-12-30 10:17:34 +1000 |
| commit | c0e0c89c089f4bd66dbbd1a44da90abe74fe3f02 (patch) | |
| tree | 60bdd9106863a003f30b33a34ee74e8567f342ba /arch/m68k/platform/68328/config.c | |
| parent | 40c1b9cfeedf79b909c961e0e00a13497e80bc82 (diff) | |
| download | blackbird-op-linux-c0e0c89c089f4bd66dbbd1a44da90abe74fe3f02.tar.gz blackbird-op-linux-c0e0c89c089f4bd66dbbd1a44da90abe74fe3f02.zip | |
m68knommu: fix broken boot logo inclusion
Compiling for the m68knommu/68328 Palm/Pilot target you get:
AS arch/m68k/platform/68328/head-pilot.o
arch/m68k/platform/68328/head-pilot.S:37:23: fatal error: bootlogo.rh: No such file or directory
The build for this target used to do a conversion on a C coded boot logo
and include this in the head assembler code. This got broken by changes to
the local Makefile.
Clean all this up by just including the C coded boot logo struct in the
C code. With the appropriate alignment attribute there is no difference
to the way it can be used.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/platform/68328/config.c')
| -rw-r--r-- | arch/m68k/platform/68328/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/platform/68328/config.c b/arch/m68k/platform/68328/config.c index a7bd21deb00f..d70bf2623db1 100644 --- a/arch/m68k/platform/68328/config.c +++ b/arch/m68k/platform/68328/config.c @@ -20,6 +20,9 @@ #include <asm/system.h> #include <asm/machdep.h> #include <asm/MC68328.h> +#if defined(CONFIG_PILOT) || defined(CONFIG_INIT_LCD) +#include "bootlogo.h" +#endif /***************************************************************************/ |
