Note: a .scc file can have multiple KMACHINE entries. Allowing
it to match against different target MACHINEs.
That being said, these files aren't included by other BSPs, so
the renaiming won't cause an issue.
Merged.
Bruce
In message: [PATCH] marvell-cn10xxx: rename marvell-cn106xx to new name
on 13/10/2023 Ruiqiang Hao wrote:
> From: Ruiqiang Hao
>
> To add support for marvell-cn102xx and marvell-cn103xx, rename origin
> name to marvell-cn10xxx.
>
> Signed-off-by: Ruiqiang Hao
> ---
> .../marvell-cn10xxx-preempt-rt.scc} | 4 ++--
> .../marvell-cn10xxx-standard.scc} | 4 ++--
> .../marvell-cn10xxx.cfg} | 0
> .../marvell-cn10xxx.scc} | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
> rename bsp/{marvell-cn106xx/marvell-cn106xx-preempt-rt.scc =>
> marvell-cn10xxx/marvell-cn10xxx-preempt-rt.scc} (54%)
> rename bsp/{marvell-cn106xx/marvell-cn106xx-standard.scc =>
> marvell-cn10xxx/marvell-cn10xxx-standard.scc} (62%)
> rename bsp/{marvell-cn106xx/marvell-cn106xx.cfg =>
> marvell-cn10xxx/marvell-cn10xxx.cfg} (100%)
> rename bsp/{marvell-cn106xx/marvell-cn106xx.scc =>
> marvell-cn10xxx/marvell-cn10xxx.scc} (86%)
>
> diff --git a/bsp/marvell-cn106xx/marvell-cn106xx-preempt-rt.scc
> b/bsp/marvell-cn10xxx/marvell-cn10xxx-preempt-rt.scc
> similarity index 54%
> rename from bsp/marvell-cn106xx/marvell-cn106xx-preempt-rt.scc
> rename to bsp/marvell-cn10xxx/marvell-cn10xxx-preempt-rt.scc
> index 8733cbad..a0ed4819 100644
> --- a/bsp/marvell-cn106xx/marvell-cn106xx-preempt-rt.scc
> +++ b/bsp/marvell-cn10xxx/marvell-cn10xxx-preempt-rt.scc
> @@ -1,7 +1,7 @@
> -define KMACHINE marvell-cn106xx
> +define KMACHINE marvell-cn10xxx
> define KTYPE preempt-rt
> define KARCH arm64
>
> include ktypes/preempt-rt
>
> -include marvell-cn106xx.scc
> +include marvell-cn10xxx.scc
> diff --git a/bsp/marvell-cn106xx/marvell-cn106xx-standard.scc
> b/bsp/marvell-cn10xxx/marvell-cn10xxx-standard.scc
> similarity index 62%
> rename from bsp/marvell-cn106xx/marvell-cn106xx-standard.scc
> rename to bsp/marvell-cn10xxx/marvell-cn10xxx-standard.scc
> index 037540b1..03115305 100644
> --- a/bsp/marvell-cn106xx/marvell-cn106xx-standard.scc
> +++ b/bsp/marvell-cn10xxx/marvell-cn10xxx-standard.scc
> @@ -1,8 +1,8 @@
> # SPDX-License-Identifier: MIT
> -define KMACHINE marvell-cn106xx
> +define KMACHINE marvell-cn10xxx
> define KTYPE standard
> define KARCH arm64
>
> include ktypes/standard
>
> -include marvell-cn106xx.scc
> +include marvell-cn10xxx.scc
> diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
> b/bsp/marvell-cn10xxx/marvell-cn10xxx.cfg
> similarity index 100%
> rename from bsp/marvell-cn106xx/marvell-cn106xx.cfg
> rename to bsp/marvell-cn10xxx/marvell-cn10xxx.cfg
> diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.scc
> b/bsp/marvell-cn10xxx/marvell-cn10xxx.scc
> similarity index 86%
> rename from bsp/marvell-cn106xx/marvell-cn106xx.scc
> rename to bsp/marvell-cn10xxx/marvell-cn10xxx.scc
> index a809af52..f72630d7 100644
> --- a/bsp/marvell-cn106xx/marvell-cn106xx.scc
> +++ b/bsp/marvell-cn10xxx/marvell-cn10xxx.scc
> @@ -1,5 +1,5 @@
> # SPDX-License-Identifier: MIT
> -kconf hardware marvell-cn106xx.cfg
> +kconf hardware marvell-cn10xxx.cfg
> kconf hardware features/edac/edac.cfg
>
> include cfg/usb-mass-storage.scc
> --
> 2.39.2
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13194):
https://lists.yoctoproject.org/g/linux-yocto/message/13194
Mute This Topic: https://lists.yoctoproject.org/mt/101935164/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe:
https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
