Skip to contentSkip to conversation

m68knommu: add missing make rule for Palm/Pilot bitmap boot logo

PATCH In review [email protected] 2 participants 4 messages Dec 22, 2011 – Dec 30, 2011 m68k architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 m68knommu: add missing make rule for Palm/Pilot bitmap boot logo

From: Greg Ungerer <[email protected]>

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 Makefile contains rules to make the bootlogo.rh file from the C source bootlogo.h. But it is missing a dependency that compiling head-pilot.S needs bootlogo.rh.

---
 arch/m68k/platform/68328/Makefile |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/m68k/platform/68328/Makefile +3 -0
index e4dfd8f..704e36d 100644
@@ -16,6 +16,9 @@ obj-$(CONFIG_ROM)	+= romvec.o
 extra-y			:= head.o
 extra-$(CONFIG_M68328)	+= bootlogo.rh head.o
 
+$(obj)/head-pilot.o: $(obj)/bootlogo.rh
+$(obj)/head-rom.o: $(obj)/bootlogo.rh
+
 $(obj)/bootlogo.rh: $(src)/bootlogo.h
 	perl $(src)/bootlogo.pl < $(src)/bootlogo.h > $(obj)/bootlogo.rh
 
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 24 lines · On Thu, Dec 22, 2011 at 08:03, <[email protected]> wrote:

From: Greg Ungerer <[email protected]>

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 Makefile contains rules to make the bootlogo.rh file from the C source bootlogo.h. But it is missing a dependency that compiling head-pilot.S needs bootlogo.rh.

---
 arch/m68k/platform/68328/Makefile |    3 +++

 1 files changed, 3 insertions(+), 0 deletions(-)
arch/m68k/platform/68328/Makefile +0 -0
index e4dfd8f..704e36d 100644
@@ -16,6 +16,9 @@ obj-$(CONFIG_ROM)     += romvec.o

 extra-y                        := head.o
 extra-$(CONFIG_M68328) += bootlogo.rh head.o

Quoted 5 lines

+$(obj)/head-pilot.o: $(obj)/bootlogo.rh
+$(obj)/head-rom.o: $(obj)/bootlogo.rh
+
 $(obj)/bootlogo.rh: $(src)/bootlogo.h
       perl $(src)/bootlogo.pl < $(src)/bootlogo.h > $(obj)/bootlogo.rh

Nothing serious, you just made me wondering:
1. Any chance bootlogo.h can be generated from a more edit-friendly format, cfr. drivers/video/logo/?
2. Why do you include the *.rh file from an assembler source file, instead of including the *.h file from a C source file?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

#2 lore raw

Hi Geert,

Quoted 25 lines · Geert Uytterhoeven
Quoted 24 lines · On Thu, Dec 22, 2011 at 08:03,<[email protected]> wrote:

From: Greg Ungerer<[email protected]>

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 Makefile contains rules to make the bootlogo.rh file from the C source bootlogo.h. But it is missing a dependency that compiling head-pilot.S needs bootlogo.rh.

---
áarch/m68k/platform/68328/Makefile | á á3 +++ á1 files changed, 3 insertions(+), 0 deletions(-)

arch/m68k/platform/68328/Makefile +0 -0
index e4dfd8f..704e36d 100644
@@ -16,6 +16,9 @@ obj-$(CONFIG_ROM) á á += romvec.o

áextra-y á á á á á á á á á á á á:= head.o áextra-$(CONFIG_M68328) += bootlogo.rh head.o

Quoted 9 lines
Quoted 5 lines

+$(obj)/head-pilot.o: $(obj)/bootlogo.rh
+$(obj)/head-rom.o: $(obj)/bootlogo.rh
+
á$(obj)/bootlogo.rh: $(src)/bootlogo.h
á á á áperl $(src)/bootlogo.pl< $(src)/bootlogo.h> $(obj)/bootlogo.rh

Nothing serious, you just made me wondering:
1. Any chance bootlogo.h can be generated from a more edit-friendly format, cfr. drivers/video/logo/?

Probably. This is the way the code came to me originally, and I haven't looked at it in quite a while.

Quoted 2 lines

2. Why do you include the *.rh file from an assembler source file, instead of including the *.h file from a C source file?

Good question. I am not sure why it was done this way. I'll see if we can do this a little more cleanly.

Regards
Greg

------------------------------------------------------------------------

Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com
#3 lore raw
In reply to Geert Uytterhoeven

Hi Geert,

Quoted 25 lines · Geert Uytterhoeven
Quoted 24 lines · On Thu, Dec 22, 2011 at 08:03,<[email protected]> wrote:

From: Greg Ungerer<[email protected]>

Compiling for the m68knommu/68328 Palm/Pilot target you get:

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 Makefile contains rules to make the bootlogo.rh file from the C source bootlogo.h. But it is missing a dependency that compiling head-pilot.S needs bootlogo.rh.

---
arch/m68k/platform/68328/Makefile | á á3 +++

1 files changed, 3 insertions(+), 0 deletions(-)
arch/m68k/platform/68328/Makefile +0 -0
index e4dfd8f..704e36d 100644
@@ -16,6 +16,9 @@ obj-$(CONFIG_ROM) += romvec.o
 extra-y		   := head.o
 extra-$(CONFIG_M68328) += bootlogo.rh head.o
 
Quoted 9 lines

arch/m68k/platform/68328/Makefile obj-$(CONFIG_ROM) += romvec.o

Quoted 5 lines
arch/m68k/platform/68328/Makefile +3 -0
+$(obj)/head-pilot.o: $(obj)/bootlogo.rh
+$(obj)/head-rom.o: $(obj)/bootlogo.rh
+
 $(obj)/bootlogo.rh: $(src)/bootlogo.h
 	perl $(src)/bootlogo.pl<  $(src)/bootlogo.h>  $(obj)/bootlogo.rh

Nothing serious, you just made me wondering:
1. Any chance bootlogo.h can be generated from a more edit-friendly format, cfr. drivers/video/logo/?

Looking at this I think you are right. This could be in the same way with all the others in drivers/video/logo.

Quoted 2 lines

2. Why do you include the *.rh file from an assembler source file, instead of including the *.h file from a C source file?

Although the fix involves more change to do it in C code, at least it improves this code a little :-) So I have a different patch to fix this that does it this way. Sending patch after this.

Regards
Greg

------------------------------------------------------------------------

Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com