From 77a0a7f1d96b188849d1d8d8884b3c93857d3f69 Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Tue, 2 Nov 2021 18:03:31 +0100 Subject: [PATCH 1/2] fix(checkpatch): do not check merge commits Add the --no-merges option when listing patches to check with rev-list command, when running make checkpatch. Change-Id: I47f3f5dfe358ed2b960a754f70aec0dc3c2b4536 Signed-off-by: Yann Gautier --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e5ab3247e..2a1d4d8ef 100644 --- a/Makefile +++ b/Makefile @@ -1318,7 +1318,8 @@ checkpatch: locate-checkpatch echo " with ${CHECKPATCH_OPTS} option(s)"; \ fi ${Q}COMMON_COMMIT=$$(git merge-base HEAD ${BASE_COMMIT}); \ - for commit in `git rev-list $$COMMON_COMMIT..HEAD`; do \ + for commit in `git rev-list --no-merges $$COMMON_COMMIT..HEAD`; \ + do \ printf "\n[*] Checking style of '$$commit'\n\n"; \ git log --format=email "$$commit~..$$commit" \ -- ${CHECK_PATHS} | \ From 306dcd6b0d1981b75e103c560a4034bdaa6862d5 Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Tue, 2 Nov 2021 17:03:46 +0100 Subject: [PATCH 2/2] fix(plat/st): remove double space Replace double space with single space in stm32cubeprogrammer_usb.c. Change-Id: I717b136119e85fe8e25dd540758525f995200458 Signed-off-by: Yann Gautier --- plat/st/common/stm32cubeprogrammer_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plat/st/common/stm32cubeprogrammer_usb.c b/plat/st/common/stm32cubeprogrammer_usb.c index 4cd210e9e..19a6bbae8 100644 --- a/plat/st/common/stm32cubeprogrammer_usb.c +++ b/plat/st/common/stm32cubeprogrammer_usb.c @@ -116,7 +116,7 @@ static int dfu_callback_download(uint8_t alt, uintptr_t *buffer, uint32_t *len, dfu->address += *len; if (dfu->address - dfu->base > dfu->len) { - return -EIO; + return -EIO; } return 0;