CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Nov 2 05:55:22 UTC 2023
Modified Files:
src/usr.bin/make: main.c parse.c var.c
Log Message:
make: miscellaneous cleanups
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.602 -r1.603 src/usr.bin/make/main.c
cvs rdiff -u -r1.708 -r1.709 src/usr.bin/make/parse.c
cvs rdiff -u -r1.1066 -r1.1067 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.602 src/usr.bin/make/main.c:1.603
--- src/usr.bin/make/main.c:1.602 Thu Nov 2 05:40:49 2023
+++ src/usr.bin/make/main.c Thu Nov 2 05:55:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.602 2023/11/02 05:40:49 rillig Exp $ */
+/* $NetBSD: main.c,v 1.603 2023/11/02 05:55:22 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,8 +111,8 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.602 2023/11/02 05:40:49 rillig Exp $");
-#if defined(MAKE_NATIVE) && !defined(lint)
+MAKE_RCSID("$NetBSD: main.c,v 1.603 2023/11/02 05:55:22 rillig Exp $");
+#if defined(MAKE_NATIVE)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
"All rights reserved.");
@@ -439,7 +439,7 @@ MainParseArgJobs(const char *arg)
static void
MainParseArgSysInc(const char *argvalue)
{
- if (strncmp(".../", argvalue, 4) == 0) {
+ if (strncmp(argvalue, ".../", 4) == 0) {
char *found_path = Dir_FindHereOrAbove(curdir, argvalue + 4);
if (found_path == NULL)
return;
@@ -686,18 +686,18 @@ Main_ParseArgLine(const char *line)
{
Words words;
char *buf;
+ const char *p;
if (line == NULL)
return;
- /* XXX: don't use line as an iterator variable */
- for (; *line == ' '; line++)
+ for (p = line; *p == ' '; p++)
continue;
- if (line[0] == '\0')
+ if (p[0] == '\0')
return;
{
FStr argv0 = Var_Value(SCOPE_GLOBAL, ".MAKE");
- buf = str_concat3(argv0.str, " ", line);
+ buf = str_concat3(argv0.str, " ", p);
FStr_Done();
}
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.708 src/usr.bin/make/parse.c:1.709
--- src/usr.bin/make/parse.c:1.708 Thu Nov 2 05:40:49 2023
+++ src/usr.bin/make/parse.c Thu Nov 2 05:55:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.708 2023/11/02 05:40:49 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.709 2023/11/02 05:55:22 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.708 2023/11/02 05:40:49 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.709 2023/11/02 05:55:22 rillig Exp $");
/* Detects a multiple-inclusion guard in a makefile. */
typedef enum {
@@ -235,7 +235,7 @@ static StringList targCmds = LST_INIT;
*/
static GNode *order_pred;
-static int parseErrors = 0;
+static int parseErrors;
/*
* The include chain of makefiles. At index 0 is the top-level makefile from
@@ -858,7 +858,8 @@ MaybeUpdateMainTarget(void)
for (ln = targets->first; ln != NULL; ln = ln->next) {
GNode *gn = ln->datum;
if (GNode_IsMainCandidate(gn)) {
- DEBUG1(MAKE, "Setting main node to \"%s\"\n", gn->name);
+ DEBUG1(MAKE, "Setting main node to \"%s\"\n",
+ gn->name);
mainNode = gn;
return;
}
@@ -880,31 +881,31 @@ InvalidLineType(const char *line, const
} else if (strcmp(line, unexpanded_line) == 0)
Parse_Error(PARSE_FATAL, "Invalid line '%s'", line);
else
- Parse_Error(PARSE_FATAL, "Invalid line '%s', expanded to '%s'",
+ Parse_Error(PARSE_FATAL,
+ "Invalid line '%s', expanded to '%s'",
unexpanded_line, line);
}
static void
ParseDependencyTargetWord(char **pp, const char *lstart)
{
- const char *cp = *pp;
+ const char *p = *pp;
- while (*cp != '\0') {
- if ((ch_isspace(*cp) || *cp == '!' || *cp == ':' ||
- *cp == '(') &&
- !IsEscaped(lstart, cp))
+ while (*p != '\0') {
+ if ((ch_isspace(*p) || *p == '!' || *p == ':' || *p == '(')
+ && !IsEscaped(lstart, p))
break;
- if (*cp == '$') {
- FStr val = Var_Parse(, SCOPE_CMDLINE,
+ if (*p == '$') {
+ FStr val = Var_Parse(, SCOPE_CMDLINE,
VARE_PARSE_ONLY);
/* TODO: handle errors */
FStr_Done();
} else
- cp++;
+ p++;
}
- *pp += cp - *pp;
+ *pp += p - *pp;
}
/*
@@ -1331,6 +1332,7 @@ ParseDependencySourceSpecial(ParseSpecia
Suff_AddSuffix(word);
break;
case SP_PATH:
+ case SP_SYSPATH:
AddToPaths(word, paths);
break;
case SP_INCLUDES:
@@ -1351,9 +1353,6 @@ ParseDependencySourceSpecial(ParseSpecia
case SP_READONLY:
Var_ReadOnly(word, true);
break;
- case SP_SYSPATH:
- AddToPaths(word, paths);
- break;
default:
break;
}
@@ -1364,7 +1363,7 @@ ApplyDependencyTarget(char *name, char *
GNodeType *inout_targetAttr,
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Nov 2 05:55:22 UTC 2023 Modified Files: src/usr.bin/make: main.c parse.c var.c Log Message: make: miscellaneous cleanups No functional change. To generate a diff of this commit: cvs rdiff -u -r1.602 -r1.603 src/usr.bin/make/main.c cvs rdiff -u -r1.708 -r1.709 src/usr.bin/make/parse.c cvs rdiff -u -r1.1066 -r1.1067 src/usr.bin/make/var.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Thu Nov 2 05:46:26 UTC 2023
Modified Files:
src/usr.bin/make/unit-tests: var-op-append.mk
Log Message:
tests/make: test appending to an environment variable
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/var-op-append.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/var-op-append.mk
diff -u src/usr.bin/make/unit-tests/var-op-append.mk:1.11 src/usr.bin/make/unit-tests/var-op-append.mk:1.12
--- src/usr.bin/make/unit-tests/var-op-append.mk:1.11 Thu Nov 2 05:14:58 2023
+++ src/usr.bin/make/unit-tests/var-op-append.mk Thu Nov 2 05:46:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: var-op-append.mk,v 1.11 2023/11/02 05:14:58 rillig Exp $
+# $NetBSD: var-op-append.mk,v 1.12 2023/11/02 05:46:26 rillig Exp $
#
# Tests for the '+=' variable assignment operator, which appends to a
# variable, creating it if necessary.
@@ -56,4 +56,33 @@ VAR.${:U\$\$\$\$\$\$\$\$}+= dollars
. error
.endif
+
+# Appending to an environment variable in the global scope creates a global
+# variable of the same name, taking its initial value from the environment
+# variable. After the assignment, the environment variable is left as-is,
+# the value of the global variable is not synced back to the environment
+# variable.
+export ENV_PLUS_GLOBAL=from-env-value
+ENV_PLUS_GLOBAL+= appended-value
+.if ${ENV_PLUS_GLOBAL} != "from-env-value appended-value"
+. error
+.endif
+EXPORTED!= echo "$$ENV_PLUS_GLOBAL"
+.if ${EXPORTED} != "from-env-value"
+. error
+.endif
+
+# Appending to an environment variable in the command line scope ignores the
+# environment variable.
+export ENV_PLUS_COMMAND=from-env-value
+.MAKEFLAGS: ENV_PLUS_COMMAND+=appended-command
+.if ${ENV_PLUS_COMMAND} != "appended-command"
+. error ${ENV_PLUS_COMMAND}
+.endif
+EXPORTED!= echo "$$ENV_PLUS_GLOBAL"
+.if ${EXPORTED} != "from-env-value"
+. error
+.endif
+
+
all:
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Nov 2 05:46:26 UTC 2023 Modified Files: src/usr.bin/make/unit-tests: var-op-append.mk Log Message: tests/make: test appending to an environment variable To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/var-op-append.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Nov 2 05:40:49 UTC 2023
Modified Files:
src/usr.bin/make: main.c parse.c var.c
src/usr.bin/make/unit-tests: varmod-defined.mk
Log Message:
make: clean up comments
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.601 -r1.602 src/usr.bin/make/main.c
cvs rdiff -u -r1.707 -r1.708 src/usr.bin/make/parse.c
cvs rdiff -u -r1.1065 -r1.1066 src/usr.bin/make/var.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/varmod-defined.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.601 src/usr.bin/make/main.c:1.602
--- src/usr.bin/make/main.c:1.601 Thu Nov 2 04:50:44 2023
+++ src/usr.bin/make/main.c Thu Nov 2 05:40:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.601 2023/11/02 04:50:44 rillig Exp $ */
+/* $NetBSD: main.c,v 1.602 2023/11/02 05:40:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.601 2023/11/02 04:50:44 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.602 2023/11/02 05:40:49 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -121,7 +121,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
CmdOpts opts;
time_t now; /* Time at start of make */
GNode *defaultNode; /* .DEFAULT node */
-bool allPrecious; /* .PRECIOUS given on line by itself */
+bool allPrecious; /* .PRECIOUS given on a line by itself */
bool deleteOnError; /* .DELETE_ON_ERROR: set */
static int maxJobTokens; /* -j argument */
@@ -148,7 +148,7 @@ static HashTable cached_realpaths;
/*
* For compatibility with the POSIX version of MAKEFLAGS that includes
- * all the options without '-', convert 'flags' to '-f -l -a -g -s'.
+ * all the options without '-', convert 'flags' to '-f -l -a -g -s '.
*/
static char *
explode(const char *flags)
@@ -439,7 +439,6 @@ MainParseArgJobs(const char *arg)
static void
MainParseArgSysInc(const char *argvalue)
{
- /* look for magic parent directory search string */
if (strncmp(".../", argvalue, 4) == 0) {
char *found_path = Dir_FindHereOrAbove(curdir, argvalue + 4);
if (found_path == NULL)
@@ -1015,20 +1014,14 @@ InitVarMachineArch(void)
#ifndef NO_PWD_OVERRIDE
/*
- * All this code is so that we know where we are when we start up
- * on a different machine with pmake.
- *
- * XXX: Make no longer has "local" and "remote" mode. Is this code still
- * necessary?
- *
* Overriding getcwd() with $PWD totally breaks MAKEOBJDIRPREFIX
* since the value of curdir can vary depending on how we got
- * here. Ie sitting at a shell prompt (shell that provides $PWD)
- * or via subdir.mk in which case its likely a shell which does
+ * here. That is, sitting at a shell prompt (shell that provides $PWD)
+ * or via subdir.mk, in which case it's likely a shell which does
* not provide it.
*
* So, to stop it breaking this case only, we ignore PWD if
- * MAKEOBJDIRPREFIX is set or MAKEOBJDIR contains a variable expression.
+ * MAKEOBJDIRPREFIX is set or MAKEOBJDIR contains an expression.
*/
static void
HandlePWD(const struct stat *curdir_st)
@@ -1346,22 +1339,12 @@ main_Init(int argc, char **argv)
exit(2);
}
- /*
- * Get the name of this type of MACHINE from utsname
- * so we can share an executable for similar machines.
- * (i.e. m68k: amiga hp300, mac68k, sun3, ...)
- *
- * Note that both MACHINE and MACHINE_ARCH are decided at
- * run-time.
- */
machine = InitVarMachine();
machine_arch = InitVarMachineArch();
myPid = getpid(); /* remember this for vFork() */
- /*
- * Just in case MAKEOBJDIR wants us to do something tricky.
- */
+ /* Just in case MAKEOBJDIR wants us to do something tricky. */
Targ_Init();
Var_Init();
Global_Set_ReadOnly(".MAKE.OS", utsname.sysname);
@@ -1370,7 +1353,7 @@ main_Init(int argc, char **argv)
#ifdef MAKE_VERSION
Global_Set("MAKE_VERSION", MAKE_VERSION);
#endif
- Global_Set_ReadOnly(".newline", "\n"); /* handy for :@ loops */
+ Global_Set_ReadOnly(".newline", "\n");
#ifndef MAKEFILE_PREFERENCE_LIST
/* This is the traditional preference for makefiles. */
# define MAKEFILE_PREFERENCE_LIST "makefile Makefile"
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.707 src/usr.bin/make/parse.c:1.708
--- src/usr.bin/make/parse.c:1.707 Thu Nov 2 04:50:44 2023
+++ src/usr.bin/make/parse.c Thu Nov 2 05:40:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.707 2023/11/02 04:50:44 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.708 2023/11/02 05:40:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Nov 2 05:40:49 UTC 2023 Modified Files: src/usr.bin/make: main.c parse.c var.c src/usr.bin/make/unit-tests: varmod-defined.mk Log Message: make: clean up comments No functional change. To generate a diff of this commit: cvs rdiff -u -r1.601 -r1.602 src/usr.bin/make/main.c cvs rdiff -u -r1.707 -r1.708 src/usr.bin/make/parse.c cvs rdiff -u -r1.1065 -r1.1066 src/usr.bin/make/var.c cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/varmod-defined.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Nov 2 05:14:58 UTC 2023
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: var-op-append.mk varmod-defined.mk
varmod-match-escape.mk varmod-match.mk
Log Message:
make: sync comments with the extracted ParseModifier_Match
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.1064 -r1.1065 src/usr.bin/make/var.c
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/var-op-append.mk \
src/usr.bin/make/unit-tests/varmod-match-escape.mk
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/varmod-defined.mk
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/varmod-match.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1064 src/usr.bin/make/var.c:1.1065
--- src/usr.bin/make/var.c:1.1064 Sat Aug 19 19:59:17 2023
+++ src/usr.bin/make/var.c Thu Nov 2 05:14:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1064 2023/08/19 19:59:17 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1065 2023/11/02 05:14:58 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1064 2023/08/19 19:59:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1065 2023/11/02 05:14:58 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -2457,7 +2457,7 @@ ParseModifier_Defined(const char **pp, M
/*
* XXX: This code is similar to the one in Var_Parse. See if
- * the code can be merged. See also ApplyModifier_Match and
+ * the code can be merged. See also ParseModifier_Match and
* ParseModifierPart.
*/
Index: src/usr.bin/make/unit-tests/var-op-append.mk
diff -u src/usr.bin/make/unit-tests/var-op-append.mk:1.10 src/usr.bin/make/unit-tests/var-op-append.mk:1.11
--- src/usr.bin/make/unit-tests/var-op-append.mk:1.10 Wed Jun 21 07:30:50 2023
+++ src/usr.bin/make/unit-tests/var-op-append.mk Thu Nov 2 05:14:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: var-op-append.mk,v 1.10 2023/06/21 07:30:50 rillig Exp $
+# $NetBSD: var-op-append.mk,v 1.11 2023/11/02 05:14:58 rillig Exp $
#
# Tests for the '+=' variable assignment operator, which appends to a
# variable, creating it if necessary.
@@ -39,7 +39,7 @@ VAR+= # empty
# '+=' assignment operator. As far as possible, the '+' is interpreted as
# part of the assignment operator.
#
-# See Parse_Var
+# See Parse_Var, AdjustVarassignOp.
C++= value
.if ${C+} != "value" || defined(C++)
. error
Index: src/usr.bin/make/unit-tests/varmod-match-escape.mk
diff -u src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.10 src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.11
--- src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.10 Fri Jun 23 04:56:54 2023
+++ src/usr.bin/make/unit-tests/varmod-match-escape.mk Thu Nov 2 05:14:58 2023
@@ -1,8 +1,8 @@
-# $NetBSD: varmod-match-escape.mk,v 1.10 2023/06/23 04:56:54 rillig Exp $
+# $NetBSD: varmod-match-escape.mk,v 1.11 2023/11/02 05:14:58 rillig Exp $
#
# As of 2020-08-01, the :M and :N modifiers interpret backslashes differently,
# depending on whether there was a variable expression somewhere before the
-# first backslash or not. See ApplyModifier_Match, "copy = true".
+# first backslash or not. See ParseModifier_Match, "copy = true".
#
# Apart from the different and possibly confusing debug output, there is no
# difference in behavior. When parsing the modifier text, only \{, \} and \:
@@ -34,7 +34,7 @@ SPECIALS= \: : \\ * \*
# Therefore the escaped ':' is kept as-is, and the final pattern becomes
# ':\:'.
#
-# If ApplyModifier_Match had used the same parsing algorithm as Var_Subst,
+# If ParseModifier_Match had used the same parsing algorithm as Var_Subst,
# both patterns would end up as '::'.
#
VALUES= : :: :\:
@@ -53,7 +53,7 @@ VALUES= : :: :\:
.endif
# XXX: As of 2020-11-01, unlike all other variable modifiers, '\$' is not
-# parsed as an escaped '$'. Instead, ApplyModifier_Match first scans for
+# parsed as an escaped '$'. Instead, ParseModifier_Match first scans for
# the ':' at the end of the modifier, which results in the pattern '\$'.
# No unescaping takes place since the pattern neither contained '\:' nor
# '\{' nor '\}'. But the text is expanded, and a lonely '$' at the end
Index: src/usr.bin/make/unit-tests/varmod-defined.mk
diff -u src/usr.bin/make/unit-tests/varmod-defined.mk:1.13 src/usr.bin/make/unit-tests/varmod-defined.mk:1.14
--- src/usr.bin/make/unit-tests/varmod-defined.mk:1.13 Wed Aug 24 20:22:10 2022
+++ src/usr.bin/make/unit-tests/varmod-defined.mk Thu Nov 2 05:14:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-defined.mk,v 1.13 2022/08/24 20:22:10 rillig Exp $
+# $NetBSD: varmod-defined.mk,v 1.14 2023/11/02 05:14:58 rillig Exp $
#
# Tests for the :D
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Nov 2 05:14:58 UTC 2023 Modified Files: src/usr.bin/make: var.c src/usr.bin/make/unit-tests: var-op-append.mk varmod-defined.mk varmod-match-escape.mk varmod-match.mk Log Message: make: sync comments with the extracted ParseModifier_Match No functional change. To generate a diff of this commit: cvs rdiff -u -r1.1064 -r1.1065 src/usr.bin/make/var.c cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/var-op-append.mk \ src/usr.bin/make/unit-tests/varmod-match-escape.mk cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/varmod-defined.mk cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/varmod-match.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Thu Nov 2 05:07:57 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.c ixv.c
Log Message:
ixgbe: Whitespace. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.345 -r1.346 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.192 -r1.193 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.104 src/sys/dev/pci/ixgbe/ix_txrx.c:1.105
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.104 Thu Oct 12 03:43:55 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Thu Nov 2 05:07:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.104 2023/10/12 03:43:55 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.105 2023/11/02 05:07:57 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.104 2023/10/12 03:43:55 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.105 2023/11/02 05:07:57 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -123,7 +123,7 @@ static int ixgbe_dma_malloc(st
struct ixgbe_dma_alloc *, int);
static void ixgbe_dma_free(struct ixgbe_softc *, struct ixgbe_dma_alloc *);
-static void ixgbe_setup_hw_rsc(struct rx_ring *);
+static void ixgbe_setup_hw_rsc(struct rx_ring *);
/
* ixgbe_legacy_start_locked - Transmit entry point
@@ -406,7 +406,7 @@ ixgbe_drain_all(struct ixgbe_softc *sc)
static int
ixgbe_xmit(struct tx_ring *txr, struct mbuf *m_head)
{
- struct ixgbe_softc *sc = txr->sc;
+ struct ixgbe_softc *sc = txr->sc;
struct ixgbe_tx_buf *txbuf;
union ixgbe_adv_tx_desc *txd = NULL;
struct ifnet *ifp = sc->ifp;
@@ -765,7 +765,7 @@ ixgbe_free_transmit_structures(struct ix
static void
ixgbe_free_transmit_buffers(struct tx_ring *txr)
{
- struct ixgbe_softc *sc = txr->sc;
+ struct ixgbe_softc *sc = txr->sc;
struct ixgbe_tx_buf *tx_buffer;
int i;
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.345 src/sys/dev/pci/ixgbe/ixgbe.c:1.346
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.345 Mon Oct 30 02:46:28 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Nov 2 05:07:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.345 2023/10/30 02:46:28 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.346 2023/11/02 05:07:57 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.345 2023/10/30 02:46:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.346 2023/11/02 05:07:57 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3611,7 +3611,7 @@ static int
ixgbe_allocate_pci_resources(struct ixgbe_softc *sc,
const struct pci_attach_args *pa)
{
- pcireg_t memtype, csr;
+ pcireg_t memtype, csr;
device_t dev = sc->dev;
bus_addr_t addr;
int flags;
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.192 src/sys/dev/pci/ixgbe/ixv.c:1.193
--- src/sys/dev/pci/ixgbe/ixv.c:1.192 Wed Oct 18 03:52:55 2023
+++ src/sys/dev/pci/ixgbe/ixv.c Thu Nov 2 05:07:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixv.c,v 1.192 2023/10/18 03:52:55 msaitoh Exp $ */
+/* $NetBSD: ixv.c,v 1.193 2023/11/02 05:07:57 msaitoh Exp $ */
/**
@@ -35,7 +35,7 @@
/*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.192 2023/10/18 03:52:55 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.193 2023/11/02 05:07:57 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1519,8 +1519,8 @@ static int
ixv_allocate_pci_resources(struct ixgbe_softc *sc,
const struct pci_attach_args *pa)
{
- pcireg_t memtype, csr;
- device_t dev = sc->dev;
+ pcireg_t memtype, csr;
+ device_t dev = sc->dev;
bus_addr_t addr;
int flags;
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Nov 2 05:07:57 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.c ixv.c Log Message: ixgbe: Whitespace. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.345 -r1.346 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.192 -r1.193 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Nov 2 04:50:44 UTC 2023
Modified Files:
src/usr.bin/make: main.c make.h parse.c
Log Message:
make: inline a single-line cross-file function
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.600 -r1.601 src/usr.bin/make/main.c
cvs rdiff -u -r1.325 -r1.326 src/usr.bin/make/make.h
cvs rdiff -u -r1.706 -r1.707 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.600 src/usr.bin/make/main.c:1.601
--- src/usr.bin/make/main.c:1.600 Tue Sep 19 17:43:43 2023
+++ src/usr.bin/make/main.c Thu Nov 2 04:50:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.600 2023/09/19 17:43:43 rillig Exp $ */
+/* $NetBSD: main.c,v 1.601 2023/11/02 04:50:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.600 2023/09/19 17:43:43 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.601 2023/11/02 04:50:44 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -476,7 +476,7 @@ MainParseOption(char c, const char *argv
Global_Append(MAKEFLAGS, argvalue);
break;
case 'I':
- Parse_AddIncludeDir(argvalue);
+ SearchPath_Add(parseIncPath, argvalue);
Global_Append(MAKEFLAGS, "-I");
Global_Append(MAKEFLAGS, argvalue);
break;
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.325 src/usr.bin/make/make.h:1.326
--- src/usr.bin/make/make.h:1.325 Sun Sep 10 11:52:29 2023
+++ src/usr.bin/make/make.h Thu Nov 2 04:50:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.325 2023/09/10 11:52:29 rillig Exp $ */
+/* $NetBSD: make.h,v 1.326 2023/11/02 04:50:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -859,7 +859,6 @@ void PrintLocation(FILE *, bool, const G
void PrintStackTrace(bool);
void Parse_Error(ParseErrorLevel, const char *, ...) MAKE_ATTR_PRINTFLIKE(2, 3);
bool Parse_VarAssign(const char *, bool, GNode *) MAKE_ATTR_USE;
-void Parse_AddIncludeDir(const char *);
void Parse_File(const char *, int);
void Parse_PushInput(const char *, unsigned, unsigned, Buffer,
struct ForLoop *);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.706 src/usr.bin/make/parse.c:1.707
--- src/usr.bin/make/parse.c:1.706 Sat Aug 19 11:09:02 2023
+++ src/usr.bin/make/parse.c Thu Nov 2 04:50:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.706 2023/08/19 11:09:02 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.707 2023/11/02 04:50:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.706 2023/08/19 11:09:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.707 2023/11/02 04:50:44 rillig Exp $");
/* Detects a multiple-inclusion guard in a makefile. */
typedef enum {
@@ -2014,17 +2014,6 @@ GNode_AddCommand(GNode *gn, char *cmd)
}
/*
- * Add a directory to the path searched for included makefiles bracketed
- * by double-quotes.
- */
-void
-Parse_AddIncludeDir(const char *dir)
-{
- (void)SearchPath_Add(parseIncPath, dir);
-}
-
-
-/*
* Parse a directive like '.include' or '.-include'.
*
* .include "user-makefile.mk"
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Nov 2 04:50:44 UTC 2023 Modified Files: src/usr.bin/make: main.c make.h parse.c Log Message: make: inline a single-line cross-file function No functional change. To generate a diff of this commit: cvs rdiff -u -r1.600 -r1.601 src/usr.bin/make/main.c cvs rdiff -u -r1.325 -r1.326 src/usr.bin/make/make.h cvs rdiff -u -r1.706 -r1.707 src/usr.bin/make/parse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: msaitoh Date: Thu Nov 2 02:32:41 UTC 2023 Modified Files: src/sys/dev/ic: dwc_eqos.c Log Message: eqos(4): Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/dwc_eqos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/dwc_eqos.c diff -u src/sys/dev/ic/dwc_eqos.c:1.28 src/sys/dev/ic/dwc_eqos.c:1.29 --- src/sys/dev/ic/dwc_eqos.c:1.28 Sun Oct 29 14:55:16 2023 +++ src/sys/dev/ic/dwc_eqos.c Thu Nov 2 02:32:41 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_eqos.c,v 1.28 2023/10/29 14:55:16 msaitoh Exp $ */ +/* $NetBSD: dwc_eqos.c,v 1.29 2023/11/02 02:32:41 msaitoh Exp $ */ /*- * Copyright (c) 2022 Jared McNeill @@ -38,7 +38,7 @@ #include "opt_net_mpsafe.h" #include -__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.28 2023/10/29 14:55:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.29 2023/11/02 02:32:41 msaitoh Exp $"); #include #include @@ -75,7 +75,7 @@ CTASSERT(MCLBYTES >= EQOS_RXDMA_SIZE); #define EDEB_INTR (1U << 1) #define EDEB_RXRING (1U << 2) #define EDEB_TXRING (1U << 3) -unsigned int eqos_debug; /* Default vaule */ +unsigned int eqos_debug; /* Default value */ #define DPRINTF(FLAG, FORMAT, ...) \ if (sc->sc_debug & FLAG) \ device_printf(sc->sc_dev, "%s: " FORMAT, \
CVS commit: src/sys/dev/ic
Module Name:src Committed By: msaitoh Date: Thu Nov 2 02:32:41 UTC 2023 Modified Files: src/sys/dev/ic: dwc_eqos.c Log Message: eqos(4): Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/dwc_eqos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Wed Nov 1 18:59:19 UTC 2023 Modified Files: src/doc: 3RDPARTY Log Message: new sqlite3 out To generate a diff of this commit: cvs rdiff -u -r1.1962 -r1.1963 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1962 src/doc/3RDPARTY:1.1963 --- src/doc/3RDPARTY:1.1962 Wed Oct 25 20:23:26 2023 +++ src/doc/3RDPARTY Wed Nov 1 18:59:19 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1962 2023/10/25 20:23:26 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1963 2023/11/01 18:59:19 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1328,7 +1328,7 @@ original. Package: sqlite Version: 3.43.0 -Current Vers: 3.43.0 +Current Vers: 3.44.0 Maintainer: Richard Hipp Home Page: http://www.sqlite.org Date: 2023-09-04
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Wed Nov 1 18:59:19 UTC 2023 Modified Files: src/doc: 3RDPARTY Log Message: new sqlite3 out To generate a diff of this commit: cvs rdiff -u -r1.1962 -r1.1963 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/dtb
Module Name:src Committed By: simonb Date: Wed Nov 1 12:51:44 UTC 2023 Modified Files: src/distrib/sets/lists/dtb: ad.earmv7eb Log Message: Catch up with recent changes in distrib/sets/lists/dtb/ad.earmv7hfeb To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/dtb/ad.earmv7eb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/dtb/ad.earmv7eb diff -u src/distrib/sets/lists/dtb/ad.earmv7eb:1.1 src/distrib/sets/lists/dtb/ad.earmv7eb:1.2 --- src/distrib/sets/lists/dtb/ad.earmv7eb:1.1 Mon Sep 14 00:01:51 2020 +++ src/distrib/sets/lists/dtb/ad.earmv7eb Wed Nov 1 12:51:44 2023 @@ -1,4 +1,4 @@ -# $NetBSD: ad.earmv7eb,v 1.1 2020/09/14 00:01:51 mrg Exp $ +# $NetBSD: ad.earmv7eb,v 1.2 2023/11/01 12:51:44 simonb Exp $ # # DO NOT EDIT THIS FILE MANUALLY # Generated by "make update-sets" in sys/dtb @@ -22,6 +22,7 @@ ./boot/dtb/am335x-lxm.dtbdtb-base-boot dtb ./boot/dtb/am335x-moxa-uc-2101.dtb dtb-base-boot dtb ./boot/dtb/am335x-moxa-uc-8100-me-t.dtb dtb-base-boot dtb +./boot/dtb/am335x-myirtech-myd.dtb dtb-base-boot dtb ./boot/dtb/am335x-nano.dtb dtb-base-boot dtb ./boot/dtb/am335x-netcan-plus-1xx.dtbdtb-base-boot dtb ./boot/dtb/am335x-netcom-plus-2xx.dtbdtb-base-boot dtb @@ -32,6 +33,7 @@ ./boot/dtb/am335x-phycore-rdk.dtbdtb-base-boot dtb ./boot/dtb/am335x-pocketbeagle.dtb dtb-base-boot dtb ./boot/dtb/am335x-regor-rdk.dtb dtb-base-boot dtb +./boot/dtb/am335x-sancloud-bbe-lite.dtb dtb-base-boot dtb ./boot/dtb/am335x-sancloud-bbe.dtb dtb-base-boot dtb ./boot/dtb/am335x-sbc-t335.dtb dtb-base-boot dtb ./boot/dtb/am335x-shc.dtbdtb-base-boot dtb @@ -41,6 +43,7 @@ ./boot/dtb/am3517-evm.dtbdtb-base-boot dtb ./boot/dtb/am3517_mt_ventoux.dtb dtb-base-boot dtb ./boot/dtb/bcm2711-rpi-4-b.dtb dtb-base-boot dtb +./boot/dtb/bcm2711-rpi-400.dtb dtb-base-boot dtb ./boot/dtb/bcm2835-rpi-a-plus.dtbdtb-base-boot dtb ./boot/dtb/bcm2835-rpi-a.dtb dtb-base-boot dtb ./boot/dtb/bcm2835-rpi-b-plus.dtbdtb-base-boot dtb @@ -70,16 +73,24 @@ ./boot/dtb/exynos5422-odroidxu3.dtb dtb-base-boot dtb ./boot/dtb/exynos5422-odroidxu4.dtb dtb-base-boot dtb ./boot/dtb/exynos5800-peach-pi.dtb dtb-base-boot dtb +./boot/dtb/imx6dl-alti6p.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-apf6dev.dtbdtb-base-boot dtb ./boot/dtb/imx6dl-aristainetos2_4.dtbdtb-base-boot dtb ./boot/dtb/imx6dl-aristainetos2_7.dtbdtb-base-boot dtb ./boot/dtb/imx6dl-aristainetos_4.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-aristainetos_7.dtb dtb-base-boot dtb +./boot/dtb/imx6dl-b105pv2.dtbdtb-base-boot dtb +./boot/dtb/imx6dl-b105v2.dtb dtb-base-boot dtb +./boot/dtb/imx6dl-b125pv2.dtbdtb-base-boot dtb +./boot/dtb/imx6dl-b125v2.dtb dtb-base-boot dtb +./boot/dtb/imx6dl-b155v2.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-colibri-eval-v3.dtbdtb-base-boot dtb +./boot/dtb/imx6dl-colibri-v1_1-eval-v3.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-cubox-i-emmc-som-v15.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-cubox-i-som-v15.dtbdtb-base-boot dtb ./boot/dtb/imx6dl-cubox-i.dtbdtb-base-boot dtb ./boot/dtb/imx6dl-dfi-fs700-m60.dtb dtb-base-boot dtb +./boot/dtb/imx6dl-dhcom-picoitx.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-eckelmann-ci4x10.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-emcon-avari.dtbdtb-base-boot dtb ./boot/dtb/imx6dl-gw51xx.dtb dtb-base-boot dtb @@ -92,6 +103,10 @@ ./boot/dtb/imx6dl-gw560x.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-gw5903.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-gw5904.dtb dtb-base-boot dtb +./boot/dtb/imx6dl-gw5907.dtb dtb-base-boot dtb +./boot/dtb/imx6dl-gw5910.dtb dtb-base-boot dtb +./boot/dtb/imx6dl-gw5912.dtb dtb-base-boot dtb +./boot/dtb/imx6dl-gw5913.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-hummingboard-emmc-som-v15.dtb dtb-base-boot dtb ./boot/dtb/imx6dl-hummingboard-som-v15.dtb
CVS commit: src/distrib/sets/lists/dtb
Module Name:src Committed By: simonb Date: Wed Nov 1 12:51:44 UTC 2023 Modified Files: src/distrib/sets/lists/dtb: ad.earmv7eb Log Message: Catch up with recent changes in distrib/sets/lists/dtb/ad.earmv7hfeb To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/dtb/ad.earmv7eb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/dtb
Module Name:src Committed By: simonb Date: Wed Nov 1 12:51:13 UTC 2023 Modified Files: src/distrib/sets/lists/dtb: ad.earmv7 Log Message: Catch up with recent changes in distrib/sets/lists/dtb/ad.earmv7hf. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/dtb/ad.earmv7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/dtb
Module Name:src Committed By: simonb Date: Wed Nov 1 12:51:13 UTC 2023 Modified Files: src/distrib/sets/lists/dtb: ad.earmv7 Log Message: Catch up with recent changes in distrib/sets/lists/dtb/ad.earmv7hf. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/dtb/ad.earmv7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/dtb/ad.earmv7 diff -u src/distrib/sets/lists/dtb/ad.earmv7:1.9 src/distrib/sets/lists/dtb/ad.earmv7:1.10 --- src/distrib/sets/lists/dtb/ad.earmv7:1.9 Sat Sep 10 15:54:11 2022 +++ src/distrib/sets/lists/dtb/ad.earmv7 Wed Nov 1 12:51:13 2023 @@ -1,4 +1,4 @@ -# $NetBSD: ad.earmv7,v 1.9 2022/09/10 15:54:11 rillig Exp $ +# $NetBSD: ad.earmv7,v 1.10 2023/11/01 12:51:13 simonb Exp $ # # DO NOT EDIT THIS FILE MANUALLY # Generated by "make update-sets" in sys/dtb @@ -273,6 +273,16 @@ ./boot/dtb/imx6qp-wandboard-revd1.dtbdtb-base-boot dtb ./boot/dtb/imx6qp-zii-rdu2.dtb dtb-base-boot dtb ./boot/dtb/imx6s-dhcom-drc02.dtb dtb-base-boot dtb +./boot/dtb/imx6sx-nitrogen6sx.dtbdtb-base-boot dtb +./boot/dtb/imx6sx-sabreauto.dtb dtb-base-boot dtb +./boot/dtb/imx6sx-sdb-mqs.dtbdtb-base-boot dtb +./boot/dtb/imx6sx-sdb-reva.dtb dtb-base-boot dtb +./boot/dtb/imx6sx-sdb-sai.dtbdtb-base-boot dtb +./boot/dtb/imx6sx-sdb.dtbdtb-base-boot dtb +./boot/dtb/imx6sx-softing-vining-2000.dtbdtb-base-boot dtb +./boot/dtb/imx6sx-udoo-neo-basic.dtb dtb-base-boot dtb +./boot/dtb/imx6sx-udoo-neo-extended.dtb dtb-base-boot dtb +./boot/dtb/imx6sx-udoo-neo-full.dtb dtb-base-boot dtb ./boot/dtb/imx7d-cl-som-imx7.dtb dtb-base-boot dtb ./boot/dtb/imx7d-colibri-aster.dtb dtb-base-boot dtb ./boot/dtb/imx7d-colibri-emmc-aster.dtb dtb-base-boot dtb
