[commit] r1936 - in cpu/arm: beagle/build mmp2/build openmoko openmoko/build pxa3xx pxa3xx/build versatilepb/build

[repository service]

Author: wmb
Date: Wed Aug 11 20:30:05 2010
New Revision: 1936
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1936

Log:
ARM - cleaned up and synchronized makefiles for all ARM targets.

Modified:
   cpu/arm/beagle/build/Makefile
   cpu/arm/mmp2/build/Makefile
   cpu/arm/openmoko/build/Makefile
   cpu/arm/openmoko/openmoko.bth
   cpu/arm/pxa3xx/build/Makefile
   cpu/arm/pxa3xx/pxa3xx.bth
   cpu/arm/versatilepb/build/Makefile

Modified: cpu/arm/beagle/build/Makefile
==============================================================================
--- cpu/arm/beagle/build/Makefile	Wed Aug 11 10:51:38 2010	(r1935)
+++ cpu/arm/beagle/build/Makefile	Wed Aug 11 20:30:05 2010	(r1936)
@@ -1,35 +1,41 @@
-OS := $(shell uname)
+ROMNAME=beagle

BASEDIR= `(cd ../../../..; pwd;)`
+
+OS := $(shell uname)
+HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh)
+HOSTDIR= ../../../${HOSTCPU}/${OS}
+BUILDSH= ${BASEDIR}/forth/lib/build.sh
+
 TAGFILES= ../../build/*.tag *.tag
 CLIENTDIR=../../../../clients
 CLIENTPROGS=

-all: beagle.rom tags
+all: ${ROMNAME}.rom tags

-beagle.tag: beagle.rom
+${ROMNAME}.tag: ${ROMNAME}.rom

-tags: beagle.tag
+tags: ${ROMNAME}.tag
    @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES}

-beagle.rom: FORCE build ${CLIENTPROGS}
+${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth
    ./build $@

-../../${OS}/forth:
-	@make -C ../../${OS} forth
+${HOSTDIR}/forth:
+	@make -C ${HOSTDIR} forth

../../build/inflate.bin:
    @make -C ../../build inflate.bin

-build: ../../${OS}/forth
-	@ln -sf ../../${OS}/forth build
+build:
+	@ln -sf ${BUILDSH} build

clean:
-	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version
+	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag

clean-all: clean
    @make -C ../../build clean
-	@make -C ../../${OS} clean
+	@make -C ${HOSTDIR} clean

.PHONY: FORCE clean all clean-all

@@ -56,4 +62,3 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # LICENSE_END
-

Modified: cpu/arm/mmp2/build/Makefile
==============================================================================
--- cpu/arm/mmp2/build/Makefile	Wed Aug 11 10:51:38 2010	(r1935)
+++ cpu/arm/mmp2/build/Makefile	Wed Aug 11 20:30:05 2010	(r1936)
@@ -1,26 +1,28 @@
-OS := $(shell uname)
+ROMNAME=ofw

BASEDIR= `(cd ../../../..; pwd;)`

+OS := $(shell uname)
 HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh)
+HOSTDIR= ../../../${HOSTCPU}/${OS}
 BUILDSH= ${BASEDIR}/forth/lib/build.sh

TAGFILES= ../../build/*.tag *.tag
 CLIENTDIR=../../../../clients
 CLIENTPROGS=

-all: ofw.rom tags
+all: ${ROMNAME}.rom tags

-ofw.tag: ofw.rom
+${ROMNAME}.tag: ${ROMNAME}.rom

-tags: ofw.tag
+tags: ${ROMNAME}.tag
    @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES}

-ofw.rom: FORCE build ${CLIENTPROGS} ../../../${HOSTCPU}/${OS}/forth
+${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth
    ./build $@

-../../../${HOSTCPU}/${OS}/forth:
-	@make -C ../../../${HOSTCPU}/${OS} forth
+${HOSTDIR}/forth:
+	@make -C ${HOSTDIR} forth

../../build/inflate.bin:
    @make -C ../../build inflate.bin
@@ -29,11 +31,11 @@
    @ln -sf ${BUILDSH} build

clean:
-	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version
+	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag

clean-all: clean
    @make -C ../../build clean
-	@make -C ../../${OS} clean
+	@make -C ${HOSTDIR} clean

.PHONY: FORCE clean all clean-all

@@ -60,4 +62,3 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # LICENSE_END
-

Modified: cpu/arm/openmoko/build/Makefile
==============================================================================
--- cpu/arm/openmoko/build/Makefile	Wed Aug 11 10:51:38 2010	(r1935)
+++ cpu/arm/openmoko/build/Makefile	Wed Aug 11 20:30:05 2010	(r1936)
@@ -1,35 +1,41 @@
-OS := $(shell uname)
+ROMNAME=openmoko

BASEDIR= `(cd ../../../..; pwd;)`
+
+OS := $(shell uname)
+HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh)
+HOSTDIR= ../../../${HOSTCPU}/${OS}
+BUILDSH= ${BASEDIR}/forth/lib/build.sh
+
 TAGFILES= ../../build/*.tag *.tag
 CLIENTDIR=../../../../clients
 CLIENTPROGS=

-all: openmoko.rom tags
+all: ${ROMNAME}.rom tags

-openmoko.tag: openmoko.rom
+${ROMNAME}.tag: ${ROMNAME}.rom

-tags: openmoko.tag
+tags: ${ROMNAME}.tag
    @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES}

-openmoko.rom: FORCE build ${CLIENTPROGS}
+${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth
    ./build $@

-../../${OS}/forth:
-	@make -C ../../${OS} forth
+${HOSTDIR}/forth:
+	@make -C ${HOSTDIR} forth

../../build/inflate.bin:
    @make -C ../../build inflate.bin

-build: ../../${OS}/forth
-	@ln -sf ../../${OS}/forth build
+build:
+	@ln -sf ${BUILDSH} build

clean:
-	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version
+	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag

clean-all: clean
    @make -C ../../build clean
-	@make -C ../../${OS} clean
+	@make -C ${HOSTDIR} clean

.PHONY: FORCE clean all clean-all

Modified: cpu/arm/openmoko/openmoko.bth
==============================================================================
--- cpu/arm/openmoko/openmoko.bth	Wed Aug 11 10:51:38 2010	(r1935)
+++ cpu/arm/openmoko/openmoko.bth	Wed Aug 11 20:30:05 2010	(r1936)
@@ -1,11 +1,11 @@
-purpose: Load file for OFW on ARM beagleboard
+purpose: Load file for OFW on ARM OpenMoko
 \ See license at end of file

dictionary: ${BP}/cpu/arm/build/basefw.dic
 command: &armforth &dictionary &this
 build-now

-" beagle.tag" r/w create-file drop  tag-file !
+" openmoko.tag" r/w create-file drop  tag-file !

\ ' $report-name is include-hook

@@ -15,11 +15,10 @@
 ' (initial-heap) to initial-heap

-\ fload ${BP}/dev/diaguartbb.fth	\ beagleboard UART3
-fload ${BP}/cpu/arm/beagle/diaguartbb.fth	\ beagleboard UART3 
-\ h# 50000000 to uart-base \ UART# base address on beagleboard
-h# 50004000 to uart-base \ UART# base address on beagleboard
-\ h# 50008000 to uart-base \ UART# base address on beagleboard
+fload ${BP}/dev/omap/diaguart.fth	\ OMAP UART
+\ h# 50000000 to uart-base
+h# 50004000 to uart-base
+\ h# 50008000 to uart-base

fload ${BP}/forth/lib/sysuart.fth	\ Set console I/O vectors to UART

Modified: cpu/arm/pxa3xx/build/Makefile
==============================================================================
--- cpu/arm/pxa3xx/build/Makefile	Wed Aug 11 10:51:38 2010	(r1935)
+++ cpu/arm/pxa3xx/build/Makefile	Wed Aug 11 20:30:05 2010	(r1936)
@@ -1,35 +1,41 @@
-OS := $(shell uname)
+ROMNAME=pxa3xx

BASEDIR= `(cd ../../../..; pwd;)`
+
+OS := $(shell uname)
+HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh)
+HOSTDIR= ../../../${HOSTCPU}/${OS}
+BUILDSH= ${BASEDIR}/forth/lib/build.sh
+
 TAGFILES= ../../build/*.tag *.tag
 CLIENTDIR=../../../../clients
 CLIENTPROGS=

-all: pxa3xx.rom tags
+all: ${ROMNAME}.rom tags

-pxa3xx.tag: pxa3xx.rom
+${ROMNAME}.tag: ${ROMNAME}.rom

-tags: pxa3xx.tag
+tags: ${ROMNAME}.tag
    @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES}

-pxa3xx.rom: FORCE build ${CLIENTPROGS}
+${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth
    ./build $@

-../../${OS}/forth:
-	@make -C ../../${OS} forth
+${HOSTDIR}/forth:
+	@make -C ${HOSTDIR} forth

../../build/inflate.bin:
    @make -C ../../build inflate.bin

-build: ../../${OS}/forth
-	@ln -sf ../../${OS}/forth build
+build:
+	@ln -sf ${BUILDSH} build

clean:
-	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version
+	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag

clean-all: clean
    @make -C ../../build clean
-	@make -C ../../${OS} clean
+	@make -C ${HOSTDIR} clean

.PHONY: FORCE clean all clean-all

@@ -56,4 +62,3 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # LICENSE_END
-

Modified: cpu/arm/pxa3xx/pxa3xx.bth
==============================================================================
--- cpu/arm/pxa3xx/pxa3xx.bth	Wed Aug 11 10:51:38 2010	(r1935)
+++ cpu/arm/pxa3xx/pxa3xx.bth	Wed Aug 11 20:30:05 2010	(r1936)
@@ -1,11 +1,11 @@
-purpose: Load file for OFW on ARM beagleboard
+purpose: Load file for OFW on ARM PXA3xx
 \ See license at end of file

dictionary: ${BP}/cpu/arm/build/basefw.dic
 command: &armforth &dictionary &this
 build-now

-" beagle.tag" r/w create-file drop  tag-file !
+" pxa3xx.tag" r/w create-file drop  tag-file !

\ ' $report-name is include-hook

Modified: cpu/arm/versatilepb/build/Makefile
==============================================================================
--- cpu/arm/versatilepb/build/Makefile	Wed Aug 11 10:51:38 2010	(r1935)
+++ cpu/arm/versatilepb/build/Makefile	Wed Aug 11 20:30:05 2010	(r1936)
@@ -1,34 +1,64 @@
-OS := $(shell uname)
+ROMNAME=qemubase

BASEDIR= `(cd ../../../..; pwd;)`
+
+OS := $(shell uname)
+HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh)
+HOSTDIR= ../../../${HOSTCPU}/${OS}
+BUILDSH= ${BASEDIR}/forth/lib/build.sh
+
 TAGFILES= ../../build/*.tag *.tag
 CLIENTDIR=../../../../clients
 CLIENTPROGS=

-all: qemubase.rom tags
+all: ${ROMNAME}.rom tags

-qemubase.tag: qemubase.rom
+${ROMNAME}.tag: ${ROMNAME}.rom

-tags: qemubase.tag
+tags: ${ROMNAME}.tag
    @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES}

-qemubase.rom: FORCE build ${CLIENTPROGS}
+${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth
    ./build $@

-../../${OS}/forth:
-	@make -C ../../${OS} forth
+${HOSTDIR}/forth:
+	@make -C ${HOSTDIR} forth

../../build/inflate.bin:
    @make -C ../../build inflate.bin

-build: ../../${OS}/forth
-	@ln -sf ../../${OS}/forth build
+build:
+	@ln -sf ${BUILDSH} build

clean:
-	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version
+	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag

clean-all: clean
    @make -C ../../build clean
-	@make -C ../../${OS} clean
+	@make -C ${HOSTDIR} clean

.PHONY: FORCE clean all clean-all
+
+# LICENSE_BEGIN
+# Copyright (c) 2009 FirmWorks
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# LICENSE_END