Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbarm fdt_openfirm_set_data -> fdtbus_set_data



details:   https://anonhg.NetBSD.org/src/rev/948679cdc8e4
branches:  trunk
changeset: 342320:948679cdc8e4
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Dec 16 12:18:02 2015 +0000

description:
fdt_openfirm_set_data -> fdtbus_set_data

diffstat:

 sys/arch/evbarm/exynos/exynos_machdep.c |  8 +++-----
 sys/arch/evbarm/tegra/tegra_machdep.c   |  8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diffs (72 lines):

diff -r 732806d06ac5 -r 948679cdc8e4 sys/arch/evbarm/exynos/exynos_machdep.c
--- a/sys/arch/evbarm/exynos/exynos_machdep.c   Wed Dec 16 12:17:45 2015 +0000
+++ b/sys/arch/evbarm/exynos/exynos_machdep.c   Wed Dec 16 12:18:02 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exynos_machdep.c,v 1.4 2015/12/14 22:06:57 marty Exp $ */
+/*     $NetBSD: exynos_machdep.c,v 1.5 2015/12/16 12:18:34 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_machdep.c,v 1.4 2015/12/14 22:06:57 marty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_machdep.c,v 1.5 2015/12/16 12:18:34 jmcneill Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_exynos.h"
@@ -105,8 +105,6 @@
  * made into a linux (not netbsd) uboot image.
  */
 #include <libfdt.h>
-#include <dev/fdt/fdt_openfirm.h>
-#include <dev/ofw/openfirm.h>
 #include <dev/fdt/fdtvar.h>
 #define FDT_BUF_SIZE   (128*1024)
 static uint8_t fdt_data[FDT_BUF_SIZE];
@@ -412,7 +410,7 @@
                if (error != 0) {
                        panic("fdt_move failed: %s", fdt_strerror(error));
                }
-               fdt_openfirm_set_data(fdt_data);
+               fdtbus_set_data(fdt_data);
        } else {
                panic("fdt_check_header failed: %s", fdt_strerror(error));
        }
diff -r 732806d06ac5 -r 948679cdc8e4 sys/arch/evbarm/tegra/tegra_machdep.c
--- a/sys/arch/evbarm/tegra/tegra_machdep.c     Wed Dec 16 12:17:45 2015 +0000
+++ b/sys/arch/evbarm/tegra/tegra_machdep.c     Wed Dec 16 12:18:02 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.35 2015/12/13 22:55:05 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.36 2015/12/16 12:18:02 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.35 2015/12/13 22:55:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.36 2015/12/16 12:18:02 jmcneill Exp $");
 
 #include "opt_tegra.h"
 #include "opt_machdep.h"
@@ -104,8 +104,6 @@
 u_int uboot_args[4] = { 0 };   /* filled in by tegra_start.S (not in bss) */
 
 #include <libfdt.h>
-#include <dev/fdt/fdt_openfirm.h>
-#include <dev/ofw/openfirm.h>
 #include <dev/fdt/fdtvar.h>
 #define FDT_BUF_SIZE   (128*1024)
 static uint8_t fdt_data[FDT_BUF_SIZE];
@@ -266,7 +264,7 @@
                if (error != 0) {
                        panic("fdt_move failed: %s", fdt_strerror(error));
                }
-               fdt_openfirm_set_data(fdt_data);
+               fdtbus_set_data(fdt_data);
        } else {
                panic("fdt_check_header failed: %s", fdt_strerror(error));
        }



Home | Main Index | Thread Index | Old Index