Index: sys/arch/arm/amlogic/meson_platform.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/amlogic/meson_platform.c,v
retrieving revision 1.13
diff -u -p -r1.13 meson_platform.c
--- sys/arch/arm/amlogic/meson_platform.c	13 Aug 2019 09:56:08 -0000	1.13
+++ sys/arch/arm/amlogic/meson_platform.c	20 Jun 2020 15:46:06 -0000
@@ -189,10 +189,8 @@ meson_platform_device_register(device_t 
 		uint8_t enaddr[ETHER_ADDR_LEN];
 		if (get_bootconf_option(boot_args, "awge0.mac-address",
 		    BOOTOPT_TYPE_MACADDR, enaddr)) {
-			prop_data_t pd = prop_data_create_data(enaddr,
+			prop_dictionary_set_data(dict, "mac-address", enaddr,
 			    sizeof(enaddr));
-			prop_dictionary_set(dict, "mac-address", pd);
-			prop_object_release(pd);
 		}
 	}
 
Index: sys/arch/arm/nvidia/tegra_platform.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/nvidia/tegra_platform.c,v
retrieving revision 1.20
diff -u -p -r1.20 tegra_platform.c
--- sys/arch/arm/nvidia/tegra_platform.c	3 Jan 2019 12:52:40 -0000	1.20
+++ sys/arch/arm/nvidia/tegra_platform.c	20 Jun 2020 15:46:06 -0000
@@ -161,23 +161,23 @@ tegra_platform_device_register(device_t 
 	if (device_is_a(self, "tegradrm")) {
 		const char *video = get_bootconf_string(boot_args, "video");
 		if (video)
-			prop_dictionary_set_cstring(dict, "HDMI-A-1", video);
+			prop_dictionary_set_string(dict, "HDMI-A-1", video);
 		if (match_bootconf_option(boot_args, "hdmi.forcemode", "dvi"))
 			prop_dictionary_set_bool(dict, "force-dvi", true);
 	}
 
 	if (device_is_a(self, "tegracec"))
-		prop_dictionary_set_cstring(dict, "hdmi-device", "tegradrm0");
+		prop_dictionary_set_string(dict, "hdmi-device", "tegradrm0");
 
 	if (device_is_a(self, "nouveau")) {
 		const char *config = get_bootconf_string(boot_args,
 		    "nouveau.config");
 		if (config)
-			prop_dictionary_set_cstring(dict, "config", config);
+			prop_dictionary_set_string(dict, "config", config);
 		const char *debug = get_bootconf_string(boot_args,
 		    "nouveau.debug");
 		if (debug)
-			prop_dictionary_set_cstring(dict, "debug", debug);
+			prop_dictionary_set_string(dict, "debug", debug);
 	}
 
 	if (device_is_a(self, "tegrapcie")) {