[src/trunk]: src/sys/arch/arm/nvidia Make TEGRA124_XUSB_BIN_STATIC and TEGRA2...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6c06bb167804
branches:  trunk
changeset: 995878:6c06bb167804
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Tue Jan 08 18:04:00 2019 +0000

description:
Make TEGRA124_XUSB_BIN_STATIC and TEGRA210_XUSB_BIN_STATIC compile again.

diffstat:

 sys/arch/arm/nvidia/tegra_xusb.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r f4f16990224b -r 6c06bb167804 sys/arch/arm/nvidia/tegra_xusb.c
--- a/sys/arch/arm/nvidia/tegra_xusb.c  Tue Jan 08 17:35:42 2019 +0000
+++ b/sys/arch/arm/nvidia/tegra_xusb.c  Tue Jan 08 18:04:00 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_xusb.c,v 1.16 2018/12/14 18:17:36 skrll Exp $ */
+/* $NetBSD: tegra_xusb.c,v 1.17 2019/01/08 18:04:00 jakllsch Exp $ */
 
 /*
  * Copyright (c) 2016 Jonathan A. Kollasch
@@ -30,7 +30,7 @@
 #include "opt_tegra.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.16 2018/12/14 18:17:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.17 2019/01/08 18:04:00 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -701,7 +701,6 @@
        return err;
 }
 
-#if !defined(TEGRA124_XUSB_BIN_STATIC)
 static void
 fw_dma_free(struct tegra_xusb_softc * const psc, struct fw_dma * const p)
 {
@@ -713,7 +712,6 @@
        bus_dmamem_unmap(dmat, p->addr, p->size);
        bus_dmamem_free(dmat, p->segs, p->nsegs);
 }
-#endif
 
 #define FWHEADER_BOOT_CODETAG 8
 #define FWHEADER_BOOT_CODESIZE 12
@@ -735,7 +733,7 @@
        case XUSB_T124:
 #if defined(TEGRA124_XUSB_BIN_STATIC)
                firmware_size = (uintptr_t)&_binary_tegra124_xusb_bin_size;
-               fw_static = _binary_tegra124_xusb_bin_start;
+               fw_static = __UNCONST(_binary_tegra124_xusb_bin_start);
 #else
                fw_path = "nvidia/tegra124";
 #endif
@@ -743,7 +741,7 @@
        case XUSB_T210:
 #if defined(TEGRA210_XUSB_BIN_STATIC)
                firmware_size = (uintptr_t)&_binary_tegra210_xusb_bin_size;
-               fw_static = _binary_tegra210_xusb_bin_start;
+               fw_static = __UNCONST(_binary_tegra210_xusb_bin_start);
 #else
                fw_path = "nvidia/tegra210";
 #endif