8 files changed, 24 insertions, 8 deletions

diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c
index 4fd8dc8ad9..9a41ecb587 100644
--- a/arch/x86/lib/acpi_table.c
+++ b/arch/x86/lib/acpi_table.c
@@ -74,7 +74,7 @@ int acpi_create_madt_lapics(u32 current)
 	for (uclass_find_first_device(UCLASS_CPU, &dev);
 	     dev;
 	     uclass_find_next_device(&dev)) {
-		struct cpu_platdata *plat = dev_get_parent_platdata(dev);
+		struct cpu_plat *plat = dev_get_parent_plat(dev);
 		int length;
 
 		length = acpi_create_madt_lapic(
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index 6534b6690b..a029237d08 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -80,7 +80,7 @@ static int save_vesa_mode(struct vesa_mode_info *vesa)
 
 static int fsp_video_probe(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 	struct video_priv *uc_priv = dev_get_uclass_priv(dev);
 	struct vesa_mode_info *vesa = &mode_info.vesa;
 	int ret;
@@ -124,7 +124,7 @@ err:
 
 static int fsp_video_bind(struct udevice *dev)
 {
-	struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
+	struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 
 	/* Set the maximum supported resolution */
 	plat->size = 2560 * 1600 * 4;
diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c
index 1c49c41b31..562a27c557 100644
--- a/arch/x86/lib/mpspec.c
+++ b/arch/x86/lib/mpspec.c
@@ -81,7 +81,7 @@ void mp_write_processor(struct mp_config_table *mc)
 	for (uclass_find_first_device(UCLASS_CPU, &dev);
 	     dev;
 	     uclass_find_next_device(&dev)) {
-		struct cpu_platdata *plat = dev_get_parent_platdata(dev);
+		struct cpu_plat *plat = dev_get_parent_plat(dev);
 		u8 cpuflag = MPC_CPU_EN;
 
 		if (!device_active(dev))
diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c
index 3cd7b1f536..083aec8d8d 100644
--- a/arch/x86/lib/pmu.c
+++ b/arch/x86/lib/pmu.c
@@ -113,5 +113,5 @@ U_BOOT_DRIVER(intel_mid_pmu) = {
 	.id		= UCLASS_SYSCON,
 	.of_match	= pmu_mid_match,
 	.probe		= pmu_mid_probe,
-	.priv_auto_alloc_size = sizeof(struct pmu_mid),
+	.priv_auto	= sizeof(struct pmu_mid),
 };
diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c
index d29d701631..90ef239bcd 100644
--- a/arch/x86/lib/scu.c
+++ b/arch/x86/lib/scu.c
@@ -227,5 +227,5 @@ U_BOOT_DRIVER(scu_ipc) = {
 	.id		= UCLASS_SYSCON,
 	.of_match	= scu_ipc_match,
 	.probe		= scu_ipc_probe,
-	.priv_auto_alloc_size = sizeof(struct scu),
+	.priv_auto	= sizeof(struct scu),
 };
diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c
index b48bd5d8f3..85e963b634 100644
--- a/arch/x86/lib/sfi.c
+++ b/arch/x86/lib/sfi.c
@@ -84,7 +84,7 @@ static int sfi_write_cpus(struct table_info *tab)
 	for (uclass_find_first_device(UCLASS_CPU, &dev);
 	     dev;
 	     uclass_find_next_device(&dev)) {
-		struct cpu_platdata *plat = dev_get_parent_platdata(dev);
+		struct cpu_plat *plat = dev_get_parent_plat(dev);
 
 		if (!device_active(dev))
 			continue;
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index 15b0212d19..04ff32277f 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -133,14 +133,16 @@ void spl_board_init(void)
  * for devices, so the TPL BARs continue to be used. Once U-Boot starts it does
  * the auto allocation (after relocation).
  */
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
 static const struct udevice_id tpl_fake_pci_ids[] = {
 	{ .compatible = "pci-x86" },
 	{ }
 };
+#endif
 
 U_BOOT_DRIVER(pci_x86) = {
 	.name	= "pci_x86",
 	.id	= UCLASS_SIMPLE_BUS,
-	.of_match = tpl_fake_pci_ids,
+	.of_match = of_match_ptr(tpl_fake_pci_ids),
 };
 #endif
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 24a503d011..708025b207 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -15,6 +15,7 @@
 #define LOG_CATEGORY	LOGC_BOOT
 
 #include <common.h>
+#include <bootm.h>
 #include <command.h>
 #include <env.h>
 #include <irq_func.h>
@@ -330,7 +331,12 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
 	}
 
 	if (cmd_line) {
+		int max_size = 0xff;
+		int ret;
+
 		log_debug("Setup cmdline\n");
+		if (bootproto >= 0x0206)
+			max_size = hdr->cmdline_size;
 		if (bootproto >= 0x0202) {
 			hdr->cmd_line_ptr = (uintptr_t)cmd_line;
 		} else if (bootproto >= 0x0200) {
@@ -346,6 +352,14 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
 			strcpy(cmd_line, (char *)cmdline_force);
 		else
 			build_command_line(cmd_line, auto_boot);
+		ret = bootm_process_cmdline(cmd_line, max_size, BOOTM_CL_ALL);
+		if (ret) {
+			printf("Cmdline setup failed (err=%d)\n", ret);
+			return ret;
+		}
+		printf("Kernel command line: \"");
+		puts(cmd_line);
+		printf("\"\n");
 	}
 
 	if (IS_ENABLED(CONFIG_INTEL_MID) && bootproto >= 0x0207)