Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0e0c89c authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
parent 40c1b9cf

arch/m68k/platform/68328/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -14,12 +14,8 @@ obj-$(CONFIG_M68328) += config.o 
obj-$(CONFIG_ROM)	+= romvec.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)

	ln -sf $(head-y) $(obj)/head.o



clean-files := $(obj)/bootlogo.rh $(obj)/head.o $(head-y)
 
clean-files := $(obj)/head.o $(head-y)

arch/m68k/platform/68328/bootlogo.h

+1 −1
Original line number Diff line number Diff line 
#define bootlogo_width 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, 0x00, 0x00, 0x00, 0x00, 0x00,

  0x00, 0x00, 0x40, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

arch/m68k/platform/68328/bootlogo.pl

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 


$_ = 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 $_;

arch/m68k/platform/68328/config.c

+3 −0
Original line number Diff line number Diff line
@@ -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



/***************************************************************************/

arch/m68k/platform/68328/head-pilot.S

+2 −14
Original line number Diff line number Diff line
@@ -24,19 +24,7 @@ 
.global _ramstart

.global _ramend



.global penguin_bits



#ifdef CONFIG_PILOT



#define IMR 0xFFFFF304



	.data

	.align 16



penguin_bits:	

#include "bootlogo.rh"



#endif

.global bootlogo_bits



/*****************************************************************************/
@@ -196,7 +184,7 @@ L3: 
	DBG_PUTC('H')



#ifdef CONFIG_PILOT

	movel	#penguin_bits, 0xFFFFFA00

	movel	#bootlogo_bits, 0xFFFFFA00

	moveb	#10, 0xFFFFFA05

	movew	#160, 0xFFFFFA08

	movew	#160, 0xFFFFFA0A