mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
hw/boards: Rename no_sdcard -> auto_create_sdcard
Invert the 'no_sdcard' logic, renaming it as the more explicit "auto_create_sdcard". Machines are supposed to create a SD Card drive when this flag is set. In many cases it doesn't make much sense (as boards don't expose SD Card host controller), but this is patch only aims to expose that nonsense; so no logical change intended (mechanical patch using gsed). Most of the changes are: - mc->no_sdcard = ON_OFF_AUTO_OFF; + mc->auto_create_sdcard = true; Except in . hw/core/null-machine.c . hw/arm/xilinx_zynq.c . hw/s390x/s390-virtio-ccw.c where the disabled option is manually removed (since default): - mc->no_sdcard = ON_OFF_AUTO_ON; + mc->auto_create_sdcard = false; - mc->auto_create_sdcard = false; and in system/vl.c we change the 'default_sdcard' type to boolean. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20250204200934.65279-4-philmd@linaro.org>
This commit is contained in:
+1
-1
@@ -213,7 +213,7 @@ static void clipper_machine_init(MachineClass *mc)
|
||||
mc->default_cpu_type = ALPHA_CPU_TYPE_NAME("ev67");
|
||||
mc->default_ram_id = "ram";
|
||||
mc->default_nic = "e1000";
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("clipper", clipper_machine_init)
|
||||
|
||||
+21
-21
@@ -1253,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 256 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1270,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 128 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
@@ -1289,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 256 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
@@ -1308,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
@@ -1325,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1343,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1360,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1378,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1395,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1412,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1433,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
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);
|
||||
@@ -1452,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1024 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1470,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 512 * MiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1489,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
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);
|
||||
@@ -1512,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = FUJI_BMC_RAM_SIZE;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1533,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = BLETCHLEY_BMC_RAM_SIZE;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
@@ -1575,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
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);
|
||||
@@ -1658,7 +1658,7 @@ static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc,
|
||||
amc->spi_model = "w25q256";
|
||||
amc->num_cs = 2;
|
||||
amc->macs_mask = 0;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
|
||||
@@ -1687,7 +1687,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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
}
|
||||
@@ -1708,7 +1708,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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
@@ -1728,7 +1728,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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
aspeed_machine_class_init_cpus_defaults(mc);
|
||||
};
|
||||
|
||||
@@ -120,7 +120,7 @@ static void bl475e_machine_init(ObjectClass *oc, void *data)
|
||||
mc->desc = "B-L475E-IOT01A Discovery Kit (Cortex-M4)";
|
||||
mc->init = bl475e_init;
|
||||
mc->valid_cpu_types = machine_valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
|
||||
/* SRAM pre-allocated as part of the SoC instantiation */
|
||||
mc->default_ram_size = 0;
|
||||
|
||||
@@ -141,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("bpim2u", bpim2u_machine_init)
|
||||
|
||||
+1
-1
@@ -79,7 +79,7 @@ static void collie_machine_class_init(ObjectClass *oc, void *data)
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("sa1110");
|
||||
mc->default_ram_size = RAM_SIZE;
|
||||
mc->default_ram_id = "strongarm.sdram";
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
static const TypeInfo collie_machine_typeinfo = {
|
||||
|
||||
+1
-1
@@ -122,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("cubieboard", cubieboard_machine_init)
|
||||
|
||||
@@ -143,7 +143,7 @@ static void canon_a1100_machine_init(MachineClass *mc)
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_ram_size = 64 * MiB;
|
||||
mc->default_ram_id = "ram";
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init)
|
||||
|
||||
@@ -165,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
static const TypeInfo nuri_type = {
|
||||
@@ -185,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
static const TypeInfo smdkc210_type = {
|
||||
|
||||
+1
-1
@@ -170,7 +170,7 @@ static void fby35_class_init(ObjectClass *oc, void *data)
|
||||
mc->init = fby35_init;
|
||||
mc->no_floppy = 1;
|
||||
mc->no_cdrom = 1;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mc->min_cpus = mc->max_cpus = mc->default_cpus = 3;
|
||||
|
||||
object_class_property_add_bool(oc, "execute-in-place",
|
||||
|
||||
+2
-2
@@ -357,7 +357,7 @@ static void highbank_class_init(ObjectClass *oc, void *data)
|
||||
mc->max_cpus = 4;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_ram_id = "highbank.dram";
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
static const TypeInfo highbank_type = {
|
||||
@@ -382,7 +382,7 @@ static void midway_class_init(ObjectClass *oc, void *data)
|
||||
mc->max_cpus = 4;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_ram_id = "highbank.dram";
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
static const TypeInfo midway_type = {
|
||||
|
||||
+1
-1
@@ -147,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init)
|
||||
|
||||
@@ -688,7 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
|
||||
machine_add_audiodev_property(mc);
|
||||
}
|
||||
|
||||
+1
-1
@@ -137,7 +137,7 @@ static void kzm_machine_init(MachineClass *mc)
|
||||
mc->init = kzm_init;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->default_ram_id = "kzm.ram";
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("kzm", kzm_machine_init)
|
||||
|
||||
@@ -74,6 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init)
|
||||
|
||||
@@ -74,6 +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->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
DEFINE_MACHINE("mcimx7d-sabre", mcimx7d_sabre_machine_init)
|
||||
|
||||
+1
-1
@@ -67,7 +67,7 @@ static void microbit_machine_class_init(ObjectClass *oc, void *data)
|
||||
mc->desc = "BBC micro:bit (Cortex-M0)";
|
||||
mc->init = microbit_init;
|
||||
mc->max_cpus = 1;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
static const TypeInfo microbit_info = {
|
||||
|
||||
+4
-4
@@ -1320,7 +1320,7 @@ static void mps2tz_an505_class_init(ObjectClass *oc, void *data)
|
||||
mmc->fpga_type = FPGA_AN505;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mmc->scc_id = 0x41045050;
|
||||
mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */
|
||||
mmc->apb_periph_frq = mmc->sysclk_frq;
|
||||
@@ -1355,7 +1355,7 @@ static void mps2tz_an521_class_init(ObjectClass *oc, void *data)
|
||||
mmc->fpga_type = FPGA_AN521;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mmc->scc_id = 0x41045210;
|
||||
mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */
|
||||
mmc->apb_periph_frq = mmc->sysclk_frq;
|
||||
@@ -1390,7 +1390,7 @@ static void mps3tz_an524_class_init(ObjectClass *oc, void *data)
|
||||
mmc->fpga_type = FPGA_AN524;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mmc->scc_id = 0x41045240;
|
||||
mmc->sysclk_frq = 32 * 1000 * 1000; /* 32MHz */
|
||||
mmc->apb_periph_frq = mmc->sysclk_frq;
|
||||
@@ -1430,7 +1430,7 @@ static void mps3tz_an547_class_init(ObjectClass *oc, void *data)
|
||||
mmc->fpga_type = FPGA_AN547;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m55");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mmc->scc_id = 0x41055470;
|
||||
mmc->sysclk_frq = 32 * 1000 * 1000; /* 32MHz */
|
||||
mmc->apb_periph_frq = 25 * 1000 * 1000; /* 25MHz */
|
||||
|
||||
+4
-4
@@ -487,7 +487,7 @@ static void mps2_an385_class_init(ObjectClass *oc, void *data)
|
||||
mmc->fpga_type = FPGA_AN385;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mmc->scc_id = 0x41043850;
|
||||
mmc->psram_base = 0x21000000;
|
||||
mmc->ethernet_base = 0x40200000;
|
||||
@@ -507,7 +507,7 @@ static void mps2_an386_class_init(ObjectClass *oc, void *data)
|
||||
mmc->fpga_type = FPGA_AN386;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m4");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mmc->scc_id = 0x41043860;
|
||||
mmc->psram_base = 0x21000000;
|
||||
mmc->ethernet_base = 0x40200000;
|
||||
@@ -527,7 +527,7 @@ static void mps2_an500_class_init(ObjectClass *oc, void *data)
|
||||
mmc->fpga_type = FPGA_AN500;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m7");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mmc->scc_id = 0x41045000;
|
||||
mmc->psram_base = 0x60000000;
|
||||
mmc->ethernet_base = 0xa0000000;
|
||||
@@ -547,7 +547,7 @@ static void mps2_an511_class_init(ObjectClass *oc, void *data)
|
||||
mmc->fpga_type = FPGA_AN511;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mmc->scc_id = 0x41045110;
|
||||
mmc->psram_base = 0x21000000;
|
||||
mmc->ethernet_base = 0x40200000;
|
||||
|
||||
+1
-1
@@ -618,7 +618,7 @@ static void mps3r_an536_class_init(ObjectClass *oc, void *data)
|
||||
mc->max_cpus = 2;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-r52");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
mmc->raminfo = an536_raminfo;
|
||||
mps3r_set_default_ram_info(mmc);
|
||||
}
|
||||
|
||||
+1
-1
@@ -106,7 +106,7 @@ static void emcraft_sf2_machine_init(MachineClass *mc)
|
||||
mc->desc = "SmartFusion2 SOM kit from Emcraft (M2S010)";
|
||||
mc->init = emcraft_sf2_s2s010_init;
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->no_sdcard = ON_OFF_AUTO_OFF;
|
||||
mc->auto_create_sdcard = true;
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_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