[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 27/30] hw/ppc/spapr, e500: Use new property "stdout-pat
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 27/30] hw/ppc/spapr, e500: Use new property "stdout-path" for boot console |
Date: |
Tue, 6 Mar 2018 15:01:51 +1100 |
From: Nikunj A Dadhania <address@hidden>
Linux kernel commit 2a9d832cc9aae21ea827520fef635b6c49a06c6d
(of: Add bindings for chosen node, stdout-path) deprecated chosen property
"linux,stdout-path" and "stdout".
Introduce the new property "stdout-path" and continue supporting the older
property to remain compatible with existing/older firmware. This older property
can be deprecated after 5 years.
Signed-off-by: Nikunj A Dadhania <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/e500.c | 7 +++++++
hw/ppc/spapr.c | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 13a34f50b7..ef541a00be 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -120,7 +120,14 @@ static void dt_serial_create(void *fdt, unsigned long long
offset,
qemu_fdt_setprop_string(fdt, "/aliases", alias, ser);
if (defcon) {
+ /*
+ * "linux,stdout-path" and "stdout" properties are deprecated by linux
+ * kernel. New platforms should only use the "stdout-path" property.
Set
+ * the new property and continue using older property to remain
+ * compatible with the existing firmware.
+ */
qemu_fdt_setprop_string(fdt, "/chosen", "linux,stdout-path", ser);
+ qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", ser);
}
}
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 1b6ddd827e..7e1c858566 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1053,7 +1053,14 @@ static void spapr_dt_chosen(sPAPRMachineState *spapr,
void *fdt)
}
if (!spapr->has_graphics && stdout_path) {
+ /*
+ * "linux,stdout-path" and "stdout" properties are deprecated by linux
+ * kernel. New platforms should only use the "stdout-path" property.
Set
+ * the new property and continue using older property to remain
+ * compatible with the existing firmware.
+ */
_FDT(fdt_setprop_string(fdt, chosen, "linux,stdout-path",
stdout_path));
+ _FDT(fdt_setprop_string(fdt, chosen, "stdout-path", stdout_path));
}
spapr_dt_ov5_platform_support(fdt, chosen);
--
2.14.3
- [Qemu-ppc] [PULL 12/30] heathrow: convert to trace-events, (continued)
- [Qemu-ppc] [PULL 12/30] heathrow: convert to trace-events, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 18/30] mac_newworld: use object link to pass OpenPIC object to macio, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 16/30] openpic: move KVM-specific declarations into separate openpic_kvm.h file, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 13/30] heathrow: change heathrow_pic_init() to return the heathrow device, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 10/30] macio: move ESCC device within the macio device, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 21/30] target/ppc: Check mask when setting cap_ppc_safe_indirect_branch, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 20/30] macio: remove macio_init() function, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 19/30] macio: move setting of CUDA timebase frequency to macio_common_realize(), David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 22/30] ppc/spapr-caps: Add support for custom spapr_capabilities, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 30/30] PowerPC: Add TS bits into msr_mask, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 27/30] hw/ppc/spapr, e500: Use new property "stdout-path" for boot console,
David Gibson <=
- [Qemu-ppc] [PULL 24/30] ppc/spapr-caps: Convert cap-sbbc to custom spapr-cap, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 26/30] ppc/spapr-caps: Define the pseries-2.12-sxxm machine type, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 29/30] adb: add trace-events for monitoring keyboard/mouse during bus enumeration, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 25/30] ppc/spapr-caps: Convert cap-ibs to custom spapr-cap, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 14/30] macio: move macio related structures and defines into separate macio.h file, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 23/30] ppc/spapr-caps: Convert cap-cfpc to custom spapr-cap, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 11/30] heathrow: QOMify heathrow PIC, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 17/30] openpic: move OpenPIC state and related definitions to openpic.h, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 28/30] PPC: e500: Fix duplicate kernel load and device tree overlap, David Gibson, 2018/03/05
- [Qemu-ppc] [PULL 06/30] ppc: Add aCube Sam460ex board, David Gibson, 2018/03/05