qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] d4c6d3: microblaze: boot.c: Don't try to find

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] d4c6d3: microblaze: boot.c: Don't try to find NULL file
Date: Fri, 26 Jan 2018 07:08:25 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d4c6d3600beab8b976f373f6e5b68066e9b9fdaa
      
https://github.com/qemu/qemu/commit/d4c6d3600beab8b976f373f6e5b68066e9b9fdaa
  Author: Alistair Francis <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/microblaze/boot.c

  Log Message:
  -----------
  microblaze: boot.c: Don't try to find NULL file

Previously if no device tree was passed to microblaze_load_kernel() then
qemu_find_file() would try to find a NULL pointer. To avoid this put a
check around qemu_find_file().

Signed-off-by: Alistair Francis <address@hidden>
Reported-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>


  Commit: 4690bf4e9a4005161afd5a4a8caeb8e24c7dbc76
      
https://github.com/qemu/qemu/commit/4690bf4e9a4005161afd5a4a8caeb8e24c7dbc76
  Author: Alistair Francis <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/microblaze/Makefile.objs
    A hw/microblaze/xlnx-zynqmp-pmu.c

  Log Message:
  -----------
  xlnx-zynqmp-pmu: Initial commit of the ZynqMP PMU

The Xilinx ZynqMP SoC has two main processing systems in it. The ARM
processing system (which is already modeled in QEMU) and the MicroBlaze
Power Management Unit (PMU). This is the inital work for adding support
for the PMU.

The PMU susbsystem runs along side the ARM system on hardware, but due
to architecture limitations in QEMU the two instances are seperate for
the time being.

Let's follow the same setup we do with the ARM system, where there is an
SoC device and a ZCU102 board. Although the PMU is less board specific
we are still going to follow the same split as maybe in future we can
connect the PMU device to the ARM ZCU102 board. As the machine will be
fairly small let's keep them both together in one file.

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>


  Commit: 133d23b3ad1be53105b9950fb18858cf059f2da6
      
https://github.com/qemu/qemu/commit/133d23b3ad1be53105b9950fb18858cf059f2da6
  Author: Alistair Francis <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/microblaze/xlnx-zynqmp-pmu.c

  Log Message:
  -----------
  xlnx-zynqmp-pmu: Add the CPU and memory

Connect the MicroBlaze CPU and the ROM and RAM memory regions.

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>


  Commit: 07c4a51a2988d1a5f7cf34b227e685373ac98bff
      
https://github.com/qemu/qemu/commit/07c4a51a2988d1a5f7cf34b227e685373ac98bff
  Author: Alistair Francis <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M default-configs/aarch64-softmmu.mak
    M hw/arm/Makefile.objs
    M hw/display/Makefile.objs
    M hw/dma/Makefile.objs

  Log Message:
  -----------
  aarch64-softmmu.mak: Use an ARM specific config

In preperation for having an ARM and MicroBlaze ZynqMP machine let's
split out the current ARM specific config options.

Signed-off-by: Alistair Francis <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>


  Commit: c859b566e8ceba48c4314e7123f7480e4eb66ff2
      
https://github.com/qemu/qemu/commit/c859b566e8ceba48c4314e7123f7480e4eb66ff2
  Author: Alistair Francis <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M default-configs/microblaze-softmmu.mak
    M hw/intc/Makefile.objs
    A hw/intc/xlnx-pmu-iomod-intc.c
    A include/hw/intc/xlnx-pmu-iomod-intc.h

  Log Message:
  -----------
  xlnx-pmu-iomod-intc: Add the PMU Interrupt controller

Add the PMU IO Module Interrupt controller device.

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>


  Commit: 633a91b687823b84c37d754b876e96ec9b1dc296
      
https://github.com/qemu/qemu/commit/633a91b687823b84c37d754b876e96ec9b1dc296
  Author: Alistair Francis <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/microblaze/xlnx-zynqmp-pmu.c

  Log Message:
  -----------
  xlnx-zynqmp-pmu: Connect the PMU interrupt controller

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>


  Commit: b350735ef63f7df0d85c0e3fe6c7b828e9902e09
      
https://github.com/qemu/qemu/commit/b350735ef63f7df0d85c0e3fe6c7b828e9902e09
  Author: Alistair Francis <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/intc/Makefile.objs
    A hw/intc/xlnx-zynqmp-ipi.c
    A include/hw/intc/xlnx-zynqmp-ipi.h

  Log Message:
  -----------
  xlnx-zynqmp-ipi: Initial version of the Xilinx IPI device

This is the initial version of the Inter Processor Interrupt device.

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>


  Commit: 07b30201e691dcaf1646df9d02ccbe27a8ea0ef3
      
https://github.com/qemu/qemu/commit/07b30201e691dcaf1646df9d02ccbe27a8ea0ef3
  Author: Alistair Francis <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/microblaze/xlnx-zynqmp-pmu.c

  Log Message:
  -----------
  xlnx-zynqmp-pmu: Connect the IPI device to the PMU

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>


  Commit: 0ab7bbc75bc167f06a74379e8a8d2d6f9a78888b
      
https://github.com/qemu/qemu/commit/0ab7bbc75bc167f06a74379e8a8d2d6f9a78888b
  Author: Alistair Francis <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M hw/arm/xlnx-zynqmp.c
    M include/hw/arm/xlnx-zynqmp.h

  Log Message:
  -----------
  xlnx-zynqmp: Connect the IPI device to the ZynqMP SoC

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>


  Commit: e607bbee553cfe73072870cef458cfa4e78133e2
      
https://github.com/qemu/qemu/commit/e607bbee553cfe73072870cef458cfa4e78133e2
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-26 (Fri, 26 Jan 2018)

  Changed paths:
    M default-configs/aarch64-softmmu.mak
    M default-configs/microblaze-softmmu.mak
    M hw/arm/Makefile.objs
    M hw/arm/xlnx-zynqmp.c
    M hw/display/Makefile.objs
    M hw/dma/Makefile.objs
    M hw/intc/Makefile.objs
    A hw/intc/xlnx-pmu-iomod-intc.c
    A hw/intc/xlnx-zynqmp-ipi.c
    M hw/microblaze/Makefile.objs
    M hw/microblaze/boot.c
    A hw/microblaze/xlnx-zynqmp-pmu.c
    M include/hw/arm/xlnx-zynqmp.h
    A include/hw/intc/xlnx-pmu-iomod-intc.h
    A include/hw/intc/xlnx-zynqmp-ipi.h

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/edgar/tags/edgar/xilinx-next-2018-01-26.for-upstream' into staging

Xilinx queue

# gpg: Signature made Fri 26 Jan 2018 10:17:01 GMT
# gpg:                using RSA key 0x29C596780F6BCA83
# gpg: Good signature from "Edgar E. Iglesias (Xilinx key) <address@hidden>"
# gpg:                 aka "Edgar E. Iglesias <address@hidden>"
# Primary key fingerprint: AC44 FEDC 14F7 F1EB EDBF  4151 29C5 9678 0F6B CA83

* remotes/edgar/tags/edgar/xilinx-next-2018-01-26.for-upstream:
  xlnx-zynqmp: Connect the IPI device to the ZynqMP SoC
  xlnx-zynqmp-pmu: Connect the IPI device to the PMU
  xlnx-zynqmp-ipi: Initial version of the Xilinx IPI device
  xlnx-zynqmp-pmu: Connect the PMU interrupt controller
  xlnx-pmu-iomod-intc: Add the PMU Interrupt controller
  aarch64-softmmu.mak: Use an ARM specific config
  xlnx-zynqmp-pmu: Add the CPU and memory
  xlnx-zynqmp-pmu: Initial commit of the ZynqMP PMU
  microblaze: boot.c: Don't try to find NULL file

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/d45091e449c4...e607bbee553c
reply via email to
[Prev in Thread] Current Thread [Next in Thread]