andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes from topic "fix_checkpatch_merges" into integration 

* changes:
  fix(plat/st): remove double space
  fix(checkpatch): do not check merge commits
This commit is contained in:
Madhukar Pappireddy 2021-11-03 19:38:00 +01:00 committed by TrustedFirmware Code Review
parent 663461b914 306dcd6b0d
commit 89ff55fef4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -1318,7 +1318,8 @@ checkpatch: locate-checkpatch
echo " with ${CHECKPATCH_OPTS} option(s)"; \ echo " with ${CHECKPATCH_OPTS} option(s)"; \
fi fi
${Q}COMMON_COMMIT=$$(git merge-base HEAD ${BASE_COMMIT}); \ ${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"; \ printf "\n[*] Checking style of '$$commit'\n\n"; \
git log --format=email "$$commit~..$$commit" \ git log --format=email "$$commit~..$$commit" \
-- ${CHECK_PATHS} | \ -- ${CHECK_PATHS} | \

2
plat/st/common/stm32cubeprogrammer_usb.c
View File

@ -116,7 +116,7 @@ static int dfu_callback_download(uint8_t alt, uintptr_t *buffer, uint32_t *len,
dfu->address += *len; dfu->address += *len;
if (dfu->address - dfu->base > dfu->len) { if (dfu->address - dfu->base > dfu->len) {
return -EIO; return -EIO;
} }
return 0; return 0;