diff mbox

[2/6] prep: change default cpu to '7448'

Message ID 1331995186-18507-3-git-send-email-hpoussin@reactos.org
State New
Headers show

Commit Message

Hervé Poussineau March 17, 2012, 2:39 p.m. UTC
In b37fc148bb81b5b022846156a6cba266e6c23962, PReP default cpu was changed from
'default' to '602'. However, '7448' is closer of 'default' than '602'.

This repairs following command line, which is available in some tutorials:
qemu-system-ppc -kernel zImage.prep -fda debian_install_root.bin -M prep

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/ppc_prep.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Andreas Färber March 19, 2012, 12:53 p.m. UTC | #1
Am 17.03.2012 15:39, schrieb Hervé Poussineau:
> In b37fc148bb81b5b022846156a6cba266e6c23962, PReP default cpu was changed from
> 'default' to '602'. However, '7448' is closer of 'default' than '602'.
> 
> This repairs following command line, which is available in some tutorials:
> qemu-system-ppc -kernel zImage.prep -fda debian_install_root.bin -M prep
> 
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>

Weak nack. I guess this depends more on the image than on the command
line. If at this point we change the default CPU for -M prep, we would
need to start creating prep-1.0 etc. which I would like to avoid as long
as possible...

Did you happen to found out which physical machine 'prep' corresponds
to? If so, what CPU did it have?
The Sandalfoot supposedly had a 601, the BeBox a dual 603.

Andreas

> ---
>  hw/ppc_prep.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
> index 06d589d..19a674f 100644
> --- a/hw/ppc_prep.c
> +++ b/hw/ppc_prep.c
> @@ -517,7 +517,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
>  
>      /* init CPUs */
>      if (cpu_model == NULL)
> -        cpu_model = "602";
> +        cpu_model = "7448";
>      for (i = 0; i < smp_cpus; i++) {
>          env = cpu_init(cpu_model);
>          if (!env) {
Hervé Poussineau March 19, 2012, 9:01 p.m. UTC | #2
Andreas Färber a écrit :
> Am 17.03.2012 15:39, schrieb Hervé Poussineau:
>> In b37fc148bb81b5b022846156a6cba266e6c23962, PReP default cpu was changed from
>> 'default' to '602'. However, '7448' is closer of 'default' than '602'.
>>
>> This repairs following command line, which is available in some tutorials:
>> qemu-system-ppc -kernel zImage.prep -fda debian_install_root.bin -M prep
>>
>> Cc: Gerd Hoffmann <kraxel@redhat.com>
>> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> 
> Weak nack. I guess this depends more on the image than on the command
> line. If at this point we change the default CPU for -M prep, we would
> need to start creating prep-1.0 etc. which I would like to avoid as long
> as possible...

I'm using floppy images available at
http://archive.debian.org/debian/dists/woody/main/disks-powerpc/current/prep/images-1.44/
more specifically root.bin
The default cpu has already been changed once between 0.11 and 0.12, so 
I think it's not impossible to change it once more.
Moreover, I don't think prep emulation is used in any production 
environment...

> 
> Did you happen to found out which physical machine 'prep' corresponds
> to? If so, what CPU did it have?
It seems that 'prep' emulates a Motorola, maybe the 
PowerStack/BlackHack, but I'm not sure...

> The Sandalfoot supposedly had a 601, the BeBox a dual 603.

With 601, Open Hack'Ware doesn't work.
With 602, the Debian installer doesn't start.
With 603, the Debian installer starts.
With 604, Open Hack'Ware doesn't work.

Will you accept a patch to change '602' to '603'?

Hervé
Hervé Poussineau March 19, 2012, 9:02 p.m. UTC | #3
Andreas Färber a écrit :
> Am 17.03.2012 15:39, schrieb Hervé Poussineau:
>> In b37fc148bb81b5b022846156a6cba266e6c23962, PReP default cpu was changed from
>> 'default' to '602'. However, '7448' is closer of 'default' than '602'.
>>
>> This repairs following command line, which is available in some tutorials:
>> qemu-system-ppc -kernel zImage.prep -fda debian_install_root.bin -M prep
>>
>> Cc: Gerd Hoffmann <kraxel@redhat.com>
>> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> 
> Weak nack. I guess this depends more on the image than on the command
> line. If at this point we change the default CPU for -M prep, we would
> need to start creating prep-1.0 etc. which I would like to avoid as long
> as possible...

I'm using floppy images available at
http://archive.debian.org/debian/dists/woody/main/disks-powerpc/current/prep/images-1.44/
more specifically root.bin
The default cpu has already been changed once between 0.11 and 0.12, so 
I think it's not impossible to change it once more.
Moreover, I'm not sure PReP emulation is used in any real environment...

> 
> Did you happen to found out which physical machine 'prep' corresponds
> to? If so, what CPU did it have?
It seems that 'prep' emulates a Motorola, maybe the 
PowerStack/BlackHack, but I'm not sure...

> The Sandalfoot supposedly had a 601, the BeBox a dual 603.

With 601, Open Hack'Ware doesn't work.
With 602, the Debian installer doesn't start.
With 603, the Debian installer starts.
With 604, Open Hack'Ware doesn't work.

Will you accept a patch to change '602' to '603'?

Hervé
diff mbox

Patch

diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 06d589d..19a674f 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -517,7 +517,7 @@  static void ppc_prep_init (ram_addr_t ram_size,
 
     /* init CPUs */
     if (cpu_model == NULL)
-        cpu_model = "602";
+        cpu_model = "7448";
     for (i = 0; i < smp_cpus; i++) {
         env = cpu_init(cpu_model);
         if (!env) {