OpenBIOS February 2013

openbios@openbios.org

12 participants
24 discussions

[PATCH] build: improve subdir rules
by Blue Swirl 16 Feb '13

16 Feb '13

Use subdirectory build rules from QEMU. They allow a parallel build of all available subdirectory targets. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- Makefile | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3526b75..172f450 100644 --- a/Makefile +++ b/Makefile @@ -15,18 +15,24 @@ clean: $(MAKE) -C $$dir clean; \ done -build: - @printf "Building..." +build: start-build @for dir in $(ODIRS); do \ $(MAKE) -C $$dir > $$dir/build.log 2>&1 && echo "ok." || \ ( echo "error:"; tail -15 $$dir/build.log; exit 1 ) \ done -build-verbose: +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGETS)) +SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) + +quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) + +build-verbose: start-build $(SUBDIR_RULES) + +subdir-%: + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C obj-$* V="$(V)" all,) + +start-build: @echo "Building..." - @for dir in $(ODIRS); do \ - $(MAKE) -C $$dir || exit 1; \ - done run: @echo "Running..." -- 1.7.2.5

1 0

[commit] r1099 - in trunk/openbios-devel: . config/scripts config/xml
by repository service 16 Feb '13

16 Feb '13

Author: blueswirl Date: Sat Feb 16 13:08:33 2013 New Revision: 1099 URL: http://tracker.coreboot.org/trac/openbios/changeset/1099 Log: build: support disjoint build directory Support building in any directory, not just in-tree build. Use VPATH for non-Forth files. Forth compiler does not support explicit paths, so drop source path prefixes added by XML and rely on directories passed with -I flag. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/.gitignore trunk/openbios-devel/Makefile trunk/openbios-devel/Makefile.target trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/config/xml/dictionary.xsl trunk/openbios-devel/config/xml/object.xsl Modified: trunk/openbios-devel/.gitignore ============================================================================== --- trunk/openbios-devel/.gitignore Sun Feb 3 17:50:11 2013 (r1098) +++ trunk/openbios-devel/.gitignore Sat Feb 16 13:08:33 2013 (r1099) @@ -1,2 +1,3 @@ obj-* .stgit-* +config-host.mak Modified: trunk/openbios-devel/Makefile ============================================================================== --- trunk/openbios-devel/Makefile Sun Feb 3 17:50:11 2013 (r1098) +++ trunk/openbios-devel/Makefile Sat Feb 16 13:08:33 2013 (r1099) @@ -1,5 +1,4 @@ -ODIRS=$(wildcard obj-*) -TARGETS=$(subst obj-,,$(ODIRS)) +include config-host.mak all: requirements info build Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Sun Feb 3 17:50:11 2013 (r1098) +++ trunk/openbios-devel/Makefile.target Sat Feb 16 13:08:33 2013 (r1099) @@ -6,7 +6,6 @@ include config.mak ODIR := . -SRCDIR := .. HOSTCC := gcc HOSTCFLAGS+= -O2 -g -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) @@ -38,6 +37,10 @@ quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) +VPATH_SUFFIXES = %.c %.h %.S %.fs +set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(PATTERN) $1))) +$(call set-vpath, $(SRCDIR)) + # # pre rules # Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sun Feb 3 17:50:11 2013 (r1098) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Feb 16 13:08:33 2013 (r1099) @@ -117,21 +117,18 @@ echo "<option name=\"$option\" type=\"boolean\" value=\"true\" />" } -if ! test -f utils/dist/debian/rules; then - echo "switch-arch must be run from the top-level source directory" >&2 - exit 1 -fi -# This is needed because viewvc messes with the permissions of executables: -chmod 755 utils/dist/debian/rules -chmod 755 config/scripts/switch-arch -chmod 755 config/scripts/reldir +SRCDIR=`dirname "$0"`/../.. +BUILDDIR=`pwd` + +# make source path absolute +SRCDIR=`cd "$SRCDIR"; pwd` if test "x$HOSTARCH" = "x"; then archname fi -VERSION=`head VERSION` +VERSION=`head $SRCDIR/VERSION` echo "Configuring OpenBIOS on $HOSTARCH for $*" @@ -156,8 +153,8 @@ arch_list="" for target in $target_list; do arch=`echo $target | sed s/.*-//g` - if ! test -f config/examples/${arch}_config.xml; then - echo "Cannot find config/examples/${arch}_config.xml" >&2 + if ! test -f $SRCDIR/config/examples/${arch}_config.xml; then + echo "Cannot find $SRCDIR/config/examples/${arch}_config.xml" >&2 exit 1 fi if ! echo $arch_list | grep -q "$arch"; then @@ -269,7 +266,8 @@ cross="yes" fi crosscflags $HOSTARCH $ARCH - OBJDIR=obj-$ARCH + OBJDIR=$BUILDDIR/obj-$ARCH + ODIRS="$ODIRS $OBJDIR" printf "Initializing build tree $OBJDIR..." rm -rf "$OBJDIR" @@ -294,9 +292,9 @@ mkdir -p $OBJDIR/host/include mkdir -p $OBJDIR/host/kernel mkdir -p $OBJDIR/forth - ln -s ../../../include/arch/$BASEARCH $OBJDIR/target/include/asm + ln -s $SRCDIR/include/arch/$BASEARCH $OBJDIR/target/include/asm #compile the host binary with target settings instead - #ln -s ../../../include/arch/$HOSTARCH $OBJDIR/host/include/asm + #ln -s $SRCDIR/include/arch/$HOSTARCH $OBJDIR/host/include/asm if [ "$mol" = "yes" ]; then printf "\nUsing MOL path $MOLPATH...\n" mkdir -p $OBJDIR/target/arch/ppc/mol @@ -324,11 +322,9 @@ fi echo "ok." - cd $OBJDIR - SRCDIR=.. - ODIR=. + ODIR=$OBJDIR - printf "Creating target Makefile..." + printf "Creating target config.mak..." echo "ARCH=$ARCH" > $ODIR/config.mak if [ "$cross" = "yes" ]; then echo "TARGET=$TARGET" >> $ODIR/config.mak @@ -338,7 +334,10 @@ echo "HOSTARCH?=$HOSTARCH" >> $ODIR/config.mak echo "CROSSCFLAGS=$CROSSCFLAGS" >> $ODIR/config.mak echo "VERSION=\"$VERSION\"" >> $ODIR/config.mak + echo "SRCDIR=$SRCDIR" >> $ODIR/config.mak + echo "ok." + printf "Creating target rules.mak..." ln -s $SRCDIR/config/xml/rules.xml $ODIR/rules.xml echo "<?xml version=\"1.0\"?><config>" > $ODIR/config.xml # Generic @@ -381,8 +380,9 @@ fi cat $SRCDIR/config/examples/${ARCH}_config.xml >> $ODIR/config.xml + cd $ODIR echo "</config>" >> $ODIR/config.xml - ln -s ../Makefile.target $ODIR/Makefile + ln -s $SRCDIR/Makefile.target $ODIR/Makefile xsltproc $SRCDIR/config/xml/xinclude.xsl $SRCDIR/build.xml > $ODIR/build-full.xml xsltproc $SRCDIR/config/xml/makefile.xsl $ODIR/build-full.xml > $ODIR/rules.mak echo "ok." @@ -392,5 +392,12 @@ xsltproc $SRCDIR/config/xml/config-forth.xsl $ODIR/config.xml > $ODIR/forth/config.fs echo "ok." - cd $SRCDIR + cd $BUILDDIR done + +if [ "$SRCDIR" != "$BUILDDIR" ]; then + ln -s $SRCDIR/Makefile $BUILDDIR +fi + +echo "ODIRS=$ODIRS" >> $BUILDDIR/config-host.mak +echo "TARGETS=$arch_list" >> $BUILDDIR/config-host.mak Modified: trunk/openbios-devel/config/xml/dictionary.xsl ============================================================================== --- trunk/openbios-devel/config/xml/dictionary.xsl Sun Feb 3 17:50:11 2013 (r1098) +++ trunk/openbios-devel/config/xml/dictionary.xsl Sat Feb 16 13:08:33 2013 (r1099) @@ -56,7 +56,6 @@ <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY:=$(</xsl:text> <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY) </xsl:text> - <xsl:text>$(SRCDIR)/</xsl:text> <xsl:value-of select="$path"/> <xsl:value-of select="@source"/> <xsl:text>
</xsl:text> @@ -122,6 +121,8 @@ </xsl:if> </xsl:for-each> +  + <xsl:text> -I$(SRCDIR)</xsl:text>  <xsl:text> -I$(ODIR)/forth</xsl:text> Modified: trunk/openbios-devel/config/xml/object.xsl ============================================================================== --- trunk/openbios-devel/config/xml/object.xsl Sun Feb 3 17:50:11 2013 (r1098) +++ trunk/openbios-devel/config/xml/object.xsl Sat Feb 16 13:08:33 2013 (r1099) @@ -52,7 +52,6 @@ <xsl:text>.o: </xsl:text>  - <xsl:text>$(SRCDIR)/</xsl:text> <xsl:value-of select="$path"/> <xsl:value-of select="@source"/>

1 0

Re: [OpenBIOS] Macintosh device tree
by Programmingkid 16 Feb '13

16 Feb '13

On second thought you and others can still help. The device tree to the 450 MHz blue and white Power Mac G3 would help. To print out the device tree you will need these items: The blue and white G3, another computer with an ethernet port, and a ethernet crossover cable. You might be able to substitute the crossover cable with a regular ethernet patch cable if you use another more recent Mac like a MacPro or MacBook Pro. The other computer can be a Mac or PC. First connect the cable into each computer's ethernet port. Start up the blue and white G3 while holding down the command-option-o-f keys. This will bring up Open Firmware. Type in this command to start a telnet server: “ enet:telnet,10.0.0.2” io On the other computer, make sure its ethernet ip address is set to something like 10.0.0.1. You can do this in the Network pane under System Preferences in Mac OS X. Under Windows you would use something like the Network control panel. On the other computer, you will also want to open some console and start the telnet command like this: telnet 10.0.0.2 If everything worked, then the blue and white G3's screen will go black and its output will appear on the telnet session. Type these commands to print the device tree: dev / ls Also type this command to give us info on the model string: .properties Yes, the period is there on purpose. Once you are done with that, the info for the via-cuda and uninorth nodes would help as well. These commands will print out some useful info: dev via-cuda .properties words I think this would bring up info on the uninorth node: dev uni-n@f8000000 .properties words If the dev command doesn't work, it might be because the node might have a @<some hex number> text attached to it. I can help any one who needs help with this issue. Copy and paste the output from these commands and send them to the mailing list. Thank you to anyone who can help. This much needed information will really help push the mac99 target along. On Feb 3, 2013, at 9:03 PM, Programmingkid wrote: > Thanks for the help, but it turns out I needed an early iMac's device tree. > > On Feb 3, 2013, at 8:00 PM, Mike Erwin wrote: > >> For some reason this mail didn't go through... >> >> Mike Erwin >> musician, naturalist, pixel pusher, hacker extraordinaire >> >> >> On Sat, Feb 2, 2013 at 7:14 PM, Mike Erwin <significant.bit(a)gmail.com> wrote: >> I have several machines of that vintage. How do I get the device tree? Let me know which ones would be useful. >> >> 450MHz blue & white G3 >> 500MHz Powerbook G3 >> dual 500MHz (I think) graphite G4 >> a few Quicksilver G4s (my favorite model) >> >> Mike Erwin >> musician, naturalist, pixel pusher, hacker extraordinaire >> >> >> On Sat, Feb 2, 2013 at 4:27 PM, Programmingkid <programmingkidx(a)gmail.com> wrote: >> I am investigating the device tree of the mac99 model. It looks like it is wrong. The part that I am concerned with is the via-cuda node. Both my iMac and iBook don't even have a via-cuda. They both have a via-pmu@16000 node. I'm hoping someone has an original blue and white PowerMac G3. I would like the full device tree printout from it. The question I am trying to answer is does any newworld Mac have a via-cuda? If they don't, we know that it should be changed to a via-pmu@16000 node. >> -- >> OpenBIOS http://openbios.org/ >> Mailinglist: http://lists.openbios.org/mailman/listinfo >> Free your System - May the Forth be with you >> >> >

2 1

Re: [OpenBIOS] Macintosh device tree
by Programmingkid 16 Feb '13

16 Feb '13

On Feb 3, 2013, at 9:47 PM, Programmingkid wrote: > > On Feb 3, 2013, at 7:17 PM, Amadeusz Sławiński wrote: > >> On Mon, Feb 04, 2013 at 12:24:26AM +0100, Andreas Färber wrote: >>> Am 02.02.2013 22:27, schrieb Programmingkid: >>>> I am investigating the device tree of the mac99 model. It looks like it is wrong. The part that I am concerned with is the via-cuda node. Both my iMac and iBook don't even have a via-cuda. They both have a via-pmu@16000 node. I'm hoping someone has an original blue and white PowerMac G3. I would like the full device tree printout from it. The question I am trying to answer is does any newworld Mac have a via-cuda? If they don't, we know that it should be changed to a via-pmu@16000 node. >>> >>> I have one around, and it has a via-cuda@16000 node. There's a >>> power-mgt@0 node at the same level (under mac-io@5) but no pmu node. >> >> With regards to mac99 target I would rather be concerned with lack of /uni-n, as >> darwin seems to check for this (it panics when checking machine type) Do you think this is a QEMU or OpenBIOS issue?

3 2

Beige G3 device tree
by Programmingkid 15 Feb '13

15 Feb '13

I finally obtained a Beige G3 for comparing with our emulated model. The model is very wrong. No wonder Mac OS X won't boot. What it expects a Beige G3 to look like is not being supplied. It is going to take a lot of changes to QEMU and OpenBIOS to fix things. My current guess why Mac OS X stops where it does is because of the missing ide@20000 node under the mac-io@10 node. Here is a real Beige G3's device tree: Children of the node: 86748104: / [AAPL,Gossamer MacRISC] Node Adr Node Name Compatible 86753208: /cpus@0 86753488: /PowerPC,750@0 86754536: /l2-cache@0,0 86756192: /chosen@0 86756496: /memory@0 86756824: /openprom@0 86757016: /AAPL,ROM@FFC00000 [AAPL,ROM] 86757600: /options@0 86758784: /aliases@0 /packages@0 /deblocker@0,0 /disk-label@0,0 /obp-tftp@0,0 /mac-files@0,0 /mac-parts@0,0 /aix-boot@0,0 /fat-files@0,0 /iso-9660-files@0,0 /xcoff-loader@0,0 /terminal-emulator@0,0 /pci@80000000 [grackle] /mac-io@10 [heathrow] /mesh@10000 [mesh] /sd@0,0 [sd] /st@0,0 [st] /bmac@11000 [bmac] /escc@13000 [escc CHRP,es0] /ch-a@13020 [ch-a CHRP,es2] /ch-b@13000 [ch-b CHRP,es3] /davbus@14000 /sound@0,0 [awacs screamer] /swim3@15000 [swim3] /nvram@60000 [nvram] /ide@20000 [heathrow-ata] /disk@0,0 /ide@21000 [heathrow-ata] /disk@0,0 /via-cuda@16000 [via-cuda] /adb@0,0 [adb] /keyboard@0,0 /mouse@1,0 /pram@0,0 /rtc@0,0 [rtc] /power-mgt@0,0 [power-mgt] /ATY,mach64_3DU@12 /perch@0 [Wings] \ Properties of the root node 0 > .properties name device-tree model Power Macintosh compatible AAPL,Gossamer MacRISC AAPL,cpu-id 00000000 #address-cells 00000001 #size-cells 00000001 clock-frequency 03FB97A0 \ mac-io node properties name mac-io device_type dbdma model AAPL,343S1201 reg 00008000 00000000 00000000 00000000 00000000 02008010 00000000 F3000000 00000000 00080000 assigned-addresses 02008010 00000000 F3000000 00000000 00080000 ranges 00000000 02008010 00000000 F3000000 00080000 #address-cells 00000001 #size-cells 00000001 vendor-id 0000106B device-id 00000010 revision-id 00000001 class-code 00FF0000 min-grant 00000000 max-latency 00000000 devsel-speed 00000001 AAPL,address F3000000 compatible heathrow 0 > dev mesh@10000 ok 0 > .properties name mesh device_type scsi model AAPL,343S1146 reg 00010000 00000100 00008000 00000200 clock-frequency 02FAF080 AAPL,interrupts 0000000C 00000000 AAPL,connector scsi compatible mesh 0 > dev /nvram@60000 ok 0 > .properties name nvram device_type nvram compatible nvram reg 00060000 00020000 existing 00000000 00002000 0 > dev ide@20000 ok 0 > ls Children of the node: 86825168: /ide@20000 [heathrow-ata] Node Adr Node Name Compatible 86832680: /disk@0,0 0 > .properties name ide device_type ide AAPL,connector ata compatible heathrow-ata AAPL,bus-id 00000000 reg 00020000 00002000 00008800 00000200 AAPL,pio-timing 00000526 00000085 00000025 00000025 00000025 00000000 00000000 00000000 AAPL,interrupts 00000000 00000002 #address-cells 00000001

1 0

[PATCH] build: support disjoint build directory
by Blue Swirl 09 Feb '13

09 Feb '13

Support building in any directory, not just in-tree build. Use VPATH for non-Forth files. Forth compiler does not support explicit paths, so drop source path prefixes added by XML and rely on directories passed with -I flag. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- .gitignore | 1 + Makefile | 3 +- Makefile.target | 5 +++- config/scripts/switch-arch | 47 +++++++++++++++++++++++++------------------ config/xml/dictionary.xsl | 3 +- config/xml/object.xsl | 1 - 6 files changed, 35 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index e6b5c59..38e6dd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ obj-* .stgit-* +config-host.mak diff --git a/Makefile b/Makefile index 74e462c..3526b75 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ -ODIRS=$(wildcard obj-*) -TARGETS=$(subst obj-,,$(ODIRS)) +include config-host.mak all: requirements info build diff --git a/Makefile.target b/Makefile.target index 934b95a..913fb13 100644 --- a/Makefile.target +++ b/Makefile.target @@ -6,7 +6,6 @@ include config.mak ODIR := . -SRCDIR := .. HOSTCC := gcc HOSTCFLAGS+= -O2 -g -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) @@ -38,6 +37,10 @@ AS_FLAGS+= -g quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) +VPATH_SUFFIXES = %.c %.h %.S %.fs +set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(PATTERN) $1))) +$(call set-vpath, $(SRCDIR)) + # # pre rules # diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index a9c911b..b91af7c 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -117,21 +117,18 @@ config_set_boolean() echo "<option name=\"$option\" type=\"boolean\" value=\"true\" />" } -if ! test -f utils/dist/debian/rules; then - echo "switch-arch must be run from the top-level source directory" >&2 - exit 1 -fi -# This is needed because viewvc messes with the permissions of executables: -chmod 755 utils/dist/debian/rules -chmod 755 config/scripts/switch-arch -chmod 755 config/scripts/reldir +SRCDIR=`dirname "$0"`/../.. +BUILDDIR=`pwd` + +# make source path absolute +SRCDIR=`cd "$SRCDIR"; pwd` if test "x$HOSTARCH" = "x"; then archname fi -VERSION=`head VERSION` +VERSION=`head $SRCDIR/VERSION` echo "Configuring OpenBIOS on $HOSTARCH for $*" @@ -156,8 +153,8 @@ done arch_list="" for target in $target_list; do arch=`echo $target | sed s/.*-//g` - if ! test -f config/examples/${arch}_config.xml; then - echo "Cannot find config/examples/${arch}_config.xml" >&2 + if ! test -f $SRCDIR/config/examples/${arch}_config.xml; then + echo "Cannot find $SRCDIR/config/examples/${arch}_config.xml" >&2 exit 1 fi if ! echo $arch_list | grep -q "$arch"; then @@ -269,7 +266,8 @@ for ARCH in $arch_list; do cross="yes" fi crosscflags $HOSTARCH $ARCH - OBJDIR=obj-$ARCH + OBJDIR=$BUILDDIR/obj-$ARCH + ODIRS="$ODIRS $OBJDIR" printf "Initializing build tree $OBJDIR..." rm -rf "$OBJDIR" @@ -294,9 +292,9 @@ for ARCH in $arch_list; do mkdir -p $OBJDIR/host/include mkdir -p $OBJDIR/host/kernel mkdir -p $OBJDIR/forth - ln -s ../../../include/arch/$BASEARCH $OBJDIR/target/include/asm + ln -s $SRCDIR/include/arch/$BASEARCH $OBJDIR/target/include/asm #compile the host binary with target settings instead - #ln -s ../../../include/arch/$HOSTARCH $OBJDIR/host/include/asm + #ln -s $SRCDIR/include/arch/$HOSTARCH $OBJDIR/host/include/asm if [ "$mol" = "yes" ]; then printf "\nUsing MOL path $MOLPATH...\n" mkdir -p $OBJDIR/target/arch/ppc/mol @@ -324,11 +322,9 @@ for ARCH in $arch_list; do fi echo "ok." - cd $OBJDIR - SRCDIR=.. - ODIR=. + ODIR=$OBJDIR - printf "Creating target Makefile..." + printf "Creating target config.mak..." echo "ARCH=$ARCH" > $ODIR/config.mak if [ "$cross" = "yes" ]; then echo "TARGET=$TARGET" >> $ODIR/config.mak @@ -338,7 +334,10 @@ for ARCH in $arch_list; do echo "HOSTARCH?=$HOSTARCH" >> $ODIR/config.mak echo "CROSSCFLAGS=$CROSSCFLAGS" >> $ODIR/config.mak echo "VERSION=\"$VERSION\"" >> $ODIR/config.mak + echo "SRCDIR=$SRCDIR" >> $ODIR/config.mak + echo "ok." + printf "Creating target rules.mak..." ln -s $SRCDIR/config/xml/rules.xml $ODIR/rules.xml echo "<?xml version=\"1.0\"?><config>" > $ODIR/config.xml # Generic @@ -381,8 +380,9 @@ for ARCH in $arch_list; do fi cat $SRCDIR/config/examples/${ARCH}_config.xml >> $ODIR/config.xml + cd $ODIR echo "</config>" >> $ODIR/config.xml - ln -s ../Makefile.target $ODIR/Makefile + ln -s $SRCDIR/Makefile.target $ODIR/Makefile xsltproc $SRCDIR/config/xml/xinclude.xsl $SRCDIR/build.xml > $ODIR/build-full.xml xsltproc $SRCDIR/config/xml/makefile.xsl $ODIR/build-full.xml > $ODIR/rules.mak echo "ok." @@ -392,5 +392,12 @@ for ARCH in $arch_list; do xsltproc $SRCDIR/config/xml/config-forth.xsl $ODIR/config.xml > $ODIR/forth/config.fs echo "ok." - cd $SRCDIR + cd $BUILDDIR done + +if [ "$SRCDIR" != "$BUILDDIR" ]; then + ln -s $SRCDIR/Makefile $BUILDDIR +fi + +echo "ODIRS=$ODIRS" >> $BUILDDIR/config-host.mak +echo "TARGETS=$arch_list" >> $BUILDDIR/config-host.mak diff --git a/config/xml/dictionary.xsl b/config/xml/dictionary.xsl index 52d836a..664df0f 100644 --- a/config/xml/dictionary.xsl +++ b/config/xml/dictionary.xsl @@ -56,7 +56,6 @@ <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY:=$(</xsl:text> <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY) </xsl:text> - <xsl:text>$(SRCDIR)/</xsl:text> <xsl:value-of select="$path"/> <xsl:value-of select="@source"/> <xsl:text>
</xsl:text> @@ -122,6 +121,8 @@ </xsl:if> </xsl:for-each> +  + <xsl:text> -I$(SRCDIR)</xsl:text>  <xsl:text> -I$(ODIR)/forth</xsl:text> diff --git a/config/xml/object.xsl b/config/xml/object.xsl index 7af54ab..cf521f5 100644 --- a/config/xml/object.xsl +++ b/config/xml/object.xsl @@ -52,7 +52,6 @@ <xsl:text>.o: </xsl:text>  - <xsl:text>$(SRCDIR)/</xsl:text> <xsl:value-of select="$path"/> <xsl:value-of select="@source"/> -- 1.7.2.5

1 0

Re: [OpenBIOS] testing Mac OS X boot on latest trunk (revision 1085) + divide by zero patch
by Programmingkid 07 Feb '13

07 Feb '13

> On 13.01.13 16:43, Mark Cave-Ayland wrote: > > > On 12/01/13 16:05, Amadeusz Sławiński wrote: > > > > > > >> > I used the latest proposed divide by zero patch > > >> > >> > So it seems like it is almost there. > > >> > >> > Seems like it still can't load kernel when run with boot cd:,\\:tbxi > > >> > Mac OS X 10.0 > > >> http://asmblr.net/scrot/2013-01-12-155737_1366x768_scrot.png > >> > >> > Mac OS X 10.2 > > >> http://asmblr.net/scrot/2013-01-12-155642_1366x768_scrot.png > >> > >> > Mac OS X 10.4 > > >> http://asmblr.net/scrot/2013-01-12-155935_1366x768_scrot.png > >> > >> > >> > However when I specify partition to use it loads: > > >> > Mac OS X 10.0 (boot cd:9,\\:tbxi) > > >> http://asmblr.net/scrot/2013-01-12-163133_1366x768_scrot.png > >> > >> > Mac OS X 10.2 (boot cd:9,\\:tbxi) > > >> http://asmblr.net/scrot/2013-01-12-163300_1366x768_scrot.png > >> > >> > Mac OS X 10.4 (boot cd:3,\\:tbxi) > > >> http://asmblr.net/scrot/2013-01-12-163419_1366x768_scrot.png > > > > > > > This should now be fixed in SVN trunk. > > > > > > > > I believe I have now committed all outstanding patches based upon > > > > William's main GSOC patchset, and performed a QEMU CDROM boot test > > > > across all of SPARC32, SPARC64 and PPC to confirm that I haven't > > > > introduced any regressions across any of my test images. Thank you > > > > everyone for your help, patience and testing. > > > > > > > > Interestingly enough, commits 1081 and 1082 appear to have fixed the key > > > > issues with OpenBIOS's PPC MMU code and as a result, the following > > > > kernels will now at least boot from ISO images in QEMU: > > > > > > > > Darwin > > > > FreeBSD > > > > NetBSD > > > > HelenOS > > > > Fedora Linux > > > > SuSE Linux > > > > > > > > I think the remainder of the bugs during kernel initialisation are > > > > related to either missing/erroneous properties in the OpenBIOS device > > > > tree, or bugs in QEMU's device emulation/Mac hardware model. This will > > > > likely require some assistance from the QEMU people to fix. > > > I can confirm the statement from Mark regarding FreeBSD. So far I can > boot but I fail due to the fact that some interrupt-parents are not > populated. Namely for via-cuda and for ata-1/2/3. Adding these lets the > boot continue until I hang somewhere in a cpu_idle routine. Still > investigating. > > One thing the qemu people might clarify, is -M mac99 ok to use? Or what > would be the preferred Mac model and which cpu? > My trials go with mac99 and -cpu G4 on the 32-bit qemu. > > I think once I solved the spinning in the cpu_idle routine I'm near > completing the boot. > > Thank you all for this effort! > > Andreas > Would you have a patch for this interrupt-parent property? If it helps, here is the what I found in an G3 iMac: via-pmu properties 0 > .properties name via-pmu device_type via-pmu compatible pmu reg 00016000 00002000 interrupts 00000019 00000001 interrupt-parent ff90fa00 pmu-version 00d07e0c AAPL,clock-id 73706920 73703331 AAPL,clock-data 01de2000 00000044 00008000 00000000 00000000 00000044 00008000 00000044 00000010 6e756c6c 6e756c6c 012ad400 I think the mac99 model might be better at making Mac OS X boot on QEMU than the Beige G3 model. I personally would stick with the G3 processor. It has less features than the G4 so it might be easier to work with and emulate.

2 2

[Patch] Fix model string
by Programmingkid 07 Feb '13

07 Feb '13

This patch corrects the model string so OpenBIOS reports a value of PowerMac1,1. This string represents the blue and white Power Mac G3. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: arch/ppc/qemu/init.c =================================================================== --- arch/ppc/qemu/init.c (revision 1098) +++ arch/ppc/qemu/init.c (working copy) @@ -734,12 +734,12 @@ /* model */ - push_str("PowerMac2,1"); + push_str("PowerMac1,1"); fword("model"); /* compatible */ - push_str("PowerMac2,1"); + push_str("PowerMac1,1"); fword("encode-string"); push_str("MacRISC"); fword("encode-string");

2 2

[PATCH] SPARC32 : microSPARC-II identification
by Olivier DANET 03 Feb '13

03 Feb '13

For the microSPARC-II = Fujitsu MB86904 = Sun STP1012PGA, PSR.IMPL=0 and PSR.VERS=4 This CPU model is used as default by QEMU when emulating a SparcStation-4 or SparcStation-5 Signed-off-by: Olivier DANET <odanet(a)caramail.com> diff a/openbios-devel/arch/sparc32/openbios.c b/openbios-devel/arch/sparc32/openbios.c --- a/openbios-devel/arch/sparc32/openbios.c +++ b/openbios-devel/arch/sparc32/openbios.c @@ -244,9 +244,9 @@ static const struct cpudef sparc_defs[] .iu_version = 0x04 << 24, /* Impl 0, ver 4 */ .name = "FMI,MB86904", .psr_impl = 0, - .psr_vers = 5, + .psr_vers = 4, .impl = 0, - .vers = 5, + .vers = 4, .dcache_line_size = 0x10, .dcache_lines = 0x200, .dcache_assoc = 1,

2 1

[commit] r1098 - trunk/openbios-devel/arch/sparc32
by repository service 03 Feb '13

03 Feb '13

Author: blueswirl Date: Sun Feb 3 17:50:11 2013 New Revision: 1098 URL: http://tracker.coreboot.org/trac/openbios/changeset/1098 Log: SPARC32: microSPARC-II identification For the microSPARC-II = Fujitsu MB86904 = Sun STP1012PGA, PSR.IMPL=0 and PSR.VERS=4. This CPU model is used as default by QEMU when emulating a SparcStation-4 or SparcStation-5. Signed-off-by: Olivier DANET <odanet(a)caramail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/openbios.c Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Thu Jan 31 22:37:13 2013 (r1097) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Feb 3 17:50:11 2013 (r1098) @@ -244,9 +244,9 @@ .iu_version = 0x04 << 24, /* Impl 0, ver 4 */ .name = "FMI,MB86904", .psr_impl = 0, - .psr_vers = 5, + .psr_vers = 4, .impl = 0, - .vers = 5, + .vers = 4, .dcache_line_size = 0x10, .dcache_lines = 0x200, .dcache_assoc = 1,

1 0