[1/2] bsp: Rename files to include subtarget

Submitted by Fabian Blaese on April 15, 2020, 1:47 p.m.

Details

Message ID 20200415134703.1033234-1-fabian@blaese.de
State Accepted
Headers show

Commit Message

Fabian Blaese April 15, 2020, 1:47 p.m.
Because we might want to support different subtargets
inside a single target in the future, the name is changed
so it includes the subtarget as well.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
---
 bsp/{board_ar71xx.bsp => ar71xx-tiny.bsp}      | 2 +-
 bsp/{ar71xx => ar71xx-tiny}/.config            | 0
 bsp/{board_ipq806x.bsp => ipq806x-generic.bsp} | 2 +-
 bsp/{ipq806x => ipq806x-generic}/.config       | 0
 bsp/{board_mpc85xx.bsp => mpc85xx-generic.bsp} | 2 +-
 bsp/{mpc85xx => mpc85xx-generic}/.config       | 0
 bsp/{board_mt7621.bsp => ramips-mt7621.bsp}    | 2 +-
 bsp/{mt7621 => ramips-mt7621}/.config          | 0
 bsp/{board_mt76x8.bsp => ramips-mt76x8.bsp}    | 2 +-
 bsp/{mt76x8 => ramips-mt76x8}/.config          | 0
 10 files changed, 5 insertions(+), 5 deletions(-)
 rename bsp/{board_ar71xx.bsp => ar71xx-tiny.bsp} (99%)
 rename bsp/{ar71xx => ar71xx-tiny}/.config (100%)
 rename bsp/{board_ipq806x.bsp => ipq806x-generic.bsp} (83%)
 rename bsp/{ipq806x => ipq806x-generic}/.config (100%)
 rename bsp/{board_mpc85xx.bsp => mpc85xx-generic.bsp} (83%)
 rename bsp/{mpc85xx => mpc85xx-generic}/.config (100%)
 rename bsp/{board_mt7621.bsp => ramips-mt7621.bsp} (87%)
 rename bsp/{mt7621 => ramips-mt7621}/.config (100%)
 rename bsp/{board_mt76x8.bsp => ramips-mt76x8.bsp} (90%)
 rename bsp/{mt76x8 => ramips-mt76x8}/.config (100%)

Patch hide | download patch | download mbox

diff --git a/bsp/board_ar71xx.bsp b/bsp/ar71xx-tiny.bsp
similarity index 99%
rename from bsp/board_ar71xx.bsp
rename to bsp/ar71xx-tiny.bsp
index 344e2e5..0cf426c 100644
--- a/bsp/board_ar71xx.bsp
+++ b/bsp/ar71xx-tiny.bsp
@@ -1,4 +1,4 @@ 
-machine=ar71xx
+machine=ar71xx-tiny
 chipset=ar71xx
 subtarget=tiny
 images=("openwrt-${chipset}-${subtarget}-archer-c25-v1-squashfs-*"
diff --git a/bsp/ar71xx/.config b/bsp/ar71xx-tiny/.config
similarity index 100%
rename from bsp/ar71xx/.config
rename to bsp/ar71xx-tiny/.config
diff --git a/bsp/board_ipq806x.bsp b/bsp/ipq806x-generic.bsp
similarity index 83%
rename from bsp/board_ipq806x.bsp
rename to bsp/ipq806x-generic.bsp
index 194049a..405f8d0 100644
--- a/bsp/board_ipq806x.bsp
+++ b/bsp/ipq806x-generic.bsp
@@ -1,4 +1,4 @@ 
-machine=ipq806x
+machine=ipq806x-generic
 chipset=ipq806x
 subtarget=generic
 
diff --git a/bsp/ipq806x/.config b/bsp/ipq806x-generic/.config
similarity index 100%
rename from bsp/ipq806x/.config
rename to bsp/ipq806x-generic/.config
diff --git a/bsp/board_mpc85xx.bsp b/bsp/mpc85xx-generic.bsp
similarity index 83%
rename from bsp/board_mpc85xx.bsp
rename to bsp/mpc85xx-generic.bsp
index 6e10035..1d3658f 100644
--- a/bsp/board_mpc85xx.bsp
+++ b/bsp/mpc85xx-generic.bsp
@@ -1,4 +1,4 @@ 
-machine=mpc85xx
+machine=mpc85xx-generic
 chipset=mpc85xx
 subtarget=generic
 
diff --git a/bsp/mpc85xx/.config b/bsp/mpc85xx-generic/.config
similarity index 100%
rename from bsp/mpc85xx/.config
rename to bsp/mpc85xx-generic/.config
diff --git a/bsp/board_mt7621.bsp b/bsp/ramips-mt7621.bsp
similarity index 87%
rename from bsp/board_mt7621.bsp
rename to bsp/ramips-mt7621.bsp
index aef3800..8a5c69e 100644
--- a/bsp/board_mt7621.bsp
+++ b/bsp/ramips-mt7621.bsp
@@ -1,4 +1,4 @@ 
-machine=mt7621
+machine=mt7621-generic
 chipset=ramips
 subtarget=mt7621
 
diff --git a/bsp/mt7621/.config b/bsp/ramips-mt7621/.config
similarity index 100%
rename from bsp/mt7621/.config
rename to bsp/ramips-mt7621/.config
diff --git a/bsp/board_mt76x8.bsp b/bsp/ramips-mt76x8.bsp
similarity index 90%
rename from bsp/board_mt76x8.bsp
rename to bsp/ramips-mt76x8.bsp
index bf8d236..53bf3d1 100644
--- a/bsp/board_mt76x8.bsp
+++ b/bsp/ramips-mt76x8.bsp
@@ -1,4 +1,4 @@ 
-machine=mt76x8
+machine=ramips-mt76x8
 chipset=ramips
 subtarget=mt76x8
 images=("openwrt-${chipset}-${subtarget}-tplink_c50-v3-squashfs-sysupgrade.bin"
diff --git a/bsp/mt76x8/.config b/bsp/ramips-mt76x8/.config
similarity index 100%
rename from bsp/mt76x8/.config
rename to bsp/ramips-mt76x8/.config

Comments

Adrian Schmutzler April 15, 2020, 2:15 p.m.
Reviewed and directly applied 1/2.

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
> Of Fabian Bläse
> Sent: Mittwoch, 15. April 2020 15:47
> To: franken-dev@freifunk.net
> Subject: [PATCH 1/2] bsp: Rename files to include subtarget
> 
> Because we might want to support different subtargets inside a single target
> in the future, the name is changed so it includes the subtarget as well.
> 
> Signed-off-by: Fabian Bläse <fabian@blaese.de>
> ---
>  bsp/{board_ar71xx.bsp => ar71xx-tiny.bsp}      | 2 +-
>  bsp/{ar71xx => ar71xx-tiny}/.config            | 0
>  bsp/{board_ipq806x.bsp => ipq806x-generic.bsp} | 2 +-
>  bsp/{ipq806x => ipq806x-generic}/.config       | 0
>  bsp/{board_mpc85xx.bsp => mpc85xx-generic.bsp} | 2 +-
>  bsp/{mpc85xx => mpc85xx-generic}/.config       | 0
>  bsp/{board_mt7621.bsp => ramips-mt7621.bsp}    | 2 +-
>  bsp/{mt7621 => ramips-mt7621}/.config          | 0
>  bsp/{board_mt76x8.bsp => ramips-mt76x8.bsp}    | 2 +-
>  bsp/{mt76x8 => ramips-mt76x8}/.config          | 0
>  10 files changed, 5 insertions(+), 5 deletions(-)  rename
> bsp/{board_ar71xx.bsp => ar71xx-tiny.bsp} (99%)  rename bsp/{ar71xx =>
> ar71xx-tiny}/.config (100%)  rename bsp/{board_ipq806x.bsp => ipq806x-
> generic.bsp} (83%)  rename bsp/{ipq806x => ipq806x-generic}/.config (100%)
> rename bsp/{board_mpc85xx.bsp => mpc85xx-generic.bsp} (83%)  rename
> bsp/{mpc85xx => mpc85xx-generic}/.config (100%)  rename
> bsp/{board_mt7621.bsp => ramips-mt7621.bsp} (87%)  rename bsp/{mt7621
> => ramips-mt7621}/.config (100%)  rename bsp/{board_mt76x8.bsp =>
> ramips-mt76x8.bsp} (90%)  rename bsp/{mt76x8 => ramips-mt76x8}/.config
> (100%)
> 
> diff --git a/bsp/board_ar71xx.bsp b/bsp/ar71xx-tiny.bsp similarity index 99%
> rename from bsp/board_ar71xx.bsp rename to bsp/ar71xx-tiny.bsp index
> 344e2e5..0cf426c 100644
> --- a/bsp/board_ar71xx.bsp
> +++ b/bsp/ar71xx-tiny.bsp
> @@ -1,4 +1,4 @@
> -machine=ar71xx
> +machine=ar71xx-tiny
>  chipset=ar71xx
>  subtarget=tiny
>  images=("openwrt-${chipset}-${subtarget}-archer-c25-v1-squashfs-*"
> diff --git a/bsp/ar71xx/.config b/bsp/ar71xx-tiny/.config similarity index 100%
> rename from bsp/ar71xx/.config rename to bsp/ar71xx-tiny/.config diff --git
> a/bsp/board_ipq806x.bsp b/bsp/ipq806x-generic.bsp similarity index 83%
> rename from bsp/board_ipq806x.bsp rename to bsp/ipq806x-generic.bsp
> index 194049a..405f8d0 100644
> --- a/bsp/board_ipq806x.bsp
> +++ b/bsp/ipq806x-generic.bsp
> @@ -1,4 +1,4 @@
> -machine=ipq806x
> +machine=ipq806x-generic
>  chipset=ipq806x
>  subtarget=generic
> 
> diff --git a/bsp/ipq806x/.config b/bsp/ipq806x-generic/.config similarity index
> 100% rename from bsp/ipq806x/.config rename to bsp/ipq806x-
> generic/.config diff --git a/bsp/board_mpc85xx.bsp b/bsp/mpc85xx-
> generic.bsp similarity index 83% rename from bsp/board_mpc85xx.bsp
> rename to bsp/mpc85xx-generic.bsp index 6e10035..1d3658f 100644
> --- a/bsp/board_mpc85xx.bsp
> +++ b/bsp/mpc85xx-generic.bsp
> @@ -1,4 +1,4 @@
> -machine=mpc85xx
> +machine=mpc85xx-generic
>  chipset=mpc85xx
>  subtarget=generic
> 
> diff --git a/bsp/mpc85xx/.config b/bsp/mpc85xx-generic/.config similarity
> index 100% rename from bsp/mpc85xx/.config rename to bsp/mpc85xx-
> generic/.config diff --git a/bsp/board_mt7621.bsp b/bsp/ramips-mt7621.bsp
> similarity index 87% rename from bsp/board_mt7621.bsp rename to
> bsp/ramips-mt7621.bsp index aef3800..8a5c69e 100644
> --- a/bsp/board_mt7621.bsp
> +++ b/bsp/ramips-mt7621.bsp
> @@ -1,4 +1,4 @@
> -machine=mt7621
> +machine=mt7621-generic
>  chipset=ramips
>  subtarget=mt7621
> 
> diff --git a/bsp/mt7621/.config b/bsp/ramips-mt7621/.config similarity index
> 100% rename from bsp/mt7621/.config rename to bsp/ramips-
> mt7621/.config diff --git a/bsp/board_mt76x8.bsp b/bsp/ramips-mt76x8.bsp
> similarity index 90% rename from bsp/board_mt76x8.bsp rename to
> bsp/ramips-mt76x8.bsp index bf8d236..53bf3d1 100644
> --- a/bsp/board_mt76x8.bsp
> +++ b/bsp/ramips-mt76x8.bsp
> @@ -1,4 +1,4 @@
> -machine=mt76x8
> +machine=ramips-mt76x8
>  chipset=ramips
>  subtarget=mt76x8
>  images=("openwrt-${chipset}-${subtarget}-tplink_c50-v3-squashfs-
> sysupgrade.bin"
> diff --git a/bsp/mt76x8/.config b/bsp/ramips-mt76x8/.config similarity index
> 100% rename from bsp/mt76x8/.config rename to bsp/ramips-
> mt76x8/.config
> --
> 2.26.0