RZ-G/BSP upgrade
< RZ-G
To migrate from one VLP version to the following, the best would be to rebase.
For example for kernel, as you probably know we use the CIP kernel. However CIP and our kernel follow different paths and when we release the a version of the VLP, we generate a set of patches that are then applied to the version we chose:
o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o remotes/origin/linux-4.19.y-cip \ \ \ o--o--o vlp64_v104 o--o--o--o vlp64_v105 o--o--o--o--o vlp64_v106
But customers, for example TQ, has probably started working on on one version, created their own branch and applied their own modifications:
o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o remotes/origin/linux-4.19.y-cip \ \ \ o--o--o vlp64_v104 o--o--o--o vlp64_v105 o--o--o--o--o vlp64_v106 \ A--B--C customer_v1 \ D customer_v2
Now, at certain point in time, if the customer wants to move to a new vlp version, for example 1.0.5, then the solution for them is to rebase, basically a sort of "move" of their modifications to the newer vlp:
o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o remotes/origin/linux-4.19.y-cip \ \ \ o--o--o vlp64_v104 o--o--o--o vlp64_v105 o--o--o--o--o vlp64_v106 \ \ A--B--C customer_v1 A--B--C--D customer_v3 \ \ D customer_v2 E customer_v4
And so on, for the following versions:
o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o--o remotes/origin/linux-4.19.y-cip \ \ \ o--o--o vlp64_v104 o--o--o--o vlp64_v105 o--o--o--o--o vlp64_v106 \ \ \ A--B--C customer_v1 A--B--C--D customer_v3 A--B--C--D--E customer_v5 \ \ \ D customer_v2 E customer_v4 F customer_v6