Commit a69dc537 authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

ppc: Remove deprecated ppcemb target 



There is no known available OS for ppc around anymore that uses page
sizes below 4k, so it does not make much sense that we keep wasting
our time on building and testing the ppcemb-softmmu target. It has
been deprecated since two releases, and nobody complained, so let's
remove this now.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 19b599f7

configure

+3 −10
Original line number Diff line number Diff line
@@ -195,8 +195,7 @@ supported_kvm_target() { 
        i386:i386 | i386:x86_64 | i386:x32 | \

        x86_64:i386 | x86_64:x86_64 | x86_64:x32 | \

        mips:mips | mipsel:mips | \

        ppc:ppc | ppcemb:ppc | ppc64:ppc | \

        ppc:ppc64 | ppcemb:ppc64 | ppc64:ppc64 | \

        ppc:ppc | ppc64:ppc | ppc:ppc64 | ppc64:ppc64 | \

        s390x:s390x)

            return 0

        ;;
@@ -6951,7 +6950,7 @@ if test "$linux" = "yes" ; then 
  i386|x86_64|x32)

    linux_arch=x86

    ;;

  ppcemb|ppc|ppc64)

  ppc|ppc64)

    linux_arch=powerpc

    ;;

  s390x)
@@ -6981,7 +6980,7 @@ target_name=$(echo $target | cut -d '-' -f 1) 
target_bigendian="no"



case "$target_name" in

  armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)

  armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)

  target_bigendian=yes

  ;;

esac
@@ -7109,12 +7108,6 @@ case "$target_name" in 
    gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"

    target_compiler=$cross_cc_powerpc

  ;;

  ppcemb)

    TARGET_BASE_ARCH=ppc

    TARGET_ABI_DIR=ppc

    gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"

    target_compiler=$cross_cc_ppcemb

  ;;

  ppc64)

    TARGET_BASE_ARCH=ppc

    TARGET_ABI_DIR=ppc

cpus.c

+0 −1
Original line number Diff line number Diff line
@@ -2251,7 +2251,6 @@ static CpuInfoArch sysemu_target_to_cpuinfo_arch(SysEmuTarget target) 
        return CPU_INFO_ARCH_X86;



    case SYS_EMU_TARGET_PPC:

    case SYS_EMU_TARGET_PPCEMB:

    case SYS_EMU_TARGET_PPC64:

        return CPU_INFO_ARCH_PPC;

default-configs/ppcemb-softmmu.mak

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
# Default configuration for ppcemb-softmmu



include pci.mak

include sound.mak

include usb.mak

CONFIG_PPC4XX=y

CONFIG_M48T59=y

CONFIG_SERIAL=y

CONFIG_SERIAL_ISA=y

CONFIG_I8257=y

CONFIG_OPENPIC=y

CONFIG_PFLASH_CFI01=y

CONFIG_PFLASH_CFI02=y

CONFIG_PTIMER=y

CONFIG_I8259=y

CONFIG_XILINX=y

CONFIG_XILINX_ETHLITE=y

CONFIG_USB_EHCI_SYSBUS=y

CONFIG_SM501=y

CONFIG_DDC=y

CONFIG_IDE_SII3112=y

CONFIG_I2C=y

CONFIG_BITBANG_I2C=y

hw/ppc/ppc405_boards.c

+0 −14
Original line number Diff line number Diff line
@@ -162,13 +162,6 @@ static void ref405ep_init(MachineState *machine) 
    DriveInfo *dinfo;

    MemoryRegion *sysmem = get_system_memory();



#ifdef TARGET_PPCEMB

    if (!qtest_enabled()) {

        warn_report("qemu-system-ppcemb is deprecated, "

                    "please use qemu-system-ppc instead.");

    }

#endif



    /* XXX: fix this */

    memory_region_allocate_system_memory(&ram_memories[0], NULL, "ef405ep.ram",

                                         0x08000000);
@@ -463,13 +456,6 @@ static void taihu_405ep_init(MachineState *machine) 
    int fl_idx, fl_sectors;

    DriveInfo *dinfo;



#ifdef TARGET_PPCEMB

    if (!qtest_enabled()) {

        warn_report("qemu-system-ppcemb is deprecated, "

                    "please use qemu-system-ppc instead.");

    }

#endif



    /* RAM is soldered to the board so the size cannot be changed */

    ram_size = 0x08000000;

    memory_region_allocate_system_memory(ram, NULL, "taihu_405ep.ram",

hw/ppc/ppc440_bamboo.c

+0 −7
Original line number Diff line number Diff line
@@ -195,13 +195,6 @@ static void bamboo_init(MachineState *machine) 
        exit(1);

    }



#ifdef TARGET_PPCEMB

    if (!qtest_enabled()) {

        warn_report("qemu-system-ppcemb is deprecated, "

                    "please use qemu-system-ppc instead.");

    }

#endif



    qemu_register_reset(main_cpu_reset, cpu);

    ppc_booke_timers_init(cpu, 400000000, 0);

    ppc_dcr_init(env, NULL, NULL);