pkarashchenko commented on code in PR #7614: URL: https://github.com/apache/incubator-nuttx/pull/7614#discussion_r1027108915
########## arch/arm/src/sama5/hardware/_sama5d2x_memorymap.h: ########## @@ -517,9 +520,10 @@ #define SAM_SFRBU_VBASE (SAM_PERIPHC_VSECTION+SAM_SFRBU_OFFSET) #define SAM_CHIPID_VBASE (SAM_PERIPHC_VSECTION+SAM_CHIPID_OFFSET) -#define SAM_PIOA_VBASE (SAM_PERIPHA_VSECTION+SAM_PIO_OFFSET) -#define SAM_PIOB_VBASE (SAM_PERIPHB_VSECTION+SAM_PIO_OFFSET) -#define SAM_PIOC_VBASE (SAM_PERIPHC_VSECTION+SAM_PIO_OFFSET) +#define SAM_PIOA_VBASE (SAM_PIO_VBASE) +#define SAM_PIOB_VBASE (SAM_PIO_VBASE+SAM_PIOB_OFFSET) +#define SAM_PIOC_VBASE (SAM_PIO_VBASE+SAM_PIOC_OFFSET) +#define SAM_PIOD_VBASE (SAM_PIO_VBASE+SAM_PIOD_OFFSET) Review Comment: First of all if you are new to git and do not want to loose all your changes then I would recommend you to go with the next steps: ``` git checkout SAMA5D2-PIO-errors git checkout -b SAMA5D2-PIO-errors-backup # <- just checkout new branch, to save what you have now. you can push if you want of keep those changes locally git checkout SAMA5D2-PIO-errors # <- get back to branch for this PR git rebase -i master # <- to trigger interactive rebase. Here you can reorder, update, squash, etc. your commits git rebase --continue # <- will be needed after each step is finished until you reach the end git push -f origin SAMA5D2-PIO-errors # <- this will "force-push" your branch. It meats that Github version will be overwritten with your local change in SAMA5D2-PIO-errors branch, but SAMA5D2-PIO-errors-backup will still contain old code, so you can recover from it in case anything goes wrong ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
