From 0d91e8394079869d009134b352c4f7569d3a02f7 Mon Sep 17 00:00:00 2001 From: Guillaume Girou Date: Sun, 7 Jun 2020 22:57:15 +0200 Subject: [PATCH] Idempotent patch commit sha1 --- README.md | 4 ++++ scripts/build_uboot.sh | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4cc683b..3bbab09 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,8 @@ First, keep current u-boot parameters: > Keep the content of `printenv` [output](infos/printenv.txt). This will be a useful reference if you want to restore any u-boot parameters. +> Hint: press `ctrl + a` then type `:quit` to quit. + # Test new U-Boot with Serial port > **NB:** Newer stock versions of u-boot cannot boot the original D-link kernels! @@ -126,6 +128,8 @@ Try to boot with following commands : > New default boot commands try to load `uEnv.txt` from USB FAT partition, just change `loadbootenv` to load from ext2. > The `mtdparts` option had became `cmdlinepart.mtdparts` (in Debian-land, at least). [StackExchange](https://unix.stackexchange.com/q/554266) +> Hint: press `ctrl + \` then type `c` to quit. + ## `uEnv.txt` configuration `/uEnv.txt` file is already configured to load Flat Image Tree (FIT) uImage from UBIFS partition first, and fallback to USB on failing. diff --git a/scripts/build_uboot.sh b/scripts/build_uboot.sh index 707f068..869eaf1 100755 --- a/scripts/build_uboot.sh +++ b/scripts/build_uboot.sh @@ -13,10 +13,11 @@ fi git config user.email "john@doe.xyz"; git config user.name "John Doe" +# git checkout v2020.04; git merge --squash v2020.04-dns320; git format-patch HEAD~1 # Apply `EHCI timed out on TD` patch from https://forum.doozan.com/read.php\?3,35295 -git am < /scripts/v2020.04-usbtimeoutfix.patch +git am --committer-date-is-author-date < /scripts/v2020.04-usbtimeoutfix.patch # Apply DNS-320 support patch from https://github.com/avoidik/board_dns320 -git am < /scripts/v2020.04-dns320.patch +git am --committer-date-is-author-date < /scripts/v2020.04-dns320.patch export ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- make distclean