Compare commits
No commits in common. "master" and "master" have entirely different histories.
|
|
@ -1,46 +0,0 @@
|
|||
clone:
|
||||
git:
|
||||
image: woodpeckerci/plugin-git
|
||||
settings:
|
||||
tags: true
|
||||
|
||||
steps:
|
||||
buildall-layer3:
|
||||
image: openwrtorg/imagebuilder
|
||||
commands:
|
||||
- export HOME=/home/build/openwrt
|
||||
- sudo chown -R build:build .
|
||||
- git config --global user.email "ci@fff.community"
|
||||
- git config --global user.name "FFF CI"
|
||||
- ./buildscript selectvariant layer3
|
||||
- ./buildscript selectbsp bsp/ath79-generic.bsp
|
||||
- ./buildscript prepare
|
||||
- ./buildscript buildall
|
||||
|
||||
buildall-node:
|
||||
image: openwrtorg/imagebuilder
|
||||
commands:
|
||||
- export HOME=/home/build/openwrt
|
||||
- sudo chown -R build:build .
|
||||
- git config --global user.email "ci@fff.community"
|
||||
- git config --global user.name "FFF CI"
|
||||
- ./buildscript selectvariant node
|
||||
- ./buildscript selectbsp bsp/ath79-generic.bsp
|
||||
- ./buildscript prepare
|
||||
- ./buildscript buildall
|
||||
|
||||
distribute:
|
||||
image: alpine/git
|
||||
volumes:
|
||||
- /var/lib/woodpecker/artifacts:/var/run/artifacts
|
||||
commands:
|
||||
- rm -rf /var/run/artifacts/$(git describe --tags)
|
||||
- mkdir -p /var/run/artifacts/$(git describe --tags)
|
||||
- cp -r bin/* /var/run/artifacts/$(git describe --tags)/
|
||||
- echo
|
||||
- echo
|
||||
- echo "You can download the built firmware images here:"
|
||||
- echo "https://ci.fff.community/artifacts/$(git describe --tags)"
|
||||
|
||||
when:
|
||||
branch: [ master ]
|
||||
356
LICENSES/GPL-2.0
356
LICENSES/GPL-2.0
|
|
@ -1,356 +0,0 @@
|
|||
Valid-License-Identifier: GPL-2.0-only
|
||||
Valid-License-Identifier: GPL-2.0
|
||||
Valid-License-Identifier: GPL-2.0-or-later
|
||||
Valid-License-Identifier: GPL-2.0+
|
||||
SPDX-URL: https://spdx.org/licenses/GPL-2.0-only.html
|
||||
SPDX-URL: https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
Usage-Guide:
|
||||
To use this license in source code, put one of the following SPDX
|
||||
tag/value pairs into a comment according to the placement
|
||||
guidelines in the licensing rules documentation.
|
||||
For 'GNU General Public License (GPL) version 2 only' use:
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
For 'GNU General Public License (GPL) version 2 or any later version' use:
|
||||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
License-Text:
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Library General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Library General
|
||||
Public License instead of this License.
|
||||
690
LICENSES/GPL-3.0
690
LICENSES/GPL-3.0
|
|
@ -1,690 +0,0 @@
|
|||
Valid-License-Identifier: GPL-3.0-only
|
||||
Valid-License-Identifier: GPL-3.0
|
||||
Valid-License-Identifier: GPL-3.0-or-later
|
||||
Valid-License-Identifier: GPL-3.0+
|
||||
SPDX-URL: https://spdx.org/licenses/GPL-3.0-only.html
|
||||
SPDX-URL: https://spdx.org/licenses/GPL-3.0-or-later.html
|
||||
Usage-Guide:
|
||||
To use this license in source code, put one of the following SPDX
|
||||
tag/value pairs into a comment according to the placement
|
||||
guidelines in the licensing rules documentation.
|
||||
For 'GNU General Public License (GPL) version 3 only' use:
|
||||
SPDX-License-Identifier: GPL-3.0-only
|
||||
For 'GNU General Public License (GPL) version 3 or any later version' use:
|
||||
SPDX-License-Identifier: GPL-3.0-or-later
|
||||
License-Text:
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
33
README.md
33
README.md
|
|
@ -8,12 +8,13 @@ Weitere Informationen gibt es auf <https://freifunk.net/> und auf <https://wiki.
|
|||
|
||||
# Firmware selbst kompilieren
|
||||
## Voraussetzungen
|
||||
* `apt-get install zlib1g-dev lua5.2 build-essential unzip libncurses-dev gawk git subversion libssl-dev rsync python3-distutils` (Sicherlich müssen noch mehr Abhängigkeiten installiert werden, diese Liste wird sich hoffentlich nach und nach füllen. Ein erster Ansatzpunkt sind die Abhängigkeiten von OpenWrt selbst)
|
||||
* `git clone https://git.freifunk-franken.de/freifunk-franken/firmware.git`
|
||||
* `apt-get install zlib1g-dev lua5.2 build-essential unzip libncurses-dev gawk git subversion realpath libssl-dev` (Sicherlich müssen noch mehr Abhängigkeiten installiert werden, diese Liste wird sich hoffentlich nach und nach füllen. Ein erster Ansatzpunkt sind die Abhängigkeiten von OpenWrt selbst)
|
||||
* `git clone https://github.com/FreifunkFranken/firmware.git`
|
||||
* `cd firmware`
|
||||
|
||||
## Erste Schritte
|
||||
Je nachdem, für welche Hardware die Firmware gebaut werden soll, muss das BSP gewählt werden:
|
||||
|
||||
* `./buildscript selectbsp bsp/ath79-generic.bsp`
|
||||
* Um die vorhandenen BSPs zu sehen, kann `./buildscript selectbsp help` ausgeführt werden.
|
||||
|
||||
|
|
@ -29,15 +30,11 @@ Die Daten des BSP werden nie alleine verwendet. Zuerst werden immer die Daten au
|
|||
Die BSP-Datei wird durch das Buildscript automatisch als dot-Script geladen, somit stehen dort alle Funktionen zur Verfügung.
|
||||
Das Buildscript generiert ein dynamisches sed-Script. Dies geschieht, damit die Templates mit den richtigen Werten gefüllt werden können.
|
||||
|
||||
### `./buildscript selectvariant`
|
||||
Hier wählt man aus ob man Node Firmware oder Layer3 Firmware bauen möchte:
|
||||
* `./buildscript selectvariant [node/layer3]`
|
||||
* Um die verschiedenen Varianten zu sehen, kann `./buildscript selectvariant help` ausgeführt werden.
|
||||
|
||||
### `./buildscript prepare`
|
||||
* Sourcen werden in einen separaten src-Folder geladen, sofern diese nicht schon da sind. Zu den Sourcen zählen folgende Komponenten:
|
||||
* OpenWrt
|
||||
* Sämtliche Packages (ggf. werden Patches angewandt)
|
||||
|
||||
* Eine OpenWrt Feed-Config wird mit dem lokalen Source Verzeichnis als Quelle angelegt
|
||||
* Die Feeds werden geladen
|
||||
* Spezielle Auswahl an Paketen wird geladen
|
||||
|
|
@ -53,15 +50,7 @@ Dieses Kommando arbeitet folgendermaßen:
|
|||
* Config-Format vereinfachen
|
||||
* Config ins BSP zurück speichern
|
||||
|
||||
### `./buildscript updatefeeds`
|
||||
Aktualisiert die OpenWrt Feeds für zusätzliche Pakete, die in die Firmware eingebaut werden. Dabei werden die Referenzen im build/ Verzeichnis aktualisiert. Dieser Schritt wird bereits von `./buildscript prepare` übernommen, daher ist dies nur bei manuellen Änderungen der Feeds nötig.
|
||||
|
||||
### `./buildscript clean`
|
||||
Entfernt den Inhalt der bin/ und build/ Verzeichnisse und die Feeds in src/packages/. Damit werden beim nächsten `./buildscript prepare` alle Dateien die für das Bauen der Firmware nötig sind neu heruntergeladen. Dies kann nötig sein wenn z.B. seit dem letzen build ein größerer Versionssprung in OpenWRT gemacht wurde. Wenn es Fehler beim bauen gibt, wie fehlende Dependencies o.Ä., ist ein clean mal einen Versuch wert.
|
||||
* Nach einem clean muss daher erst noch einmal `./buildscript prepare` ausgeführt werden, bevor man mit `./buildscipt build` bauen kann!
|
||||
|
||||
### `./buildscript build`
|
||||
Sollte man am besten mit Hilfe des Tools 'screen' oder ähnlichem laufen lassen um einen Abbruch des Builds bei Verbindungsproblemen oder ähnlichem zu verhindern.
|
||||
* prebuild
|
||||
* $target/files aufräumen
|
||||
* (In $target/files liegen Dateien, die später direkt im Ziel-Image landen)
|
||||
|
|
@ -74,15 +63,12 @@ Sollte man am besten mit Hilfe des Tools 'screen' oder ähnlichem laufen lassen
|
|||
* postbuild
|
||||
* board_postbuild() wird aufgerufen
|
||||
|
||||
### `./buildscript buildall`
|
||||
Kann verwendet werden um für alle BSPs Firmware zu bauen. Das kann jedoch mehrere Stunden dauern.
|
||||
|
||||
## Erweiterung eines BSPs
|
||||
Beispielhaftes Vorgehen um den WR1043V2 zu unterstützen.
|
||||
|
||||
### Repository auschecken
|
||||
```
|
||||
git clone https://git.freifunk-franken.de/freifunk-franken/firmware.git
|
||||
git clone https://github.com/FreifunkFranken/firmware.git
|
||||
cd firmware
|
||||
```
|
||||
|
||||
|
|
@ -136,14 +122,9 @@ scp root@[ipv6ll%scope]:/etc/network.tl-wr1043nd-v2 /path/to/git/firmware/bsp/wr
|
|||
```
|
||||
|
||||
### BSP commiten und Patch erzeugen
|
||||
Nun kann man mit `git status` die Änderungen sehen.
|
||||
|
||||
Damit man an mehreren Änderungen gleichzeitig arbeiten kann, sollte zunächst mit `git checkout -b mein-neues-feature` ein neuer Branch erzeugt werden. Dann können die Änderungen mit `git add` gestaged und danach mit `git commit` eingecheckt werden.
|
||||
|
||||
Die so erzeugten Änderungen können dann mit einem Pull Request im [Gitea](https://git.freifunk-franken.de/freifunk-franken/firmware) submitted werden. Dafür ist ein [Account](https://docs.freifunk-franken.de/services/git.freifunk-franken/#anmeldung) nötig. Dazu muss das Firmware-Repository zunächst geforkt werden. Die SSH-Adresse des Forks (steht oben rechts) kann dann mit `git remote set-url origin gitea@git.freifunk-franken.de:meinname/firmware.git` in das lokale Repository eingetragen werden. Danach kann der weiter oben erstellte Branch mit `git push origin mein-neues-feature` in den Fork hochgeladen werden. Nun kann der Pull Request im Freifunk Franken Repository [angelegt](https://git.freifunk-franken.de/freifunk-franken/firmware/pulls) werden.
|
||||
|
||||
Soll der Pull Request später geändert werden, dann müssen zunächst die nötigen Änderungen gemacht und danach mit `git commit --amend` in den bereits bestehenden Commit eingefügt werden. Dies kann dann mit `git push --force origin mein-neues-feature` in den Fork hochgeladen werden. Force ist hierbei nötig, da bereits bestehende Commits geändert werden. Der Pull Request wird dann automatisch aktualisiert. Um Reviews zu erleichtern sollten die Änderungen im Pull Request als Kommentar beschrieben werden.
|
||||
Nun kann man mit `git status` die Änderungen sehen. Mit `git add` staged man diese und mit `git commit` checkt man sie ein. `git format-patch origin/HEAD` erzeugt dann aus deinen Commits ein (oder mehr) Patches. Diese schickst du dann mit `git send-email --to franken-dev@freifunk.net *.patch` an unsere Liste. Dort nimmt sich jemand die Zeit und schaut kurz drüber und wenn alles passt finden deine Änderungen in den Hauptentwicklungszweig und sind ab dann Teil der Freifunk-Franken-Firmware.
|
||||
|
||||
### Patch schicken
|
||||
Auf der Mailingliste franken-dev@freifunk.net kannst du natürlich jederzeit Fragen stellen, falls etwas nicht klar sein sollte.
|
||||
|
||||
## Hinzufügen von Paketen zum Image
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
chipset=ar71xx
|
||||
subtarget=generic
|
||||
images=("openwrt-${chipset}-${subtarget}-cpe210-220-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-cpe510-520-v1-squashfs-*"
|
||||
)
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
# Generated using "./buildscript config openwrt".
|
||||
# Do no edit manually
|
||||
#
|
||||
CONFIG_TARGET_ar71xx=y
|
||||
CONFIG_TARGET_ar71xx_generic=y
|
||||
CONFIG_TARGET_MULTI_PROFILE=y
|
||||
CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe210-220-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe210-220-v1="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe510-520-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe510-520-v1="-rssileds"
|
||||
CONFIG_BUSYBOX_CUSTOM=y
|
||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CROND is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
|
||||
CONFIG_CLEAN_IPKG=y
|
||||
# CONFIG_DROPBEAR_CURVE25519 is not set
|
||||
# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
|
||||
# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
|
||||
# CONFIG_FASTD_ENABLE_MAC_UHASH is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
|
||||
CONFIG_KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE=1
|
||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||
CONFIG_PACKAGE_hostapd-mini=y
|
||||
CONFIG_PACKAGE_iwinfo=m
|
||||
CONFIG_PACKAGE_libiwinfo=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_wpad-mini=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
|
|
@ -5,21 +5,25 @@ images=("openwrt-${chipset}-${subtarget}-glinet_gl-ar150-squashfs-*"
|
|||
"openwrt-${chipset}-${subtarget}-tplink_archer-c60-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_archer-c60-v2-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_archer-c7-v2-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_archer-c7-v4-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_archer-c7-v5-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_cpe210-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_cpe210-v2-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_cpe210-v3-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_cpe510-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr3500-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr3600-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr4300-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr4310-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v2-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v3-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v4-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043n-v5-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr710n-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr842n-v2-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-ubnt_bullet-m-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-ubnt_nanostation-loco-m-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-ubnt_nanostation-loco-m-xw-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-ubnt_unifi-ap-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-ubnt_nanostation-m-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-ubnt_picostation-m-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-ubnt_unifi-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-ubnt_unifiac-mesh-squashfs-*"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -7,25 +7,19 @@ CONFIG_TARGET_MULTI_PROFILE=y
|
|||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_glinet_gl-ar150=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_glinet_gl-ar150=""
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c25-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c25-v1="-kmod-ath10k-ct-smallbuffers kmod-ath10k-smallbuffers -ath10k-firmware-qca9887-ct ath10k-firmware-qca9887"
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c25-v1="-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9887-ct ath10k-firmware-qca9887"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c60-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c60-v1="-kmod-ath10k-ct-smallbuffers kmod-ath10k-smallbuffers -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888"
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c60-v1="-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c60-v2=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c60-v2="-kmod-ath10k-ct-smallbuffers kmod-ath10k-smallbuffers -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888"
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c60-v2="-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v2=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v2="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v4=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v4="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v5=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v5="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v1="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v2=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v2="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v3=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v3="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe510-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe510-v1="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr3500-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wdr3500-v1=""
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr3600-v1=y
|
||||
|
|
@ -48,10 +42,8 @@ CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr710n-v1=y
|
|||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr710n-v1=""
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr842n-v2=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr842n-v2=""
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m-ar7240=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_bullet-m-ar7240="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m-ar7241=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_bullet-m-ar7241="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_bullet-m="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-loco-m=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_nanostation-loco-m="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-loco-m-xw=y
|
||||
|
|
@ -60,8 +52,8 @@ CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-m=y
|
|||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_nanostation-m="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_picostation-m=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_picostation-m="-rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_unifi-ap=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_unifi-ap=""
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_unifi=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_unifi=""
|
||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_unifiac-mesh=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_unifiac-mesh="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
|
||||
CONFIG_BUSYBOX_CUSTOM=y
|
||||
|
|
@ -85,17 +77,11 @@ CONFIG_KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE=1
|
|||
CONFIG_PACKAGE_hostapd-mini=y
|
||||
CONFIG_PACKAGE_iwinfo=m
|
||||
CONFIG_PACKAGE_libiwinfo=m
|
||||
CONFIG_PACKAGE_libuclient=m
|
||||
CONFIG_PACKAGE_libwolfssl=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_wpad-basic=y
|
||||
CONFIG_PACKAGE_uclient-fetch=m
|
||||
CONFIG_PACKAGE_wpad-basic-wolfssl=m
|
||||
CONFIG_PACKAGE_wpad-mini=m
|
||||
CONFIG_PACKAGE_ath10k-firmware-qca9887=m
|
||||
CONFIG_PACKAGE_ath10k-firmware-qca9888=m
|
||||
CONFIG_PACKAGE_ath10k-firmware-qca988x=m
|
||||
CONFIG_PACKAGE_kmod-ath10k-smallbuffers=m
|
||||
CONFIG_PACKAGE_kmod-ath10k=m
|
||||
CONFIG_PACKAGE_ath10k-firmware-qca9887-ct=m
|
||||
CONFIG_PACKAGE_ath10k-firmware-qca9888-ct=m
|
||||
|
|
@ -103,9 +89,3 @@ CONFIG_PACKAGE_ath10k-firmware-qca988x-ct=m
|
|||
CONFIG_PACKAGE_kmod-ath10k-ct-smallbuffers=m
|
||||
CONFIG_PACKAGE_kmod-ath10k-ct=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=1024
|
||||
# CONFIG_LIBCURL_FILE is not set
|
||||
# CONFIG_LIBCURL_FTP is not set
|
||||
# CONFIG_LIBCURL_PROXY is not set
|
||||
# CONFIG_LIBCURL_UNIX_SOCKETS is not set
|
||||
# CONFIG_HTOP_LMSENSORS is not set
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
chipset=ath79
|
||||
subtarget=tiny
|
||||
images=("openwrt-${chipset}-${subtarget}-tplink_tl-mr3020-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wa850re-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wa860re-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wa901nd-v2-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr740n-v4-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr741-v1-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr741nd-v4-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v7-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v8-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v9-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v10-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v11-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v12-squashfs-*"
|
||||
)
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
# Generated using "./buildscript config openwrt".
|
||||
# Do no edit manually
|
||||
#
|
||||
CONFIG_TARGET_ath79=y
|
||||
CONFIG_TARGET_ath79_tiny=y
|
||||
CONFIG_TARGET_MULTI_PROFILE=y
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-mr3020-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-mr3020-v1="-uboot-envtools -kmod-usb-core -kmod-usb-chipidea2 -kmod-usb-ledtrig-usbport"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wa850re-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wa850re-v1="-uboot-envtools -rssileds"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wa860re-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wa860re-v1="-uboot-envtools"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wa901nd-v2=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wa901nd-v2="-uboot-envtools"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr740n-v4=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr740n-v4="-uboot-envtools"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr741-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr741-v1="-uboot-envtools"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr741nd-v4=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr741nd-v4="-uboot-envtools"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v7=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v7="-uboot-envtools"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v8=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v8="-uboot-envtools"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v9=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v9="-uboot-envtools"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v10=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v10="-uboot-envtools"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v11=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v11="-uboot-envtools"
|
||||
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v12=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v12="-uboot-envtools"
|
||||
CONFIG_BUSYBOX_CUSTOM=y
|
||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CROND is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
|
||||
CONFIG_CLEAN_IPKG=y
|
||||
# CONFIG_DROPBEAR_CURVE25519 is not set
|
||||
# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
|
||||
# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
|
||||
# CONFIG_FASTD_ENABLE_MAC_UHASH is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
|
||||
CONFIG_KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE=1
|
||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||
CONFIG_PACKAGE_hostapd-mini=y
|
||||
CONFIG_PACKAGE_iwinfo=m
|
||||
CONFIG_PACKAGE_libiwinfo=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_wpad-mini=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
|
|
@ -13,9 +13,6 @@ export HOME=${HOME:-/root}
|
|||
[ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; }
|
||||
[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
|
||||
|
||||
# update uhttpd passwd on passwd-change
|
||||
[ -e /etc/rc.d/S50uhttpd ] && passwd() { /bin/passwd "$@" && /etc/init.d/uhttpd restart; }
|
||||
|
||||
# I'm lazy, let's add some aliases
|
||||
alias ..='cd ..'
|
||||
alias ...='cd ../..'
|
||||
|
|
@ -23,7 +20,6 @@ alias l='ls -CF'
|
|||
alias la='ls -A'
|
||||
alias ll='ls -alF'
|
||||
alias ls='ls --color=auto'
|
||||
alias ip='ip --color=auto'
|
||||
|
||||
# and color my prompt
|
||||
export PS1='\[\033[01;32m\]\u@\H\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
|
||||
export PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
|
||||
|
|
@ -1 +0,0 @@
|
|||
/tmp/.ash_history
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
chipset=ipq40xx
|
||||
subtarget=generic
|
||||
|
||||
images=(
|
||||
"openwrt-${chipset}-${subtarget}-avm_fritzbox-4040-squashfs-*"
|
||||
)
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
# Generated using "./buildscript config openwrt".
|
||||
# Do no edit manually
|
||||
#
|
||||
CONFIG_TARGET_ipq40xx=y
|
||||
CONFIG_TARGET_ipq40xx_generic=y
|
||||
CONFIG_TARGET_MULTI_PROFILE=y
|
||||
CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_avm_fritzbox-4040=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ipq40xx_generic_DEVICE_avm_fritzbox-4040="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca4019-ct ath10k-firmware-qca4019"
|
||||
CONFIG_BUSYBOX_CUSTOM=y
|
||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CROND is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
|
||||
CONFIG_CLEAN_IPKG=y
|
||||
# CONFIG_DROPBEAR_CURVE25519 is not set
|
||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||
CONFIG_PACKAGE_ath10k-firmware-qca4019=m
|
||||
CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=m
|
||||
CONFIG_PACKAGE_fff-extra=y
|
||||
CONFIG_PACKAGE_kmod-ath10k=m
|
||||
CONFIG_PACKAGE_kmod-ath10k-ct=m
|
||||
CONFIG_PACKAGE_libuclient=m
|
||||
CONFIG_PACKAGE_libwolfssl=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_wpad-basic=y
|
||||
CONFIG_PACKAGE_uclient-fetch=m
|
||||
CONFIG_PACKAGE_wpad-basic-wolfssl=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
CONFIG_PACKAGE_kmod-hwmon-core=y
|
||||
# CONFIG_HTOP_LMSENSORS is not set
|
||||
|
|
@ -23,20 +23,9 @@ CONFIG_CLEAN_IPKG=y
|
|||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
|
||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||
CONFIG_PACKAGE_fff-extra=y
|
||||
CONFIG_PACKAGE_libuclient=m
|
||||
CONFIG_PACKAGE_libwolfssl=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_wpad-basic=y
|
||||
CONFIG_PACKAGE_uclient-fetch=m
|
||||
CONFIG_PACKAGE_wpad-basic-wolfssl=m
|
||||
CONFIG_PACKAGE_ath10k-firmware-qca99x0=m
|
||||
CONFIG_PACKAGE_kmod-ath10k=y
|
||||
CONFIG_PACKAGE_ath10k-firmware-qca99x0-ct=m
|
||||
CONFIG_PACKAGE_kmod-ath10k-ct=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
# CONFIG_LIBCURL_FILE is not set
|
||||
# CONFIG_LIBCURL_FTP is not set
|
||||
# CONFIG_LIBCURL_PROXY is not set
|
||||
# CONFIG_LIBCURL_UNIX_SOCKETS is not set
|
||||
# CONFIG_HTOP_LMSENSORS is not set
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
chipset=mpc85xx
|
||||
subtarget=generic
|
||||
|
||||
images=(
|
||||
"openwrt-${chipset}-${subtarget}-tl-wdr4900-v1-squashfs-*"
|
||||
)
|
||||
|
|
@ -2,10 +2,10 @@
|
|||
# Do no edit manually
|
||||
#
|
||||
CONFIG_TARGET_mpc85xx=y
|
||||
CONFIG_TARGET_mpc85xx_p1010=y
|
||||
CONFIG_TARGET_mpc85xx_generic=y
|
||||
CONFIG_TARGET_MULTI_PROFILE=y
|
||||
CONFIG_TARGET_DEVICE_mpc85xx_p1010_DEVICE_tplink_tl-wdr4900-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_mpc85xx_p1010_DEVICE_tplink_tl-wdr4900-v1=""
|
||||
CONFIG_TARGET_DEVICE_mpc85xx_generic_DEVICE_tl-wdr4900-v1=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_mpc85xx_generic_DEVICE_tl-wdr4900-v1=""
|
||||
CONFIG_BUSYBOX_CUSTOM=y
|
||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||
|
|
@ -23,17 +23,6 @@ CONFIG_CLEAN_IPKG=y
|
|||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
|
||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||
CONFIG_PACKAGE_fff-extra=y
|
||||
CONFIG_PACKAGE_libuclient=m
|
||||
CONFIG_PACKAGE_libwolfssl=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_wpad-basic=y
|
||||
CONFIG_PACKAGE_uclient-fetch=m
|
||||
CONFIG_PACKAGE_wpad-basic-wolfssl=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
|
||||
# CONFIG_LIBCURL_FILE is not set
|
||||
# CONFIG_LIBCURL_FTP is not set
|
||||
# CONFIG_LIBCURL_PROXY is not set
|
||||
# CONFIG_LIBCURL_UNIX_SOCKETS is not set
|
||||
# CONFIG_HTOP_LMSENSORS is not set
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
chipset=mpc85xx
|
||||
subtarget=p1010
|
||||
|
||||
images=(
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr4900-v1-squashfs-*"
|
||||
)
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
chipset=mvebu
|
||||
subtarget=cortexa72
|
||||
|
||||
images=(
|
||||
"openwrt-mvebu-cortexa72-mikrotik_rb5009-squashfs*"
|
||||
)
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
# Generated using "./buildscript config openwrt".
|
||||
# Do no edit manually
|
||||
#
|
||||
CONFIG_TARGET_mvebu=y
|
||||
CONFIG_TARGET_mvebu_cortexa72=y
|
||||
CONFIG_TARGET_MULTI_PROFILE=y
|
||||
CONFIG_TARGET_DEVICE_mvebu_cortexa72_DEVICE_mikrotik_rb5009=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_mvebu_cortexa72_DEVICE_mikrotik_rb5009=""
|
||||
CONFIG_BUSYBOX_CUSTOM=y
|
||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CHGRP is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CHOWN is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CROND is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_IFCONFIG is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_IP is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_MKSWAP is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_ROUTE is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_SWAPOFF is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_SWAPON is not set
|
||||
CONFIG_CLEAN_IPKG=y
|
||||
# CONFIG_DROPBEAR_CURVE25519 is not set
|
||||
# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
|
||||
# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
|
||||
# CONFIG_FASTD_ENABLE_MAC_UHASH is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
|
||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||
CONFIG_PACKAGE_fff-extra=y
|
||||
CONFIG_PACKAGE_libuclient=m
|
||||
CONFIG_PACKAGE_libwolfssl=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_uclient-fetch=m
|
||||
CONFIG_PACKAGE_wpad-basic=y
|
||||
CONFIG_PACKAGE_wpad-basic-wolfssl=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
# CONFIG_TARGET_ROOTFS_EXT4FS is not set
|
||||
CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
|
||||
# CONFIG_LIBCURL_FILE is not set
|
||||
# CONFIG_LIBCURL_FTP is not set
|
||||
# CONFIG_LIBCURL_PROXY is not set
|
||||
# CONFIG_LIBCURL_UNIX_SOCKETS is not set
|
||||
# CONFIG_HTOP_LMSENSORS is not set
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
chipset=octeon
|
||||
subtarget=generic
|
||||
|
||||
images=(
|
||||
"openwrt-${chipset}-${subtarget}-ubnt_edgerouter-4-*"
|
||||
)
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
# Generated using "./buildscript config openwrt".
|
||||
# Do no edit manually
|
||||
#
|
||||
CONFIG_TARGET_octeon=y
|
||||
CONFIG_TARGET_octeon_generic=y
|
||||
CONFIG_TARGET_MULTI_PROFILE=y
|
||||
CONFIG_TARGET_DEVICE_octeon_generic_DEVICE_ubnt_edgerouter-4=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_octeon_generic_DEVICE_ubnt_edgerouter-4=""
|
||||
CONFIG_BUSYBOX_CUSTOM=y
|
||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CROND is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
|
||||
CONFIG_CLEAN_IPKG=y
|
||||
# CONFIG_DROPBEAR_CURVE25519 is not set
|
||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||
CONFIG_PACKAGE_fff-extra=y
|
||||
CONFIG_PACKAGE_libuclient=m
|
||||
CONFIG_PACKAGE_libwolfssl=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_wpad-basic=y
|
||||
CONFIG_PACKAGE_uclient-fetch=m
|
||||
CONFIG_PACKAGE_wpad-basic-wolfssl=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
|
||||
# CONFIG_LIBCURL_FILE is not set
|
||||
# CONFIG_LIBCURL_FTP is not set
|
||||
# CONFIG_LIBCURL_PROXY is not set
|
||||
# CONFIG_LIBCURL_UNIX_SOCKETS is not set
|
||||
# CONFIG_HTOP_LMSENSORS is not set
|
||||
|
|
@ -2,8 +2,7 @@ chipset=ramips
|
|||
subtarget=mt7621
|
||||
|
||||
images=(
|
||||
"openwrt-ramips-mt7621-netgear_r6220-squashfs-*"
|
||||
"openwrt-ramips-mt7621-ubnt_edgerouter-x-squashfs-*"
|
||||
"openwrt-ramips-mt7621-ubnt_edgerouter-x-sfp-squashfs-*"
|
||||
"openwrt-ramips-mt7621-xiaomi_mi-router-4a-gigabit-squashfs-*"
|
||||
"openwrt-ramips-mt7621-r6220-squashfs-*"
|
||||
"openwrt-ramips-mt7621-ubnt-erx-squashfs-*"
|
||||
"openwrt-ramips-mt7621-ubnt-erx-sfp-squashfs-*"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -4,14 +4,12 @@
|
|||
CONFIG_TARGET_ramips=y
|
||||
CONFIG_TARGET_ramips_mt7621=y
|
||||
CONFIG_TARGET_MULTI_PROFILE=y
|
||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_netgear_r6220=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_netgear_r6220=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt_edgerouter-x=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt_edgerouter-x=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt_edgerouter-x-sfp=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt_edgerouter-x-sfp=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-4a-gigabit=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_xiaomi_mi-router-4a-gigabit=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_r6220=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_r6220=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt-erx=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx-sfp=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt-erx-sfp=""
|
||||
CONFIG_BUSYBOX_CUSTOM=y
|
||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||
|
|
@ -29,17 +27,6 @@ CONFIG_CLEAN_IPKG=y
|
|||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
|
||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||
CONFIG_PACKAGE_fff-extra=y
|
||||
CONFIG_PACKAGE_libuclient=m
|
||||
CONFIG_PACKAGE_libwolfssl=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_wpad-basic=y
|
||||
CONFIG_PACKAGE_uclient-fetch=m
|
||||
CONFIG_PACKAGE_wpad-basic-wolfssl=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
|
||||
# CONFIG_LIBCURL_FILE is not set
|
||||
# CONFIG_LIBCURL_FTP is not set
|
||||
# CONFIG_LIBCURL_PROXY is not set
|
||||
# CONFIG_LIBCURL_UNIX_SOCKETS is not set
|
||||
# CONFIG_HTOP_LMSENSORS is not set
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
chipset=ramips
|
||||
subtarget=mt76x8
|
||||
images=("openwrt-${chipset}-${subtarget}-tplink_archer-c50-v3-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_archer-c50-v4-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841n-v13-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-xiaomi_mi-router-4a-100m-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-xiaomi_mi-router-4a-100m-intl-squashfs-*"
|
||||
images=("openwrt-${chipset}-${subtarget}-tplink_c50-v3-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tplink_c50-v4-squashfs-*"
|
||||
"openwrt-${chipset}-${subtarget}-tl-wr841n-v13-squashfs-*"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -4,16 +4,12 @@
|
|||
CONFIG_TARGET_ramips=y
|
||||
CONFIG_TARGET_ramips_mt76x8=y
|
||||
CONFIG_TARGET_MULTI_PROFILE=y
|
||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_archer-c50-v3=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_archer-c50-v3=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_archer-c50-v4=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_archer-c50-v4=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_tl-wr841n-v13=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_tl-wr841n-v13=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_xiaomi_mi-router-4a-100m=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_xiaomi_mi-router-4a-100m=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_xiaomi_mi-router-4a-100m-intl=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_xiaomi_mi-router-4a-100m-intl=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_c50-v3=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_c50-v3=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_c50-v4=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_c50-v4=""
|
||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tl-wr841n-v13=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tl-wr841n-v13=""
|
||||
CONFIG_BUSYBOX_CUSTOM=y
|
||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||
|
|
@ -31,15 +27,5 @@ CONFIG_CLEAN_IPKG=y
|
|||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
|
||||
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
|
||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||
CONFIG_PACKAGE_libuclient=m
|
||||
CONFIG_PACKAGE_libwolfssl=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_wpad-basic=y
|
||||
CONFIG_PACKAGE_uclient-fetch=m
|
||||
CONFIG_PACKAGE_wpad-basic-wolfssl=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
# CONFIG_LIBCURL_FILE is not set
|
||||
# CONFIG_LIBCURL_FTP is not set
|
||||
# CONFIG_LIBCURL_PROXY is not set
|
||||
# CONFIG_LIBCURL_UNIX_SOCKETS is not set
|
||||
# CONFIG_HTOP_LMSENSORS is not set
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
chipset=x86
|
||||
subtarget=64
|
||||
images=("openwrt-${chipset}-${subtarget}-generic-squashfs-combined-*"
|
||||
)
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# Generated using "./buildscript config openwrt".
|
||||
# Do no edit manually
|
||||
#
|
||||
CONFIG_TARGET_x86=y
|
||||
CONFIG_TARGET_x86_64=y
|
||||
CONFIG_TARGET_MULTI_PROFILE=y
|
||||
CONFIG_TARGET_DEVICE_x86_64_DEVICE_generic=y
|
||||
CONFIG_TARGET_DEVICE_PACKAGES_x86_64_DEVICE_generic=""
|
||||
CONFIG_BUSYBOX_CUSTOM=y
|
||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CROND is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
|
||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
|
||||
CONFIG_CLEAN_IPKG=y
|
||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||
CONFIG_PACKAGE_fff-extra=y
|
||||
CONFIG_PACKAGE_kmod-vmxnet3=y
|
||||
CONFIG_PACKAGE_libuclient=m
|
||||
CONFIG_PACKAGE_libwolfssl=m
|
||||
CONFIG_PACKAGE_opkg=m
|
||||
CONFIG_PACKAGE_wpad-basic=y
|
||||
CONFIG_PACKAGE_uclient-fetch=m
|
||||
CONFIG_PACKAGE_wpad-basic-wolfssl=m
|
||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
||||
# CONFIG_LIBCURL_FILE is not set
|
||||
# CONFIG_LIBCURL_FTP is not set
|
||||
# CONFIG_LIBCURL_PROXY is not set
|
||||
# CONFIG_LIBCURL_UNIX_SOCKETS is not set
|
||||
# CONFIG_HTOP_LMSENSORS is not set
|
||||
|
|
@ -6,23 +6,18 @@ This disables all OpenWrt config migration mechanisms except for
|
|||
files listed in /etc/sysupgrade.conf
|
||||
|
||||
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
|
||||
index 9315091302..be8325463e 100755
|
||||
index 6c518b780eddd973966537b50d8f7c82539bb1e1..49d4514b988e827098450d57da0ae50a37506d3a 100755
|
||||
--- a/package/base-files/files/sbin/sysupgrade
|
||||
+++ b/package/base-files/files/sbin/sysupgrade
|
||||
@@ -139,14 +139,14 @@ list_static_conffiles() {
|
||||
local filter=$1
|
||||
|
||||
find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
|
||||
- /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
|
||||
+ /etc/sysupgrade.conf 2>/dev/null) \
|
||||
\( -type f -o -type l \) $filter 2>/dev/null
|
||||
}
|
||||
|
||||
@@ -134,9 +134,9 @@ list_changed_conffiles() {
|
||||
add_conffiles() {
|
||||
local file="$1"
|
||||
|
||||
- ( list_static_conffiles "$find_filter"; list_changed_conffiles ) |
|
||||
+ ( list_static_conffiles "$find_filter" ) |
|
||||
sort -u > "$file"
|
||||
( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
|
||||
- /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
|
||||
+ /etc/sysupgrade.conf 2>/dev/null) \
|
||||
\( -type f -o -type l \) $find_filter 2>/dev/null;
|
||||
- list_changed_conffiles ) | sort -u > "$file"
|
||||
+ ) | sort -u > "$file"
|
||||
return 0
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ Date: Sat, 8 Jul 2017 10:47:28 +0200
|
|||
Subject: set root password
|
||||
|
||||
diff --git a/package/base-files/files/etc/shadow b/package/base-files/files/etc/shadow
|
||||
index 39bdb9c90a..b8d180a956 100644
|
||||
index 4b4154f21f478cc025a350363b3e34319c6afacc..b8d180a95691ab09f9c4d759ffd97da34a022623 100644
|
||||
--- a/package/base-files/files/etc/shadow
|
||||
+++ b/package/base-files/files/etc/shadow
|
||||
@@ -1,4 +1,4 @@
|
||||
-root:::0:99999:7:::
|
||||
-root::0:0:99999:7:::
|
||||
+root:$1$OmvoKpjK$e.lPVnBxsrAbNV4EoH3xb1:0:0:99999:7:::
|
||||
daemon:*:0:0:99999:7:::
|
||||
ftp:*:0:0:99999:7:::
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@ Date: Sat, 8 Jul 2017 10:47:56 +0200
|
|||
Subject: ntpd host as string
|
||||
|
||||
diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
|
||||
index 074f14b8f8..a05d1789ff 100755
|
||||
index 52866ba32acd26a490f9c9024fc3e43e0f757496..b6b28cd02527b89c0a4cc2f9adef52bb4c8427b0 100755
|
||||
--- a/package/utils/busybox/files/sysntpd
|
||||
+++ b/package/utils/busybox/files/sysntpd
|
||||
@@ -34,7 +34,7 @@ validate_ntp_section() {
|
||||
'enable_server:bool:0' \
|
||||
'enabled:bool:1' \
|
||||
'interface:string' \
|
||||
- 'server:list(host)' \
|
||||
+ 'server:list(string)' \
|
||||
'use_dhcp:bool:1'
|
||||
@@ -30,7 +30,7 @@ get_dhcp_ntp_servers() {
|
||||
|
||||
validate_ntp_section() {
|
||||
uci_load_validate system timeserver "$1" "$2" \
|
||||
- 'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0' 'use_dhcp:bool:1' 'dhcp_interface:list(string)'
|
||||
+ 'server:list(string)' 'enabled:bool:1' 'enable_server:bool:0' 'use_dhcp:bool:1' 'dhcp_interface:list(string)'
|
||||
}
|
||||
|
||||
start_ntpd_instance() {
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||
Date: Wed, 10 Feb 2021 19:12:59 +0100
|
||||
Subject: build: remove libustream and certs from default packages
|
||||
|
||||
This effectively reverts upstream commit e79df3516d3e ("build: add
|
||||
libustream and certs to default pkgs").
|
||||
|
||||
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||
[fabian@blaese.de: Rebase onto OpenWrt 23.05]
|
||||
Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||
|
||||
diff --git a/include/target.mk b/include/target.mk
|
||||
index b5e3e7ff6f..2324b6cc11 100644
|
||||
--- a/include/target.mk
|
||||
+++ b/include/target.mk
|
||||
@@ -12,12 +12,10 @@ DEVICE_TYPE?=router
|
||||
# Default packages - the really basic set
|
||||
DEFAULT_PACKAGES:=\
|
||||
base-files \
|
||||
- ca-bundle \
|
||||
dropbear \
|
||||
fstools \
|
||||
libc \
|
||||
libgcc \
|
||||
- libustream-mbedtls \
|
||||
logd \
|
||||
mtd \
|
||||
netifd \
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
From: Johannes Kimmel <fff@bareminimum.eu>
|
||||
Date: Mon, 20 Jul 2020 08:05:09 +0200
|
||||
Subject: vxlan: remove mandatory peeraddr
|
||||
|
||||
vxlan can be configured without a peer address. This is used to prepare
|
||||
an interface and add peers later.
|
||||
|
||||
Fixes: FS#2743
|
||||
|
||||
Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
||||
Acked-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
(cherry picked from commit 5222aadbf353b7cc030c39aa816f33951b104552)
|
||||
|
||||
diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
|
||||
index 7b1c7039551b7781f5f7a8e73b964db698f3697b..bdcaa628c4416cc83258dd38a6fc0978ea55a3bb 100755
|
||||
--- a/package/network/config/vxlan/files/vxlan.sh
|
||||
+++ b/package/network/config/vxlan/files/vxlan.sh
|
||||
@@ -55,12 +55,6 @@ proto_vxlan_setup() {
|
||||
local ipaddr peeraddr
|
||||
json_get_vars ipaddr peeraddr tunlink
|
||||
|
||||
- [ -z "$peeraddr" ] && {
|
||||
- proto_notify_error "$cfg" "MISSING_ADDRESS"
|
||||
- proto_block_restart "$cfg"
|
||||
- exit
|
||||
- }
|
||||
-
|
||||
( proto_add_host_dependency "$cfg" '' "$tunlink" )
|
||||
|
||||
[ -z "$ipaddr" ] && {
|
||||
@@ -85,12 +79,6 @@ proto_vxlan6_setup() {
|
||||
local ip6addr peer6addr
|
||||
json_get_vars ip6addr peer6addr tunlink
|
||||
|
||||
- [ -z "$peer6addr" ] && {
|
||||
- proto_notify_error "$cfg" "MISSING_ADDRESS"
|
||||
- proto_block_restart "$cfg"
|
||||
- exit
|
||||
- }
|
||||
-
|
||||
( proto_add_host_dependency "$cfg" '' "$tunlink" )
|
||||
|
||||
[ -z "$ip6addr" ] && {
|
||||
|
|
@ -0,0 +1,159 @@
|
|||
From: Johannes Kimmel <fff@bareminimum.eu>
|
||||
Date: Mon, 20 Jul 2020 08:05:10 +0200
|
||||
Subject: vxlan: add capability for multiple fdb entries
|
||||
|
||||
Similar to wireguard, vxlan can configure multiple peers or add specific
|
||||
entries to the fdb for a single mac address.
|
||||
|
||||
While you can still use peeraddr/peer6addr option within the proto
|
||||
vxlan/vxlan6 section to not break existing configurations, this patch
|
||||
allows to add multiple sections that conigure fdb entries via the bridge
|
||||
command. As such, the bridge command is now a dependency of the vxlan
|
||||
package. (To be honest without the bridge command available, vxlan isn't
|
||||
very much fun to use or debug at all)
|
||||
|
||||
Field names are taken direclty from the bridge command.
|
||||
|
||||
Example with all supported parameters, since this hasn't been documented so
|
||||
far:
|
||||
|
||||
config interface 'vx0'
|
||||
option proto 'vxlan6' # use vxlan over ipv6
|
||||
|
||||
# main options
|
||||
option ip6addr '2001:db8::1' # listen address
|
||||
option tunlink 'wan6' # optional if listen address given
|
||||
option peer6addr '2001:db8::2' # now optional
|
||||
option port '8472' # this is the standard port under linux
|
||||
option vid '42' # VXLAN Network Identifier to use
|
||||
option mtu '1430' # vxlan6 has 70 bytes overhead
|
||||
|
||||
# extra options
|
||||
option rxcsum '0' # allow receiving packets without checksum
|
||||
option txcsum '0' # send packets without checksum
|
||||
option ttl '16' # specifies the TTL value for outgoing packets
|
||||
option tos '0' # specifies the TOS value for outgoing packets
|
||||
option macaddr '11:22:33:44:55:66' # optional, manually specify mac
|
||||
# default is a random address
|
||||
|
||||
Single peer with head-end replication. Corresponds to the following call
|
||||
to bridge:
|
||||
|
||||
$ bridge fdb append 00:00:00:00:00:00 dev vx0 dst 2001:db8::3
|
||||
|
||||
config vxlan_peer
|
||||
option vxlan 'vx0'
|
||||
option dst '2001:db8::3' # always required
|
||||
|
||||
For multiple peers, this section can be repeated for each dst address.
|
||||
|
||||
It's possible to specify a multicast address as destination. Useful when
|
||||
multicast routing is available or within one lan segment:
|
||||
|
||||
config vxlan_peer
|
||||
option vxlan 'vx0'
|
||||
option dst 'ff02::1337' # multicast group to join.
|
||||
# all bum traffic will be send there
|
||||
option via 'eth1' # for multicast, an outgoing interface needs
|
||||
# to be specified
|
||||
|
||||
All available peer options for completeness:
|
||||
|
||||
config vxlan_peer
|
||||
option vxlan 'vx0' # the interface to configure
|
||||
option lladdr 'aa:bb:cc:dd:ee:ff' # specific mac,
|
||||
option dst '2001:db8::4' # connected to this peer
|
||||
option via 'eth0.1' # use this interface only
|
||||
option port '4789' # use different port for this peer
|
||||
option vni '23' # override vni for this peer
|
||||
option src_vni '123' # see man 3 bridge
|
||||
|
||||
Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
||||
(cherry picked from commit 65e9de3c333bae1ccef1dfb0cc008ad6f13958e4)
|
||||
|
||||
diff --git a/package/network/config/vxlan/Makefile b/package/network/config/vxlan/Makefile
|
||||
index 13fcf0c55d07d97f5dcc3cbfcf2478020e7107cc..7232f71b45e6f72f2c62a245ad44cb9ade144f52 100644
|
||||
--- a/package/network/config/vxlan/Makefile
|
||||
+++ b/package/network/config/vxlan/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=vxlan
|
||||
-PKG_RELEASE:=3
|
||||
+PKG_RELEASE:=4
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
|
||||
index bdcaa628c4416cc83258dd38a6fc0978ea55a3bb..d063c47d47d0f4e339b21e97f4e25f55a33c0497 100755
|
||||
--- a/package/network/config/vxlan/files/vxlan.sh
|
||||
+++ b/package/network/config/vxlan/files/vxlan.sh
|
||||
@@ -7,6 +7,50 @@
|
||||
init_proto "$@"
|
||||
}
|
||||
|
||||
+proto_vxlan_setup_peer() {
|
||||
+ type bridge &> /dev/null || {
|
||||
+ proto_notify_error "$cfg" "MISSING_BRIDGE_COMMAND"
|
||||
+ exit
|
||||
+ }
|
||||
+
|
||||
+ local peer_config="$1"
|
||||
+
|
||||
+ local vxlan
|
||||
+ local lladdr
|
||||
+ local dst
|
||||
+ local src_vni
|
||||
+ local vni
|
||||
+ local port
|
||||
+ local via
|
||||
+
|
||||
+ config_get vxlan "${peer_config}" "vxlan"
|
||||
+ config_get lladdr "${peer_config}" "lladdr"
|
||||
+ config_get dst "${peer_config}" "dst"
|
||||
+ config_get src_vni "${peer_config}" "src_vni"
|
||||
+ config_get vni "${peer_config}" "vni"
|
||||
+ config_get port "${peer_config}" "port"
|
||||
+ config_get via "${peer_config}" "via"
|
||||
+
|
||||
+ [ "$cfg" = "$vxlan" ] || {
|
||||
+ # This peer section belongs to another device
|
||||
+ return
|
||||
+ }
|
||||
+
|
||||
+ [ -n "${dst}" ] || {
|
||||
+ proto_notify_error "$cfg" "MISSING_PEER_ADDRESS"
|
||||
+ exit
|
||||
+ }
|
||||
+
|
||||
+ bridge fdb append \
|
||||
+ ${lladdr:-00:00:00:00:00:00} \
|
||||
+ dev ${cfg} \
|
||||
+ dst ${dst} \
|
||||
+ ${src_vni:+src_vni $src_vni} \
|
||||
+ ${vni:+vni $vni} \
|
||||
+ ${port:+port $port} \
|
||||
+ ${via:+via $via}
|
||||
+}
|
||||
+
|
||||
vxlan_generic_setup() {
|
||||
local cfg="$1"
|
||||
local mode="$2"
|
||||
@@ -18,7 +62,6 @@ vxlan_generic_setup() {
|
||||
local port vid ttl tos mtu macaddr zone rxcsum txcsum
|
||||
json_get_vars port vid ttl tos mtu macaddr zone rxcsum txcsum
|
||||
|
||||
-
|
||||
proto_init_update "$link" 1
|
||||
|
||||
proto_add_tunnel
|
||||
@@ -47,6 +90,9 @@ vxlan_generic_setup() {
|
||||
proto_close_data
|
||||
|
||||
proto_send_update "$cfg"
|
||||
+
|
||||
+ config_load network
|
||||
+ config_foreach proto_vxlan_setup_peer "vxlan_peer"
|
||||
}
|
||||
|
||||
proto_vxlan_setup() {
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||
Date: Fri, 16 Oct 2020 13:36:02 +0200
|
||||
Subject: mt76: mt7603: allow eeprom sections starting with 7600
|
||||
|
||||
Fixes low signal issue for 2.4 GHz for the TP-Link Archer C50 v4.
|
||||
The first two bytes in the eeprom are the chip id. The working
|
||||
devices have 0x7628 there, whereas the non-working devices have
|
||||
0x7600 there. This chip id gets checked by the function
|
||||
mt7603_check_eeprom() which leads the driver to ignore the
|
||||
contents of the eeprom partition and load default values from otp.
|
||||
|
||||
The has been manually added based on mt76 PR:
|
||||
https://github.com/openwrt/mt76/pull/442/
|
||||
|
||||
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||
|
||||
diff --git a/package/kernel/mt76/patches/0001-fix-archer-c50-v4.patch b/package/kernel/mt76/patches/0001-fix-archer-c50-v4.patch
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..29e422dc0c7f3046be0aa761bcfe8db1e298ed88
|
||||
--- /dev/null
|
||||
+++ b/package/kernel/mt76/patches/0001-fix-archer-c50-v4.patch
|
||||
@@ -0,0 +1,28 @@
|
||||
+From b0c7f88d900d2986cd2061113201825eda6a6482 Mon Sep 17 00:00:00 2001
|
||||
+From: Ron Asimi <ron.asimi@gmail.com>
|
||||
+Date: Wed, 2 Sep 2020 23:18:23 -0400
|
||||
+Subject: [PATCH] mt7603: allow eeprom sections starting with 7600
|
||||
+
|
||||
+Fixes low signal issue for 2.4 GHz for the TP-Link Archer C50 v4.
|
||||
+The first two bytes in the eeprom are the chip id. The working
|
||||
+devices have 0x7628 there, whereas the non-working devices have
|
||||
+0x7600 there. This chip id gets checked by the function
|
||||
+mt7603_check_eeprom() which leads the driver to ignore the contents
|
||||
+of the eeprom partition and load default values from otp.
|
||||
+
|
||||
+---
|
||||
+ mt7603/eeprom.c | 1 +
|
||||
+ 1 file changed, 1 insertion(+)
|
||||
+
|
||||
+diff --git a/mt7603/eeprom.c b/mt7603/eeprom.c
|
||||
+index 01f1e0da..9d5042af 100644
|
||||
+--- a/mt7603/eeprom.c
|
||||
++++ b/mt7603/eeprom.c
|
||||
+@@ -136,6 +136,7 @@ static int mt7603_check_eeprom(struct mt76_dev *dev)
|
||||
+ switch (val) {
|
||||
+ case 0x7628:
|
||||
+ case 0x7603:
|
||||
++ case 0x7600:
|
||||
+ return 0;
|
||||
+ default:
|
||||
+ return -EINVAL;
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||
Date: Sun, 6 Aug 2023 19:57:16 +0200
|
||||
Subject: [PATCH 1/2] ipq40xx: re-add label MAC address for FritzBox 4040
|
||||
|
||||
The MAC address of the GMAC is contained inside the CWMP-Account
|
||||
number on the label.
|
||||
|
||||
The label MAC address alias was defined previously, but it has been
|
||||
removed with the switch to IPQESS / DSA.
|
||||
|
||||
Restore the label MAC address alias.
|
||||
|
||||
Fixes: 27b441cbaf42 ("ipq40xx: drop ESSEDMA + AR40xx DTS nodes")
|
||||
Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||
|
||||
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts
|
||||
index e448206c36..ec1112ee2b 100644
|
||||
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts
|
||||
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts
|
||||
@@ -14,6 +14,7 @@
|
||||
led-failsafe = &flash;
|
||||
led-running = &power;
|
||||
led-upgrade = &flash;
|
||||
+ label-mac-device = &gmac;
|
||||
};
|
||||
|
||||
soc {
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||
Date: Tue, 8 Aug 2023 20:59:16 +0200
|
||||
Subject: [PATCH] ipq40xx: retain old compat_version
|
||||
|
||||
diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
|
||||
index 2ba4c779a0..5851b29875 100644
|
||||
--- a/target/linux/ipq40xx/image/Makefile
|
||||
+++ b/target/linux/ipq40xx/image/Makefile
|
||||
@@ -10,8 +10,6 @@ define Device/Default
|
||||
IMAGES := sysupgrade.bin
|
||||
IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
|
||||
IMAGE/sysupgrade.bin/squashfs :=
|
||||
- DEVICE_COMPAT_VERSION := 1.1
|
||||
- DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA
|
||||
endef
|
||||
|
||||
include $(SUBTARGET).mk
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||
Date: Wed, 24 Jan 2024 16:50:12 +0200
|
||||
Subject: [PATCH] mpc85xx: retain old compat_version
|
||||
|
||||
diff --git a/target/linux/mpc85xx/image/p1010.mk b/target/linux/mpc85xx/image/p1010.mk
|
||||
index c0de19f6c6..5aa580300f 100644
|
||||
--- a/target/linux/mpc85xx/image/p1010.mk
|
||||
+++ b/target/linux/mpc85xx/image/p1010.mk
|
||||
@@ -51,8 +51,6 @@ define Device/tplink_tl-wdr4900-v1
|
||||
DEVICE_VENDOR := TP-Link
|
||||
DEVICE_MODEL := TL-WDR4900
|
||||
DEVICE_VARIANT := v1
|
||||
- DEVICE_COMPAT_VERSION := 1.1
|
||||
- DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA
|
||||
TPLINK_HEADER_VERSION := 1
|
||||
TPLINK_HWID := 0x49000001
|
||||
TPLINK_HWREV := 1
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||
Date: Thu, 24 Feb 2022 00:04:47 +0100
|
||||
Subject: [PATCH] Add hack which fixes forwarding on a stacked bridge
|
||||
configuration using DSA
|
||||
|
||||
---
|
||||
.../999-fix-stacked-bridge-forwarding.patch | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
create mode 100644 target/linux/generic/hack-5.15/999-fix-stacked-bridge-forwarding.patch
|
||||
|
||||
diff --git a/target/linux/generic/hack-5.15/999-fix-stacked-bridge-forwarding.patch b/target/linux/generic/hack-5.15/999-fix-stacked-bridge-forwarding.patch
|
||||
new file mode 100644
|
||||
index 0000000000..e1d4cb9cd5
|
||||
--- /dev/null
|
||||
+++ b/target/linux/generic/hack-5.15/999-fix-stacked-bridge-forwarding.patch
|
||||
@@ -0,0 +1,12 @@
|
||||
+--- a/net/bridge/br_input.c
|
||||
++++ b/net/bridge/br_input.c
|
||||
+@@ -52,6 +52,9 @@ static int br_pass_frame_up(struct sk_bu
|
||||
+ return NET_RX_DROP;
|
||||
+ }
|
||||
+
|
||||
++ /* remove offload flag, so upper bridges do not drop the packet */
|
||||
++ br_switchdev_frame_unmark(skb);
|
||||
++
|
||||
+ indev = skb->dev;
|
||||
+ skb->dev = brdev;
|
||||
+ skb = br_handle_vlan(br, NULL, vg, skb);
|
||||
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
From ab8d25d5ac1b307dacdc3e5e44e23248f4b9a018 Mon Sep 17 00:00:00 2001
|
||||
From: Serhii Serhieiev <adron@mstnt.com>
|
||||
Date: Wed, 9 Feb 2022 09:07:57 +0200
|
||||
Subject: [PATCH 01/18] generic: fix mikrotik/rb_softconfig work(crc mismatch)
|
||||
with 64K block size
|
||||
|
||||
Signed-off-by: Serhii Serhieiev <adron@mstnt.com>
|
||||
---
|
||||
.../files/drivers/platform/mikrotik/rb_softconfig.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c b/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c
|
||||
index 5acff6aa91..2332089a46 100644
|
||||
--- a/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c
|
||||
+++ b/target/linux/generic/files/drivers/platform/mikrotik/rb_softconfig.c
|
||||
@@ -58,6 +58,7 @@
|
||||
|
||||
#define RB_SOFTCONFIG_VER "0.05"
|
||||
#define RB_SC_PR_PFX "[rb_softconfig] "
|
||||
+#define SOFT_CONF_FIXED_SIZE 0x1000
|
||||
|
||||
#define RB_SC_HAS_WRITE_SUPPORT true
|
||||
#define RB_SC_WMODE S_IWUSR
|
||||
@@ -636,7 +637,7 @@ static ssize_t sc_commit_store(struct kobject *kobj, struct kobj_attribute *attr
|
||||
|
||||
write_lock(&sc_bufrwl);
|
||||
if (!flush) // reread
|
||||
- ret = mtd_read(mtd, 0, mtd->size, &bytes_rw, sc_buf);
|
||||
+ ret = mtd_read(mtd, 0, sc_buflen, &bytes_rw, sc_buf);
|
||||
else { // crc32 + commit
|
||||
/*
|
||||
* CRC32 is computed on the entire buffer, excluding the CRC
|
||||
@@ -658,7 +659,7 @@ static ssize_t sc_commit_store(struct kobject *kobj, struct kobj_attribute *attr
|
||||
ei.len = mtd->size;
|
||||
ret = mtd_erase(mtd, &ei);
|
||||
if (!ret)
|
||||
- ret = mtd_write(mtd, 0, mtd->size, &bytes_rw, sc_buf);
|
||||
+ ret = mtd_write(mtd, 0, sc_buflen, &bytes_rw, sc_buf);
|
||||
|
||||
/*
|
||||
* Handling mtd_write() failure here is a tricky situation. The
|
||||
@@ -708,7 +709,7 @@ int rb_softconfig_init(struct kobject *rb_kobj, struct mtd_info *mtd)
|
||||
if (ret)
|
||||
return -ENODEV;
|
||||
|
||||
- sc_buflen = mtd->size;
|
||||
+ sc_buflen = mtd->size > SOFT_CONF_FIXED_SIZE ? SOFT_CONF_FIXED_SIZE : mtd->size;
|
||||
sc_buf = kmalloc(sc_buflen, GFP_KERNEL);
|
||||
if (!sc_buf) {
|
||||
__put_mtd_device(mtd);
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
From d1b6214aadbce601ebf54e8f673bbf427b4e33ec Mon Sep 17 00:00:00 2001
|
||||
From: Serhii Serhieiev <adron@mstnt.com>
|
||||
Date: Wed, 9 Feb 2022 09:32:30 +0200
|
||||
Subject: [PATCH 02/18] mvebu: add aux-loader2 support
|
||||
|
||||
This auxiliary bootloader implements the ability to run the OpenWrt Linux kernel(FIT image)
|
||||
from the RouterBOOT. The thing is that RouterBOOT is able to load ONLY program code in ELF format.
|
||||
To bypass this restriction, the auxiliary bootloader extends the capabilities of the RouterBOOT -
|
||||
by adding support for loading system from FIT images.
|
||||
|
||||
Source code is available under GPLv2: https://github.com/adron-s/aux-loader2
|
||||
|
||||
Signed-off-by: Serhii Serhieiev <adron@mstnt.com>
|
||||
[fabian@blaese.de: Remove aux-loader blob, as it is only required for initial installation]
|
||||
Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||
---
|
||||
target/linux/mvebu/image/Makefile | 12 ++++++++++++
|
||||
target/linux/mvebu/image/cortexa72.mk | 19 +++++++++++++++++++
|
||||
2 files changed, 25 insertions(+)
|
||||
|
||||
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
|
||||
index 57129d2dcb..180b909cbd 100644
|
||||
--- a/target/linux/mvebu/image/Makefile
|
||||
+++ b/target/linux/mvebu/image/Makefile
|
||||
@@ -162,6 +162,12 @@ define Build/uDPU-firmware
|
||||
-f $(KDIR_TMP)/$(DEVICE_IMG_PREFIX)-firmware.tgz -C $@-fw .
|
||||
endef
|
||||
|
||||
+define Device/FitImageLzma
|
||||
+ KERNEL_SUFFIX := -fit-uImage.itb
|
||||
+ KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb | pad-to 64k
|
||||
+ KERNEL_NAME := Image
|
||||
+endef
|
||||
+
|
||||
define Device/Default
|
||||
PROFILES := Default
|
||||
DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
|
||||
diff --git a/target/linux/mvebu/image/cortexa72.mk b/target/linux/mvebu/image/cortexa72.mk
|
||||
index 7f344f1de2..fc4712a597 100644
|
||||
--- a/target/linux/mvebu/image/cortexa72.mk
|
||||
+++ b/target/linux/mvebu/image/cortexa72.mk
|
||||
@@ -52,6 +52,25 @@ define Device/marvell_macchiatobin-singleshot
|
||||
endef
|
||||
TARGET_DEVICES += marvell_macchiatobin-singleshot
|
||||
|
||||
+define Device/mikrotik_rb5009
|
||||
+ DEVICE_DTS := armada-7040-rb5009
|
||||
+ DEVICE_DTS_DIR := $(DTS_DIR)/marvell
|
||||
+ $(call Device/FitImageLzma)
|
||||
+ DEVICE_VENDOR := MikroTik
|
||||
+ DEVICE_MODEL := RB5009
|
||||
+ SOC := armada-7040
|
||||
+ KERNEL_LOADADDR := 0x22000000
|
||||
+ KERNEL_INITRAMFS = $$(KERNEL)
|
||||
+ KERNEL_INITRAMFS_SUFFIX := -fit-uImage.elf
|
||||
+ BLOCKSIZE := 64k
|
||||
+ IMAGE_SIZE := 15360k
|
||||
+ IMAGES := sysupgrade.bin
|
||||
+ IMAGE/sysupgrade.bin := append-kernel | pad-to $$(BLOCKSIZE) | \
|
||||
+ append-rootfs | pad-rootfs | check-size | append-metadata
|
||||
+ DEVICE_PACKAGES += kmod-i2c-gpio
|
||||
+endef
|
||||
+TARGET_DEVICES += mikrotik_rb5009
|
||||
+
|
||||
define Device/marvell_clearfog-gt-8k
|
||||
$(call Device/Default-arm64)
|
||||
DEVICE_VENDOR := SolidRun
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,439 +0,0 @@
|
|||
From 4994d15a2708e3c2e5df3d91061a4899cb44a979 Mon Sep 17 00:00:00 2001
|
||||
From: Serhii Serhieiev <adron@mstnt.com>
|
||||
Date: Wed, 9 Feb 2022 09:45:47 +0200
|
||||
Subject: [PATCH 03/18] mvebu: mvebu: add support for RB5009UG+S+IN.
|
||||
|
||||
This patch adds support for Mikrotik RB5009UG+S+IN.
|
||||
|
||||
Specifications:
|
||||
- SoC: Marvell Armada 7040 (88F7040) - 4 cores, ARMv8, 1.4GHz, 64bit
|
||||
- RAM: 1024MB DDR4
|
||||
- Flash: 16MB SPI NOR flash, 1024MB NAND
|
||||
- Ethernet: One Marvell 88E6393X - Amethyst: one 2.5G + seven 1G ports and one SFP+
|
||||
- LED: User, SFP, Hdr1, Hdr2
|
||||
- Buttons: Reset
|
||||
- UART: 115200 8n1
|
||||
- USB: One USB3 port
|
||||
Signed-off-by: Serhii Serhieiev <adron@mstnt.com>
|
||||
---
|
||||
.../base-files/etc/board.d/02_network | 3 +
|
||||
.../base-files/lib/upgrade/platform.sh | 4 +
|
||||
.../boot/dts/marvell/armada-7040-rb5009.dts | 377 ++++++++++++++++++
|
||||
3 files changed, 384 insertions(+)
|
||||
create mode 100644 target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
|
||||
diff --git a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
|
||||
index 6a5861084e..ccb89add24 100644
|
||||
--- a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
|
||||
+++ b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
|
||||
@@ -32,6 +32,9 @@ marvell,armada7040-db)
|
||||
marvell,armada8040-clearfog-gt-8k)
|
||||
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 eth2" "eth0 eth1"
|
||||
;;
|
||||
+mikrotik,rb5009)
|
||||
+ ucidef_set_interfaces_lan_wan "p2 p3 p4 p5 p6 p7 p8" "sfp p1"
|
||||
+ ;;
|
||||
*)
|
||||
ucidef_set_interface_lan "eth0"
|
||||
;;
|
||||
diff --git a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh
|
||||
index dc964a3117..d61e937cdc 100755
|
||||
--- a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh
|
||||
+++ b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh
|
||||
@@ -35,6 +35,10 @@ platform_do_upgrade() {
|
||||
marvell,armada8040-clearfog-gt-8k)
|
||||
legacy_sdcard_do_upgrade "$1"
|
||||
;;
|
||||
+ mikrotik,rb5009)
|
||||
+ PART_NAME=firmware
|
||||
+ default_do_upgrade "$1"
|
||||
+ ;;
|
||||
*)
|
||||
default_do_upgrade "$1"
|
||||
;;
|
||||
diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
new file mode 100644
|
||||
index 0000000000..66c74451f0
|
||||
--- /dev/null
|
||||
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
@@ -0,0 +1,377 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
||||
+
|
||||
+/dts-v1/;
|
||||
+
|
||||
+#include "armada-7040.dtsi"
|
||||
+#include <dt-bindings/gpio/gpio.h>
|
||||
+#include <dt-bindings/input/input.h>
|
||||
+
|
||||
+/ {
|
||||
+ model = "MikroTik RB5009";
|
||||
+ compatible = "mikrotik,rb5009", "marvell,armada7040",
|
||||
+ "marvell,armada-ap806-quad", "marvell,armada-ap806";
|
||||
+
|
||||
+ chosen {
|
||||
+ stdout-path = "serial0:115200n8";
|
||||
+ };
|
||||
+
|
||||
+ memory@0 {
|
||||
+ device_type = "memory";
|
||||
+ reg = <0x0 0x0 0x0 0x40000000>;
|
||||
+ };
|
||||
+
|
||||
+ aliases {
|
||||
+ led-boot = &led_user;
|
||||
+ led-failsafe = &led_user;
|
||||
+ led-running = &led_user;
|
||||
+ led-upgrade = &led_user;
|
||||
+ };
|
||||
+
|
||||
+ sfp_i2c: sfp-i2c {
|
||||
+ compatible = "i2c-gpio";
|
||||
+ sda-gpios = <&cp0_gpio1 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
|
||||
+ scl-gpios = <&cp0_gpio1 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
|
||||
+ };
|
||||
+
|
||||
+ keys {
|
||||
+ compatible = "gpio-keys";
|
||||
+
|
||||
+ reset {
|
||||
+ label = "reset";
|
||||
+ gpios = <&cp0_gpio1 28 GPIO_ACTIVE_LOW>;
|
||||
+ linux,code = <KEY_RESTART>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+
|
||||
+ led_user: user {
|
||||
+ label = "green:user";
|
||||
+ gpios = <&cp0_gpio2 26 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ sfp {
|
||||
+ label = "green:sfp";
|
||||
+ gpios = <&cp0_gpio2 25 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ hdr1 {
|
||||
+ label = "blue:hdr1";
|
||||
+ gpios = <&cp0_gpio1 4 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ hdr2 {
|
||||
+ label = "blue:hdr2";
|
||||
+ gpios = <&cp0_gpio2 19 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ sfp: sfp {
|
||||
+ compatible = "sff,sfp";
|
||||
+ i2c-bus = <&sfp_i2c>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ pinctrl-0 = <&uart0_pins>;
|
||||
+ pinctrl-names = "default";
|
||||
+};
|
||||
+
|
||||
+
|
||||
+&spi0 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ spi-flash@0 {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+ compatible = "jedec,spi-nor";
|
||||
+ reg = <0>;
|
||||
+ spi-max-frequency = <20000000>;
|
||||
+
|
||||
+ partitions {
|
||||
+ compatible = "fixed-partitions";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ partition@0 {
|
||||
+ label = "ATF";
|
||||
+ reg = <0x0 0x95c04>;
|
||||
+ read-only;
|
||||
+ };
|
||||
+ partition@1 {
|
||||
+ label = "backup_RouterBOOT";
|
||||
+ reg = <0x95c04 0x193FC>;
|
||||
+ read-only;
|
||||
+ };
|
||||
+ hard_config: partition@2 {
|
||||
+ label = "hard_config";
|
||||
+ reg = <0xaf000 0x1000>;
|
||||
+ read-only;
|
||||
+ };
|
||||
+ partition@3 {
|
||||
+ label = "RouterBOOT";
|
||||
+ reg = <0xb0000 0x10000>;
|
||||
+ };
|
||||
+ partition@4 {
|
||||
+ label = "soft_config";
|
||||
+ reg = <0xc0000 0x10000>;
|
||||
+ };
|
||||
+ partition@5 {
|
||||
+ label = "DTS";
|
||||
+ reg = <0xd0000 0x10000>;
|
||||
+ read-only;
|
||||
+ };
|
||||
+ partition@6 {
|
||||
+ label = "free_space";
|
||||
+ reg = <0xe0000 0x20000>;
|
||||
+ };
|
||||
+ partition@7 {
|
||||
+ compatible = "denx,fit";
|
||||
+ label = "firmware";
|
||||
+ reg = <0x100000 0xf00000>;
|
||||
+ };
|
||||
+ partition@8 {
|
||||
+ label = "first_1M";
|
||||
+ reg = <0x0 0x100000>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&cp0_nand_controller {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ nand@0 {
|
||||
+ reg = <0>;
|
||||
+ nand-rb = <0>;
|
||||
+ nand-ecc-mode = "hw";
|
||||
+ nand-ecc-strength = <4>;
|
||||
+ nand-ecc-step-size = <512>;
|
||||
+ nand-on-flash-bbt;
|
||||
+
|
||||
+ partitions {
|
||||
+ compatible = "fixed-partitions";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ partition@0 {
|
||||
+ label = "RouterBoard NAND Boot";
|
||||
+ reg = <0x0 0x800000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@800000 {
|
||||
+ label = "RouterBoard NAND Main";
|
||||
+ reg = <0x800000 0x3f800000>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&cp0_gpio2 {
|
||||
+ enable-usb-power {
|
||||
+ gpio-hog;
|
||||
+ gpios = <23 GPIO_ACTIVE_HIGH>;
|
||||
+ output-high;
|
||||
+ line-name = "enable USB power";
|
||||
+ };
|
||||
+
|
||||
+ enable-leds-power {
|
||||
+ gpio-hog;
|
||||
+ gpios = <27 GPIO_ACTIVE_HIGH>;
|
||||
+ output-high;
|
||||
+ line-name = "enable LED-s power";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&cp0_usb3_1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&cp0_i2c0 {
|
||||
+ status = "okay";
|
||||
+ clock-frequency = <100000>;
|
||||
+};
|
||||
+
|
||||
+&cp0_mdio {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&cp0_ethernet {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&cp0_eth0 {
|
||||
+ /* This port is connected to 88E6393X switch */
|
||||
+ status = "okay";
|
||||
+ phy-mode = "10gbase-r";
|
||||
+ managed = "in-band-status";
|
||||
+ nvmem-cells = <&macaddr_hard>;
|
||||
+ nvmem-cell-names = "mac-address";
|
||||
+ mac-address-increment = <0>;
|
||||
+};
|
||||
+
|
||||
+&cp0_mdio {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ switch@0 {
|
||||
+ /* Actual device is MV88E6393X */
|
||||
+ compatible = "marvell,mv88e6190";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ reg = <0>;
|
||||
+ //strict-cpu-mode = <1>;
|
||||
+ //reset-gpios = <&cp0_gpio2 2 GPIO_ACTIVE_HIGH>;
|
||||
+
|
||||
+ ports {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ port@0 {
|
||||
+ reg = <0>;
|
||||
+ label = "cpu";
|
||||
+ ethernet = <&cp0_eth0>;
|
||||
+ };
|
||||
+
|
||||
+ port@1 {
|
||||
+ reg = <1>;
|
||||
+ label = "p8";
|
||||
+ phy-handle = <&switch0phy1>;
|
||||
+ nvmem-cells = <&macaddr_hard>;
|
||||
+ nvmem-cell-names = "mac-address";
|
||||
+ mac-address-increment = <7>;
|
||||
+ };
|
||||
+
|
||||
+ port@2 {
|
||||
+ reg = <2>;
|
||||
+ label = "p7";
|
||||
+ phy-handle = <&switch0phy2>;
|
||||
+ nvmem-cells = <&macaddr_hard>;
|
||||
+ nvmem-cell-names = "mac-address";
|
||||
+ mac-address-increment = <6>;
|
||||
+ };
|
||||
+
|
||||
+ port@3 {
|
||||
+ reg = <3>;
|
||||
+ label = "p6";
|
||||
+ phy-handle = <&switch0phy3>;
|
||||
+ nvmem-cells = <&macaddr_hard>;
|
||||
+ nvmem-cell-names = "mac-address";
|
||||
+ mac-address-increment = <5>;
|
||||
+ };
|
||||
+
|
||||
+ port@4 {
|
||||
+ reg = <4>;
|
||||
+ label = "p5";
|
||||
+ phy-handle = <&switch0phy4>;
|
||||
+ nvmem-cells = <&macaddr_hard>;
|
||||
+ nvmem-cell-names = "mac-address";
|
||||
+ mac-address-increment = <4>;
|
||||
+ };
|
||||
+
|
||||
+ port@5 {
|
||||
+ reg = <5>;
|
||||
+ label = "p4";
|
||||
+ phy-handle = <&switch0phy5>;
|
||||
+ nvmem-cells = <&macaddr_hard>;
|
||||
+ nvmem-cell-names = "mac-address";
|
||||
+ mac-address-increment = <3>;
|
||||
+ };
|
||||
+
|
||||
+ port@6 {
|
||||
+ reg = <6>;
|
||||
+ label = "p3";
|
||||
+ phy-handle = <&switch0phy6>;
|
||||
+ nvmem-cells = <&macaddr_hard>;
|
||||
+ nvmem-cell-names = "mac-address";
|
||||
+ mac-address-increment = <2>;
|
||||
+ };
|
||||
+
|
||||
+ port@7 {
|
||||
+ reg = <7>;
|
||||
+ label = "p2";
|
||||
+ phy-handle = <&switch0phy7>;
|
||||
+ nvmem-cells = <&macaddr_hard>;
|
||||
+ nvmem-cell-names = "mac-address";
|
||||
+ mac-address-increment = <1>;
|
||||
+ };
|
||||
+
|
||||
+ port@9 {
|
||||
+ reg = <9>;
|
||||
+ label = "p1";
|
||||
+ phy-mode = "sgmii";
|
||||
+ phy-handle = <&switch0phy9>;
|
||||
+ managed = "in-band-status";
|
||||
+ nvmem-cells = <&macaddr_hard>;
|
||||
+ nvmem-cell-names = "mac-address";
|
||||
+ mac-address-increment = <0>;
|
||||
+ };
|
||||
+
|
||||
+ port@a {
|
||||
+ reg = <10>;
|
||||
+ label = "sfp";
|
||||
+ phy-mode = "10gbase-r";
|
||||
+ managed = "in-band-status";
|
||||
+ sfp = <&sfp>;
|
||||
+ nvmem-cells = <&macaddr_hard>;
|
||||
+ nvmem-cell-names = "mac-address";
|
||||
+ mac-address-increment = <8>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ mdio {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ switch0phy1: switch0phy1@1 {
|
||||
+ reg = <0x1>;
|
||||
+ };
|
||||
+
|
||||
+ switch0phy2: switch0phy2@2 {
|
||||
+ reg = <0x2>;
|
||||
+ };
|
||||
+
|
||||
+ switch0phy3: switch0phy3@3 {
|
||||
+ reg = <0x3>;
|
||||
+ };
|
||||
+
|
||||
+ switch0phy4: switch0phy4@4 {
|
||||
+ reg = <0x4>;
|
||||
+ };
|
||||
+
|
||||
+ switch0phy5: switch0phy5@5 {
|
||||
+ reg = <0x5>;
|
||||
+ };
|
||||
+
|
||||
+ switch0phy6: switch0phy6@6 {
|
||||
+ reg = <0x6>;
|
||||
+ };
|
||||
+
|
||||
+ switch0phy7: switch0phy7@7 {
|
||||
+ reg = <0x7>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ mdio1 {
|
||||
+ compatible = "marvell,mv88e6xxx-mdio-external";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ switch0phy9: switch0phy9@0 {
|
||||
+ reg = <0>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&hard_config {
|
||||
+ compatible = "nvmem-cells";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ macaddr_hard: macaddr@10 {
|
||||
+ reg = <0x10 0x6>;
|
||||
+ };
|
||||
+};
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
From ddf04b2773e5316e2b645ee669d172e8a61b2d00 Mon Sep 17 00:00:00 2001
|
||||
From: Serhii Serhieiev <adron@mstnt.com>
|
||||
Date: Mon, 14 Feb 2022 06:50:56 +0200
|
||||
Subject: [PATCH 04/18] mvebu: RB5009: start to use UBI
|
||||
|
||||
Now UBI on a NAND flash drive is used as rootfs.
|
||||
The kernel is still located on a NOR flash drive in the form of a FIT image.
|
||||
|
||||
Signed-off-by: Serhii Serhieiev <adron@mstnt.com>
|
||||
---
|
||||
.../cortexa72/base-files/lib/upgrade/platform.sh | 3 +--
|
||||
.../arm64/boot/dts/marvell/armada-7040-rb5009.dts | 12 +++---------
|
||||
target/linux/mvebu/image/cortexa72.mk | 6 +-----
|
||||
3 files changed, 5 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh
|
||||
index d61e937cdc..55bdfb7264 100755
|
||||
--- a/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh
|
||||
+++ b/target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh
|
||||
@@ -36,8 +36,7 @@ platform_do_upgrade() {
|
||||
legacy_sdcard_do_upgrade "$1"
|
||||
;;
|
||||
mikrotik,rb5009)
|
||||
- PART_NAME=firmware
|
||||
- default_do_upgrade "$1"
|
||||
+ nand_do_upgrade "$1"
|
||||
;;
|
||||
*)
|
||||
default_do_upgrade "$1"
|
||||
diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
index 66c74451f0..5535f8ad89 100644
|
||||
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
@@ -129,8 +129,7 @@
|
||||
reg = <0xe0000 0x20000>;
|
||||
};
|
||||
partition@7 {
|
||||
- compatible = "denx,fit";
|
||||
- label = "firmware";
|
||||
+ label = "kernel";
|
||||
reg = <0x100000 0xf00000>;
|
||||
};
|
||||
partition@8 {
|
||||
@@ -158,13 +157,8 @@
|
||||
#size-cells = <1>;
|
||||
|
||||
partition@0 {
|
||||
- label = "RouterBoard NAND Boot";
|
||||
- reg = <0x0 0x800000>;
|
||||
- };
|
||||
-
|
||||
- partition@800000 {
|
||||
- label = "RouterBoard NAND Main";
|
||||
- reg = <0x800000 0x3f800000>;
|
||||
+ label = "ubi";
|
||||
+ reg = <0x0 0x40000000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
diff --git a/target/linux/mvebu/image/cortexa72.mk b/target/linux/mvebu/image/cortexa72.mk
|
||||
index fc4712a597..9f872d3afc 100644
|
||||
--- a/target/linux/mvebu/image/cortexa72.mk
|
||||
+++ b/target/linux/mvebu/image/cortexa72.mk
|
||||
@@ -56,17 +56,13 @@ define Device/mikrotik_rb5009
|
||||
DEVICE_DTS := armada-7040-rb5009
|
||||
DEVICE_DTS_DIR := $(DTS_DIR)/marvell
|
||||
$(call Device/FitImageLzma)
|
||||
+ $(Device/NAND-128K)
|
||||
DEVICE_VENDOR := MikroTik
|
||||
DEVICE_MODEL := RB5009
|
||||
SOC := armada-7040
|
||||
KERNEL_LOADADDR := 0x22000000
|
||||
KERNEL_INITRAMFS = $$(KERNEL)
|
||||
KERNEL_INITRAMFS_SUFFIX := -fit-uImage.elf
|
||||
- BLOCKSIZE := 64k
|
||||
- IMAGE_SIZE := 15360k
|
||||
- IMAGES := sysupgrade.bin
|
||||
- IMAGE/sysupgrade.bin := append-kernel | pad-to $$(BLOCKSIZE) | \
|
||||
- append-rootfs | pad-rootfs | check-size | append-metadata
|
||||
DEVICE_PACKAGES += kmod-i2c-gpio
|
||||
endef
|
||||
TARGET_DEVICES += mikrotik_rb5009
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From de0624d0317cd14d6eba6b239457de6f2596d1e7 Mon Sep 17 00:00:00 2001
|
||||
From: Serhii Serhieiev <adron@mstnt.com>
|
||||
Date: Tue, 15 Feb 2022 07:35:09 +0200
|
||||
Subject: [PATCH 06/18] mvebu: RB5009: remove sfp port from wan bridge
|
||||
|
||||
The presence of two bridges leads to a conflict between vlans
|
||||
and Wan ports become inoperative.
|
||||
|
||||
Signed-off-by: Serhii Serhieiev <adron@mstnt.com>
|
||||
---
|
||||
target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
|
||||
index ccb89add24..e1703029be 100644
|
||||
--- a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
|
||||
+++ b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
|
||||
@@ -33,7 +33,7 @@ marvell,armada8040-clearfog-gt-8k)
|
||||
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 eth2" "eth0 eth1"
|
||||
;;
|
||||
mikrotik,rb5009)
|
||||
- ucidef_set_interfaces_lan_wan "p2 p3 p4 p5 p6 p7 p8" "sfp p1"
|
||||
+ ucidef_set_interfaces_lan_wan "p2 p3 p4 p5 p6 p7 p8 sfp" "p1"
|
||||
;;
|
||||
*)
|
||||
ucidef_set_interface_lan "eth0"
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From daf670f8f34df3169d64f1d9e45453c3b0f61185 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marko <robimarko@gmail.com>
|
||||
Date: Mon, 14 Mar 2022 18:55:25 +0100
|
||||
Subject: [PATCH 07/18] mvebu: rb5009: add SFP GPIO pins
|
||||
|
||||
After finally being able to trace them out using a breakout lets add the
|
||||
required SFP GPIO pins.
|
||||
|
||||
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
---
|
||||
.../files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
index 5535f8ad89..0babac6f08 100644
|
||||
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
@@ -70,6 +70,11 @@
|
||||
sfp: sfp {
|
||||
compatible = "sff,sfp";
|
||||
i2c-bus = <&sfp_i2c>;
|
||||
+ mod-def0-gpios = <&cp0_gpio1 11 GPIO_ACTIVE_LOW>;
|
||||
+ los-gpios = <&cp0_gpio1 2 GPIO_ACTIVE_HIGH>;
|
||||
+ tx-fault-gpios = <&cp0_gpio1 6 GPIO_ACTIVE_HIGH>;
|
||||
+ tx-disable-gpios = <&cp0_gpio1 5 GPIO_ACTIVE_HIGH>;
|
||||
+ rate-select0-gpios = <&cp0_gpio1 3 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
From 16969a4451e09d1bd0b7aff2208d514a6bcbf011 Mon Sep 17 00:00:00 2001
|
||||
From: Stijn Segers <foss@volatilesystems.org>
|
||||
Date: Tue, 20 Sep 2022 23:05:43 +0200
|
||||
Subject: [PATCH 08/18] mvebu: rb5009: use QCA8081 label for 2.5 GbE port in
|
||||
DTS
|
||||
|
||||
The SFP+ interface is clearly labeled as such in the DTS,
|
||||
unlike the 2,5 GbE QCA8081. Label it to distinguish it from
|
||||
the GbE ports as well. Taken from robimarko's tree at
|
||||
https://github.com/robimarko/openwrt/tree/rb5009-5.15.
|
||||
---
|
||||
.../files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
index 0babac6f08..0c9742d2d8 100644
|
||||
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dts
|
||||
@@ -301,7 +301,7 @@
|
||||
reg = <9>;
|
||||
label = "p1";
|
||||
phy-mode = "sgmii";
|
||||
- phy-handle = <&switch0phy9>;
|
||||
+ phy-handle = <&qca8081>;
|
||||
managed = "in-band-status";
|
||||
nvmem-cells = <&macaddr_hard>;
|
||||
nvmem-cell-names = "mac-address";
|
||||
@@ -358,7 +358,7 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
- switch0phy9: switch0phy9@0 {
|
||||
+ qca8081: qca8081@0 {
|
||||
reg = <0>;
|
||||
};
|
||||
};
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From a4964c4d4d8367d3dbf225efaa4488af76c4e97a Mon Sep 17 00:00:00 2001
|
||||
From: Stijn Segers <foss@volatilesystems.org>
|
||||
Date: Wed, 30 Nov 2022 19:23:29 +0100
|
||||
Subject: [PATCH 09/18] mvebu: cortexa72: add missing symbol
|
||||
|
||||
---
|
||||
target/linux/mvebu/cortexa72/config-5.15 | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/target/linux/mvebu/cortexa72/config-5.15 b/target/linux/mvebu/cortexa72/config-5.15
|
||||
index 978208f1cb..27a413c624 100644
|
||||
--- a/target/linux/mvebu/cortexa72/config-5.15
|
||||
+++ b/target/linux/mvebu/cortexa72/config-5.15
|
||||
@@ -93,6 +93,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
|
||||
CONFIG_SWIOTLB=y
|
||||
CONFIG_SYSCTL_EXCEPTION_TRACE=y
|
||||
CONFIG_THREAD_INFO_IN_TASK=y
|
||||
+# CONFIG_UCLAMP_TASK is not set
|
||||
CONFIG_UNMAP_KERNEL_AT_EL0=y
|
||||
CONFIG_VMAP_STACK=y
|
||||
CONFIG_ZONE_DMA32=y
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 3363cd5d3afd161f3a6d1aa94889c36c42073216 Mon Sep 17 00:00:00 2001
|
||||
From: Stijn Segers <foss@volatilesystems.org>
|
||||
Date: Sun, 18 Sep 2022 15:46:26 +0200
|
||||
Subject: [PATCH 10/18] mvebu: cortexa72: enable SBSA Watchdog, Mikrotik RB
|
||||
Sysfs and MTD_SPLIT_FIT_FW
|
||||
|
||||
---
|
||||
target/linux/mvebu/cortexa72/config-5.15 | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/target/linux/mvebu/cortexa72/config-5.15 b/target/linux/mvebu/cortexa72/config-5.15
|
||||
index 27a413c624..0f19de730e 100644
|
||||
--- a/target/linux/mvebu/cortexa72/config-5.15
|
||||
+++ b/target/linux/mvebu/cortexa72/config-5.15
|
||||
@@ -35,6 +35,7 @@ CONFIG_ARM_GIC_V3_ITS=y
|
||||
CONFIG_ARM_GIC_V3_ITS_PCI=y
|
||||
# CONFIG_ARM_PL172_MPMC is not set
|
||||
CONFIG_ARM_PSCI_FW=y
|
||||
+CONFIG_ARM_SBSA_WATCHDOG=y
|
||||
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
|
||||
CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
|
||||
CONFIG_CPU_LITTLE_ENDIAN=y
|
||||
@@ -54,6 +55,9 @@ CONFIG_MFD_IEI_WT61P803_PUZZLE=y
|
||||
CONFIG_MFD_SYSCON=y
|
||||
CONFIG_MMC_SDHCI_XENON=y
|
||||
CONFIG_MODULES_USE_ELF_RELA=y
|
||||
+CONFIG_MIKROTIK=y
|
||||
+CONFIG_MIKROTIK_RB_SYSFS=y
|
||||
+CONFIG_MTD_SPLIT_FIT_FW=y
|
||||
CONFIG_MVEBU_GICP=y
|
||||
CONFIG_MVEBU_ICU=y
|
||||
CONFIG_MVEBU_ODMI=y
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From 97711723fb3d695c87133b2ec6ab5a9b6dea352c Mon Sep 17 00:00:00 2001
|
||||
From: Stijn Segers <foss@volatilesystems.org>
|
||||
Date: Fri, 23 Sep 2022 23:54:15 +0200
|
||||
Subject: [PATCH 11/18] mvebu: cortexa72: performance as default scheduler
|
||||
|
||||
It looks more and more like demand-based governors cause extra
|
||||
jitter, so ditch 'schedutil' and switch to 'performance'
|
||||
|
||||
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
|
||||
---
|
||||
target/linux/mvebu/cortexa72/config-5.15 | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/target/linux/mvebu/cortexa72/config-5.15 b/target/linux/mvebu/cortexa72/config-5.15
|
||||
index 0f19de730e..5d7b5594aa 100644
|
||||
--- a/target/linux/mvebu/cortexa72/config-5.15
|
||||
+++ b/target/linux/mvebu/cortexa72/config-5.15
|
||||
@@ -38,6 +38,9 @@ CONFIG_ARM_PSCI_FW=y
|
||||
CONFIG_ARM_SBSA_WATCHDOG=y
|
||||
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
|
||||
CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
|
||||
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
|
||||
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
|
||||
CONFIG_CPU_LITTLE_ENDIAN=y
|
||||
CONFIG_DMA_DIRECT_REMAP=y
|
||||
CONFIG_FRAME_POINTER=y
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
From facbe16f6981dccaf682980a2cb18790d6eae0d2 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marko <robimarko@gmail.com>
|
||||
Date: Sun, 30 Jan 2022 13:03:13 +0100
|
||||
Subject: [PATCH 12/18] mvebu: add Amethyst specific SMI setup
|
||||
|
||||
Amethyst switches require different external SMI GPIO setup then other
|
||||
switches, so provide it since RB5009 uses the external SMI bus.
|
||||
|
||||
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
---
|
||||
...x-add-Amethyst-specific-SMI-GPIO-fun.patch | 95 +++++++++++++++++++
|
||||
1 file changed, 95 insertions(+)
|
||||
create mode 100644 target/linux/mvebu/patches-5.15/706-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch
|
||||
|
||||
diff --git a/target/linux/mvebu/patches-5.15/706-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch b/target/linux/mvebu/patches-5.15/706-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch
|
||||
new file mode 100644
|
||||
index 0000000000..248b8b9d6c
|
||||
--- /dev/null
|
||||
+++ b/target/linux/mvebu/patches-5.15/706-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch
|
||||
@@ -0,0 +1,95 @@
|
||||
+From 40aa82107e7b1e7f20cbf6e644005c0c606f9f79 Mon Sep 17 00:00:00 2001
|
||||
+From: Robert Marko <robimarko@gmail.com>
|
||||
+Date: Fri, 14 Jan 2022 15:17:37 +0100
|
||||
+Subject: [PATCH] net: dsa: mv88e6xxx: add Amethyst specific SMI GPIO function
|
||||
+
|
||||
+The existing mv88e6xxx_g2_scratch_gpio_set_smi() cannot be used on the
|
||||
+88E6393X as it requires certain P0_MODE, it also checks the CPU mode
|
||||
+as it impacts the bit setting value.
|
||||
+
|
||||
+This is all irrelevant for Amethyst (MV88E6191X/6193X/6393X) as only
|
||||
+the default value of the SMI_PHY Config bit is set to CPU_MGD bootstrap
|
||||
+pin value but it can be changed without restrictions so that GPIO pins
|
||||
+9 and 10 are used as SMI pins.
|
||||
+
|
||||
+So, introduce Amethyst specific function and call that if the Amethyst
|
||||
+family wants to setup the external PHY.
|
||||
+
|
||||
+Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
+---
|
||||
+ drivers/net/dsa/mv88e6xxx/chip.c | 5 +++-
|
||||
+ drivers/net/dsa/mv88e6xxx/global2.h | 2 ++
|
||||
+ drivers/net/dsa/mv88e6xxx/global2_scratch.c | 31 +++++++++++++++++++++
|
||||
+ 3 files changed, 37 insertions(+), 1 deletion(-)
|
||||
+
|
||||
+diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||
+index 43d126628610..b3803101d612 100644
|
||||
+--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||
++++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||
+@@ -3409,7 +3409,10 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
|
||||
+
|
||||
+ if (external) {
|
||||
+ mv88e6xxx_reg_lock(chip);
|
||||
+- err = mv88e6xxx_g2_scratch_gpio_set_smi(chip, true);
|
||||
++ if (chip->info->family == MV88E6XXX_FAMILY_6393)
|
||||
++ err = mv88e6393x_g2_scratch_gpio_set_smi(chip, true);
|
||||
++ else
|
||||
++ err = mv88e6xxx_g2_scratch_gpio_set_smi(chip, true);
|
||||
+ mv88e6xxx_reg_unlock(chip);
|
||||
+
|
||||
+ if (err)
|
||||
+diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h
|
||||
+index f3e27573a386..e0649f21f28e 100644
|
||||
+--- a/drivers/net/dsa/mv88e6xxx/global2.h
|
||||
++++ b/drivers/net/dsa/mv88e6xxx/global2.h
|
||||
+@@ -370,6 +370,8 @@ extern const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops;
|
||||
+
|
||||
+ int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
|
||||
+ bool external);
|
||||
++int mv88e6393x_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
|
||||
++ bool external);
|
||||
+ int mv88e6xxx_g2_atu_stats_set(struct mv88e6xxx_chip *chip, u16 kind, u16 bin);
|
||||
+ int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip, u16 *stats);
|
||||
+
|
||||
+diff --git a/drivers/net/dsa/mv88e6xxx/global2_scratch.c b/drivers/net/dsa/mv88e6xxx/global2_scratch.c
|
||||
+index eda710062933..dc3f4645fa52 100644
|
||||
+--- a/drivers/net/dsa/mv88e6xxx/global2_scratch.c
|
||||
++++ b/drivers/net/dsa/mv88e6xxx/global2_scratch.c
|
||||
+@@ -289,3 +289,34 @@ int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
|
||||
+
|
||||
+ return mv88e6xxx_g2_scratch_write(chip, misc_cfg, val);
|
||||
+ }
|
||||
++
|
||||
++/**
|
||||
++ * mv88e6393x_g2_scratch_gpio_set_smi - set gpio muxing for external smi
|
||||
++ * @chip: chip private data
|
||||
++ * @external: set mux for external smi, or free for gpio usage
|
||||
++ *
|
||||
++ * MV88E6191X/6193X/6393X GPIO pins 9 and 10 can be configured as an
|
||||
++ * external SMI interface or as regular GPIO-s.
|
||||
++ *
|
||||
++ * They however have a different register layout then the existing
|
||||
++ * function.
|
||||
++ */
|
||||
++
|
||||
++int mv88e6393x_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
|
||||
++ bool external)
|
||||
++{
|
||||
++ int misc_cfg = MV88E6352_G2_SCRATCH_MISC_CFG;
|
||||
++ int err;
|
||||
++ u8 val;
|
||||
++
|
||||
++ err = mv88e6xxx_g2_scratch_read(chip, misc_cfg, &val);
|
||||
++ if (err)
|
||||
++ return err;
|
||||
++
|
||||
++ if (external)
|
||||
++ val &= ~MV88E6352_G2_SCRATCH_MISC_CFG_NORMALSMI;
|
||||
++ else
|
||||
++ val |= MV88E6352_G2_SCRATCH_MISC_CFG_NORMALSMI;
|
||||
++
|
||||
++ return mv88e6xxx_g2_scratch_write(chip, misc_cfg, val);
|
||||
++}
|
||||
+--
|
||||
+2.34.1
|
||||
+
|
||||
--
|
||||
2.42.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,29 +0,0 @@
|
|||
From 211bc4d66dd5b1c17ad85ed1a51bf202aa8c62b5 Mon Sep 17 00:00:00 2001
|
||||
From: Stijn Segers <foss@volatilesystems.org>
|
||||
Date: Sun, 18 Sep 2022 17:07:22 +0200
|
||||
Subject: [PATCH 14/18] mvebu: rb5009: add QCA8081 PHY support for 5.15
|
||||
|
||||
The required DT nodes area already in adrons's RB5009 DTS, so we
|
||||
only need to enable the relevant kernel symbol in 5.15.
|
||||
|
||||
Robimarko's tree use the 'qca8081' label whereas adrons's uses
|
||||
the more generic 'switch0phy9' one.
|
||||
---
|
||||
target/linux/mvebu/cortexa72/config-5.15 | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/target/linux/mvebu/cortexa72/config-5.15 b/target/linux/mvebu/cortexa72/config-5.15
|
||||
index 5d7b5594aa..29d9ee3556 100644
|
||||
--- a/target/linux/mvebu/cortexa72/config-5.15
|
||||
+++ b/target/linux/mvebu/cortexa72/config-5.15
|
||||
@@ -36,6 +36,7 @@ CONFIG_ARM_GIC_V3_ITS_PCI=y
|
||||
# CONFIG_ARM_PL172_MPMC is not set
|
||||
CONFIG_ARM_PSCI_FW=y
|
||||
CONFIG_ARM_SBSA_WATCHDOG=y
|
||||
+CONFIG_AT803X_PHY=y
|
||||
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
|
||||
CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
|
||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,154 +0,0 @@
|
|||
From e1abb1ddb7177391d9e02be985e5950d3dd233e0 Mon Sep 17 00:00:00 2001
|
||||
From: Stijn Segers <foss@volatilesystems.org>
|
||||
Date: Sat, 26 Aug 2023 12:08:34 +0200
|
||||
Subject: [PATCH 15/18] generic: backport 5.18 AT803x fiber support patch
|
||||
|
||||
Commit e1242fc3390 backported some 5.18 AT803x patches, which were
|
||||
modified to apply to 5.15. With the QCA8081 patches part of the 5.16
|
||||
merge window, those 5.18 AT803x patches need to be the actual upstream
|
||||
ones; otherwise RB5009UG just hangs at boot time.
|
||||
|
||||
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
|
||||
---
|
||||
...-01-net-phy-at803x-add-fiber-support.patch | 37 ++++++++++---------
|
||||
1 file changed, 20 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/target/linux/generic/backport-5.15/778-v5.18-01-net-phy-at803x-add-fiber-support.patch b/target/linux/generic/backport-5.15/778-v5.18-01-net-phy-at803x-add-fiber-support.patch
|
||||
index 7cb21ed00d..989dc06ca6 100644
|
||||
--- a/target/linux/generic/backport-5.15/778-v5.18-01-net-phy-at803x-add-fiber-support.patch
|
||||
+++ b/target/linux/generic/backport-5.15/778-v5.18-01-net-phy-at803x-add-fiber-support.patch
|
||||
@@ -20,9 +20,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 76 +++++++++++++++++++++++++++++++++++-----
|
||||
1 file changed, 67 insertions(+), 9 deletions(-)
|
||||
|
||||
+diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
+index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -48,6 +48,8 @@
|
||||
+@@ -51,6 +51,8 @@
|
||||
#define AT803X_INTR_ENABLE_PAGE_RECEIVED BIT(12)
|
||||
#define AT803X_INTR_ENABLE_LINK_FAIL BIT(11)
|
||||
#define AT803X_INTR_ENABLE_LINK_SUCCESS BIT(10)
|
||||
@@ -31,10 +33,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
#define AT803X_INTR_ENABLE_WIRESPEED_DOWNGRADE BIT(5)
|
||||
#define AT803X_INTR_ENABLE_POLARITY_CHANGED BIT(1)
|
||||
#define AT803X_INTR_ENABLE_WOL BIT(0)
|
||||
-@@ -82,6 +84,17 @@
|
||||
+@@ -85,7 +87,17 @@
|
||||
+ #define AT803X_DEBUG_DATA 0x1E
|
||||
|
||||
#define AT803X_MODE_CFG_MASK 0x0F
|
||||
- #define AT803X_MODE_CFG_SGMII 0x01
|
||||
+-#define AT803X_MODE_CFG_SGMII 0x01
|
||||
+#define AT803X_MODE_CFG_BASET_RGMII 0x00
|
||||
+#define AT803X_MODE_CFG_BASET_SGMII 0x01
|
||||
+#define AT803X_MODE_CFG_BX1000_RGMII_50OHM 0x02
|
||||
@@ -49,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
#define AT803X_PSSR 0x11 /*PHY-Specific Status Register*/
|
||||
#define AT803X_PSSR_MR_AN_COMPLETE 0x0200
|
||||
-@@ -199,6 +212,8 @@ struct at803x_priv {
|
||||
+@@ -283,6 +295,8 @@ struct at803x_priv {
|
||||
u16 clk_25m_mask;
|
||||
u8 smarteee_lpi_tw_1g;
|
||||
u8 smarteee_lpi_tw_100m;
|
||||
@@ -58,7 +61,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
struct regulator_dev *vddio_rdev;
|
||||
struct regulator_dev *vddh_rdev;
|
||||
struct regulator *vddio;
|
||||
-@@ -674,7 +689,33 @@ static int at803x_probe(struct phy_devic
|
||||
+@@ -784,7 +798,33 @@ static int at803x_probe(struct phy_device *phydev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -92,7 +95,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
}
|
||||
|
||||
static void at803x_remove(struct phy_device *phydev)
|
||||
-@@ -687,6 +728,7 @@ static void at803x_remove(struct phy_dev
|
||||
+@@ -797,6 +837,7 @@ static void at803x_remove(struct phy_device *phydev)
|
||||
|
||||
static int at803x_get_features(struct phy_device *phydev)
|
||||
{
|
||||
@@ -100,7 +103,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
int err;
|
||||
|
||||
err = genphy_read_abilities(phydev);
|
||||
-@@ -704,12 +746,13 @@ static int at803x_get_features(struct ph
|
||||
+@@ -823,12 +864,13 @@ static int at803x_get_features(struct phy_device *phydev)
|
||||
* As a result of that, ESTATUS_1000_XFULL is set
|
||||
* to 1 even when operating in copper TP mode.
|
||||
*
|
||||
@@ -119,7 +122,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
return 0;
|
||||
}
|
||||
|
||||
-@@ -773,15 +816,18 @@ static int at8031_pll_config(struct phy_
|
||||
+@@ -892,15 +934,18 @@ static int at8031_pll_config(struct phy_device *phydev)
|
||||
|
||||
static int at803x_config_init(struct phy_device *phydev)
|
||||
{
|
||||
@@ -141,7 +144,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
phy_unlock_mdio_bus(phydev);
|
||||
if (ret)
|
||||
return ret;
|
||||
-@@ -840,6 +886,7 @@ static int at803x_ack_interrupt(struct p
|
||||
+@@ -959,6 +1004,7 @@ static int at803x_ack_interrupt(struct phy_device *phydev)
|
||||
|
||||
static int at803x_config_intr(struct phy_device *phydev)
|
||||
{
|
||||
@@ -149,7 +152,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
int err;
|
||||
int value;
|
||||
|
||||
-@@ -856,6 +903,10 @@ static int at803x_config_intr(struct phy
|
||||
+@@ -975,6 +1021,10 @@ static int at803x_config_intr(struct phy_device *phydev)
|
||||
value |= AT803X_INTR_ENABLE_DUPLEX_CHANGED;
|
||||
value |= AT803X_INTR_ENABLE_LINK_FAIL;
|
||||
value |= AT803X_INTR_ENABLE_LINK_SUCCESS;
|
||||
@@ -160,12 +163,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
err = phy_write(phydev, AT803X_INTR_ENABLE, value);
|
||||
} else {
|
||||
-@@ -923,8 +974,12 @@ static void at803x_link_change_notify(st
|
||||
+@@ -1107,8 +1157,12 @@ static int at803x_read_specific_status(struct phy_device *phydev)
|
||||
|
||||
static int at803x_read_status(struct phy_device *phydev)
|
||||
{
|
||||
+ struct at803x_priv *priv = phydev->priv;
|
||||
- int ss, err, old_link = phydev->link;
|
||||
+ int err, old_link = phydev->link;
|
||||
|
||||
+ if (priv->is_1000basex)
|
||||
+ return genphy_c37_read_status(phydev);
|
||||
@@ -173,7 +176,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
/* Update the link, but return if there was an error */
|
||||
err = genphy_update_link(phydev);
|
||||
if (err)
|
||||
-@@ -1023,6 +1078,7 @@ static int at803x_config_mdix(struct phy
|
||||
+@@ -1162,6 +1216,7 @@ static int at803x_config_mdix(struct phy_device *phydev, u8 ctrl)
|
||||
|
||||
static int at803x_config_aneg(struct phy_device *phydev)
|
||||
{
|
||||
@@ -181,13 +184,13 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
int ret;
|
||||
|
||||
ret = at803x_config_mdix(phydev, phydev->mdix_ctrl);
|
||||
-@@ -1039,6 +1095,9 @@ static int at803x_config_aneg(struct phy
|
||||
+@@ -1178,6 +1233,9 @@ static int at803x_config_aneg(struct phy_device *phydev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
+ if (priv->is_1000basex)
|
||||
+ return genphy_c37_config_aneg(phydev);
|
||||
+
|
||||
- return genphy_config_aneg(phydev);
|
||||
- }
|
||||
-
|
||||
+ /* Do not restart auto-negotiation by setting ret to 0 defautly,
|
||||
+ * when calling __genphy_config_aneg later.
|
||||
+ */
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
From fa76a94d8c10d66f0204500e3cb86969b6ba4bd7 Mon Sep 17 00:00:00 2001
|
||||
From: Stijn Segers <foss@volatilesystems.org>
|
||||
Date: Sat, 26 Aug 2023 12:13:58 +0200
|
||||
Subject: [PATCH 16/18] generic: replace at803x null pointer fix with upstream
|
||||
one
|
||||
|
||||
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
|
||||
---
|
||||
...LL-pointer-dereference-on-AR9331-PHY.patch | 27 +++++++++++++++++--
|
||||
1 file changed, 25 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/target/linux/generic/backport-5.15/778-v5.18-03-net-phy-at803x-fix-NULL-pointer-dereference-on-AR9331-PHY.patch b/target/linux/generic/backport-5.15/778-v5.18-03-net-phy-at803x-fix-NULL-pointer-dereference-on-AR9331-PHY.patch
|
||||
index 53d6325c49..0ac5fda4a0 100644
|
||||
--- a/target/linux/generic/backport-5.15/778-v5.18-03-net-phy-at803x-fix-NULL-pointer-dereference-on-AR9331-PHY.patch
|
||||
+++ b/target/linux/generic/backport-5.15/778-v5.18-03-net-phy-at803x-fix-NULL-pointer-dereference-on-AR9331-PHY.patch
|
||||
@@ -1,8 +1,10 @@
|
||||
-From 9926de7315be3d606cc011a305ad9adb9e8e14c9 Mon Sep 17 00:00:00 2001
|
||||
+From 66fa352215e8455ba2e5f33793535795bd3e36ca Mon Sep 17 00:00:00 2001
|
||||
From: Oleksij Rempel <o.rempel@pengutronix.de>
|
||||
Date: Sat, 18 Jun 2022 14:23:33 +0200
|
||||
Subject: [PATCH] net: phy: at803x: fix NULL pointer dereference on AR9331 PHY
|
||||
|
||||
+[ Upstream commit 9926de7315be3d606cc011a305ad9adb9e8e14c9 ]
|
||||
+
|
||||
Latest kernel will explode on the PHY interrupt config, since it depends
|
||||
now on allocated priv. So, run probe to allocate priv to fix it.
|
||||
|
||||
@@ -39,13 +41,16 @@ Fixes: 3265f4218878 ("net: phy: at803x: add fiber support")
|
||||
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
|
||||
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
+Signed-off-by: Sasha Levin <sashal@kernel.org>
|
||||
---
|
||||
drivers/net/phy/at803x.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
+diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
+index 6a467e7817a6a..59fe356942b51 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -1592,6 +1592,8 @@ static struct phy_driver at803x_driver[]
|
||||
+@@ -2072,6 +2072,8 @@ static struct phy_driver at803x_driver[] = {
|
||||
/* ATHEROS AR9331 */
|
||||
PHY_ID_MATCH_EXACT(ATH9331_PHY_ID),
|
||||
.name = "Qualcomm Atheros AR9331 built-in PHY",
|
||||
@@ -54,3 +59,21 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
.suspend = at803x_suspend,
|
||||
.resume = at803x_resume,
|
||||
.flags = PHY_POLL_CABLE_TEST,
|
||||
+@@ -2087,6 +2089,8 @@ static struct phy_driver at803x_driver[] = {
|
||||
+ /* Qualcomm Atheros QCA9561 */
|
||||
+ PHY_ID_MATCH_EXACT(QCA9561_PHY_ID),
|
||||
+ .name = "Qualcomm Atheros QCA9561 built-in PHY",
|
||||
++ .probe = at803x_probe,
|
||||
++ .remove = at803x_remove,
|
||||
+ .suspend = at803x_suspend,
|
||||
+ .resume = at803x_resume,
|
||||
+ .flags = PHY_POLL_CABLE_TEST,
|
||||
+@@ -2151,6 +2155,8 @@ static struct phy_driver at803x_driver[] = {
|
||||
+ PHY_ID_MATCH_EXACT(QCA8081_PHY_ID),
|
||||
+ .name = "Qualcomm QCA8081",
|
||||
+ .flags = PHY_POLL_CABLE_TEST,
|
||||
++ .probe = at803x_probe,
|
||||
++ .remove = at803x_remove,
|
||||
+ .config_intr = at803x_config_intr,
|
||||
+ .handle_interrupt = at803x_handle_interrupt,
|
||||
+ .get_tunable = at803x_get_tunable,
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,172 +0,0 @@
|
|||
From 3202c7d6107b5c09d1995a23e8fb0625922789b3 Mon Sep 17 00:00:00 2001
|
||||
From: Stijn Segers <foss@volatilesystems.org>
|
||||
Date: Sat, 29 Apr 2023 16:35:49 +0200
|
||||
Subject: [PATCH 17/18] kernel: replace QCA8081 2.5Gb patch with upstream one
|
||||
|
||||
The v2 of this patch was merged into 5.17. Drop the old patch
|
||||
and replace it with v2.
|
||||
---
|
||||
...a8081-with-speeds-lower-than-2.5Gb-s.patch | 59 +++++++++++++
|
||||
...a8081-with-speeds-lower-than-2.5Gb-s.patch | 84 -------------------
|
||||
2 files changed, 59 insertions(+), 84 deletions(-)
|
||||
create mode 100644 target/linux/generic/backport-5.15/778-v5.17-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch
|
||||
delete mode 100644 target/linux/generic/pending-5.15/790-net-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch
|
||||
|
||||
diff --git a/target/linux/generic/backport-5.15/778-v5.17-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch b/target/linux/generic/backport-5.15/778-v5.17-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch
|
||||
new file mode 100644
|
||||
index 0000000000..1d8e7997fd
|
||||
--- /dev/null
|
||||
+++ b/target/linux/generic/backport-5.15/778-v5.17-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch
|
||||
@@ -0,0 +1,59 @@
|
||||
+From 881cc731df6af99a21622e9be25a23b81adcd10b Mon Sep 17 00:00:00 2001
|
||||
+From: Jonathan McDowell <noodles@earth.li>
|
||||
+Date: Mon, 31 Jan 2022 13:56:41 +0000
|
||||
+Subject: [PATCH] net: phy: Fix qca8081 with speeds lower than 2.5Gb/s
|
||||
+
|
||||
+A typo in qca808x_read_status means we try to set SMII mode on the port
|
||||
+rather than SGMII when the link speed is not 2.5Gb/s. This results in no
|
||||
+traffic due to the mismatch in configuration between the phy and the
|
||||
+mac.
|
||||
+
|
||||
+v2:
|
||||
+ Only change interface mode when the link is up
|
||||
+
|
||||
+Fixes: 79c7bc0521545 ("net: phy: add qca8081 read_status")
|
||||
+Cc: stable@vger.kernel.org
|
||||
+Signed-off-by: Jonathan McDowell <noodles@earth.li>
|
||||
+Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
||||
+Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
+---
|
||||
+ drivers/net/phy/at803x.c | 26 +++++++++++++-------------
|
||||
+ 1 file changed, 13 insertions(+), 13 deletions(-)
|
||||
+
|
||||
+diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
+index 5b6c0d120e09e2..29aa811af430f0 100644
|
||||
+--- a/drivers/net/phy/at803x.c
|
||||
++++ b/drivers/net/phy/at803x.c
|
||||
+@@ -1688,19 +1688,19 @@ static int qca808x_read_status(struct phy_device *phydev)
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
+- if (phydev->link && phydev->speed == SPEED_2500)
|
||||
+- phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
|
||||
+- else
|
||||
+- phydev->interface = PHY_INTERFACE_MODE_SMII;
|
||||
+-
|
||||
+- /* generate seed as a lower random value to make PHY linked as SLAVE easily,
|
||||
+- * except for master/slave configuration fault detected.
|
||||
+- * the reason for not putting this code into the function link_change_notify is
|
||||
+- * the corner case where the link partner is also the qca8081 PHY and the seed
|
||||
+- * value is configured as the same value, the link can't be up and no link change
|
||||
+- * occurs.
|
||||
+- */
|
||||
+- if (!phydev->link) {
|
||||
++ if (phydev->link) {
|
||||
++ if (phydev->speed == SPEED_2500)
|
||||
++ phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
|
||||
++ else
|
||||
++ phydev->interface = PHY_INTERFACE_MODE_SGMII;
|
||||
++ } else {
|
||||
++ /* generate seed as a lower random value to make PHY linked as SLAVE easily,
|
||||
++ * except for master/slave configuration fault detected.
|
||||
++ * the reason for not putting this code into the function link_change_notify is
|
||||
++ * the corner case where the link partner is also the qca8081 PHY and the seed
|
||||
++ * value is configured as the same value, the link can't be up and no link change
|
||||
++ * occurs.
|
||||
++ */
|
||||
+ if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR) {
|
||||
+ qca808x_phy_ms_seed_enable(phydev, false);
|
||||
+ } else {
|
||||
diff --git a/target/linux/generic/pending-5.15/790-net-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch b/target/linux/generic/pending-5.15/790-net-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch
|
||||
deleted file mode 100644
|
||||
index 2bec96d306..0000000000
|
||||
--- a/target/linux/generic/pending-5.15/790-net-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch
|
||||
+++ /dev/null
|
||||
@@ -1,84 +0,0 @@
|
||||
-From patchwork Sun Jan 30 10:25:28 2022
|
||||
-Content-Type: text/plain; charset="utf-8"
|
||||
-MIME-Version: 1.0
|
||||
-Content-Transfer-Encoding: 7bit
|
||||
-X-Patchwork-Submitter: Jonathan McDowell <noodles@earth.li>
|
||||
-X-Patchwork-Id: 12729797
|
||||
-X-Patchwork-Delegate: kuba@kernel.org
|
||||
-Return-Path: <netdev-owner@kernel.org>
|
||||
-X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
|
||||
- aws-us-west-2-korg-lkml-1.web.codeaurora.org
|
||||
-Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
|
||||
- by smtp.lore.kernel.org (Postfix) with ESMTP id 1DD5EC433EF
|
||||
- for <netdev@archiver.kernel.org>; Sun, 30 Jan 2022 10:55:25 +0000 (UTC)
|
||||
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||||
- id S240477AbiA3KzX (ORCPT <rfc822;netdev@archiver.kernel.org>);
|
||||
- Sun, 30 Jan 2022 05:55:23 -0500
|
||||
-Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36812 "EHLO
|
||||
- lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||||
- with ESMTP id S239076AbiA3KzV (ORCPT
|
||||
- <rfc822;netdev@vger.kernel.org>); Sun, 30 Jan 2022 05:55:21 -0500
|
||||
-X-Greylist: delayed 1780 seconds by postgrey-1.37 at
|
||||
- lindbergh.monkeyblade.net; Sun, 30 Jan 2022 02:55:21 PST
|
||||
-Received: from the.earth.li (the.earth.li
|
||||
- [IPv6:2a00:1098:86:4d:c0ff:ee:15:900d])
|
||||
- by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EAD9C061714;
|
||||
- Sun, 30 Jan 2022 02:55:21 -0800 (PST)
|
||||
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=earth.li;
|
||||
- s=the;
|
||||
- h=Content-Type:MIME-Version:Message-ID:Subject:Cc:To:From:Date:Sender:
|
||||
- Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date
|
||||
- :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:
|
||||
- References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:
|
||||
- List-Owner:List-Archive;
|
||||
- bh=zynwQsXAChbzANQqprwMGE7qGv9t50Oo07QICLYU9a0=; b=Z
|
||||
- K8tRPtlmUhokQQlgSXpHDLec4xjYjkTQl6oFZ1GPCWgQy2YyrGnhNmtUr8GG4q3NR0jhiKh9A2y61
|
||||
- pfq1eOPalgLqQ47fxD6JmCK8r/Sb6cXRKYN3OZ8NiEC9yhT8uxEqYe1tTUJL6RVfepb6+yFT5sp2Y
|
||||
- Osx4iy/QAibB+/8I6lhU5Tb35eztlYgE+/Mky3gIAhyM5kvHjcj4/S6i6Sw2UW27P3tuvH0JetOT6
|
||||
- OFx58fSC5azHX6pNGqx+Na+tHVtfBMkIiOpdumXyswfZDNqGvg6eXTMPsSZUJ269N1dkqPLBB7Mwz
|
||||
- jtBcyMpAaEbN7MJWuh2h0DMYmTymlFFrg==;
|
||||
-Received: from noodles by the.earth.li with local (Exim 4.94.2)
|
||||
- (envelope-from <noodles@earth.li>)
|
||||
- id 1nE7Oi-00A0XI-KA; Sun, 30 Jan 2022 10:25:28 +0000
|
||||
-Date: Sun, 30 Jan 2022 10:25:28 +0000
|
||||
-From: Jonathan McDowell <noodles@earth.li>
|
||||
-To: Andrew Lunn <andrew@lunn.ch>,
|
||||
- Heiner Kallweit <hkallweit1@gmail.com>,
|
||||
- Russell King <linux@armlinux.org.uk>,
|
||||
- David Miller <davem@davemloft.net>,
|
||||
- Jakub Kicinski <kuba@kernel.org>, Luo Jie <luoj@codeaurora.org>
|
||||
-Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
|
||||
- Robert Marko <robimarko@gmail.com>
|
||||
-Subject: [PATCH net] net: phy: Fix qca8081 with speeds lower than 2.5Gb/s
|
||||
-Message-ID: <YfZnmMteVry/A1XR@earth.li>
|
||||
-MIME-Version: 1.0
|
||||
-Content-Disposition: inline
|
||||
-Precedence: bulk
|
||||
-List-ID: <netdev.vger.kernel.org>
|
||||
-X-Mailing-List: netdev@vger.kernel.org
|
||||
-X-Patchwork-Delegate: kuba@kernel.org
|
||||
-
|
||||
-A typo in qca808x_read_status means we try to set SMII mode on the port
|
||||
-rather than SGMII when the link speed is not 2.5Gb/s. This results in no
|
||||
-traffic due to the mismatch in configuration between the phy and the
|
||||
-mac.
|
||||
-
|
||||
-Fixes: 79c7bc0521545 ("net: phy: add qca8081 read_status")
|
||||
-Signed-off-by: Jonathan McDowell <noodles@earth.li>
|
||||
----
|
||||
- drivers/net/phy/at803x.c | 2 +-
|
||||
- 1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
-
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 5b6c0d120e09..7077e3a92d31 100644
|
||||
---- a/drivers/net/phy/at803x.c
|
||||
-+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -1691,7 +1691,7 @@ static int qca808x_read_status(struct phy_device *phydev)
|
||||
- if (phydev->link && phydev->speed == SPEED_2500)
|
||||
- phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
|
||||
- else
|
||||
-- phydev->interface = PHY_INTERFACE_MODE_SMII;
|
||||
-+ phydev->interface = PHY_INTERFACE_MODE_SGMII;
|
||||
-
|
||||
- /* generate seed as a lower random value to make PHY linked as SLAVE easily,
|
||||
- * except for master/slave configuration fault detected.
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,890 +0,0 @@
|
|||
From 68fc4f780968f0f76bc6eebda329b525542ccd5e Mon Sep 17 00:00:00 2001
|
||||
From: Stijn Segers <foss@volatilesystems.org>
|
||||
Date: Sat, 26 Aug 2023 12:35:10 +0200
|
||||
Subject: [PATCH 18/18] kernel: 5.15: refresh RB5009UG patches
|
||||
|
||||
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
|
||||
---
|
||||
...eplace-AT803X_DEVICE_ADDR-with-MDIO_.patch | 9 ++------
|
||||
...-v5.16-net-phy-at803x-use-phy_modify.patch | 7 +------
|
||||
...t-phy-at803x-improve-the-WOL-feature.patch | 11 +++-------
|
||||
...-at803x-use-GENMASK-for-speed-status.patch | 7 +------
|
||||
...6-net-phy-at803x-add-QCA9561-support.patch | 21 +++++++------------
|
||||
...-phy-add-qca8081-ethernet-phy-driver.patch | 9 ++------
|
||||
...5.16-net-phy-add-qca8081-read_status.patch | 17 ++++++---------
|
||||
....16-net-phy-add-qca8081-get_features.patch | 9 ++------
|
||||
...5.16-net-phy-add-qca8081-config_aneg.patch | 9 ++------
|
||||
...tants-for-fast-retrain-related-regis.patch | 5 -----
|
||||
...-net-phy-add-genphy_c45_fast_retrain.patch | 11 ++--------
|
||||
...5.16-net-phy-add-qca8081-config_init.patch | 9 ++------
|
||||
...081-soft_reset-and-enable-master-sla.patch | 13 ++++--------
|
||||
...ca8081-master-slave-seed-value-if-li.patch | 7 +------
|
||||
...5.16-net-phy-add-qca8081-cdt-feature.patch | 15 +++++--------
|
||||
...a8081-with-speeds-lower-than-2.5Gb-s.patch | 4 +---
|
||||
...-01-net-phy-at803x-add-fiber-support.patch | 20 ++++++++----------
|
||||
...y-at803x-support-downstream-SFP-cage.patch | 4 ++--
|
||||
...LL-pointer-dereference-on-AR9331-PHY.patch | 8 +++----
|
||||
...ix-error-return-code-in-at803x_probe.patch | 2 +-
|
||||
...x-add-Amethyst-specific-SMI-GPIO-fun.patch | 15 +++----------
|
||||
21 files changed, 60 insertions(+), 152 deletions(-)
|
||||
|
||||
diff --git a/target/linux/generic/backport-5.15/765-v5.16-net-phy-at803x-replace-AT803X_DEVICE_ADDR-with-MDIO_.patch b/target/linux/generic/backport-5.15/765-v5.16-net-phy-at803x-replace-AT803X_DEVICE_ADDR-with-MDIO_.patch
|
||||
index 2b0b24e62c..5678f064bd 100644
|
||||
--- a/target/linux/generic/backport-5.15/765-v5.16-net-phy-at803x-replace-AT803X_DEVICE_ADDR-with-MDIO_.patch
|
||||
+++ b/target/linux/generic/backport-5.15/765-v5.16-net-phy-at803x-replace-AT803X_DEVICE_ADDR-with-MDIO_.patch
|
||||
@@ -14,8 +14,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 69da011e82c8..d0f41cdaec75 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
@@ -70,7 +70,6 @@
|
||||
@@ -26,7 +24,7 @@ index 69da011e82c8..d0f41cdaec75 100644
|
||||
#define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C
|
||||
#define AT803X_LOC_MAC_ADDR_16_31_OFFSET 0x804B
|
||||
#define AT803X_LOC_MAC_ADDR_32_47_OFFSET 0x804A
|
||||
-@@ -338,7 +337,8 @@ static int at803x_set_wol(struct phy_device *phydev,
|
||||
+@@ -337,7 +336,8 @@ static int at803x_set_wol(struct phy_dev
|
||||
const u8 *mac;
|
||||
int ret;
|
||||
u32 value;
|
||||
@@ -36,7 +34,7 @@ index 69da011e82c8..d0f41cdaec75 100644
|
||||
AT803X_LOC_MAC_ADDR_32_47_OFFSET,
|
||||
AT803X_LOC_MAC_ADDR_16_31_OFFSET,
|
||||
AT803X_LOC_MAC_ADDR_0_15_OFFSET,
|
||||
-@@ -354,7 +354,7 @@ static int at803x_set_wol(struct phy_device *phydev,
|
||||
+@@ -353,7 +353,7 @@ static int at803x_set_wol(struct phy_dev
|
||||
return -EINVAL;
|
||||
|
||||
for (i = 0; i < 3; i++)
|
||||
@@ -45,6 +43,3 @@ index 69da011e82c8..d0f41cdaec75 100644
|
||||
mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
|
||||
|
||||
value = phy_read(phydev, AT803X_INTR_ENABLE);
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/766-v5.16-net-phy-at803x-use-phy_modify.patch b/target/linux/generic/backport-5.15/766-v5.16-net-phy-at803x-use-phy_modify.patch
|
||||
index fbd7de0519..be1befa69d 100644
|
||||
--- a/target/linux/generic/backport-5.15/766-v5.16-net-phy-at803x-use-phy_modify.patch
|
||||
+++ b/target/linux/generic/backport-5.15/766-v5.16-net-phy-at803x-use-phy_modify.patch
|
||||
@@ -13,11 +13,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index d0f41cdaec75..cf25cd428ffa 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -357,16 +357,12 @@ static int at803x_set_wol(struct phy_device *phydev,
|
||||
+@@ -356,16 +356,12 @@ static int at803x_set_wol(struct phy_dev
|
||||
phy_write_mmd(phydev, MDIO_MMD_PCS, offsets[i],
|
||||
mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
|
||||
|
||||
@@ -36,6 +34,3 @@ index d0f41cdaec75..cf25cd428ffa 100644
|
||||
if (ret)
|
||||
return ret;
|
||||
value = phy_read(phydev, AT803X_INTR_STATUS);
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/767-v5.16-net-phy-at803x-improve-the-WOL-feature.patch b/target/linux/generic/backport-5.15/767-v5.16-net-phy-at803x-improve-the-WOL-feature.patch
|
||||
index 1109e0a81e..e6edf2ce21 100644
|
||||
--- a/target/linux/generic/backport-5.15/767-v5.16-net-phy-at803x-improve-the-WOL-feature.patch
|
||||
+++ b/target/linux/generic/backport-5.15/767-v5.16-net-phy-at803x-improve-the-WOL-feature.patch
|
||||
@@ -19,8 +19,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 45 +++++++++++++++++++++++++++++++++-------
|
||||
1 file changed, 38 insertions(+), 7 deletions(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index cf25cd428ffa..1363f12ba659 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
@@ -70,6 +70,8 @@
|
||||
@@ -32,7 +30,7 @@ index cf25cd428ffa..1363f12ba659 100644
|
||||
#define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C
|
||||
#define AT803X_LOC_MAC_ADDR_16_31_OFFSET 0x804B
|
||||
#define AT803X_LOC_MAC_ADDR_32_47_OFFSET 0x804A
|
||||
-@@ -335,8 +337,7 @@ static int at803x_set_wol(struct phy_device *phydev,
|
||||
+@@ -334,8 +336,7 @@ static int at803x_set_wol(struct phy_dev
|
||||
{
|
||||
struct net_device *ndev = phydev->attached_dev;
|
||||
const u8 *mac;
|
||||
@@ -42,7 +40,7 @@ index cf25cd428ffa..1363f12ba659 100644
|
||||
unsigned int i;
|
||||
const unsigned int offsets[] = {
|
||||
AT803X_LOC_MAC_ADDR_32_47_OFFSET,
|
||||
-@@ -357,18 +358,45 @@ static int at803x_set_wol(struct phy_device *phydev,
|
||||
+@@ -356,18 +357,45 @@ static int at803x_set_wol(struct phy_dev
|
||||
phy_write_mmd(phydev, MDIO_MMD_PCS, offsets[i],
|
||||
mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
|
||||
|
||||
@@ -91,7 +89,7 @@ index cf25cd428ffa..1363f12ba659 100644
|
||||
}
|
||||
|
||||
static void at803x_get_wol(struct phy_device *phydev,
|
||||
-@@ -379,8 +407,11 @@ static void at803x_get_wol(struct phy_device *phydev,
|
||||
+@@ -378,8 +406,11 @@ static void at803x_get_wol(struct phy_de
|
||||
wol->supported = WAKE_MAGIC;
|
||||
wol->wolopts = 0;
|
||||
|
||||
@@ -105,6 +103,3 @@ index cf25cd428ffa..1363f12ba659 100644
|
||||
wol->wolopts |= WAKE_MAGIC;
|
||||
}
|
||||
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/768-v5.16-net-phy-at803x-use-GENMASK-for-speed-status.patch b/target/linux/generic/backport-5.15/768-v5.16-net-phy-at803x-use-GENMASK-for-speed-status.patch
|
||||
index 534878a266..f8420c8d1f 100644
|
||||
--- a/target/linux/generic/backport-5.15/768-v5.16-net-phy-at803x-use-GENMASK-for-speed-status.patch
|
||||
+++ b/target/linux/generic/backport-5.15/768-v5.16-net-phy-at803x-use-GENMASK-for-speed-status.patch
|
||||
@@ -12,8 +12,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 1363f12ba659..3465f2bb6356 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
@@ -33,10 +33,10 @@
|
||||
@@ -31,7 +29,7 @@ index 1363f12ba659..3465f2bb6356 100644
|
||||
#define AT803X_SS_DUPLEX BIT(13)
|
||||
#define AT803X_SS_SPEED_DUPLEX_RESOLVED BIT(11)
|
||||
#define AT803X_SS_MDIX BIT(6)
|
||||
-@@ -994,7 +994,7 @@ static int at803x_read_status(struct phy_device *phydev)
|
||||
+@@ -985,7 +985,7 @@ static int at803x_read_status(struct phy
|
||||
if (sfc < 0)
|
||||
return sfc;
|
||||
|
||||
@@ -40,6 +38,3 @@ index 1363f12ba659..3465f2bb6356 100644
|
||||
case AT803X_SS_SPEED_10:
|
||||
phydev->speed = SPEED_10;
|
||||
break;
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/769-0-v5.16-net-phy-at803x-add-QCA9561-support.patch b/target/linux/generic/backport-5.15/769-0-v5.16-net-phy-at803x-add-QCA9561-support.patch
|
||||
index 48fbac610a..68e7eae7bb 100644
|
||||
--- a/target/linux/generic/backport-5.15/769-0-v5.16-net-phy-at803x-add-QCA9561-support.patch
|
||||
+++ b/target/linux/generic/backport-5.15/769-0-v5.16-net-phy-at803x-add-QCA9561-support.patch
|
||||
@@ -17,11 +17,9 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
drivers/net/phy/at803x.c | 23 +++++++++++++++++++++--
|
||||
1 file changed, 21 insertions(+), 2 deletions(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 3feee4d59030..ae7e1f1c59f0 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -153,6 +153,7 @@
|
||||
+@@ -161,6 +161,7 @@
|
||||
#define QCA8327_A_PHY_ID 0x004dd033
|
||||
#define QCA8327_B_PHY_ID 0x004dd034
|
||||
#define QCA8337_PHY_ID 0x004dd036
|
||||
@@ -29,7 +27,7 @@ index 3feee4d59030..ae7e1f1c59f0 100644
|
||||
#define QCA8K_PHY_ID_MASK 0xffffffff
|
||||
|
||||
#define QCA8K_DEVFLAGS_REVISION_MASK GENMASK(2, 0)
|
||||
-@@ -1237,7 +1238,8 @@ static int at803x_cable_test_get_status(struct phy_device *phydev,
|
||||
+@@ -1263,7 +1264,8 @@ static int at803x_cable_test_get_status(
|
||||
int pair, ret;
|
||||
|
||||
if (phydev->phy_id == ATH9331_PHY_ID ||
|
||||
@@ -39,7 +37,7 @@ index 3feee4d59030..ae7e1f1c59f0 100644
|
||||
pair_mask = 0x3;
|
||||
else
|
||||
pair_mask = 0xf;
|
||||
-@@ -1277,7 +1279,8 @@ static int at803x_cable_test_start(struct phy_device *phydev)
|
||||
+@@ -1303,7 +1305,8 @@ static int at803x_cable_test_start(struc
|
||||
phy_write(phydev, MII_BMCR, BMCR_ANENABLE);
|
||||
phy_write(phydev, MII_ADVERTISE, ADVERTISE_CSMA);
|
||||
if (phydev->phy_id != ATH9331_PHY_ID &&
|
||||
@@ -49,11 +47,10 @@ index 3feee4d59030..ae7e1f1c59f0 100644
|
||||
phy_write(phydev, MII_CTRL1000, 0);
|
||||
|
||||
/* we do all the (time consuming) work later */
|
||||
-@@ -1408,6 +1411,21 @@ static struct phy_driver at803x_driver[] = {
|
||||
- .read_status = at803x_read_status,
|
||||
+@@ -1516,6 +1519,21 @@ static struct phy_driver at803x_driver[]
|
||||
.soft_reset = genphy_soft_reset,
|
||||
.config_aneg = at803x_config_aneg,
|
||||
-+}, {
|
||||
+ }, {
|
||||
+ /* Qualcomm Atheros QCA9561 */
|
||||
+ PHY_ID_MATCH_EXACT(QCA9561_PHY_ID),
|
||||
+ .name = "Qualcomm Atheros QCA9561 built-in PHY",
|
||||
@@ -68,10 +65,11 @@ index 3feee4d59030..ae7e1f1c59f0 100644
|
||||
+ .read_status = at803x_read_status,
|
||||
+ .soft_reset = genphy_soft_reset,
|
||||
+ .config_aneg = at803x_config_aneg,
|
||||
- }, {
|
||||
++}, {
|
||||
/* QCA8337 */
|
||||
.phy_id = QCA8337_PHY_ID,
|
||||
-@@ -1466,6 +1484,7 @@ static struct mdio_device_id __maybe_unused atheros_tbl[] = {
|
||||
+ .phy_id_mask = QCA8K_PHY_ID_MASK,
|
||||
+@@ -1576,6 +1594,7 @@ static struct mdio_device_id __maybe_unu
|
||||
{ PHY_ID_MATCH_EXACT(QCA8337_PHY_ID) },
|
||||
{ PHY_ID_MATCH_EXACT(QCA8327_A_PHY_ID) },
|
||||
{ PHY_ID_MATCH_EXACT(QCA8327_B_PHY_ID) },
|
||||
@@ -79,6 +77,3 @@ index 3feee4d59030..ae7e1f1c59f0 100644
|
||||
{ }
|
||||
};
|
||||
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/769-v5.16-net-phy-add-qca8081-ethernet-phy-driver.patch b/target/linux/generic/backport-5.15/769-v5.16-net-phy-add-qca8081-ethernet-phy-driver.patch
|
||||
index 1aec1eae60..0b09503898 100644
|
||||
--- a/target/linux/generic/backport-5.15/769-v5.16-net-phy-add-qca8081-ethernet-phy-driver.patch
|
||||
+++ b/target/linux/generic/backport-5.15/769-v5.16-net-phy-add-qca8081-ethernet-phy-driver.patch
|
||||
@@ -16,8 +16,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 17 ++++++++++++++++-
|
||||
1 file changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 3465f2bb6356..aae27fe3e1e1 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
@@ -158,6 +158,8 @@
|
||||
@@ -38,7 +36,7 @@ index 3465f2bb6356..aae27fe3e1e1 100644
|
||||
MODULE_AUTHOR("Matus Ujhelyi");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
-@@ -1591,6 +1593,18 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -1581,6 +1583,18 @@ static struct phy_driver at803x_driver[]
|
||||
.get_stats = at803x_get_stats,
|
||||
.suspend = qca83xx_suspend,
|
||||
.resume = qca83xx_resume,
|
||||
@@ -57,7 +55,7 @@ index 3465f2bb6356..aae27fe3e1e1 100644
|
||||
}, };
|
||||
|
||||
module_phy_driver(at803x_driver);
|
||||
-@@ -1605,6 +1619,7 @@ static struct mdio_device_id __maybe_unused atheros_tbl[] = {
|
||||
+@@ -1595,6 +1609,7 @@ static struct mdio_device_id __maybe_unu
|
||||
{ PHY_ID_MATCH_EXACT(QCA8327_A_PHY_ID) },
|
||||
{ PHY_ID_MATCH_EXACT(QCA8327_B_PHY_ID) },
|
||||
{ PHY_ID_MATCH_EXACT(QCA9561_PHY_ID) },
|
||||
@@ -65,6 +63,3 @@ index 3465f2bb6356..aae27fe3e1e1 100644
|
||||
{ }
|
||||
};
|
||||
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/770-v5.16-net-phy-add-qca8081-read_status.patch b/target/linux/generic/backport-5.15/770-v5.16-net-phy-add-qca8081-read_status.patch
|
||||
index 3e7572b034..bbaf30eeb8 100644
|
||||
--- a/target/linux/generic/backport-5.15/770-v5.16-net-phy-add-qca8081-read_status.patch
|
||||
+++ b/target/linux/generic/backport-5.15/770-v5.16-net-phy-add-qca8081-read_status.patch
|
||||
@@ -17,8 +17,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 95 ++++++++++++++++++++++++++++++----------
|
||||
1 file changed, 73 insertions(+), 22 deletions(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index aae27fe3e1e1..cecf78e6c643 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
@@ -41,6 +41,9 @@
|
||||
@@ -31,7 +29,7 @@ index aae27fe3e1e1..cecf78e6c643 100644
|
||||
#define AT803X_INTR_ENABLE 0x12
|
||||
#define AT803X_INTR_ENABLE_AUTONEG_ERR BIT(15)
|
||||
#define AT803X_INTR_ENABLE_SPEED_CHANGED BIT(14)
|
||||
-@@ -959,27 +962,9 @@ static void at803x_link_change_notify(struct phy_device *phydev)
|
||||
+@@ -951,27 +954,9 @@ static void at803x_link_change_notify(st
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +59,7 @@ index aae27fe3e1e1..cecf78e6c643 100644
|
||||
|
||||
/* Read the AT8035 PHY-Specific Status register, which indicates the
|
||||
* speed and duplex that the PHY is actually using, irrespective of
|
||||
-@@ -990,13 +975,19 @@ static int at803x_read_status(struct phy_device *phydev)
|
||||
+@@ -982,13 +967,19 @@ static int at803x_read_status(struct phy
|
||||
return ss;
|
||||
|
||||
if (ss & AT803X_SS_SPEED_DUPLEX_RESOLVED) {
|
||||
@@ -83,7 +81,7 @@ index aae27fe3e1e1..cecf78e6c643 100644
|
||||
case AT803X_SS_SPEED_10:
|
||||
phydev->speed = SPEED_10;
|
||||
break;
|
||||
-@@ -1006,6 +997,9 @@ static int at803x_read_status(struct phy_device *phydev)
|
||||
+@@ -998,6 +989,9 @@ static int at803x_read_status(struct phy
|
||||
case AT803X_SS_SPEED_1000:
|
||||
phydev->speed = SPEED_1000;
|
||||
break;
|
||||
@@ -93,7 +91,7 @@ index aae27fe3e1e1..cecf78e6c643 100644
|
||||
}
|
||||
if (ss & AT803X_SS_DUPLEX)
|
||||
phydev->duplex = DUPLEX_FULL;
|
||||
-@@ -1030,6 +1024,35 @@ static int at803x_read_status(struct phy_device *phydev)
|
||||
+@@ -1022,6 +1016,35 @@ static int at803x_read_status(struct phy
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,7 +127,7 @@ index aae27fe3e1e1..cecf78e6c643 100644
|
||||
if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete)
|
||||
phy_resolve_aneg_pause(phydev);
|
||||
|
||||
-@@ -1434,6 +1457,33 @@ static int qca83xx_suspend(struct phy_device *phydev)
|
||||
+@@ -1426,6 +1449,33 @@ static int qca83xx_suspend(struct phy_de
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -163,7 +161,7 @@ index aae27fe3e1e1..cecf78e6c643 100644
|
||||
static struct phy_driver at803x_driver[] = {
|
||||
{
|
||||
/* Qualcomm Atheros AR8035 */
|
||||
-@@ -1605,6 +1655,7 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -1595,6 +1645,7 @@ static struct phy_driver at803x_driver[]
|
||||
.get_wol = at803x_get_wol,
|
||||
.suspend = genphy_suspend,
|
||||
.resume = genphy_resume,
|
||||
@@ -171,6 +169,3 @@ index aae27fe3e1e1..cecf78e6c643 100644
|
||||
}, };
|
||||
|
||||
module_phy_driver(at803x_driver);
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/771-v5.16-net-phy-add-qca8081-get_features.patch b/target/linux/generic/backport-5.15/771-v5.16-net-phy-add-qca8081-get_features.patch
|
||||
index 7cc6a79e7b..1408a2a403 100644
|
||||
--- a/target/linux/generic/backport-5.15/771-v5.16-net-phy-add-qca8081-get_features.patch
|
||||
+++ b/target/linux/generic/backport-5.15/771-v5.16-net-phy-add-qca8081-get_features.patch
|
||||
@@ -13,11 +13,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index cecf78e6c643..c4b7ac03cd35 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -744,6 +744,15 @@ static int at803x_get_features(struct phy_device *phydev)
|
||||
+@@ -726,6 +726,15 @@ static int at803x_get_features(struct ph
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
@@ -33,7 +31,7 @@ index cecf78e6c643..c4b7ac03cd35 100644
|
||||
if (phydev->drv->phy_id != ATH8031_PHY_ID)
|
||||
return 0;
|
||||
|
||||
-@@ -1653,6 +1662,7 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -1643,6 +1652,7 @@ static struct phy_driver at803x_driver[]
|
||||
.set_tunable = at803x_set_tunable,
|
||||
.set_wol = at803x_set_wol,
|
||||
.get_wol = at803x_get_wol,
|
||||
@@ -41,6 +39,3 @@ index cecf78e6c643..c4b7ac03cd35 100644
|
||||
.suspend = genphy_suspend,
|
||||
.resume = genphy_resume,
|
||||
.read_status = qca808x_read_status,
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/772-v5.16-net-phy-add-qca8081-config_aneg.patch b/target/linux/generic/backport-5.15/772-v5.16-net-phy-add-qca8081-config_aneg.patch
|
||||
index 2b9b2edbf8..ebf524bcf4 100644
|
||||
--- a/target/linux/generic/backport-5.15/772-v5.16-net-phy-add-qca8081-config_aneg.patch
|
||||
+++ b/target/linux/generic/backport-5.15/772-v5.16-net-phy-add-qca8081-config_aneg.patch
|
||||
@@ -13,11 +13,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 26 +++++++++++++++++++++++++-
|
||||
1 file changed, 25 insertions(+), 1 deletion(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index c4b7ac03cd35..70c1025e8e5d 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -1109,7 +1109,30 @@ static int at803x_config_aneg(struct phy_device *phydev)
|
||||
+@@ -1101,7 +1101,30 @@ static int at803x_config_aneg(struct phy
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -49,7 +47,7 @@ index c4b7ac03cd35..70c1025e8e5d 100644
|
||||
}
|
||||
|
||||
static int at803x_get_downshift(struct phy_device *phydev, u8 *d)
|
||||
-@@ -1663,6 +1686,7 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -1653,6 +1676,7 @@ static struct phy_driver at803x_driver[]
|
||||
.set_wol = at803x_set_wol,
|
||||
.get_wol = at803x_get_wol,
|
||||
.get_features = at803x_get_features,
|
||||
@@ -57,6 +55,3 @@ index c4b7ac03cd35..70c1025e8e5d 100644
|
||||
.suspend = genphy_suspend,
|
||||
.resume = genphy_resume,
|
||||
.read_status = qca808x_read_status,
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/773-v5-16-net-phy-add-constants-for-fast-retrain-related-regis.patch b/target/linux/generic/backport-5.15/773-v5-16-net-phy-add-constants-for-fast-retrain-related-regis.patch
|
||||
index 31c08efc85..bddbdb9f87 100644
|
||||
--- a/target/linux/generic/backport-5.15/773-v5-16-net-phy-add-constants-for-fast-retrain-related-regis.patch
|
||||
+++ b/target/linux/generic/backport-5.15/773-v5-16-net-phy-add-constants-for-fast-retrain-related-regis.patch
|
||||
@@ -15,8 +15,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
include/uapi/linux/mdio.h | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
-diff --git a/include/uapi/linux/mdio.h b/include/uapi/linux/mdio.h
|
||||
-index bdf77dffa5a4..c54e6eae5366 100644
|
||||
--- a/include/uapi/linux/mdio.h
|
||||
+++ b/include/uapi/linux/mdio.h
|
||||
@@ -53,12 +53,14 @@
|
||||
@@ -62,6 +60,3 @@ index bdf77dffa5a4..c54e6eae5366 100644
|
||||
/* 2.5G/5G Extended abilities register. */
|
||||
#define MDIO_PMA_NG_EXTABLE_2_5GBT 0x0001 /* 2.5GBASET ability */
|
||||
#define MDIO_PMA_NG_EXTABLE_5GBT 0x0002 /* 5GBASET ability */
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/774-v5.16-net-phy-add-genphy_c45_fast_retrain.patch b/target/linux/generic/backport-5.15/774-v5.16-net-phy-add-genphy_c45_fast_retrain.patch
|
||||
index 0cf37833f6..8aca8c1925 100644
|
||||
--- a/target/linux/generic/backport-5.15/774-v5.16-net-phy-add-genphy_c45_fast_retrain.patch
|
||||
+++ b/target/linux/generic/backport-5.15/774-v5.16-net-phy-add-genphy_c45_fast_retrain.patch
|
||||
@@ -13,11 +13,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
include/linux/phy.h | 1 +
|
||||
2 files changed, 35 insertions(+)
|
||||
|
||||
-diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
|
||||
-index c617dbcad6ea..b01180e1f578 100644
|
||||
--- a/drivers/net/phy/phy-c45.c
|
||||
+++ b/drivers/net/phy/phy-c45.c
|
||||
-@@ -611,6 +611,40 @@ int genphy_c45_loopback(struct phy_device *phydev, bool enable)
|
||||
+@@ -611,6 +611,40 @@ int genphy_c45_loopback(struct phy_devic
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(genphy_c45_loopback);
|
||||
|
||||
@@ -58,11 +56,9 @@ index c617dbcad6ea..b01180e1f578 100644
|
||||
struct phy_driver genphy_c45_driver = {
|
||||
.phy_id = 0xffffffff,
|
||||
.phy_id_mask = 0xffffffff,
|
||||
-diff --git a/include/linux/phy.h b/include/linux/phy.h
|
||||
-index 736e1d1a47c4..04e90423fa88 100644
|
||||
--- a/include/linux/phy.h
|
||||
+++ b/include/linux/phy.h
|
||||
-@@ -1584,6 +1584,7 @@ int genphy_c45_config_aneg(struct phy_device *phydev);
|
||||
+@@ -1624,6 +1624,7 @@ int genphy_c45_config_aneg(struct phy_de
|
||||
int genphy_c45_loopback(struct phy_device *phydev, bool enable);
|
||||
int genphy_c45_pma_resume(struct phy_device *phydev);
|
||||
int genphy_c45_pma_suspend(struct phy_device *phydev);
|
||||
@@ -70,6 +66,3 @@ index 736e1d1a47c4..04e90423fa88 100644
|
||||
|
||||
/* Generic C45 PHY driver */
|
||||
extern struct phy_driver genphy_c45_driver;
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/775-v5.16-net-phy-add-qca8081-config_init.patch b/target/linux/generic/backport-5.15/775-v5.16-net-phy-add-qca8081-config_init.patch
|
||||
index 9c27de67b3..6d2aae0d97 100644
|
||||
--- a/target/linux/generic/backport-5.15/775-v5.16-net-phy-add-qca8081-config_init.patch
|
||||
+++ b/target/linux/generic/backport-5.15/775-v5.16-net-phy-add-qca8081-config_init.patch
|
||||
@@ -15,8 +15,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 107 +++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 107 insertions(+)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 70c1025e8e5d..da710523b7c4 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
@@ -178,6 +178,51 @@
|
||||
@@ -71,7 +69,7 @@ index 70c1025e8e5d..da710523b7c4 100644
|
||||
MODULE_DESCRIPTION("Qualcomm Atheros AR803x and QCA808X PHY driver");
|
||||
MODULE_AUTHOR("Matus Ujhelyi");
|
||||
MODULE_LICENSE("GPL");
|
||||
-@@ -1489,6 +1534,67 @@ static int qca83xx_suspend(struct phy_device *phydev)
|
||||
+@@ -1481,6 +1526,67 @@ static int qca83xx_suspend(struct phy_de
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -139,7 +137,7 @@ index 70c1025e8e5d..da710523b7c4 100644
|
||||
static int qca808x_read_status(struct phy_device *phydev)
|
||||
{
|
||||
int ret;
|
||||
-@@ -1690,6 +1796,7 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -1680,6 +1786,7 @@ static struct phy_driver at803x_driver[]
|
||||
.suspend = genphy_suspend,
|
||||
.resume = genphy_resume,
|
||||
.read_status = qca808x_read_status,
|
||||
@@ -147,6 +145,3 @@ index 70c1025e8e5d..da710523b7c4 100644
|
||||
}, };
|
||||
|
||||
module_phy_driver(at803x_driver);
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/776-v5.16-net-phy-add-qca8081-soft_reset-and-enable-master-sla.patch b/target/linux/generic/backport-5.15/776-v5.16-net-phy-add-qca8081-soft_reset-and-enable-master-sla.patch
|
||||
index bf34b4bdfb..6ddbad3a06 100644
|
||||
--- a/target/linux/generic/backport-5.15/776-v5.16-net-phy-add-qca8081-soft_reset-and-enable-master-sla.patch
|
||||
+++ b/target/linux/generic/backport-5.15/776-v5.16-net-phy-add-qca8081-soft_reset-and-enable-master-sla.patch
|
||||
@@ -15,8 +15,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 48 ++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 48 insertions(+)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index da710523b7c4..1418db4f2091 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
@@ -223,6 +223,12 @@
|
||||
@@ -32,7 +30,7 @@ index da710523b7c4..1418db4f2091 100644
|
||||
MODULE_DESCRIPTION("Qualcomm Atheros AR803x and QCA808X PHY driver");
|
||||
MODULE_AUTHOR("Matus Ujhelyi");
|
||||
MODULE_LICENSE("GPL");
|
||||
-@@ -1569,6 +1575,26 @@ static int qca808x_phy_fast_retrain_config(struct phy_device *phydev)
|
||||
+@@ -1561,6 +1567,26 @@ static int qca808x_phy_fast_retrain_conf
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -59,7 +57,7 @@ index da710523b7c4..1418db4f2091 100644
|
||||
static int qca808x_config_init(struct phy_device *phydev)
|
||||
{
|
||||
int ret;
|
||||
-@@ -1590,6 +1616,16 @@ static int qca808x_config_init(struct phy_device *phydev)
|
||||
+@@ -1582,6 +1608,16 @@ static int qca808x_config_init(struct ph
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -76,7 +74,7 @@ index da710523b7c4..1418db4f2091 100644
|
||||
/* Configure adc threshold as 100mv for the link 10M */
|
||||
return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_ADC_THRESHOLD,
|
||||
QCA808X_ADC_THRESHOLD_MASK, QCA808X_ADC_THRESHOLD_100MV);
|
||||
-@@ -1622,6 +1658,17 @@ static int qca808x_read_status(struct phy_device *phydev)
|
||||
+@@ -1614,6 +1650,17 @@ static int qca808x_read_status(struct ph
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -94,7 +92,7 @@ index da710523b7c4..1418db4f2091 100644
|
||||
static struct phy_driver at803x_driver[] = {
|
||||
{
|
||||
/* Qualcomm Atheros AR8035 */
|
||||
-@@ -1797,6 +1844,7 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -1787,6 +1834,7 @@ static struct phy_driver at803x_driver[]
|
||||
.resume = genphy_resume,
|
||||
.read_status = qca808x_read_status,
|
||||
.config_init = qca808x_config_init,
|
||||
@@ -102,6 +100,3 @@ index da710523b7c4..1418db4f2091 100644
|
||||
}, };
|
||||
|
||||
module_phy_driver(at803x_driver);
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/777-v5.16-net-phy-adjust-qca8081-master-slave-seed-value-if-li.patch b/target/linux/generic/backport-5.15/777-v5.16-net-phy-adjust-qca8081-master-slave-seed-value-if-li.patch
|
||||
index 1f614e99a4..c0ed0d770a 100644
|
||||
--- a/target/linux/generic/backport-5.15/777-v5.16-net-phy-adjust-qca8081-master-slave-seed-value-if-li.patch
|
||||
+++ b/target/linux/generic/backport-5.15/777-v5.16-net-phy-adjust-qca8081-master-slave-seed-value-if-li.patch
|
||||
@@ -19,11 +19,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 1418db4f2091..00733badcda5 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -1655,6 +1655,22 @@ static int qca808x_read_status(struct phy_device *phydev)
|
||||
+@@ -1647,6 +1647,22 @@ static int qca808x_read_status(struct ph
|
||||
else
|
||||
phydev->interface = PHY_INTERFACE_MODE_SMII;
|
||||
|
||||
@@ -46,6 +44,3 @@ index 1418db4f2091..00733badcda5 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/778-v5.16-net-phy-add-qca8081-cdt-feature.patch b/target/linux/generic/backport-5.15/778-v5.16-net-phy-add-qca8081-cdt-feature.patch
|
||||
index d49fb2f566..ecdc902dfd 100644
|
||||
--- a/target/linux/generic/backport-5.15/778-v5.16-net-phy-add-qca8081-cdt-feature.patch
|
||||
+++ b/target/linux/generic/backport-5.15/778-v5.16-net-phy-add-qca8081-cdt-feature.patch
|
||||
@@ -16,8 +16,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 194 ++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 191 insertions(+), 3 deletions(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 00733badcda5..f1cbe1f6ddec 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
@@ -229,6 +229,32 @@
|
||||
@@ -53,7 +51,7 @@ index 00733badcda5..f1cbe1f6ddec 100644
|
||||
MODULE_DESCRIPTION("Qualcomm Atheros AR803x and QCA808X PHY driver");
|
||||
MODULE_AUTHOR("Matus Ujhelyi");
|
||||
MODULE_LICENSE("GPL");
|
||||
-@@ -1319,8 +1345,14 @@ static int at803x_cdt_start(struct phy_device *phydev, int pair)
|
||||
+@@ -1311,8 +1337,14 @@ static int at803x_cdt_start(struct phy_d
|
||||
{
|
||||
u16 cdt;
|
||||
|
||||
@@ -70,7 +68,7 @@ index 00733badcda5..f1cbe1f6ddec 100644
|
||||
|
||||
return phy_write(phydev, AT803X_CDT, cdt);
|
||||
}
|
||||
-@@ -1328,10 +1360,16 @@ static int at803x_cdt_start(struct phy_device *phydev, int pair)
|
||||
+@@ -1320,10 +1352,16 @@ static int at803x_cdt_start(struct phy_d
|
||||
static int at803x_cdt_wait_for_completion(struct phy_device *phydev)
|
||||
{
|
||||
int val, ret;
|
||||
@@ -88,7 +86,7 @@ index 00733badcda5..f1cbe1f6ddec 100644
|
||||
30000, 100000, true);
|
||||
|
||||
return ret < 0 ? ret : 0;
|
||||
-@@ -1685,6 +1723,153 @@ static int qca808x_soft_reset(struct phy_device *phydev)
|
||||
+@@ -1677,6 +1715,153 @@ static int qca808x_soft_reset(struct phy
|
||||
return qca808x_phy_ms_seed_enable(phydev, true);
|
||||
}
|
||||
|
||||
@@ -242,7 +240,7 @@ index 00733badcda5..f1cbe1f6ddec 100644
|
||||
static struct phy_driver at803x_driver[] = {
|
||||
{
|
||||
/* Qualcomm Atheros AR8035 */
|
||||
-@@ -1848,6 +2033,7 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -1838,6 +2023,7 @@ static struct phy_driver at803x_driver[]
|
||||
/* Qualcomm QCA8081 */
|
||||
PHY_ID_MATCH_EXACT(QCA8081_PHY_ID),
|
||||
.name = "Qualcomm QCA8081",
|
||||
@@ -250,7 +248,7 @@ index 00733badcda5..f1cbe1f6ddec 100644
|
||||
.config_intr = at803x_config_intr,
|
||||
.handle_interrupt = at803x_handle_interrupt,
|
||||
.get_tunable = at803x_get_tunable,
|
||||
-@@ -1861,6 +2047,8 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -1851,6 +2037,8 @@ static struct phy_driver at803x_driver[]
|
||||
.read_status = qca808x_read_status,
|
||||
.config_init = qca808x_config_init,
|
||||
.soft_reset = qca808x_soft_reset,
|
||||
@@ -259,6 +257,3 @@ index 00733badcda5..f1cbe1f6ddec 100644
|
||||
}, };
|
||||
|
||||
module_phy_driver(at803x_driver);
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
diff --git a/target/linux/generic/backport-5.15/778-v5.17-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch b/target/linux/generic/backport-5.15/778-v5.17-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch
|
||||
index 1d8e7997fd..566be8f958 100644
|
||||
--- a/target/linux/generic/backport-5.15/778-v5.17-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch
|
||||
+++ b/target/linux/generic/backport-5.15/778-v5.17-net-phy-Fix-qca8081-with-speeds-lower-than-2.5Gb-s.patch
|
||||
@@ -20,11 +20,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 26 +++++++++++++-------------
|
||||
1 file changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 5b6c0d120e09e2..29aa811af430f0 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -1688,19 +1688,19 @@ static int qca808x_read_status(struct phy_device *phydev)
|
||||
+@@ -1680,19 +1680,19 @@ static int qca808x_read_status(struct ph
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
diff --git a/target/linux/generic/backport-5.15/778-v5.18-01-net-phy-at803x-add-fiber-support.patch b/target/linux/generic/backport-5.15/778-v5.18-01-net-phy-at803x-add-fiber-support.patch
|
||||
index 989dc06ca6..46bbfa0cae 100644
|
||||
--- a/target/linux/generic/backport-5.15/778-v5.18-01-net-phy-at803x-add-fiber-support.patch
|
||||
+++ b/target/linux/generic/backport-5.15/778-v5.18-01-net-phy-at803x-add-fiber-support.patch
|
||||
@@ -20,8 +20,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
drivers/net/phy/at803x.c | 76 +++++++++++++++++++++++++++++++++++-----
|
||||
1 file changed, 67 insertions(+), 9 deletions(-)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
@@ -51,6 +51,8 @@
|
||||
@@ -61,7 +59,7 @@ index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
struct regulator_dev *vddio_rdev;
|
||||
struct regulator_dev *vddh_rdev;
|
||||
struct regulator *vddio;
|
||||
-@@ -784,7 +798,33 @@ static int at803x_probe(struct phy_device *phydev)
|
||||
+@@ -784,7 +798,33 @@ static int at803x_probe(struct phy_devic
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -95,7 +93,7 @@ index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
}
|
||||
|
||||
static void at803x_remove(struct phy_device *phydev)
|
||||
-@@ -797,6 +837,7 @@ static void at803x_remove(struct phy_device *phydev)
|
||||
+@@ -797,6 +837,7 @@ static void at803x_remove(struct phy_dev
|
||||
|
||||
static int at803x_get_features(struct phy_device *phydev)
|
||||
{
|
||||
@@ -103,7 +101,7 @@ index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
int err;
|
||||
|
||||
err = genphy_read_abilities(phydev);
|
||||
-@@ -823,12 +864,13 @@ static int at803x_get_features(struct phy_device *phydev)
|
||||
+@@ -823,12 +864,13 @@ static int at803x_get_features(struct ph
|
||||
* As a result of that, ESTATUS_1000_XFULL is set
|
||||
* to 1 even when operating in copper TP mode.
|
||||
*
|
||||
@@ -122,7 +120,7 @@ index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
-@@ -892,15 +934,18 @@ static int at8031_pll_config(struct phy_device *phydev)
|
||||
+@@ -892,15 +934,18 @@ static int at8031_pll_config(struct phy_
|
||||
|
||||
static int at803x_config_init(struct phy_device *phydev)
|
||||
{
|
||||
@@ -144,7 +142,7 @@ index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
phy_unlock_mdio_bus(phydev);
|
||||
if (ret)
|
||||
return ret;
|
||||
-@@ -959,6 +1004,7 @@ static int at803x_ack_interrupt(struct phy_device *phydev)
|
||||
+@@ -959,6 +1004,7 @@ static int at803x_ack_interrupt(struct p
|
||||
|
||||
static int at803x_config_intr(struct phy_device *phydev)
|
||||
{
|
||||
@@ -152,7 +150,7 @@ index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
int err;
|
||||
int value;
|
||||
|
||||
-@@ -975,6 +1021,10 @@ static int at803x_config_intr(struct phy_device *phydev)
|
||||
+@@ -975,6 +1021,10 @@ static int at803x_config_intr(struct phy
|
||||
value |= AT803X_INTR_ENABLE_DUPLEX_CHANGED;
|
||||
value |= AT803X_INTR_ENABLE_LINK_FAIL;
|
||||
value |= AT803X_INTR_ENABLE_LINK_SUCCESS;
|
||||
@@ -163,7 +161,7 @@ index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
|
||||
err = phy_write(phydev, AT803X_INTR_ENABLE, value);
|
||||
} else {
|
||||
-@@ -1107,8 +1157,12 @@ static int at803x_read_specific_status(struct phy_device *phydev)
|
||||
+@@ -1107,8 +1157,12 @@ static int at803x_read_specific_status(s
|
||||
|
||||
static int at803x_read_status(struct phy_device *phydev)
|
||||
{
|
||||
@@ -176,7 +174,7 @@ index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
/* Update the link, but return if there was an error */
|
||||
err = genphy_update_link(phydev);
|
||||
if (err)
|
||||
-@@ -1162,6 +1216,7 @@ static int at803x_config_mdix(struct phy_device *phydev, u8 ctrl)
|
||||
+@@ -1162,6 +1216,7 @@ static int at803x_config_mdix(struct phy
|
||||
|
||||
static int at803x_config_aneg(struct phy_device *phydev)
|
||||
{
|
||||
@@ -184,7 +182,7 @@ index 052b2eb9f101f..3f3d4c164df40 100644
|
||||
int ret;
|
||||
|
||||
ret = at803x_config_mdix(phydev, phydev->mdix_ctrl);
|
||||
-@@ -1178,6 +1233,9 @@ static int at803x_config_aneg(struct phy_device *phydev)
|
||||
+@@ -1178,6 +1233,9 @@ static int at803x_config_aneg(struct phy
|
||||
return ret;
|
||||
}
|
||||
|
||||
diff --git a/target/linux/generic/backport-5.15/778-v5.18-02-net-phy-at803x-support-downstream-SFP-cage.patch b/target/linux/generic/backport-5.15/778-v5.18-02-net-phy-at803x-support-downstream-SFP-cage.patch
|
||||
index 8393cb32e8..3205cd5b5c 100644
|
||||
--- a/target/linux/generic/backport-5.15/778-v5.18-02-net-phy-at803x-support-downstream-SFP-cage.patch
|
||||
+++ b/target/linux/generic/backport-5.15/778-v5.18-02-net-phy-at803x-support-downstream-SFP-cage.patch
|
||||
@@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
#include <dt-bindings/net/qca-ar803x.h>
|
||||
|
||||
#define AT803X_SPECIFIC_FUNCTION_CONTROL 0x10
|
||||
-@@ -555,6 +557,55 @@ static int at8031_register_regulators(st
|
||||
+@@ -664,6 +666,55 @@ static int at8031_register_regulators(st
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
static int at803x_parse_dt(struct phy_device *phydev)
|
||||
{
|
||||
struct device_node *node = phydev->mdio.dev.of_node;
|
||||
-@@ -662,6 +713,11 @@ static int at803x_parse_dt(struct phy_de
|
||||
+@@ -771,6 +822,11 @@ static int at803x_parse_dt(struct phy_de
|
||||
phydev_err(phydev, "failed to get VDDIO regulator\n");
|
||||
return PTR_ERR(priv->vddio);
|
||||
}
|
||||
diff --git a/target/linux/generic/backport-5.15/778-v5.18-03-net-phy-at803x-fix-NULL-pointer-dereference-on-AR9331-PHY.patch b/target/linux/generic/backport-5.15/778-v5.18-03-net-phy-at803x-fix-NULL-pointer-dereference-on-AR9331-PHY.patch
|
||||
index 0ac5fda4a0..5829b05d2c 100644
|
||||
--- a/target/linux/generic/backport-5.15/778-v5.18-03-net-phy-at803x-fix-NULL-pointer-dereference-on-AR9331-PHY.patch
|
||||
+++ b/target/linux/generic/backport-5.15/778-v5.18-03-net-phy-at803x-fix-NULL-pointer-dereference-on-AR9331-PHY.patch
|
||||
@@ -46,11 +46,9 @@ Signed-off-by: Sasha Levin <sashal@kernel.org>
|
||||
drivers/net/phy/at803x.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
-diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
|
||||
-index 6a467e7817a6a..59fe356942b51 100644
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -2072,6 +2072,8 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -2059,6 +2059,8 @@ static struct phy_driver at803x_driver[]
|
||||
/* ATHEROS AR9331 */
|
||||
PHY_ID_MATCH_EXACT(ATH9331_PHY_ID),
|
||||
.name = "Qualcomm Atheros AR9331 built-in PHY",
|
||||
@@ -59,7 +57,7 @@ index 6a467e7817a6a..59fe356942b51 100644
|
||||
.suspend = at803x_suspend,
|
||||
.resume = at803x_resume,
|
||||
.flags = PHY_POLL_CABLE_TEST,
|
||||
-@@ -2087,6 +2089,8 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -2074,6 +2076,8 @@ static struct phy_driver at803x_driver[]
|
||||
/* Qualcomm Atheros QCA9561 */
|
||||
PHY_ID_MATCH_EXACT(QCA9561_PHY_ID),
|
||||
.name = "Qualcomm Atheros QCA9561 built-in PHY",
|
||||
@@ -68,7 +66,7 @@ index 6a467e7817a6a..59fe356942b51 100644
|
||||
.suspend = at803x_suspend,
|
||||
.resume = at803x_resume,
|
||||
.flags = PHY_POLL_CABLE_TEST,
|
||||
-@@ -2151,6 +2155,8 @@ static struct phy_driver at803x_driver[] = {
|
||||
+@@ -2138,6 +2142,8 @@ static struct phy_driver at803x_driver[]
|
||||
PHY_ID_MATCH_EXACT(QCA8081_PHY_ID),
|
||||
.name = "Qualcomm QCA8081",
|
||||
.flags = PHY_POLL_CABLE_TEST,
|
||||
diff --git a/target/linux/generic/backport-5.15/778-v5.18-04-net-phy-at803x-fix-error-return-code-in-at803x_probe.patch b/target/linux/generic/backport-5.15/778-v5.18-04-net-phy-at803x-fix-error-return-code-in-at803x_probe.patch
|
||||
index cdae5b4ca4..f3aaff34ae 100644
|
||||
--- a/target/linux/generic/backport-5.15/778-v5.18-04-net-phy-at803x-fix-error-return-code-in-at803x_probe.patch
|
||||
+++ b/target/linux/generic/backport-5.15/778-v5.18-04-net-phy-at803x-fix-error-return-code-in-at803x_probe.patch
|
||||
@@ -17,7 +17,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
|
||||
--- a/drivers/net/phy/at803x.c
|
||||
+++ b/drivers/net/phy/at803x.c
|
||||
-@@ -749,8 +749,10 @@ static int at803x_probe(struct phy_devic
|
||||
+@@ -858,8 +858,10 @@ static int at803x_probe(struct phy_devic
|
||||
int ccr = phy_read(phydev, AT803X_REG_CHIP_CONFIG);
|
||||
int mode_cfg;
|
||||
|
||||
diff --git a/target/linux/mvebu/patches-5.15/706-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch b/target/linux/mvebu/patches-5.15/706-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch
|
||||
index 248b8b9d6c..e5c605c40f 100644
|
||||
--- a/target/linux/mvebu/patches-5.15/706-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch
|
||||
+++ b/target/linux/mvebu/patches-5.15/706-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch
|
||||
@@ -22,11 +22,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
drivers/net/dsa/mv88e6xxx/global2_scratch.c | 31 +++++++++++++++++++++
|
||||
3 files changed, 37 insertions(+), 1 deletion(-)
|
||||
|
||||
-diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||
-index 43d126628610..b3803101d612 100644
|
||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||
-@@ -3409,7 +3409,10 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
|
||||
+@@ -3424,7 +3424,10 @@ static int mv88e6xxx_mdio_register(struc
|
||||
|
||||
if (external) {
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
@@ -38,11 +36,9 @@ index 43d126628610..b3803101d612 100644
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
|
||||
if (err)
|
||||
-diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h
|
||||
-index f3e27573a386..e0649f21f28e 100644
|
||||
--- a/drivers/net/dsa/mv88e6xxx/global2.h
|
||||
+++ b/drivers/net/dsa/mv88e6xxx/global2.h
|
||||
-@@ -370,6 +370,8 @@ extern const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops;
|
||||
+@@ -371,6 +371,8 @@ extern const struct mv88e6xxx_gpio_ops m
|
||||
|
||||
int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
|
||||
bool external);
|
||||
@@ -51,11 +47,9 @@ index f3e27573a386..e0649f21f28e 100644
|
||||
int mv88e6xxx_g2_atu_stats_set(struct mv88e6xxx_chip *chip, u16 kind, u16 bin);
|
||||
int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip, u16 *stats);
|
||||
|
||||
-diff --git a/drivers/net/dsa/mv88e6xxx/global2_scratch.c b/drivers/net/dsa/mv88e6xxx/global2_scratch.c
|
||||
-index eda710062933..dc3f4645fa52 100644
|
||||
--- a/drivers/net/dsa/mv88e6xxx/global2_scratch.c
|
||||
+++ b/drivers/net/dsa/mv88e6xxx/global2_scratch.c
|
||||
-@@ -289,3 +289,34 @@ int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
|
||||
+@@ -289,3 +289,34 @@ int mv88e6xxx_g2_scratch_gpio_set_smi(st
|
||||
|
||||
return mv88e6xxx_g2_scratch_write(chip, misc_cfg, val);
|
||||
}
|
||||
@@ -90,6 +84,3 @@ index eda710062933..dc3f4645fa52 100644
|
||||
+
|
||||
+ return mv88e6xxx_g2_scratch_write(chip, misc_cfg, val);
|
||||
+}
|
||||
---
|
||||
-2.34.1
|
||||
-
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
From 4540ecce14d98e8c06a9bff6307bfaaf4074f99e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||
Date: Sat, 18 Nov 2023 23:30:43 +0100
|
||||
Subject: [PATCH] mvpp2: enable dsa parser entry
|
||||
|
||||
---
|
||||
.../999-mvpp2-enable-dsa-parser-entry.patch | 22 +++++++++++++++++++
|
||||
1 file changed, 22 insertions(+)
|
||||
create mode 100644 target/linux/mvebu/patches-5.15/999-mvpp2-enable-dsa-parser-entry.patch
|
||||
|
||||
diff --git a/target/linux/mvebu/patches-5.15/999-mvpp2-enable-dsa-parser-entry.patch b/target/linux/mvebu/patches-5.15/999-mvpp2-enable-dsa-parser-entry.patch
|
||||
new file mode 100644
|
||||
index 0000000000..fe5c2657d9
|
||||
--- /dev/null
|
||||
+++ b/target/linux/mvebu/patches-5.15/999-mvpp2-enable-dsa-parser-entry.patch
|
||||
@@ -0,0 +1,22 @@
|
||||
+--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
|
||||
++++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
|
||||
+@@ -4757,7 +4757,7 @@ static int mvpp2_open(struct net_device
|
||||
+ netdev_err(dev, "mvpp2_prs_mac_da_accept own addr failed\n");
|
||||
+ return err;
|
||||
+ }
|
||||
+- err = mvpp2_prs_tag_mode_set(port->priv, port->id, MVPP2_TAG_TYPE_MH);
|
||||
++ err = mvpp2_prs_tag_mode_set(port->priv, port->id, MVPP2_TAG_TYPE_DSA);
|
||||
+ if (err) {
|
||||
+ netdev_err(dev, "mvpp2_prs_tag_mode_set failed\n");
|
||||
+ return err;
|
||||
+--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
|
||||
++++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
|
||||
+@@ -1260,7 +1260,7 @@ static void mvpp2_prs_dsa_init(struct mv
|
||||
+
|
||||
+ /* Shift 0 bytes */
|
||||
+ mvpp2_prs_sram_shift_set(&pe, 0, MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD);
|
||||
+- mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_MAC);
|
||||
++ mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_DSA);
|
||||
+
|
||||
+ /* Clear all sram ai bits for next iteration */
|
||||
+ mvpp2_prs_sram_ai_update(&pe, 0, MVPP2_PRS_SRAM_AI_MASK);
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From fddf68b6c559df4e7b8561ea57d6e27bc4b0a8db Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||
Date: Mon, 20 Nov 2023 21:28:16 +0100
|
||||
Subject: [PATCH] mvpp2: vlan after dsa
|
||||
|
||||
---
|
||||
.../linux/mvebu/patches-5.15/999-vlan-after-dsa.patch | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
create mode 100644 target/linux/mvebu/patches-5.15/999-vlan-after-dsa.patch
|
||||
|
||||
diff --git a/target/linux/mvebu/patches-5.15/999-vlan-after-dsa.patch b/target/linux/mvebu/patches-5.15/999-vlan-after-dsa.patch
|
||||
new file mode 100644
|
||||
index 0000000000..d6f241ca08
|
||||
--- /dev/null
|
||||
+++ b/target/linux/mvebu/patches-5.15/999-vlan-after-dsa.patch
|
||||
@@ -0,0 +1,11 @@
|
||||
+--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
|
||||
++++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
|
||||
+@@ -576,7 +576,7 @@ static void mvpp2_prs_dsa_tag_set(struct
|
||||
+ /* Set result info bits to 'no vlans' */
|
||||
+ mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_VLAN_NONE,
|
||||
+ MVPP2_PRS_RI_VLAN_MASK);
|
||||
+- mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_L2);
|
||||
++ mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_VLAN);
|
||||
+ }
|
||||
+
|
||||
+ /* Mask all ports */
|
||||
--
|
||||
2.42.1
|
||||
|
||||
181
buildscript
181
buildscript
|
|
@ -1,43 +1,43 @@
|
|||
#!/bin/bash
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
set -e
|
||||
set -o pipefail
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
|
||||
builddir=./build
|
||||
|
||||
# OpenWrt: package hashes correspond to core repo version
|
||||
OPENWRTREV="v23.05.3"
|
||||
PACKAGEREV="063b2393cbc3e5aab9d2b40b2911cab1c3967c59"
|
||||
ROUTINGREV="648753932d5a7deff7f2bdb33c000018a709ad84"
|
||||
OPENWRTREV="v19.07.5"
|
||||
OPENWRTURL="https://git.openwrt.org/openwrt/openwrt.git"
|
||||
PACKAGEREV="2974079d3db786fe5da00c10f1d80e79b0112093" # openwrt-19.07.5
|
||||
PACKAGEURL="https://git.openwrt.org/feed/packages.git"
|
||||
|
||||
# Gluon packages: master from 2020-02-04
|
||||
GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"
|
||||
|
||||
OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl micrond mtr bmon htop sysstat procps-ng procps-ng-vmstat"
|
||||
ROUTING_PKGS="kmod-batman-adv batctl alfred babeld bird2"
|
||||
GLUON_PKGS="simple-tc uradvd"
|
||||
|
||||
FFF_VARIANTS="node layer3"
|
||||
|
||||
OPENWRTURL="https://git.freifunk-franken.de/mirror/openwrt.git"
|
||||
|
||||
## Feed definition [0]: name aka directory, [1]: url, [2]: revision
|
||||
## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches
|
||||
|
||||
#official openwrt packages
|
||||
OPENWRT=(openwrt
|
||||
https://git.freifunk-franken.de/mirror/openwrt-packages.git
|
||||
$PACKAGEURL
|
||||
$PACKAGEREV)
|
||||
OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl micrond mtr bmon"
|
||||
|
||||
#gluon packages
|
||||
## Be careful: FFF uses COMPAT_VERSION 15 as default at the moment.
|
||||
## See http://www.open-mesh.org/projects/batman-adv/wiki/Compatversion
|
||||
GLUON=(gluon
|
||||
https://github.com/freifunk-gluon/packages.git
|
||||
$GLUONREV)
|
||||
https://github.com/freifunk-gluon/packages.git
|
||||
12e41d0ff07ec54bbd67a31ab50d12ca04f2238c) # 2020-02-04
|
||||
GLUON_PKGS="simple-tc uradvd"
|
||||
|
||||
#official openwrt routing packages
|
||||
ROUTING=(routing
|
||||
https://git.freifunk-franken.de/mirror/openwrt-routing.git
|
||||
$ROUTINGREV)
|
||||
https://git.openwrt.org/feed/routing.git
|
||||
02b4dbfcb7b8f8b566940847d22d5a6f229d2e66) # openwrt-19.07.5
|
||||
ROUTING_PKGS="kmod-batman-adv batctl alfred babeld"
|
||||
|
||||
FFF=(fff)
|
||||
FFF_PKGS="-a"
|
||||
|
|
@ -54,36 +54,37 @@ checkout_git(){
|
|||
|
||||
local MYGIT="git -C $DIRECTORY"
|
||||
echo "checking out $REPO_URL to $DIRECTORY in version $COMMITID"
|
||||
if ! $MYGIT remote -v | grep -q "$REPO_URL"; then
|
||||
echo "we need to do a fresh clone"
|
||||
|
||||
/bin/rm -rf -- "$DIRECTORY"
|
||||
mkdir "$DIRECTORY"
|
||||
|
||||
$MYGIT clone --progress --no-checkout --filter=blob:none "$REPO_URL" .
|
||||
$MYGIT config gc.auto 0
|
||||
$MYGIT config advice.detachedHead 0
|
||||
if [ -d "$DIRECTORY" ]; then
|
||||
if $MYGIT remote -v | grep -q "$REPO_URL" ; then
|
||||
echo "Right remote detected"
|
||||
if ! $MYGIT checkout "$COMMITID" ; then
|
||||
echo "commitid not found trying to fetch new commits"
|
||||
$MYGIT pull && $MYGIT checkout "$COMMITID"
|
||||
fi
|
||||
else
|
||||
echo "wrong remote or not an git repo at all -> deleting whole directory"
|
||||
/bin/rm -rf "$DIRECTORY"
|
||||
#needs to be without -C!!!
|
||||
git clone "$REPO_URL" "$DIRECTORY"
|
||||
$MYGIT checkout "$COMMITID"
|
||||
fi
|
||||
else
|
||||
echo "We need to do a fresh checkout"
|
||||
#needs to be without -C!!!
|
||||
git clone "$REPO_URL" "$DIRECTORY"
|
||||
$MYGIT checkout "$COMMITID"
|
||||
fi
|
||||
|
||||
echo
|
||||
|
||||
# Remove untracked files
|
||||
$MYGIT clean -f -d
|
||||
# Select desired commit and remove local changes (-f)
|
||||
if ! $MYGIT checkout --progress --force "$COMMITID" ; then
|
||||
echo "commitid not found trying to fetch new commits"
|
||||
$MYGIT fetch --all && $MYGIT checkout "$COMMITID"
|
||||
fi
|
||||
|
||||
echo
|
||||
}
|
||||
|
||||
get_source() {
|
||||
#Get the OpenWrt main repo
|
||||
checkout_git $builddir $OPENWRTURL $OPENWRTREV
|
||||
test -d src || mkdir src
|
||||
cd src
|
||||
|
||||
test -d src/packages || mkdir -p src/packages
|
||||
cd src/packages
|
||||
#Get the OpenWrt Core Source for Firmware
|
||||
checkout_git openwrt $OPENWRTURL $OPENWRTREV
|
||||
|
||||
test -d packages || mkdir packages
|
||||
cd packages
|
||||
|
||||
#checkout needed package feeds
|
||||
for FEEDVAR in "${FEEDS[@]}" ; do
|
||||
|
|
@ -123,11 +124,31 @@ patch_target() {
|
|||
prepare() {
|
||||
get_source
|
||||
|
||||
test -d $builddir || mkdir $builddir
|
||||
|
||||
/bin/rm -rf "$builddir"
|
||||
cp -a src/openwrt "$builddir"
|
||||
|
||||
patch_target
|
||||
|
||||
# apply variant to ensure the included file "variant.mk"
|
||||
# exists in builddir.
|
||||
apply_variant
|
||||
|
||||
#saves ~200MB for each build
|
||||
test -d ./src/dl || mkdir ./src/dl
|
||||
ln -s ../src/dl "$builddir"/dl
|
||||
|
||||
update_feeds
|
||||
}
|
||||
|
||||
apply_variant() {
|
||||
# set the variant for this build
|
||||
cp "./src/packages/fff/fff/variant-$(cat selected_variant).mk" "$builddir"/variant.mk
|
||||
# force the reevaluation of this Makefile to make note of the new variant
|
||||
touch ./src/packages/fff/fff/Makefile
|
||||
}
|
||||
|
||||
update_feeds() {
|
||||
## generate own feeds.conf
|
||||
#this local variable should be globally configure variable used in get_source and here
|
||||
|
|
@ -162,6 +183,8 @@ update_feeds() {
|
|||
}
|
||||
|
||||
prebuild() {
|
||||
apply_variant
|
||||
|
||||
#create filesdir for our config
|
||||
/bin/rm -rf "$builddir"/files
|
||||
mkdir "$builddir"/files
|
||||
|
|
@ -169,6 +192,13 @@ prebuild() {
|
|||
cp -r ./bsp/default/root_file_system/* "$builddir"/files/
|
||||
cp ./bsp/"$machine"/.config "$builddir"/.config
|
||||
|
||||
while IFS= read -r -d '' template
|
||||
do
|
||||
echo "Translating $template .."
|
||||
$tpl_translate "$template" > "$(dirname "$template")"/"$(basename "$template" .tpl)"
|
||||
/bin/rm "$template"
|
||||
done < <(find "${builddir}/files" -name '*.tpl' -print0)
|
||||
|
||||
#insert actual firware version informations into release file
|
||||
variant=$(cat selected_variant)
|
||||
version=$(git describe --tags --dirty)
|
||||
|
|
@ -179,9 +209,6 @@ prebuild() {
|
|||
version="$variant-$version"
|
||||
fi
|
||||
|
||||
# select variant packages
|
||||
echo "CONFIG_PACKAGE_fff-${variant}=y" >> "$builddir"/.config
|
||||
|
||||
{
|
||||
echo "FIRMWARE_VERSION=\"$version\""
|
||||
echo "VARIANT=\"$variant\""
|
||||
|
|
@ -203,23 +230,17 @@ build() {
|
|||
|
||||
opath=$(pwd)
|
||||
cd "$builddir"
|
||||
cpus=$(nproc)
|
||||
cpus=$(grep -c processor /proc/cpuinfo)
|
||||
|
||||
case "$1" in
|
||||
"debug")
|
||||
if [ -n "$2" ]; then
|
||||
make V=99 -j $2
|
||||
else
|
||||
make V=99
|
||||
fi
|
||||
make V=99
|
||||
;;
|
||||
"fast")
|
||||
[ -n "$2" ] && threads=$2 || threads=$((cpus*2))
|
||||
ionice -c 2 -- nice -n 1 -- make -j $threads
|
||||
ionice -c 2 -- nice -n 1 -- make -j $((cpus*2))
|
||||
;;
|
||||
*)
|
||||
[ -n "$2" ] && threads=$2 || threads=$((cpus+1))
|
||||
ionice -c 3 -- nice -n 10 -- make -j $threads
|
||||
ionice -c 3 -- nice -n 10 -- make -j $((cpus+1))
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -285,13 +306,7 @@ cp_firmware() {
|
|||
filename_build=${f##*/}
|
||||
filename_build=${filename_build//openwrt/fff-${version}}
|
||||
filename_build=${filename_build//squashfs-/}
|
||||
|
||||
# The x86 OpenWrt target does not have a device name,
|
||||
# so keep the target and subtarget for identification.
|
||||
if [ "$chipset" != "x86" ]; then
|
||||
filename_build=${filename_build//${chipset}-/}
|
||||
filename_build=${filename_build//${subtarget}-/}
|
||||
fi
|
||||
filename_build=${filename_build//${chipset}-${subtarget}-/}
|
||||
cp "$f" "$imagedestpath/$filename_build"
|
||||
done
|
||||
done
|
||||
|
|
@ -317,7 +332,8 @@ buildrelease() {
|
|||
fi
|
||||
|
||||
cd bin/$variant
|
||||
for binary in *.bin *.img *.img.gz *.tar; do
|
||||
for binary in *.bin; do
|
||||
md5sum "$binary" > ./"$binary".md5
|
||||
sha256sum "$binary" > ./"$binary".sha256
|
||||
done
|
||||
echo -e "VERSION:$version" > release.nfo
|
||||
|
|
@ -325,7 +341,7 @@ buildrelease() {
|
|||
}
|
||||
|
||||
clean() {
|
||||
/bin/rm -rf bin $builddir
|
||||
/bin/rm -rf bin $builddir src/openwrt
|
||||
|
||||
# remove downloaded package feeds
|
||||
for FEEDVAR in "${FEEDS[@]}" ; do
|
||||
|
|
@ -381,12 +397,8 @@ buildall() {
|
|||
}
|
||||
|
||||
if [ "$(/usr/bin/id -u)" -eq 0 ]; then
|
||||
TPUT=$(command -v tput || echo ":")
|
||||
textWarn="$($TPUT bold setaf 1)" # bold + red
|
||||
textReset="$($TPUT sgr0)" # be a good citizen
|
||||
|
||||
printf "${textWarn}WARNING: buildscript is running as root${textReset}\n"
|
||||
printf "${textWarn}WARNING: build may fail at a later stage${textReset}\n"
|
||||
echo "don't run buildscript as root"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$1" != "selectbsp" -a "$1" != "selectvariant" ]; then
|
||||
|
|
@ -424,13 +436,14 @@ case "$1" in
|
|||
;;
|
||||
"selectvariant")
|
||||
if [ "$2" = "help" ] || [ "$2" = "" ]; then
|
||||
echo "Select a build variant:"
|
||||
echo "Select a build varaint:"
|
||||
echo
|
||||
echo "Usage: $0 $1 <name of variant>"
|
||||
echo "available variants: $FFF_VARIANTS"
|
||||
echo "available variants: "
|
||||
/bin/ls src/packages/fff/fff/variant-*.mk | sed 's#.*/variant-\(.*\)\.mk#\1#g'
|
||||
echo
|
||||
else
|
||||
if ! echo "$FFF_VARIANTS" | grep -q "\b$2\b"; then
|
||||
if [ ! -f "src/packages/fff/fff/variant-$2.mk" ]; then
|
||||
echo "Could not find variant $2"
|
||||
else
|
||||
setVariant $2
|
||||
|
|
@ -453,13 +466,13 @@ case "$1" in
|
|||
"build")
|
||||
if [ "$2" = "help" ] || [ "$2" = "x" ]; then
|
||||
echo "This option compiles the firmware"
|
||||
echo "Normally the build uses lower IO and System priorities, "
|
||||
echo "Normaly the build uses lower IO and System priorities, "
|
||||
echo "you can append \"fast\" option, to use normal user priorities"
|
||||
echo
|
||||
echo "Usage: $0 $1 [fast|debug] [numthreads]"
|
||||
echo "Usage: $0 $1 [fast|debug]"
|
||||
echo
|
||||
else
|
||||
build "$2" "$3"
|
||||
build "$2"
|
||||
fi
|
||||
;;
|
||||
"config")
|
||||
|
|
|
|||
|
|
@ -1,10 +1,16 @@
|
|||
From 8e7de199282ba76a94a1b4370ac7712325b81fc2 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Langhammer <rlanghammer@web.de>
|
||||
Date: Mon, 13 Nov 2017 21:04:55 +0100
|
||||
Subject: fastd_generate_key_from_urandom
|
||||
Subject: [PATCH] fastd_generate_key_from_urandom
|
||||
|
||||
---
|
||||
net/fastd/patches/001-generate_key_from_urandom.patch | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
create mode 100644 net/fastd/patches/001-generate_key_from_urandom.patch
|
||||
|
||||
diff --git a/net/fastd/patches/001-generate_key_from_urandom.patch b/net/fastd/patches/001-generate_key_from_urandom.patch
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..e06739a1e715ab310d9b30ae704f615572d6b4b9
|
||||
index 000000000..e06739a1e
|
||||
--- /dev/null
|
||||
+++ b/net/fastd/patches/001-generate_key_from_urandom.patch
|
||||
@@ -0,0 +1,14 @@
|
||||
|
|
@ -22,3 +28,6 @@ index 0000000000000000000000000000000000000000..e06739a1e715ab310d9b30ae704f6155
|
|||
+ ecc_25519_gf_sanitize_secret(&secret_key, &secret_key);
|
||||
+
|
||||
+ ecc_25519_work_t work;
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||
Date: Wed, 22 Apr 2020 16:57:34 +0200
|
||||
Subject: micrond: show stdout and stderr in log
|
||||
|
||||
So far, all output created by scripts run with micrond has been
|
||||
discarded. Since there is no reason for that and it also does not
|
||||
match the expected behavior, this enables both stdout and stderr
|
||||
output for the service.
|
||||
|
||||
If not desired, a user can still use >/dev/null or similar in his/her
|
||||
micrond jobs to disable output easily and similar to what it would be
|
||||
on other systems.
|
||||
|
||||
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||
---
|
||||
utils/micrond/Makefile | 2 +-
|
||||
utils/micrond/files/etc/init.d/micrond | 2 ++
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/utils/micrond/Makefile b/utils/micrond/Makefile
|
||||
index ba063b674..c979025bb 100644
|
||||
--- a/utils/micrond/Makefile
|
||||
+++ b/utils/micrond/Makefile
|
||||
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=micrond
|
||||
PKG_VERSION:=1
|
||||
-PKG_RELEASE:=1
|
||||
+PKG_RELEASE:=2
|
||||
PKG_LICENSE:=BSD-2-clause
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
diff --git a/utils/micrond/files/etc/init.d/micrond b/utils/micrond/files/etc/init.d/micrond
|
||||
index 1eef2ef52..35a3b9e70 100755
|
||||
--- a/utils/micrond/files/etc/init.d/micrond
|
||||
+++ b/utils/micrond/files/etc/init.d/micrond
|
||||
@@ -9,5 +9,7 @@ start_service() {
|
||||
procd_open_instance
|
||||
procd_set_param command /usr/sbin/micrond "$CRONDIR"
|
||||
procd_set_param respawn
|
||||
+ procd_set_param stdout 1
|
||||
+ procd_set_param stderr 1
|
||||
procd_close_instance
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
From f8c90adf89a45d9cfd5e189f28d0250e06710764 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||
Date: Wed, 11 Jul 2018 13:39:06 +0200
|
||||
Subject: [PATCH] Add batman-adv patch to remove gw mode switch message
|
||||
|
||||
Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||
---
|
||||
.../0000-Remove-gw-mode-switch-message.patch | 26 +++++++++++++++++++
|
||||
1 file changed, 26 insertions(+)
|
||||
create mode 100644 batman-adv/patches/0000-Remove-gw-mode-switch-message.patch
|
||||
|
||||
diff --git a/batman-adv/patches/0000-Remove-gw-mode-switch-message.patch b/batman-adv/patches/0000-Remove-gw-mode-switch-message.patch
|
||||
new file mode 100644
|
||||
index 0000000..fb49d6c
|
||||
--- /dev/null
|
||||
+++ b/batman-adv/patches/0000-Remove-gw-mode-switch-message.patch
|
||||
@@ -0,0 +1,26 @@
|
||||
+From 5a99aa98460605dcc649c43b85ae87e36d326cdf Mon Sep 17 00:00:00 2001
|
||||
+From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||
+Date: Wed, 11 Jul 2018 13:37:08 +0200
|
||||
+Subject: [PATCH] Remove gw mode switch message
|
||||
+
|
||||
+Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||
+---
|
||||
+ net/batman-adv/sysfs.c | 3 ---
|
||||
+ 1 file changed, 3 deletions(-)
|
||||
+
|
||||
+diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
|
||||
+index f2eef43b..dc529d50 100644
|
||||
+--- a/net/batman-adv/sysfs.c
|
||||
++++ b/net/batman-adv/sysfs.c
|
||||
+@@ -508,9 +508,6 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj,
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+- batadv_info(net_dev, "Changing gw mode from: %s to: %s\n",
|
||||
+- curr_gw_mode_str, buff);
|
||||
+-
|
||||
+ /* Invoking batadv_gw_reselect() is not enough to really de-select the
|
||||
+ * current GW. It will only instruct the gateway client code to perform
|
||||
+ * a re-election the next time that this is needed.
|
||||
+--
|
||||
+2.18.0
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||
Date: Sat, 6 Jan 2024 13:24:58 +0100
|
||||
Subject: [PATCH] bird: disable unnecessary protocols
|
||||
|
||||
diff --git a/bird2/Makefile b/bird2/Makefile
|
||||
index 9fd0031..dc827b0 100644
|
||||
--- a/bird2/Makefile
|
||||
+++ b/bird2/Makefile
|
||||
@@ -97,7 +97,7 @@ protocols, telling BIRD to show various information, telling it to show
|
||||
a routing table filtered by a filter, or asking BIRD to reconfigure.
|
||||
endef
|
||||
|
||||
-CONFIGURE_ARGS += --disable-libssh
|
||||
+CONFIGURE_ARGS += --disable-libssh --with-protocols="babel pipe radv static"
|
||||
|
||||
define Package/bird2/conffiles
|
||||
/etc/bird.conf
|
||||
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
From f114914490740247f2b6ca705f0f7055db9681ab Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||
Date: Mon, 30 Sep 2019 17:09:10 +0200
|
||||
Subject: babeld: Include PKG_RELEASE in babeld version
|
||||
Subject: [PATCH 1/2] babeld: Include PKG_RELEASE in babeld version
|
||||
|
||||
This will account for custom patches added, as otherwise version
|
||||
would stay the same.
|
||||
|
|
@ -8,14 +9,17 @@ would stay the same.
|
|||
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||
[fabian@blaese.de: revise version string]
|
||||
Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||
---
|
||||
babeld/Makefile | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/babeld/Makefile b/babeld/Makefile
|
||||
index 056ce43d5ddb461ba94e51a5b18ffac0ef971468..16cc86fe5c2ae8731b0d7d2f64517e9b92d029f9 100644
|
||||
index 022d0b8..78fdf83 100644
|
||||
--- a/babeld/Makefile
|
||||
+++ b/babeld/Makefile
|
||||
@@ -50,6 +50,11 @@ MAKE_FLAGS+= \
|
||||
@@ -48,6 +48,11 @@ MAKE_FLAGS+= \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
LDLIBS="" \
|
||||
LDLIBS+="-lubus -lubox"
|
||||
|
||||
+define Build/Configure
|
||||
+ echo "babeld-$(PKG_VERSION)+fff$(PKG_RELEASE)" > $(PKG_BUILD_DIR)/version
|
||||
|
|
@ -25,3 +29,6 @@ index 056ce43d5ddb461ba94e51a5b18ffac0ef971468..16cc86fe5c2ae8731b0d7d2f64517e9b
|
|||
define Package/babeld/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
|
|||
PKG_NAME:=alfred-json
|
||||
PKG_VERSION:=0.3.1
|
||||
PKG_RELEASE:=1
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_VERSION:=e4cacfc791092389f63c36a435d3f1d069f8a13e
|
||||
PKG_SOURCE_URL:=https://github.com/FreifunkFranken/alfred-json.git
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-alfred-monitoring-proxy
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-alfred-monitoring-proxy
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
@ -9,7 +11,7 @@ define Package/fff-alfred-monitoring-proxy
|
|||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken Alfred-Monitoring-Proxy
|
||||
URL:=https://www.freifunk-franken.de
|
||||
URL:=https://www.freifunk-franken.de/
|
||||
DEPENDS:=+curl +micrond +alfred-json +fff-alfred +fff-random
|
||||
endef
|
||||
|
||||
|
|
@ -19,8 +21,8 @@ define Package/fff-alfred-monitoring-proxy/description
|
|||
https://monitoring.freifunk-franken.de/
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
# nothing
|
||||
define Build/Prepare
|
||||
echo "all: " > $(PKG_BUILD_DIR)/Makefile
|
||||
endef
|
||||
|
||||
define Package/fff-alfred-monitoring-proxy/install
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
ebtables -P MULTICAST_OUT RETURN
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-alfred
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
@ -9,7 +11,7 @@ define Package/$(PKG_NAME)
|
|||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken Alfred
|
||||
URL:=https://www.freifunk-franken.de
|
||||
URL:=http://www.freifunk-franken.de
|
||||
DEPENDS:=+alfred
|
||||
endef
|
||||
|
||||
|
|
@ -18,6 +20,14 @@ define Package/$(PKG_NAME)/description
|
|||
This packages configures the Alfred on the device.
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
echo "all: " > $(PKG_BUILD_DIR)/Makefile
|
||||
endef
|
||||
|
||||
define Build/Configure
|
||||
# nothing
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
# nothing
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
uci batch <<EOF
|
||||
set alfred.alfred=alfred
|
||||
set alfred.alfred.interface='br-client'
|
||||
set alfred.alfred.interface='br-mesh'
|
||||
set alfred.alfred.mode='slave'
|
||||
set alfred.alfred.batmanif='none'
|
||||
set alfred.alfred.start_vis='0'
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-babel-bird2
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/fff-babel-bird2
|
||||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken babel-bird2
|
||||
URL:=https://www.freifunk-franken.de
|
||||
DEPENDS:=+bird2 +bird2c +owipcalc
|
||||
PROVIDES:=fff-babel-implementation
|
||||
endef
|
||||
|
||||
define Package/fff-babel-bird2/description
|
||||
This is the Freifunk Franken Firmware babel-bird2 package.
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
# nothing
|
||||
endef
|
||||
|
||||
define Package/fff-babel-bird2/install
|
||||
$(CP) ./files/* $(1)/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,fff-babel-bird2))
|
||||
|
|
@ -1,123 +0,0 @@
|
|||
# router id is not required for babeld, but necessary for bird startup
|
||||
router id 192.0.2.0;
|
||||
|
||||
ipv4 table fff4;
|
||||
ipv6 sadr table fff6;
|
||||
|
||||
protocol device {
|
||||
scan time 15;
|
||||
}
|
||||
|
||||
# device routes for ipv4 peering address
|
||||
protocol direct {
|
||||
ipv4 {
|
||||
table fff4;
|
||||
import filter {
|
||||
include "/tmp/bird/include/nat-filter.conf";
|
||||
|
||||
if (net ~ 10.50.0.0/16 || net ~ 10.83.0.0/16) && net.len = 32 then {
|
||||
accept;
|
||||
}
|
||||
reject;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
# device routes on loopback interface
|
||||
protocol direct {
|
||||
ipv4 {
|
||||
table fff4;
|
||||
import filter {
|
||||
include "/tmp/bird/include/nat-filter.conf";
|
||||
|
||||
if net ~ 10.50.0.0/16 || net ~ 10.83.0.0/16 then {
|
||||
accept;
|
||||
}
|
||||
reject;
|
||||
};
|
||||
};
|
||||
|
||||
ipv6 sadr {
|
||||
table fff6;
|
||||
import filter {
|
||||
if net ~ fdff::/64 from ::/0 then {
|
||||
reject;
|
||||
}
|
||||
|
||||
# only import GUA + ULA addresses
|
||||
if net !~ 2000::/3 from ::/0 && net !~ fc00::/7 from ::/0 then {
|
||||
reject;
|
||||
}
|
||||
|
||||
accept;
|
||||
};
|
||||
import keep filtered;
|
||||
};
|
||||
|
||||
interface "lo";
|
||||
}
|
||||
|
||||
# ipv6 kernel route interface
|
||||
protocol kernel {
|
||||
ipv6 sadr {
|
||||
table fff6;
|
||||
import filter {
|
||||
# only import routes from kernel with proto static
|
||||
if krt_source != 4 then {
|
||||
reject;
|
||||
}
|
||||
|
||||
if net ~ fdff::/64 from ::/0 then {
|
||||
reject;
|
||||
}
|
||||
|
||||
accept;
|
||||
};
|
||||
export all;
|
||||
preference 200;
|
||||
};
|
||||
kernel table 10;
|
||||
scan time 15;
|
||||
learn yes;
|
||||
}
|
||||
|
||||
# ipv4 kernel route interface
|
||||
protocol kernel {
|
||||
ipv4 {
|
||||
table fff4;
|
||||
import filter {
|
||||
include "/tmp/bird/include/nat-filter.conf";
|
||||
|
||||
# only import routes from kernel with proto static
|
||||
if krt_source = 4 then {
|
||||
accept;
|
||||
}
|
||||
reject;
|
||||
};
|
||||
export all;
|
||||
preference 200;
|
||||
};
|
||||
kernel table 10;
|
||||
scan time 15;
|
||||
learn yes;
|
||||
}
|
||||
|
||||
protocol babel {
|
||||
# required due to static configuration of global router id.
|
||||
# also improves reconnect speed after restart.
|
||||
randomize router id yes;
|
||||
|
||||
ipv4 {
|
||||
table fff4;
|
||||
import all;
|
||||
export all;
|
||||
};
|
||||
|
||||
ipv6 sadr {
|
||||
table fff6;
|
||||
import all;
|
||||
export all;
|
||||
};
|
||||
|
||||
include "/tmp/bird/include/babelpeers.conf";
|
||||
};
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
#!/bin/sh /etc/rc.common
|
||||
# Copyright (C) 2010-2017 OpenWrt.org
|
||||
|
||||
USE_PROCD=1
|
||||
START=70
|
||||
|
||||
BIRD_BIN="/usr/sbin/bird"
|
||||
BIRD_CONF="/etc/bird.conf"
|
||||
BIRD_PID_FILE="/var/run/bird.pid"
|
||||
|
||||
start_service() {
|
||||
mkdir -p /var/run
|
||||
|
||||
set_include_path
|
||||
|
||||
procd_open_instance
|
||||
procd_set_param command $BIRD_BIN -f -c $BIRD_CONF -P $BIRD_PID_FILE
|
||||
procd_set_param file "$BIRD_CONF"
|
||||
procd_set_param stdout 1
|
||||
procd_set_param stderr 1
|
||||
procd_set_param respawn
|
||||
procd_close_instance
|
||||
}
|
||||
|
||||
reload_service() {
|
||||
set_include_path
|
||||
procd_send_signal fff-bird
|
||||
}
|
||||
|
||||
set_include_path() {
|
||||
# Change include file path, so bird uses the correct configuration, depending on the configuration state:
|
||||
# - If test mode is active (and /tmp/bird/fff exists), switch to the temporary configuration to be tested.
|
||||
# - If new settings are applied or the old settings are restored after an unsuccessful test (and /tmp/bird/fff does not exist),
|
||||
# switch back to the permanent configuration (/etc/bird/fff).
|
||||
|
||||
mkdir -p /tmp/bird/include
|
||||
|
||||
if [ -d /tmp/bird/fff ]; then
|
||||
echo 'include "/tmp/bird/fff/babelpeers/*.conf";' > /tmp/bird/include/babelpeers.conf
|
||||
echo 'include "/tmp/bird/fff/nat-filter.conf";' > /tmp/bird/include/nat-filter.conf
|
||||
else
|
||||
echo 'include "/etc/bird/fff/babelpeers/*.conf";' > /tmp/bird/include/babelpeers.conf
|
||||
echo 'include "/etc/bird/fff/nat-filter.conf";' > /tmp/bird/include/nat-filter.conf
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
/etc/init.d/bird disable
|
||||
rm -f /etc/init.d/bird
|
||||
|
||||
exit 0
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
mv /etc/bird-fff.conf /etc/bird.conf
|
||||
|
||||
exit 0
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
babel_get_version() {
|
||||
/usr/sbin/bird --version 2>&1 | sed "s/BIRD version /bird-/"
|
||||
}
|
||||
|
||||
babel_add_interface() {
|
||||
[ "$#" -ne "4" ] && return 1
|
||||
|
||||
local name="$1"
|
||||
local interface="$2"
|
||||
local type="$3"
|
||||
local rxcost="$4"
|
||||
|
||||
mkdir -p /tmp/bird/fff/babelpeers
|
||||
echo "interface \"$interface\" { type $type; rxcost $rxcost; };" > /tmp/bird/fff/babelpeers/$name.conf
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_delete_interface() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local name="$1"
|
||||
|
||||
# Removing peers from /etc is not necessary, as all peers are generated into /tmp on every configuration run,
|
||||
# which completely overwrites existing peers in /etc in the apply step.
|
||||
rm -f /tmp/bird/fff/babelpeers/$name.conf
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_add_redistribute_filter() {
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_add_private_prefix_filter() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local prefix="$1"
|
||||
prefix=$(owipcalc "$prefix" network prefix "$prefix")
|
||||
|
||||
mkdir -p /tmp/bird/fff
|
||||
echo "if net ~ $prefix then reject;" > /tmp/bird/fff/nat-filter.conf
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_remove_custom_redistribute_filters() {
|
||||
mkdir -p /tmp/bird/fff
|
||||
> /tmp/bird/fff/nat-filter.conf
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_apply_implementation() {
|
||||
# error output hidden because apply might be executed without a preceding configure step.
|
||||
if [ -d /tmp/bird/fff ]; then
|
||||
rm -rf /etc/bird/fff
|
||||
mv /tmp/bird/fff /etc/bird/fff
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_reload_implementation() {
|
||||
/etc/init.d/fff-bird reload
|
||||
}
|
||||
|
||||
babel_revert() {
|
||||
rm -rf /tmp/bird/fff
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
set -e
|
||||
set -o pipefail
|
||||
|
||||
|
||||
if ! birdc show status >/dev/null 2>&1; then
|
||||
# bird daemon not running or unavailable. exit.
|
||||
exit 0
|
||||
fi
|
||||
|
||||
neighbours="$(birdc -r show babel neighbors |
|
||||
tail -n +5 |
|
||||
awk '{ printf "<neighbour><ip>%s</ip><outgoing_interface>%s</outgoing_interface><link_cost>%s</link_cost></neighbour>", $1, $2, $3 }'
|
||||
)"
|
||||
|
||||
echo -n "<babel_neighbours>$neighbours</babel_neighbours>"
|
||||
|
||||
exit 0
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-babel
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/fff-babel
|
||||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken babel
|
||||
URL:=https://www.freifunk-franken.de
|
||||
DEPENDS:=+fff-babel-implementation
|
||||
endef
|
||||
|
||||
define Package/fff-babel/description
|
||||
This is the Freifunk Franken Firmware babel package.
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
# nothing
|
||||
endef
|
||||
|
||||
define Package/fff-babel/install
|
||||
$(CP) ./files/* $(1)/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,fff-babel))
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
|
||||
implementation=$(uci -q get babelimpl.impl.impl)
|
||||
[ -z "$implementation" ] && implementation=bird2
|
||||
|
||||
. /lib/functions/fff/babeldaemon/$implementation
|
||||
|
||||
babel_add_iifrules() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local name="$1"
|
||||
local table='10'
|
||||
local prio='31'
|
||||
|
||||
uci set network.${name}_rule=rule
|
||||
uci set network.${name}_rule.in="$name"
|
||||
uci set network.${name}_rule.lookup="$table"
|
||||
uci set network.${name}_rule.priority="$prio"
|
||||
|
||||
uci set network.${name}_rule6=rule6
|
||||
uci set network.${name}_rule6.in="$name"
|
||||
uci set network.${name}_rule6.lookup="$table"
|
||||
uci set network.${name}_rule6.priority="$prio"
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_delete_iifrules() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local name="$1"
|
||||
|
||||
uci -q del network.${name}_rule
|
||||
uci -q del network.${name}_rule6
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_add_peeraddr() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local option="$1"
|
||||
|
||||
if peer_ip=$(uci -q get gateway.@gateway[0].peer_ip); then
|
||||
uci add_list "$option"="$peer_ip"
|
||||
elif router_ip=$(uci -q get gateway.meta.router_ip); then
|
||||
# use router_ip if no peer_ip is set
|
||||
ip=$router_ip
|
||||
|
||||
# use only first ip
|
||||
ip=${ip%% *}
|
||||
|
||||
# remove CIDR mask
|
||||
ip=${ip%%/*}
|
||||
|
||||
uci add_list "$option"="$ip"
|
||||
elif ipaddr=$(uci -q get gateway.@client[0].ipaddr); then
|
||||
# use client interface address (without subnet) if no router_ip is set
|
||||
uci add_list "$option"=${ipaddr%%/*}
|
||||
else
|
||||
echo "WARNING: No peer_ip, router_ip or client interface ipaddr set! IPv4 routing is not possible."
|
||||
return 1
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_add_peer6addr() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local option="$1"
|
||||
|
||||
if peer_ip6=$(uci -q get gateway.@gateway[0].peer_ip6); then
|
||||
uci add_list "$option"="$peer_ip6"
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_reload() {
|
||||
# switch implementation temporarily
|
||||
case $implementation in
|
||||
bird2)
|
||||
[ -f /etc/init.d/babeld ] && /etc/init.d/babeld stop 2>/dev/null
|
||||
[ -f /etc/init.d/fff-bird ] && /etc/init.d/fff-bird start
|
||||
;;
|
||||
babeld)
|
||||
[ -f /etc/init.d/fff-bird ] && /etc/init.d/fff-bird stop 2>/dev/null
|
||||
[ -f /etc/init.d/babeld ] && /etc/init.d/babeld start
|
||||
;;
|
||||
esac
|
||||
|
||||
# call implementation-specific reload commands
|
||||
babel_reload_implementation
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_apply() {
|
||||
# switch implementation persistently
|
||||
case $implementation in
|
||||
bird2)
|
||||
[ -f /etc/init.d/babeld ] && /etc/init.d/babeld disable
|
||||
[ -f /etc/init.d/fff-bird ] && /etc/init.d/fff-bird enable
|
||||
;;
|
||||
babeld)
|
||||
[ -f /etc/init.d/fff-bird ] && /etc/init.d/fff-bird disable
|
||||
[ -f /etc/init.d/babeld ] && /etc/init.d/babeld enable
|
||||
;;
|
||||
esac
|
||||
|
||||
babel_apply_implementation
|
||||
|
||||
return 0
|
||||
}
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-babeld
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-babeld
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
@ -9,9 +11,8 @@ define Package/fff-babeld
|
|||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken babeld configuration example
|
||||
URL:=https://www.freifunk-franken.de
|
||||
URL:=http://www.freifunk-franken.de
|
||||
DEPENDS:=+babeld
|
||||
PROVIDES:=fff-babel-implementation
|
||||
endef
|
||||
|
||||
define Package/fff-babeld/description
|
||||
|
|
@ -19,6 +20,14 @@ define Package/fff-babeld/description
|
|||
This package provides an example babeld configuration.
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
echo "all: " > $(PKG_BUILD_DIR)/Makefile
|
||||
endef
|
||||
|
||||
define Build/Configure
|
||||
# nothing
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
# nothing
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
config general
|
||||
option export_table '10'
|
||||
option import_table '10'
|
||||
option first_table_number '100'
|
||||
option local_port '33123'
|
||||
|
||||
config interface
|
||||
|
|
@ -21,11 +22,6 @@ config filter
|
|||
option local 'true'
|
||||
option ip 'fd43:5602:29bd::/48'
|
||||
|
||||
config filter
|
||||
option type 'redistribute'
|
||||
option local 'true'
|
||||
option if 'lo'
|
||||
|
||||
config filter
|
||||
option type 'redistribute'
|
||||
option local 'true'
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ configure() {
|
|||
fi
|
||||
}
|
||||
|
||||
config_load network
|
||||
config_load babeld
|
||||
config_foreach remove_babelpeer interface
|
||||
|
||||
#add new peers
|
||||
|
|
@ -75,14 +75,14 @@ configure() {
|
|||
babel_add_peer6addr "network.$prefixname.ip6addr"
|
||||
|
||||
# add babel interface
|
||||
babel_add_interface "$prefixname" "$iface" "$type" "$rxcost" || { echo "Could not add babel interface for babelpeer $name"; exit 1; }
|
||||
babel_add_interface "$prefixname" "$iface" "$type" "$rxcost" || { echo "Could not add babeld interface for babelpeer $name"; exit 1; }
|
||||
}
|
||||
|
||||
config_load gateway
|
||||
config_foreach add_babelpeer babelpeer
|
||||
|
||||
|
||||
# configure babel filters for custom ipv6 addresses
|
||||
# configure babeld filters for custom ipv6 addresses
|
||||
## remove old filters
|
||||
babel_remove_custom_redistribute_filters
|
||||
|
||||
|
|
@ -90,25 +90,14 @@ configure() {
|
|||
for prefix in $(uci -q get gateway.@client[0].ip6addr); do
|
||||
babel_add_redistribute_filter "$prefix"
|
||||
done
|
||||
|
||||
## add deny filters for client prefixes used with snat
|
||||
if [ "$(uci -q get gateway.@client[0].snat)" = "1" ]; then
|
||||
for prefix in $(uci -q get gateway.@client[0].ipaddr); do
|
||||
babel_add_private_prefix_filter "$prefix"
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
apply() {
|
||||
uci commit network
|
||||
babel_apply
|
||||
}
|
||||
|
||||
reload() {
|
||||
babel_reload
|
||||
uci commit babeld
|
||||
}
|
||||
|
||||
revert() {
|
||||
uci revert network
|
||||
babel_revert
|
||||
uci revert babeld
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ uci batch <<EOF
|
|||
set network.@rule[3].priority='20'
|
||||
add network rule
|
||||
set network.@rule[4]=rule
|
||||
set network.@rule[4].in='client'
|
||||
set network.@rule[4].in='mesh'
|
||||
set network.@rule[4].lookup='10'
|
||||
set network.@rule[4].priority='31'
|
||||
add network rule6
|
||||
|
|
@ -34,7 +34,7 @@ uci batch <<EOF
|
|||
set network.@rule6[1].priority='20'
|
||||
add network rule6
|
||||
set network.@rule6[2]=rule6
|
||||
set network.@rule6[2].in='client'
|
||||
set network.@rule6[2].in='mesh'
|
||||
set network.@rule6[2].lookup='10'
|
||||
set network.@rule6[2].priority='31'
|
||||
EOF
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
/etc/init.d/babeld disable
|
||||
|
||||
exit 0
|
||||
|
|
@ -0,0 +1,121 @@
|
|||
babel_add_iifrules() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local name="$1"
|
||||
local table='10'
|
||||
local prio='31'
|
||||
|
||||
uci set network.${name}_rule=rule
|
||||
uci set network.${name}_rule.in="$name"
|
||||
uci set network.${name}_rule.lookup="$table"
|
||||
uci set network.${name}_rule.priority="$prio"
|
||||
|
||||
uci set network.${name}_rule6=rule6
|
||||
uci set network.${name}_rule6.in="$name"
|
||||
uci set network.${name}_rule6.lookup="$table"
|
||||
uci set network.${name}_rule6.priority="$prio"
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_delete_iifrules() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local name="$1"
|
||||
|
||||
uci -q del network.${name}_rule
|
||||
uci -q del network.${name}_rule6
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_add_peeraddr() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local option="$1"
|
||||
|
||||
if peer_ip=$(uci -q get gateway.@gateway[0].peer_ip); then
|
||||
uci add_list "$option"="$peer_ip"
|
||||
elif ipaddr=$(uci -q get gateway.@client[0].ipaddr); then
|
||||
# use ipaddr (without subnet) if no peer_ip set
|
||||
uci add_list "$option"=$(echo $ipaddr | cut -d / -f1)
|
||||
else
|
||||
echo "FATAL: Neither peer_ip nor ipaddr set! No peering ipv4 set!"
|
||||
return 1
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_add_peer6addr() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local option="$1"
|
||||
|
||||
if peer_ip6=$(uci -q get gateway.@gateway[0].peer_ip6); then
|
||||
uci add_list "$option"="$peer_ip6"
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_add_interface() {
|
||||
[ "$#" -ne "4" ] && return 1
|
||||
|
||||
local name="$1"
|
||||
local interface="$2"
|
||||
local type="$3"
|
||||
local rxcost="$4"
|
||||
|
||||
uci set babeld.$name=interface
|
||||
uci set babeld.$name.ifname="$interface"
|
||||
uci set babeld.$name.type="$type"
|
||||
uci set babeld.$name.rxcost="$rxcost"
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_delete_interface() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local name="$1"
|
||||
|
||||
uci -q del babeld.$name
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_add_redistribute_filter() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local prefix="$1"
|
||||
|
||||
config=$(uci add babeld filter)
|
||||
uci set babeld.$config.type='redistribute'
|
||||
uci set babeld.$config.ip="$prefix"
|
||||
uci set babeld.$config.addedbyautoconfig='true'
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_remove_custom_redistribute_filters() {
|
||||
[ "$#" -ne "0" ] && return 1
|
||||
|
||||
remove_filters() {
|
||||
local name="$1"
|
||||
|
||||
# check if filter was added by configuregateway
|
||||
if ! [ "$(uci -q get babeld.$name.addedbyautoconfig)" = 'true' ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
uci -q del babeld.$name
|
||||
}
|
||||
|
||||
config_load babeld
|
||||
config_foreach remove_filters filter
|
||||
|
||||
return 0
|
||||
}
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
babel_get_version() {
|
||||
/usr/sbin/babeld -V 2>&1
|
||||
}
|
||||
|
||||
babel_add_interface() {
|
||||
[ "$#" -ne "4" ] && return 1
|
||||
|
||||
local name="$1"
|
||||
local interface="$2"
|
||||
local type="$3"
|
||||
local rxcost="$4"
|
||||
|
||||
uci set babeld.$name=interface
|
||||
uci set babeld.$name.ifname="$interface"
|
||||
uci set babeld.$name.type="$type"
|
||||
uci set babeld.$name.rxcost="$rxcost"
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_delete_interface() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local name="$1"
|
||||
|
||||
uci -q del babeld.$name
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_add_redistribute_filter() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local prefix="$1"
|
||||
|
||||
config=$(uci add babeld filter)
|
||||
uci set babeld.$config.type='redistribute'
|
||||
uci set babeld.$config.ip="$prefix"
|
||||
uci set babeld.$config.addedbyautoconfig='true'
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_add_private_prefix_filter() {
|
||||
[ "$#" -ne "1" ] && return 1
|
||||
|
||||
local prefix="$1"
|
||||
|
||||
config=$(uci add babeld filter)
|
||||
uci set babeld.$config.type='redistribute'
|
||||
uci set babeld.$config.ip="$prefix"
|
||||
uci set babeld.$config.addedbyautoconfig='true'
|
||||
uci set babeld.$config.action='deny'
|
||||
|
||||
# move to top, so filter rule has precedence over all other rules
|
||||
uci reorder babeld.$config=0
|
||||
|
||||
config=$(uci add babeld filter)
|
||||
uci set babeld.$config.type='redistribute'
|
||||
uci set babeld.$config.ip="$prefix"
|
||||
uci set babeld.$config.addedbyautoconfig='true'
|
||||
uci set babeld.$config.local='true'
|
||||
uci set babeld.$config.action='deny'
|
||||
|
||||
# move to top, so filter rule has precedence over all other rules
|
||||
uci reorder babeld.$config=0
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_remove_custom_redistribute_filters() {
|
||||
[ "$#" -ne "0" ] && return 1
|
||||
|
||||
remove_filters() {
|
||||
local name="$1"
|
||||
|
||||
# check if filter was added by configuregateway
|
||||
if ! [ "$(uci -q get babeld.$name.addedbyautoconfig)" = 'true' ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
uci -q del babeld.$name
|
||||
}
|
||||
|
||||
config_load babeld
|
||||
config_foreach remove_filters filter
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_apply_implementation() {
|
||||
uci commit babeld
|
||||
}
|
||||
|
||||
babel_reload_implementation() {
|
||||
return 0
|
||||
}
|
||||
|
||||
babel_revert() {
|
||||
uci revert babeld
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-base
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/fff-base
|
||||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken base dependencies
|
||||
URL:=https://www.freifunk-franken.de
|
||||
DEFAULT:=y
|
||||
DEPENDS:= \
|
||||
+@BUSYBOX_CONFIG_FEATURE_REVERSE_SEARCH \
|
||||
+@BUSYBOX_CONFIG_FEATURE_TOP_SMP_CPU \
|
||||
+@BUSYBOX_CONFIG_WATCH \
|
||||
+@BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY \
|
||||
+micrond \
|
||||
+odhcp6c \
|
||||
+fff-config \
|
||||
+fff-network \
|
||||
+fff-nodewatcher \
|
||||
+fff-simple-tc \
|
||||
+fff-support \
|
||||
+fff-sysupgrade \
|
||||
+fff-timeserver \
|
||||
+fff-web-ui \
|
||||
+fff-wireless
|
||||
endef
|
||||
|
||||
define Package/fff-variant/description
|
||||
This package includes base packages used in the Freifunk-Franken firmware
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,fff-base))
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-batman-adv
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
@ -9,7 +11,7 @@ define Package/$(PKG_NAME)
|
|||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken batman-adv
|
||||
URL:=https://www.freifunk-franken.de
|
||||
URL:=http://www.freifunk-franken.de
|
||||
DEPENDS:=+kmod-batman-adv \
|
||||
+@BATMAN_ADV_BATMAN_V \
|
||||
+@BATMAN_ADV_NC \
|
||||
|
|
@ -21,6 +23,14 @@ define Package/$(PKG_NAME)/description
|
|||
It is used to configure batman-adv.
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
echo "all: " > $(PKG_BUILD_DIR)/Makefile
|
||||
endef
|
||||
|
||||
define Build/Configure
|
||||
# nothing
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
# nothing
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
#
|
||||
# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
|
||||
# License; GPL v3
|
||||
|
||||
debug() {
|
||||
(>&2 echo "nodewatcher: $1")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-boardname
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
PKG_RELEASE:=8
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
@ -9,7 +11,7 @@ define Package/$(PKG_NAME)
|
|||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken boardname
|
||||
URL:=https://www.freifunk-franken.de
|
||||
URL:=http://www.freifunk-franken.de
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/description
|
||||
|
|
@ -17,6 +19,14 @@ define Package/$(PKG_NAME)/description
|
|||
This packages configures the boardname in the board config.
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
echo "all: " > $(PKG_BUILD_DIR)/Makefile
|
||||
endef
|
||||
|
||||
define Build/Configure
|
||||
# nothing
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
# nothing
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -1,9 +1,5 @@
|
|||
BOARD=$(cat /var/sysinfo/board_name)
|
||||
|
||||
if uname -a | grep x86_64 > /dev/null; then
|
||||
BOARD="x86_64"
|
||||
fi
|
||||
|
||||
uci set board.model.name=$BOARD
|
||||
uci commit board
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-config
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
@ -9,7 +11,7 @@ define Package/$(PKG_NAME)
|
|||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken Config
|
||||
URL:=https://www.freifunk-franken.de
|
||||
URL:=http://www.freifunk-franken.de
|
||||
DEPENDS:=+fff-boardname
|
||||
endef
|
||||
|
||||
|
|
@ -18,6 +20,14 @@ define Package/$(PKG_NAME)/description
|
|||
This packages provides utilities for a central FFF config file.
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
echo "all: " > $(PKG_BUILD_DIR)/Makefile
|
||||
endef
|
||||
|
||||
define Build/Configure
|
||||
# nothing
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
# nothing
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
vm.panic_on_oom=1
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
#
|
||||
# Copyright 2017 Adrian Schmutzler
|
||||
# License GPLv3
|
||||
|
||||
touch /etc/config/fff
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-dhcp
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-dhcp
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
@ -9,7 +11,7 @@ define Package/fff-dhcp
|
|||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken dhcp
|
||||
URL:=https://www.freifunk-franken.de
|
||||
URL:=http://www.freifunk-franken.de
|
||||
DEPENDS:=+dnsmasq
|
||||
endef
|
||||
|
||||
|
|
@ -18,6 +20,14 @@ define Package/fff-dhcp/description
|
|||
It is used to configure dnsmasq for use as gateway.
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
echo "all: " > $(PKG_BUILD_DIR)/Makefile
|
||||
endef
|
||||
|
||||
define Build/Configure
|
||||
# nothing
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
# nothing
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -8,10 +8,7 @@ configure() {
|
|||
uci add_list dhcp.@dnsmasq[0].server="/ip6.arpa/$f"
|
||||
done
|
||||
else
|
||||
echo "WARNING: No DNS servers set! Using default server fd43:5602:29bd:ffff:1:1:1:1"
|
||||
uci add_list dhcp.@dnsmasq[0].server="fd43:5602:29bd:ffff:1:1:1:1"
|
||||
uci add_list dhcp.@dnsmasq[0].server="/in-addr.arpa/fd43:5602:29bd:ffff:1:1:1:1"
|
||||
uci add_list dhcp.@dnsmasq[0].server="/ip6.arpa/fd43:5602:29bd:ffff:1:1:1:1"
|
||||
echo "WARNING: No DNS servers set!"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -1,40 +1,32 @@
|
|||
# Use a larger cachesize by default
|
||||
cachesize=1024
|
||||
|
||||
# Increase cachesize for systems with enough memory
|
||||
mem="$(awk '/^MemTotal:/ {print $2}' /proc/meminfo)"
|
||||
[ "$mem" -gt 65536 ] && cachesize=8192
|
||||
|
||||
uci batch >/dev/null <<EOF
|
||||
uci batch <<EOF
|
||||
delete dhcp.@dnsmasq[0]
|
||||
delete dhcp.lan
|
||||
delete dhcp.wan
|
||||
add dhcp dnsmasq
|
||||
set dhcp.@dnsmasq[-1].domainneeded='0'
|
||||
set dhcp.@dnsmasq[-1].boguspriv='0'
|
||||
set dhcp.@dnsmasq[-1].filterwin2k='0'
|
||||
set dhcp.@dnsmasq[-1].localise_queries='0'
|
||||
set dhcp.@dnsmasq[-1].rebind_protection='0'
|
||||
set dhcp.@dnsmasq[-1].rebind_localhost='1'
|
||||
set dhcp.@dnsmasq[-1].domain='fff.community'
|
||||
set dhcp.@dnsmasq[-1].expandhosts='0'
|
||||
set dhcp.@dnsmasq[-1].nonegcache='0'
|
||||
set dhcp.@dnsmasq[-1].cachesize="$cachesize"
|
||||
set dhcp.@dnsmasq[-1].authoritative='1'
|
||||
set dhcp.@dnsmasq[-1].readethers='1'
|
||||
set dhcp.@dnsmasq[-1].leasefile='/tmp/dhcp.leases'
|
||||
set dhcp.@dnsmasq[-1].noresolv='1'
|
||||
set dhcp.@dnsmasq[-1].localservice='1'
|
||||
set dhcp.@dnsmasq[0].domainneeded='0'
|
||||
set dhcp.@dnsmasq[0].boguspriv='0'
|
||||
set dhcp.@dnsmasq[0].filterwin2k='0'
|
||||
set dhcp.@dnsmasq[0].localise_queries='0'
|
||||
set dhcp.@dnsmasq[0].rebind_protection='0'
|
||||
set dhcp.@dnsmasq[0].rebind_localhost='1'
|
||||
set dhcp.@dnsmasq[0].domain='fff.community'
|
||||
set dhcp.@dnsmasq[0].expandhosts='0'
|
||||
set dhcp.@dnsmasq[0].nonegcache='0'
|
||||
set dhcp.@dnsmasq[0].authoritative='1'
|
||||
set dhcp.@dnsmasq[0].readethers='1'
|
||||
set dhcp.@dnsmasq[0].leasefile='/tmp/dhcp.leases'
|
||||
set dhcp.@dnsmasq[0].noresolv='1'
|
||||
set dhcp.@dnsmasq[0].localservice='1'
|
||||
add_list dhcp.@dnsmasq[0].server='10.50.252.11'
|
||||
add_list dhcp.@dnsmasq[0].server='10.50.252.0'
|
||||
add_list dhcp.@dnsmasq[0].server='/in-addr.arpa/10.50.252.11'
|
||||
add_list dhcp.@dnsmasq[0].server='/in-addr.arpa/10.50.252.0'
|
||||
add_list dhcp.@dnsmasq[0].server='/ip6.arpa/10.50.252.11'
|
||||
add_list dhcp.@dnsmasq[0].server='/ip6.arpa/10.50.252.0'
|
||||
|
||||
# do not generate A or AAAA records for the routers hostname,
|
||||
# because this might interfere with upstream records.
|
||||
#
|
||||
# e.g. hostname: 'router.fff.community'
|
||||
set dhcp.@dnsmasq[-1].add_local_fqdn='0'
|
||||
|
||||
set dhcp.client=dhcp
|
||||
set dhcp.client.interface='client'
|
||||
set dhcp.client.leasetime='1h'
|
||||
set dhcp.mesh=dhcp
|
||||
set dhcp.mesh.interface='mesh'
|
||||
set dhcp.mesh.leasetime='1h'
|
||||
EOF
|
||||
|
||||
uci commit dhcp
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-extra
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/fff-extra
|
||||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken gateway configuration
|
||||
URL:=https://www.freifunk-franken.de
|
||||
DEPENDS:=+bmon \
|
||||
+ethtool \
|
||||
+htop \
|
||||
+procps-ng \
|
||||
+procps-ng-vmstat \
|
||||
+sysstat
|
||||
endef
|
||||
|
||||
define Package/fff-extra/description
|
||||
This package selects useful packages for devices with enough disk space available
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,fff-extra))
|
||||
|
|
@ -1,7 +1,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=fff-fastd
|
||||
PKG_RELEASE:=$(COMMITCOUNT)
|
||||
PKG_RELEASE:=3
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
@ -9,7 +11,7 @@ define Package/$(PKG_NAME)
|
|||
SECTION:=base
|
||||
CATEGORY:=Freifunk
|
||||
TITLE:=Freifunk-Franken fastd configuration script
|
||||
URL:=https://www.freifunk-franken.de
|
||||
URL:=http://www.freifunk-franken.de
|
||||
DEPENDS:=+@BUSYBOX_CUSTOM \
|
||||
+@FASTD_ENABLE_METHOD_NULL \
|
||||
+@FASTD_ENABLE_CIPHER_NULL \
|
||||
|
|
@ -24,6 +26,14 @@ define Package/$(PKG_NAME)/description
|
|||
It is used to configure fastd.
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
echo "all: " > $(PKG_BUILD_DIR)/Makefile
|
||||
endef
|
||||
|
||||
define Build/Configure
|
||||
# nothing
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
# nothing
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ ln -s /tmp/fastd_fff_peers /etc/fastd/fff/peers
|
|||
echo "#!/bin/sh" > /etc/fastd/fff/up.sh
|
||||
echo "ip link set up dev fffVPN" >> /etc/fastd/fff/up.sh
|
||||
echo "batctl if add fffVPN" >> /etc/fastd/fff/up.sh
|
||||
echo "batctl hardif fffVPN hop_penalty 30" >> /etc/fastd/fff/up.sh
|
||||
chmod +x /etc/fastd/fff/up.sh
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue