FAQ - Frequently Asked Questions: Difference between revisions
Jump to navigation
Jump to search
(Add TOC) |
(Update) |
||
| Line 3: | Line 3: | ||
== How to rebase the Ronetix U-BOOT git repository? == | == How to rebase the Ronetix U-BOOT git repository? == | ||
Here are the steps to rebase the U-BOOT repository: | Here are the steps to rebase the U-BOOT repository: | ||
$ git clone https://github.com/ | $ git clone https://github.com/ronetix/u-boot.git | ||
$ cd u-boot | $ cd u-boot | ||
$ git remote add https://github.com/ | $ git remote add nxp https://github.com/nxp-imx/uboot-imx.git | ||
$ git checkout remotes/ | $ git fetch nxp | ||
$ git rebase | $ git checkout remotes/origin/lf_v2023.04 -b lf_v2023.04 | ||
$ git rebase nxp/lf_v2023.04 | |||
If there are some conflicts, resolve them manually and | If there are some conflicts, resolve them manually, for example: | ||
$ vim arch/arm/mach-imx/imx9/Kconfig # fix and save | |||
$ git add arch/arm/mach-imx/imx9/Kconfig | |||
$ git commit -m "mach-imx/imx9/Kconfig : resolve merge conflict" | |||
$ git rebase --continue | |||
Revision as of 10:01, 22 January 2024
How to rebase the Ronetix U-BOOT git repository?
Here are the steps to rebase the U-BOOT repository:
$ git clone https://github.com/ronetix/u-boot.git $ cd u-boot $ git remote add nxp https://github.com/nxp-imx/uboot-imx.git $ git fetch nxp $ git checkout remotes/origin/lf_v2023.04 -b lf_v2023.04 $ git rebase nxp/lf_v2023.04
If there are some conflicts, resolve them manually, for example:
$ vim arch/arm/mach-imx/imx9/Kconfig # fix and save $ git add arch/arm/mach-imx/imx9/Kconfig $ git commit -m "mach-imx/imx9/Kconfig : resolve merge conflict" $ git rebase --continue