mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge tag 'hw-misc-20250216' of https://github.com/philmd/qemu into staging
Misc HW patches - Use qemu_hexdump_line() in TPM backend (Philippe) - Remove magic number in APIC (Phil) - Disable thread-level cache topology (Zhao) - Xen QOM style cleanups (Bernhard) - Introduce TYPE_DYNAMIC_SYS_BUS_DEVICE (Philippe) - Invert logic of machine no_sdcard flag (Philippe) - Housekeeping in MicroBlaze functional tests (Philippe) - Prevent out-of-bound access in SMC91C111 RX path (Peter) - Declare more fields / arguments as const (Philippe) - Introduce EndianMode QAPI enum (Philippe) - Make various Xilinx devices endianness configurable (Philippe) - Mark some devices memory regions as little-endian (Philippe) - Allow execution RX gdbsim machine without BIOS/kernel (Keith) # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmeyUY8ACgkQ4+MsLN6t # wN7OQQ/+PwMfwJUjmkUYgS2E4RMEQFq3LVeY7hRcsga/F0EAQV5ksn9f8nqkWu7b # vkXIxcatWb1dgpkqIYRPG/PuAELIub9ZFpc57TNVvFZiGzqtOg1rXSAinDEtb8oL # fMB/HnLGLScOaIeWa7d7t58oOnpO6yAYZi/BYiByKnToHO4nkfu3yNIB290Tjia0 # npbundH3Gmk8B+LmcFpqXqj0KyDZNxHw8WMh8nba+mhp0gp0z5hlOKoaGgSzNW4f # Az1sjeKCVVcMf+C01tfO5V8NHQdqFQovqcua+wMoWd9we3JuIHFkhTpZHxWUvW/l # e8ovqXBfFv++TqjNb1tZJMwYqM2mBH7txqOoZmWXcnihISURIa4GkwtNOLMx0HGk # omxZYLnsVbrHivdelzNB1ipVehhqD37/lW1Tq8b+bMfCGFF2coXWyx10pyXZTB+P # 6Xyd9QWcCTQPXMgIHJ28DU8s+bIHERdPHQVtaaBSahggFm/suR+gBanCxCiGfbA/ # 8/AFolptCaxRh4OoXOFft+SOcjsURCWHSDAVK64rp7yRc4D/nEnXb79d4sthDRuG # DKvaO4D03QYIo79Bas+u687lEwQ7fiecFtt6iI0fHe5MiJG0ZymAkwmWe7UnnUZF # VvqkjRjapjphASxPKVnXAzLXBL3rCL27VeTlaXO5Qk34Jf9d1J4= # =URn3 # -----END PGP SIGNATURE----- # gpg: Signature made Sun 16 Feb 2025 15:58:55 EST # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full] # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'hw-misc-20250216' of https://github.com/philmd/qemu: (39 commits) hw/rx: Allow execution without either bios or kernel hw/pci-host: Mark versatile regions as little-endian hw/mips: Mark Loonson3 Virt machine devices as little-endian hw/mips: Mark Boston machine devices as little-endian hw/arm: Mark Allwinner Technology devices as little-endian hw/ssi/xilinx_spi: Make device endianness configurable hw/char/xilinx_uartlite: Make device endianness configurable hw/timer/xilinx_timer: Make device endianness configurable hw/net/xilinx_ethlite: Make device endianness configurable hw/intc/xilinx_intc: Make device endianness configurable hw/qdev-properties-system: Introduce EndianMode QAPI enum hw: Make class data 'const' hw: Declare various const data as 'const' tests/functional: Remove sleep() kludges from microblaze tests tests/functional: Allow microblaze tests to take a machine name argument tests/functional: Explicit endianness of microblaze assets hw/net/smc91c111: Ignore attempt to pop from empty RX fifo hw/riscv/opentitan: Include missing 'exec/address-spaces.h' header hw/boards: Ensure machine setting auto_create_sdcard expose a SD Bus hw/riscv: Remove all invalid uses of auto_create_sdcard=true ... Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
+10
-14
@@ -21,6 +21,7 @@
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/visitor.h"
|
||||
#include "tpm_int.h"
|
||||
@@ -336,8 +337,8 @@ void tpm_sized_buffer_reset(TPMSizedBuffer *tsb)
|
||||
void tpm_util_show_buffer(const unsigned char *buffer,
|
||||
size_t buffer_size, const char *string)
|
||||
{
|
||||
size_t len, i;
|
||||
char *line_buffer, *p;
|
||||
g_autoptr(GString) str = NULL;
|
||||
size_t len, i, l;
|
||||
|
||||
if (!trace_event_get_state_backends(TRACE_TPM_UTIL_SHOW_BUFFER_CONTENT)) {
|
||||
return;
|
||||
@@ -345,19 +346,14 @@ void tpm_util_show_buffer(const unsigned char *buffer,
|
||||
len = MIN(tpm_cmd_get_size(buffer), buffer_size);
|
||||
trace_tpm_util_show_buffer_header(string, len);
|
||||
|
||||
/*
|
||||
* allocate enough room for 3 chars per buffer entry plus a
|
||||
* newline after every 16 chars and a final null terminator.
|
||||
*/
|
||||
line_buffer = g_malloc(len * 3 + (len / 16) + 1);
|
||||
|
||||
for (i = 0, p = line_buffer; i < len; i++) {
|
||||
if (i && !(i % 16)) {
|
||||
p += sprintf(p, "\n");
|
||||
for (i = 0; i < len; i += l) {
|
||||
if (str) {
|
||||
g_string_append_c(str, '\n');
|
||||
}
|
||||
p += sprintf(p, "%.2X ", buffer[i]);
|
||||
l = MIN(len, 16);
|
||||
str = qemu_hexdump_line(str, buffer, l, 1, 0);
|
||||
}
|
||||
trace_tpm_util_show_buffer_content(line_buffer);
|
||||
|
||||
g_free(line_buffer);
|
||||
g_string_ascii_up(str);
|
||||
trace_tpm_util_show_buffer_content(str->str);
|
||||
}
|
||||
|
||||
@@ -158,7 +158,7 @@ static void aw_a10_realize(DeviceState *dev, Error **errp)
|
||||
/* FIXME use a qdev chardev prop instead of serial_hd() */
|
||||
serial_mm_init(get_system_memory(), AW_A10_UART0_REG_BASE, 2,
|
||||
qdev_get_gpio_in(dev, 1),
|
||||
115200, serial_hd(0), DEVICE_NATIVE_ENDIAN);
|
||||
115200, serial_hd(0), DEVICE_LITTLE_ENDIAN);
|
||||
|
||||
for (size_t i = 0; i < AW_A10_NUM_USB; i++) {
|
||||
g_autofree char *bus = g_strdup_printf("usb-bus.%zu", i);
|
||||
|
||||
@@ -408,19 +408,19 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp)
|
||||
/* UART0. For future clocktree API: All UARTS are connected to APB2_CLK. */
|
||||
serial_mm_init(get_system_memory(), s->memmap[AW_H3_DEV_UART0], 2,
|
||||
qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART0),
|
||||
115200, serial_hd(0), DEVICE_NATIVE_ENDIAN);
|
||||
115200, serial_hd(0), DEVICE_LITTLE_ENDIAN);
|
||||
/* UART1 */
|
||||
serial_mm_init(get_system_memory(), s->memmap[AW_H3_DEV_UART1], 2,
|
||||
qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART1),
|
||||
115200, serial_hd(1), DEVICE_NATIVE_ENDIAN);
|
||||
115200, serial_hd(1), DEVICE_LITTLE_ENDIAN);
|
||||
/* UART2 */
|
||||
serial_mm_init(get_system_memory(), s->memmap[AW_H3_DEV_UART2], 2,
|
||||
qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART2),
|
||||
115200, serial_hd(2), DEVICE_NATIVE_ENDIAN);
|
||||
115200, serial_hd(2), DEVICE_LITTLE_ENDIAN);
|
||||
/* UART3 */
|
||||
serial_mm_init(get_system_memory(), s->memmap[AW_H3_DEV_UART3], 2,
|
||||
qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_UART3),
|
||||
115200, serial_hd(3), DEVICE_NATIVE_ENDIAN);
|
||||
115200, serial_hd(3), DEVICE_LITTLE_ENDIAN);
|
||||
|
||||
/* DRAMC */
|
||||
sysbus_realize(SYS_BUS_DEVICE(&s->dramc), &error_fatal);
|
||||
|
||||
@@ -492,7 +492,7 @@ static void allwinner_r40_realize(DeviceState *dev, Error **errp)
|
||||
|
||||
serial_mm_init(get_system_memory(), addr, 2,
|
||||
qdev_get_gpio_in(DEVICE(&s->gic), uart_irqs[i]),
|
||||
115200, serial_hd(i), DEVICE_NATIVE_ENDIAN);
|
||||
115200, serial_hd(i), DEVICE_LITTLE_ENDIAN);
|
||||
}
|
||||
|
||||
/* I2C */
|
||||
|
||||
@@ -1253,6 +1253,7 @@ static void aspeed_machine_palmetto_class_init(ObjectClass *oc, void *data)
|
||||
amc->spi_model = "mx25l25635f";
|
||||
amc->num_cs = 1;
|
||||
amc->i2c_init = palmetto_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 256 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1269,6 +1270,7 @@ static void aspeed_machine_quanta_q71l_class_init(ObjectClass *oc, void *data)
|
||||
amc->spi_model = "mx25l25635e";
|
||||
amc->num_cs = 1;
|
||||
amc->i2c_init = quanta_q71l_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 128 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
@@ -1287,6 +1289,7 @@ static void aspeed_machine_supermicrox11_bmc_class_init(ObjectClass *oc,
|
||||
amc->num_cs = 1;
|
||||
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON;
|
||||
amc->i2c_init = palmetto_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 256 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
@@ -1305,6 +1308,7 @@ static void aspeed_machine_supermicro_x11spi_bmc_class_init(ObjectClass *oc,
|
||||
amc->num_cs = 1;
|
||||
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON;
|
||||
amc->i2c_init = palmetto_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
@@ -1321,6 +1325,7 @@ static void aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data)
|
||||
amc->spi_model = "mx25l25635f";
|
||||
amc->num_cs = 1;
|
||||
amc->i2c_init = ast2500_evb_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1338,6 +1343,7 @@ static void aspeed_machine_yosemitev2_class_init(ObjectClass *oc, void *data)
|
||||
amc->spi_model = "mx25l25635e";
|
||||
amc->num_cs = 2;
|
||||
amc->i2c_init = yosemitev2_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1354,6 +1360,7 @@ static void aspeed_machine_romulus_class_init(ObjectClass *oc, void *data)
|
||||
amc->spi_model = "mx66l1g45g";
|
||||
amc->num_cs = 2;
|
||||
amc->i2c_init = romulus_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1371,6 +1378,7 @@ static void aspeed_machine_tiogapass_class_init(ObjectClass *oc, void *data)
|
||||
amc->spi_model = "mx25l25635e";
|
||||
amc->num_cs = 2;
|
||||
amc->i2c_init = tiogapass_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1387,6 +1395,7 @@ static void aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data)
|
||||
amc->spi_model = "mx66l1g45g";
|
||||
amc->num_cs = 2;
|
||||
amc->i2c_init = sonorapass_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1403,6 +1412,7 @@ static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data)
|
||||
amc->spi_model = "mx66l1g45g";
|
||||
amc->num_cs = 2;
|
||||
amc->i2c_init = witherspoon_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1423,6 +1433,7 @@ static void aspeed_machine_ast2600_evb_class_init(ObjectClass *oc, void *data)
|
||||
ASPEED_MAC3_ON;
|
||||
amc->sdhci_wp_inverted = true;
|
||||
amc->i2c_init = ast2600_evb_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
aspeed_machine_ast2600_class_emmc_init(oc);
|
||||
@@ -1441,6 +1452,7 @@ static void aspeed_machine_g220a_class_init(ObjectClass *oc, void *data)
|
||||
amc->num_cs = 2;
|
||||
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON;
|
||||
amc->i2c_init = g220a_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1024 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1458,6 +1470,7 @@ static void aspeed_machine_fp5280g2_class_init(ObjectClass *oc, void *data)
|
||||
amc->num_cs = 2;
|
||||
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON;
|
||||
amc->i2c_init = fp5280g2_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1476,6 +1489,7 @@ static void aspeed_machine_rainier_class_init(ObjectClass *oc, void *data)
|
||||
amc->num_cs = 2;
|
||||
amc->macs_mask = ASPEED_MAC2_ON | ASPEED_MAC3_ON;
|
||||
amc->i2c_init = rainier_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
aspeed_machine_ast2600_class_emmc_init(oc);
|
||||
@@ -1498,6 +1512,7 @@ static void aspeed_machine_fuji_class_init(ObjectClass *oc, void *data)
|
||||
amc->macs_mask = ASPEED_MAC3_ON;
|
||||
amc->i2c_init = fuji_bmc_i2c_init;
|
||||
amc->uart_default = ASPEED_DEV_UART1;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = FUJI_BMC_RAM_SIZE;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1518,6 +1533,7 @@ static void aspeed_machine_bletchley_class_init(ObjectClass *oc, void *data)
|
||||
amc->num_cs = 2;
|
||||
amc->macs_mask = ASPEED_MAC2_ON;
|
||||
amc->i2c_init = bletchley_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = BLETCHLEY_BMC_RAM_SIZE;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
@@ -1559,6 +1575,7 @@ static void aspeed_machine_fby35_class_init(ObjectClass *oc, void *data)
|
||||
amc->num_cs = 2;
|
||||
amc->macs_mask = ASPEED_MAC3_ON;
|
||||
amc->i2c_init = fby35_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
/* FIXME: Replace this macro with something more general */
|
||||
mc->default_ram_size = FUJI_BMC_RAM_SIZE;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
@@ -1669,6 +1686,7 @@ static void aspeed_machine_ast2700_evb_class_init(ObjectClass *oc, void *data)
|
||||
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON | ASPEED_MAC2_ON;
|
||||
amc->uart_default = ASPEED_DEV_UART12;
|
||||
amc->i2c_init = ast2700_evb_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
@@ -1689,6 +1707,7 @@ static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc,
|
||||
amc->num_cs = 2;
|
||||
amc->macs_mask = ASPEED_MAC2_ON | ASPEED_MAC3_ON;
|
||||
amc->i2c_init = qcom_dc_scm_bmc_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1708,6 +1727,7 @@ static void aspeed_machine_qcom_firework_class_init(ObjectClass *oc,
|
||||
amc->num_cs = 2;
|
||||
amc->macs_mask = ASPEED_MAC2_ON | ASPEED_MAC3_ON;
|
||||
amc->i2c_init = qcom_dc_scm_firework_i2c_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
|
||||
@@ -141,6 +141,7 @@ static void bpim2u_machine_init(MachineClass *mc)
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
mc->default_ram_id = "bpim2u.ram";
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("bpim2u", bpim2u_machine_init)
|
||||
|
||||
@@ -122,6 +122,7 @@ static void cubieboard_machine_init(MachineClass *mc)
|
||||
mc->units_per_default_bus = 1;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_ram_id = "cubieboard.ram";
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("cubieboard", cubieboard_machine_init)
|
||||
|
||||
@@ -165,6 +165,7 @@ static void nuri_class_init(ObjectClass *oc, void *data)
|
||||
mc->min_cpus = EXYNOS4210_NCPUS;
|
||||
mc->default_cpus = EXYNOS4210_NCPUS;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
static const TypeInfo nuri_type = {
|
||||
@@ -184,6 +185,7 @@ static void smdkc210_class_init(ObjectClass *oc, void *data)
|
||||
mc->min_cpus = EXYNOS4210_NCPUS;
|
||||
mc->default_cpus = EXYNOS4210_NCPUS;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
static const TypeInfo smdkc210_type = {
|
||||
|
||||
@@ -170,6 +170,7 @@ static void fby35_class_init(ObjectClass *oc, void *data)
|
||||
mc->init = fby35_init;
|
||||
mc->no_floppy = 1;
|
||||
mc->no_cdrom = 1;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->min_cpus = mc->max_cpus = mc->default_cpus = 3;
|
||||
|
||||
object_class_property_add_bool(oc, "execute-in-place",
|
||||
|
||||
@@ -147,6 +147,7 @@ static void imx25_pdk_machine_init(MachineClass *mc)
|
||||
mc->init = imx25_pdk_init;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_ram_id = "imx25.ram";
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init)
|
||||
|
||||
@@ -688,6 +688,7 @@ static void integratorcp_machine_init(MachineClass *mc)
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
|
||||
mc->default_ram_id = "integrator.ram";
|
||||
mc->auto_create_sdcard = true;
|
||||
|
||||
machine_add_audiodev_property(mc);
|
||||
}
|
||||
|
||||
@@ -74,5 +74,6 @@ static void mcimx6ul_evk_machine_init(MachineClass *mc)
|
||||
mc->init = mcimx6ul_evk_init;
|
||||
mc->max_cpus = FSL_IMX6UL_NUM_CPUS;
|
||||
mc->default_ram_id = "mcimx6ul-evk.ram";
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init)
|
||||
|
||||
@@ -74,5 +74,6 @@ static void mcimx7d_sabre_machine_init(MachineClass *mc)
|
||||
mc->init = mcimx7d_sabre_init;
|
||||
mc->max_cpus = FSL_IMX7_NUM_CPUS;
|
||||
mc->default_ram_id = "mcimx7d-sabre.ram";
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
DEFINE_MACHINE("mcimx7d-sabre", mcimx7d_sabre_machine_init)
|
||||
|
||||
@@ -481,6 +481,7 @@ static void npcm750_evb_machine_class_init(ObjectClass *oc, void *data)
|
||||
|
||||
mc->desc = "Nuvoton NPCM750 Evaluation Board (Cortex-A9)";
|
||||
mc->init = npcm750_evb_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
};
|
||||
|
||||
@@ -493,6 +494,7 @@ static void gsj_machine_class_init(ObjectClass *oc, void *data)
|
||||
|
||||
mc->desc = "Quanta GSJ (Cortex-A9)";
|
||||
mc->init = quanta_gsj_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
};
|
||||
|
||||
@@ -505,6 +507,7 @@ static void gbs_bmc_machine_class_init(ObjectClass *oc, void *data)
|
||||
|
||||
mc->desc = "Quanta GBS (Cortex-A9)";
|
||||
mc->init = quanta_gbs_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
}
|
||||
|
||||
@@ -517,6 +520,7 @@ static void kudo_bmc_machine_class_init(ObjectClass *oc, void *data)
|
||||
|
||||
mc->desc = "Kudo BMC (Cortex-A9)";
|
||||
mc->init = kudo_bmc_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
};
|
||||
|
||||
@@ -529,6 +533,7 @@ static void mori_bmc_machine_class_init(ObjectClass *oc, void *data)
|
||||
|
||||
mc->desc = "Mori BMC (Cortex-A9)";
|
||||
mc->init = mori_bmc_init;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
}
|
||||
|
||||
|
||||
@@ -216,6 +216,7 @@ static void sx1_machine_v2_class_init(ObjectClass *oc, void *data)
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
|
||||
mc->default_ram_size = SDRAM_SIZE;
|
||||
mc->default_ram_id = "omap1.dram";
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
static const TypeInfo sx1_machine_v2_type = {
|
||||
@@ -234,6 +235,7 @@ static void sx1_machine_v1_class_init(ObjectClass *oc, void *data)
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
|
||||
mc->default_ram_size = SDRAM_SIZE;
|
||||
mc->default_ram_id = "omap1.dram";
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
static const TypeInfo sx1_machine_v1_type = {
|
||||
|
||||
@@ -121,6 +121,7 @@ static void orangepi_machine_init(MachineClass *mc)
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
mc->default_ram_id = "orangepi.ram";
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("orangepi-pc", orangepi_machine_init)
|
||||
|
||||
@@ -342,6 +342,7 @@ static void raspi0_machine_class_init(ObjectClass *oc, void *data)
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
|
||||
|
||||
mc->auto_create_sdcard = true;
|
||||
rmc->board_rev = 0x920092; /* Revision 1.2 */
|
||||
raspi_machine_class_init(mc, rmc->board_rev);
|
||||
};
|
||||
@@ -351,6 +352,7 @@ static void raspi1ap_machine_class_init(ObjectClass *oc, void *data)
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
|
||||
|
||||
mc->auto_create_sdcard = true;
|
||||
rmc->board_rev = 0x900021; /* Revision 1.1 */
|
||||
raspi_machine_class_init(mc, rmc->board_rev);
|
||||
};
|
||||
@@ -360,6 +362,7 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data)
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
|
||||
|
||||
mc->auto_create_sdcard = true;
|
||||
rmc->board_rev = 0xa21041;
|
||||
raspi_machine_class_init(mc, rmc->board_rev);
|
||||
};
|
||||
@@ -370,6 +373,7 @@ static void raspi3ap_machine_class_init(ObjectClass *oc, void *data)
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
|
||||
|
||||
mc->auto_create_sdcard = true;
|
||||
rmc->board_rev = 0x9020e0; /* Revision 1.0 */
|
||||
raspi_machine_class_init(mc, rmc->board_rev);
|
||||
};
|
||||
@@ -379,6 +383,7 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data)
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
|
||||
|
||||
mc->auto_create_sdcard = true;
|
||||
rmc->board_rev = 0xa02082;
|
||||
raspi_machine_class_init(mc, rmc->board_rev);
|
||||
};
|
||||
|
||||
@@ -118,6 +118,7 @@ static void raspi4b_machine_class_init(ObjectClass *oc, void *data)
|
||||
rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */
|
||||
#endif
|
||||
raspi_machine_class_common_init(mc, rmc->board_rev);
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->init = raspi4b_machine_init;
|
||||
}
|
||||
|
||||
|
||||
@@ -415,6 +415,7 @@ static void realview_eb_class_init(ObjectClass *oc, void *data)
|
||||
mc->block_default_type = IF_SCSI;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
|
||||
mc->auto_create_sdcard = true;
|
||||
|
||||
machine_add_audiodev_property(mc);
|
||||
}
|
||||
@@ -435,6 +436,7 @@ static void realview_eb_mpcore_class_init(ObjectClass *oc, void *data)
|
||||
mc->max_cpus = 4;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm11mpcore");
|
||||
mc->auto_create_sdcard = true;
|
||||
|
||||
machine_add_audiodev_property(mc);
|
||||
}
|
||||
@@ -453,6 +455,7 @@ static void realview_pb_a8_class_init(ObjectClass *oc, void *data)
|
||||
mc->init = realview_pb_a8_init;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8");
|
||||
mc->auto_create_sdcard = true;
|
||||
|
||||
machine_add_audiodev_property(mc);
|
||||
}
|
||||
@@ -472,6 +475,7 @@ static void realview_pbx_a9_class_init(ObjectClass *oc, void *data)
|
||||
mc->max_cpus = 4;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
|
||||
mc->auto_create_sdcard = true;
|
||||
|
||||
machine_add_audiodev_property(mc);
|
||||
}
|
||||
|
||||
@@ -110,6 +110,7 @@ static void sabrelite_machine_init(MachineClass *mc)
|
||||
mc->max_cpus = FSL_IMX6_NUM_CPUS;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_ram_id = "sabrelite.ram";
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("sabrelite", sabrelite_machine_init)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user