On Fri, May 24, 2024 at 04:55:15PM +0200, Jerome Forissier wrote: > > > On 5/23/24 17:02, Tom Rini wrote: > > On Wed, May 22, 2024 at 06:00:02PM +0200, Jerome Forissier wrote: > > > >> Import the Lightweight IP (lwIP) library as lib/lwip. The code is built > >> when CONFIG_NET_LWIP=y. > >> > >> The lwIP code was imported with the following commands: > >> > >> (cd /tmp && git clone https://git.savannah.gnu.org/git/lwip.git -b > >> STABLE-2_2_0_RELEASE) > >> mkdir -p lib/lwip > >> cp -R /tmp/lwip/src/{api,core,include} lib/lwip/ > >> mkdir -p lib/lwip/netif && cp /tmp/lwip/src/netif/ethernet.c > >> lib/lwip/netif/ > >> mkdir -p lib/lwip/apps/tftp && cp /tmp/lwip/src/apps/tftp/tftp.c > >> lib/lwip/apps/tftp/ > >> mkdir -p lib/lwip/apps/http && cp /tmp/lwip/src/apps/http/http_client.c > >> lib/lwip/apps/http/ > >> > >> The list of object files added to lib/liwip/Makefile was given by: > >> > >> (cd lib/lwip && find . -name \*.c | sort | sed 's@\./@\t@' | sed > >> 's/\.c$/.o \\/') >>lib/liwip/Makefile > >> > >> These files are adaptation layers written specially for U-Boot: > >> > >> lib/lwip/u-boot/arch/cc.h > >> lib/lwip/u-boot/arch/sys_arch.h (empty) > >> lib/lwip/u-boot/limits.h (empty) > >> lib/lwip/u-boot/lwipopts.h > >> > >> They were initially contributed by Maxim in a previous RFC patch series. > >> > >> Signed-off-by: Jerome Forissier <[email protected]> > >> Co-developed-by: Maxim Uvarov <[email protected]> > >> Cc: Maxim Uvarov <[email protected]> > > > > As I believe I've said before, this needs to be a subtree moving > > forward. > > > > Done in upcoming v2. TBH I don't quite like it because (1) it introduces a > merge > commit, (2) interactive rebase becomes difficult (I had to pass > --rebase-merges > or the rebase will fail), and (3) I found no way to record the command I > used in the patch description. FYI the command was: > git subtree add --squash --prefix lib/lwip/lwip \ > https://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASE
Thanks. It does make things differently challenging on the initial merge but there's dts/update-dts-subtree.sh as an example script on how to make subsequent updates easier. And then in the cover letter we just say a pre-req is to do the above to get the initial import of the code. -- Tom
signature.asc
Description: PGP signature
