diff options
| author | skrll <skrll@NetBSD.org> | 2023-04-22 09:53:45 +0000 |
|---|---|---|
| committer | skrll <skrll@NetBSD.org> | 2023-04-22 09:53:45 +0000 |
| commit | d8975b943e3bc4b3bd09a1bbb3e1f047e9c401a5 (patch) | |
| tree | 919ea134e9e3b46b8bf70cd484b0363463bc2963 /sys/dev | |
| parent | 4c149cfcac6c11063dd1d9fa17a146cf7dbab7d3 (diff) | |
Move fdt_update_stdout_path from evbarm code to MI code
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/fdt/fdt_boot.c | 92 | ||||
| -rw-r--r-- | sys/dev/fdt/fdt_boot.h | 37 | ||||
| -rw-r--r-- | sys/dev/fdt/files.fdt | 3 |
3 files changed, 131 insertions, 1 deletions
diff --git a/sys/dev/fdt/fdt_boot.c b/sys/dev/fdt/fdt_boot.c new file mode 100644 index 00000000000..63568e6974a --- /dev/null +++ b/sys/dev/fdt/fdt_boot.c @@ -0,0 +1,92 @@ +/* $NetBSD: fdt_boot.c,v 1.1 2023/04/22 09:53:45 skrll Exp $ */ + +/*- + * Copyright (c) 2015-2017 Jared McNeill <jmcneill@invisible.ca> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/*- + * Copyright (c) 2022 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Nick Hudson + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__KERNEL_RCSID(0, "$NetBSD: fdt_boot.c,v 1.1 2023/04/22 09:53:45 skrll Exp $"); + +#include <sys/param.h> + +#include <sys/optstr.h> + +#include <libfdt.h> + +#include <dev/fdt/fdtvar.h> +#include <dev/fdt/fdt_boot.h> + +void +fdt_update_stdout_path(void *fdt, const char *boot_args) +{ + const char *stdout_path; + char buf[256]; + + const int chosen_off = fdt_path_offset(fdt, "/chosen"); + if (chosen_off == -1) + return; + + if (optstr_get_string(boot_args, "stdout-path", &stdout_path) == false) + return; + + const char *ep = strchr(stdout_path, ' '); + size_t stdout_path_len = ep ? (ep - stdout_path) : strlen(stdout_path); + if (stdout_path_len >= sizeof(buf)) + return; + + strncpy(buf, stdout_path, stdout_path_len); + buf[stdout_path_len] = '\0'; + fdt_setprop(fdt, chosen_off, "stdout-path", + buf, stdout_path_len + 1); +} diff --git a/sys/dev/fdt/fdt_boot.h b/sys/dev/fdt/fdt_boot.h new file mode 100644 index 00000000000..9ce14d6bf7f --- /dev/null +++ b/sys/dev/fdt/fdt_boot.h @@ -0,0 +1,37 @@ +/* $NetBSD: fdt_boot.h,v 1.1 2023/04/22 09:53:45 skrll Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jared McNeill <jmcneill@invisible.ca>. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _DEV_FDT_FDT_BOOT_H_ +#define _DEV_FDT_FDT_BOOT_H_ + +void fdt_update_stdout_path(void *, const char *); + +#endif /* _DEV_FDT_FDT_BOOT_H_ */ diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt index 0784e22903e..d78a55a88f2 100644 --- a/sys/dev/fdt/files.fdt +++ b/sys/dev/fdt/files.fdt @@ -1,4 +1,4 @@ -# $NetBSD: files.fdt,v 1.68 2023/04/16 16:51:38 jmcneill Exp $ +# $NetBSD: files.fdt,v 1.69 2023/04/22 09:53:45 skrll Exp $ include "external/bsd/libfdt/conf/files.libfdt" @@ -66,6 +66,7 @@ device iicmux: i2cbus, i2cmux attach iicmux at fdt with iicmux_fdt file dev/fdt/i2cmux_fdt.c iicmux_fdt +file dev/fdt/fdt_boot.c fdtbase file dev/fdt/fdt_memory.c fdtbase file dev/fdt/fdt_openfirm.c fdtbase file dev/fdt/fdt_platform.c fdtbase |
