diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-12-22 10:19:59 +0400 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-12-30 04:17:34 +0400 |
| commit | c0e0c89c089f4bd66dbbd1a44da90abe74fe3f02 (patch) | |
| tree | 60bdd9106863a003f30b33a34ee74e8567f342ba /arch/m68k/platform/68328/head-rom.S | |
| parent | 40c1b9cfeedf79b909c961e0e00a13497e80bc82 (diff) | |
| download | linux-c0e0c89c089f4bd66dbbd1a44da90abe74fe3f02.tar.xz | |
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/head-rom.S')
| -rw-r--r-- | arch/m68k/platform/68328/head-rom.S | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/m68k/platform/68328/head-rom.S b/arch/m68k/platform/68328/head-rom.S index 6ec77d3ea0b3..a5ff96d0295f 100644 --- a/arch/m68k/platform/68328/head-rom.S +++ b/arch/m68k/platform/68328/head-rom.S @@ -8,7 +8,7 @@ .global _ramend #ifdef CONFIG_INIT_LCD - .global splash_bits + .global bootlogo_bits #endif .data @@ -29,16 +29,11 @@ _ramend: #define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE) -#ifdef CONFIG_INIT_LCD -splash_bits: -#include "bootlogo.rh" -#endif - .text _start: _stext: movew #0x2700,%sr #ifdef CONFIG_INIT_LCD - movel #splash_bits, 0xfffffA00 /* LSSA */ + movel #bootlogo_bits, 0xfffffA00 /* LSSA */ moveb #0x28, 0xfffffA05 /* LVPW */ movew #0x280, 0xFFFFFa08 /* LXMAX */ movew #0x1df, 0xFFFFFa0a /* LYMAX */ |