From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerone Young Date: Tue, 18 Mar 2008 20:06:39 +0000 Subject: [kvm-ppc-devel] [PATCH 6 of 7] Modify PPC bamboo & ppc440 board Message-Id: List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-devel@lists.sourceforge.net Cc: kvm-ppc-devel@lists.sourceforge.net # HG changeset patch # User Jerone Young # Date 1205870472 18000 # Branch merge # Node ID ac0fc9dfd78d2eddd083326e9b635a9286fc3b19 # Parent 3e87db599895937824b9bf3369eb67ea7f5a7595 Modify PPC bamboo & ppc440 board models This patch renames pp440_init to ppc440ep_init, as ppc440 is the name of the core and ppc440ep is the name of the SOC. When we init we are initializing the SOC. Also in this patch we now call cpu_ppc_init for bamboo with string 440 .. as 440 is the core. Signed-off-by: Jerone Young diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c --- a/qemu/hw/ppc440.c +++ b/qemu/hw/ppc440.c @@ -10,7 +10,7 @@ #include "ppc440.h" -void ppc440_init(CPUState *env, +void ppc440ep_init(CPUState *env, target_phys_addr_t ram_bases[2], target_phys_addr_t ram_sizes[2], qemu_irq **picp, diff --git a/qemu/hw/ppc440.h b/qemu/hw/ppc440.h --- a/qemu/hw/ppc440.h +++ b/qemu/hw/ppc440.h @@ -20,7 +20,7 @@ #include "exec-all.h" #include "boards.h" -void ppc440_init(CPUState *env, +void ppc440ep_init(CPUState *env, target_phys_addr_t ram_bases[2], target_phys_addr_t ram_sizes[2], qemu_irq **picp, diff --git a/qemu/hw/ppc440_bamboo.c b/qemu/hw/ppc440_bamboo.c --- a/qemu/hw/ppc440_bamboo.c +++ b/qemu/hw/ppc440_bamboo.c @@ -68,8 +68,7 @@ void bamboo_init(ram_addr_t ram_size, in printf("Ram size of domain is %d bytes\n", (int)ram_size); /* Setup CPU */ - /* XXX We cheat for now and use 405 */ - env = cpu_ppc_init("405"); + env = cpu_ppc_init("440"); if (!env) { fprintf(stderr, "Unable to initilize CPU!\n"); exit(1); @@ -77,7 +76,7 @@ void bamboo_init(ram_addr_t ram_size, in /* call init */ printf("Calling function ppc440_init\n"); - ppc440_init(env, ram_bases, ram_sizes, &pic,1); + ppc440ep_init(env, ram_bases, ram_sizes, &pic,1); printf("Done calling ppc440_init\n"); /* Register mem */ ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ kvm-ppc-devel mailing list kvm-ppc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jerone Young Subject: [PATCH 6 of 7] Modify PPC bamboo & ppc440 board models Date: Tue, 18 Mar 2008 15:06:39 -0500 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-ppc-devel@lists.sourceforge.net To: kvm-devel@lists.sourceforge.net Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces@lists.sourceforge.net Errors-To: kvm-devel-bounces@lists.sourceforge.net List-Id: kvm.vger.kernel.org # HG changeset patch # User Jerone Young # Date 1205870472 18000 # Branch merge # Node ID ac0fc9dfd78d2eddd083326e9b635a9286fc3b19 # Parent 3e87db599895937824b9bf3369eb67ea7f5a7595 Modify PPC bamboo & ppc440 board models This patch renames pp440_init to ppc440ep_init, as ppc440 is the name of the core and ppc440ep is the name of the SOC. When we init we are initializing the SOC. Also in this patch we now call cpu_ppc_init for bamboo with string 440 .. as 440 is the core. Signed-off-by: Jerone Young diff --git a/qemu/hw/ppc440.c b/qemu/hw/ppc440.c --- a/qemu/hw/ppc440.c +++ b/qemu/hw/ppc440.c @@ -10,7 +10,7 @@ #include "ppc440.h" -void ppc440_init(CPUState *env, +void ppc440ep_init(CPUState *env, target_phys_addr_t ram_bases[2], target_phys_addr_t ram_sizes[2], qemu_irq **picp, diff --git a/qemu/hw/ppc440.h b/qemu/hw/ppc440.h --- a/qemu/hw/ppc440.h +++ b/qemu/hw/ppc440.h @@ -20,7 +20,7 @@ #include "exec-all.h" #include "boards.h" -void ppc440_init(CPUState *env, +void ppc440ep_init(CPUState *env, target_phys_addr_t ram_bases[2], target_phys_addr_t ram_sizes[2], qemu_irq **picp, diff --git a/qemu/hw/ppc440_bamboo.c b/qemu/hw/ppc440_bamboo.c --- a/qemu/hw/ppc440_bamboo.c +++ b/qemu/hw/ppc440_bamboo.c @@ -68,8 +68,7 @@ void bamboo_init(ram_addr_t ram_size, in printf("Ram size of domain is %d bytes\n", (int)ram_size); /* Setup CPU */ - /* XXX We cheat for now and use 405 */ - env = cpu_ppc_init("405"); + env = cpu_ppc_init("440"); if (!env) { fprintf(stderr, "Unable to initilize CPU!\n"); exit(1); @@ -77,7 +76,7 @@ void bamboo_init(ram_addr_t ram_size, in /* call init */ printf("Calling function ppc440_init\n"); - ppc440_init(env, ram_bases, ram_sizes, &pic,1); + ppc440ep_init(env, ram_bases, ram_sizes, &pic,1); printf("Done calling ppc440_init\n"); /* Register mem */ ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/