leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m68knommu: fix broken boot logo inclusion

Browse Source 
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>
This commit is contained in:
Greg Ungerer 2011-12-22 16:19:59 +10:00
parent 40c1b9cfee
commit c0e0c89c08
6 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/m68k/platform/68328/Makefile
View File

@ -14,12 +14,8 @@ obj-$(CONFIG_M68328) += config.o
obj-$(CONFIG_ROM) += romvec.o obj-$(CONFIG_ROM) += romvec.o
extra-y := head.o extra-y := head.o
extra-$(CONFIG_M68328) += bootlogo.rh head.o
$(obj)/bootlogo.rh: $(src)/bootlogo.h
perl $(src)/bootlogo.pl < $(src)/bootlogo.h > $(obj)/bootlogo.rh
$(obj)/head.o: $(obj)/$(head-y) $(obj)/head.o: $(obj)/$(head-y)
ln -sf $(head-y) $(obj)/head.o ln -sf $(head-y) $(obj)/head.o
clean-files := $(obj)/bootlogo.rh $(obj)/head.o $(head-y) clean-files := $(obj)/head.o $(head-y)

2
arch/m68k/platform/68328/bootlogo.h
View File

@ -1,6 +1,6 @@
#define bootlogo_width 160 #define bootlogo_width 160
#define bootlogo_height 160 #define bootlogo_height 160
static unsigned char bootlogo_bits[] = { unsigned char __attribute__ ((aligned(16))) bootlogo_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x40, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

10
arch/m68k/platform/68328/bootlogo.pl
View File

@ -1,10 +0,0 @@
$_ = join("", <>);
s/(0x[0-9a-f]{2})/sprintf("0x%.2x",ord(pack("b8",unpack("B8",chr(hex($1))))))/gei;
s/^ / .byte /gm;
s/[,};]+$//gm;
s/^static.*//gm;
print $_;

3
arch/m68k/platform/68328/config.c
View File

@ -20,6 +20,9 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/MC68328.h> #include <asm/MC68328.h>
#if defined(CONFIG_PILOT) || defined(CONFIG_INIT_LCD)
#include "bootlogo.h"
#endif
/***************************************************************************/ /***************************************************************************/

16
arch/m68k/platform/68328/head-pilot.S
View File

@ -24,19 +24,7 @@
.global _ramstart .global _ramstart
.global _ramend .global _ramend
.global penguin_bits .global bootlogo_bits
#ifdef CONFIG_PILOT
#define IMR 0xFFFFF304
.data
.align 16
penguin_bits:
#include "bootlogo.rh"
#endif
/*****************************************************************************/ /*****************************************************************************/
@ -196,7 +184,7 @@ L3:
DBG_PUTC('H') DBG_PUTC('H')
#ifdef CONFIG_PILOT #ifdef CONFIG_PILOT
movel #penguin_bits, 0xFFFFFA00 movel #bootlogo_bits, 0xFFFFFA00
moveb #10, 0xFFFFFA05 moveb #10, 0xFFFFFA05
movew #160, 0xFFFFFA08 movew #160, 0xFFFFFA08
movew #160, 0xFFFFFA0A movew #160, 0xFFFFFA0A

9
arch/m68k/platform/68328/head-rom.S
View File

@ -8,7 +8,7 @@
.global _ramend .global _ramend
#ifdef CONFIG_INIT_LCD #ifdef CONFIG_INIT_LCD
.global splash_bits .global bootlogo_bits
#endif #endif
.data .data
@ -29,16 +29,11 @@ _ramend:
#define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE) #define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE)
#ifdef CONFIG_INIT_LCD
splash_bits:
#include "bootlogo.rh"
#endif
.text .text
_start: _start:
_stext: movew #0x2700,%sr _stext: movew #0x2700,%sr
#ifdef CONFIG_INIT_LCD #ifdef CONFIG_INIT_LCD
movel #splash_bits, 0xfffffA00 /* LSSA */ movel #bootlogo_bits, 0xfffffA00 /* LSSA */
moveb #0x28, 0xfffffA05 /* LVPW */ moveb #0x28, 0xfffffA05 /* LVPW */
movew #0x280, 0xFFFFFa08 /* LXMAX */ movew #0x280, 0xFFFFFa08 /* LXMAX */
movew #0x1df, 0xFFFFFa0a /* LYMAX */ movew #0x1df, 0xFFFFFa0a /* LYMAX */