[PATCH] arch/ppc/qemu: Rename root node for Macs to match Apple

[BALATON Zoltan]

Apple calls the root node of the device tree "device-tree" and MorphOS
relies on this to decide what properties to get. Make it happy.

Signed-off-by: BALATON Zoltan 
---
 openbios-devel/arch/ppc/qemu/init.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openbios-devel/arch/ppc/qemu/init.c b/openbios-devel/arch/ppc/qemu/init.c
index 4fe8b72..8d5ef8e 100644
--- a/openbios-devel/arch/ppc/qemu/init.c
+++ b/openbios-devel/arch/ppc/qemu/init.c
@@ -734,6 +734,12 @@ arch_of_init(void)
     push_str("/");
     fword("find-device");

+    /* Apple calls the root node device-tree */
+    if (is_apple()) {
+        push_str("device-tree");
+        fword("device-name");
+    }
+
     switch(machine_id) {
     case ARCH_HEATHROW:	/* OldWorld */

[PATCH] arch/ppc/qemu: Rename root node for Macs to match Apple

[Mark Cave-Ayland]

On 03/06/14 21:55, BALATON Zoltan wrote:
> Apple calls the root node of the device tree "device-tree" and MorphOS
> relies on this to decide what properties to get. Make it happy.
> Signed-off-by: BALATON Zoltan
>
> openbios-devel/arch/ppc/qemu/init.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/openbios-devel/arch/ppc/qemu/init.c b/openbios-devel/arch/ppc/qemu/init.c
> index 4fe8b72..8d5ef8e 100644
> --- a/openbios-devel/arch/ppc/qemu/init.c
> +++ b/openbios-devel/arch/ppc/qemu/init.c
> @@ -734,6 +734,12 @@ arch_of_init(void)
>       push_str("/");
>       fword("find-device");
> /* Apple calls the root node device-tree */
> if (is_apple()) {
>    push_str("device-tree");
>    fword("device-name");
> }
> switch(machine_id) {
> case ARCH_HEATHROW:	/* OldWorld */

I think for this I'd still prefer to change the default for all PPC 
trees in arch/ppc/qemu/tree.fs... Alex/Andreas?

ATB,

Mark.

[PATCH] arch/ppc/qemu: Rename root node for Macs to match Apple

[Alexander Graf]

On 05.06.14 20:43, Mark Cave-Ayland wrote:
> On 03/06/14 21:55, BALATON Zoltan wrote:
> > Apple calls the root node of the device tree "device-tree" and MorphOS
> > relies on this to decide what properties to get. Make it happy.
> > Signed-off-by: BALATON Zoltan
> >
> > openbios-devel/arch/ppc/qemu/init.c | 6 ++++++
> >   1 file changed, 6 insertions(+)
> >
> > diff --git a/openbios-devel/arch/ppc/qemu/init.c 
> > b/openbios-devel/arch/ppc/qemu/init.c
> > index 4fe8b72..8d5ef8e 100644
> > --- a/openbios-devel/arch/ppc/qemu/init.c
> > +++ b/openbios-devel/arch/ppc/qemu/init.c
> > @@ -734,6 +734,12 @@ arch_of_init(void)
> >       push_str("/");
> >       fword("find-device");
> > /* Apple calls the root node device-tree */
> > if (is_apple()) {
> >    push_str("device-tree");
> >    fword("device-name");
> > }
> > switch(machine_id) {
> > case ARCH_HEATHROW:    /* OldWorld */
>
> I think for this I'd still prefer to change the default for all PPC 
> trees in arch/ppc/qemu/tree.fs... Alex/Andreas?

Works for me :).

Alex