From 7d700a4113eb4bce2296160e90d595635ce3015e Mon Sep 17 00:00:00 2001 From: handyohos Date: Sat, 7 May 2022 21:01:53 +0800 Subject: [PATCH] feat: organize platform and chipset repos in different files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1）更新chipsets下的talkweb仓 2）同步ohos/ohos.xml下的仓 Signed-off-by: handyohos Change-Id: Id4dc55d7bf0df27c4b53ebc0fa5f67c6d379e4c1 --- README.md | 11 + chipsets/all.xml | 21 +- chipsets/bearpi_hm_micro.xml | 4 +- chipsets/bearpi_hm_nano.xml | 5 +- chipsets/cst85_wblink.xml | 4 +- chipsets/dayu200.xml | 4 +- chipsets/dayu200/dayu200.xml | 2 +- chipsets/dev_wifi_a.xml | 4 +- chipsets/evb_oh1.xml | 4 +- chipsets/gr5515_sk.xml | 4 +- chipsets/hispark_aries.xml | 4 +- chipsets/hispark_pegasus.xml | 4 +- chipsets/hispark_taurus.xml | 4 +- chipsets/{rk3568.xml => niobe407.xml} | 2 +- all.xml => chipsets/niobe407/niobe407.xml | 4 +- chipsets/qemu.xml | 4 +- chipsets/rk3568/rk3568.xml | 9 - chipsets/v200zr.xml | 4 +- default.xml | 377 +--------------------- ohos/ohos.xml | 109 +++---- 20 files changed, 104 insertions(+), 480 deletions(-) rename chipsets/{rk3568.xml => niobe407.xml} (84%) rename all.xml => chipsets/niobe407/niobe407.xml (53%) delete mode 100755 chipsets/rk3568/rk3568.xml diff --git a/README.md b/README.md index 1b558f77..543b3994 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,20 @@ manifest ``` - default.xml由ohos/ohos.xml和chipsets/all.xml组成，是所有平台仓和芯片仓的集合；通过此方式可以下载所有代码仓。 + - chipsets/chipsetN/chipsetN-detail.xml是单个芯片平台所引入的仓集合，chipsets/chipsetN.xml是由ohos/ohos.xml和chipsetN-detail.xml仓组合而成，用于下载该芯片平台的全量仓。 + - chipsets/all.xml则是所有芯片平台xxx/xxx-detail.xml的仓组合，用于汇总所有芯片仓。 + > 注意： + > + > 每个开发板的chipsets/chipsetN/chipsetN-detail.xml里主要包括device/soc，device/board以及vendor相关仓。多个开发板可能共用device/soc仓或vendor仓。此时可以灵活组合，防止chipsets/all.xml里需要注意防止重复包含共用的仓。 + > + > 例如： + > + > chipsets/bearpi_hm_nano.xml和chipsets/bearpi_hm_micro.xml中直接包含了chipsets/hispark/hispark.xml，并额外增加了vendor_bearpi和device_board_bearpi；而这两个仓在chipsets/bearpi_hm_micro/bearpi_hm_micro.xml中已经包含，因此chipsets/all.xml里不需要额外包含包含bearpi_hm_nano开发板的仓。 + + 按照上述分类，可支持各种代码下载方式： | **统分类** | **代码下载方式** | **下载命令** | **说明** | diff --git a/chipsets/all.xml b/chipsets/all.xml index f6548d63..7d460a20 100755 --- a/chipsets/all.xml +++ b/chipsets/all.xml @@ -3,18 +3,17 @@ - - - - - - + + + + + + - - + - + - - + + diff --git a/chipsets/bearpi_hm_micro.xml b/chipsets/bearpi_hm_micro.xml index ab2d1f63..eae1995a 100755 --- a/chipsets/bearpi_hm_micro.xml +++ b/chipsets/bearpi_hm_micro.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/bearpi_hm_nano.xml b/chipsets/bearpi_hm_nano.xml index 1d8833d2..75a20a4b 100755 --- a/chipsets/bearpi_hm_nano.xml +++ b/chipsets/bearpi_hm_nano.xml @@ -3,7 +3,8 @@ - - + + + diff --git a/chipsets/cst85_wblink.xml b/chipsets/cst85_wblink.xml index 5df90d9f..62a046ec 100755 --- a/chipsets/cst85_wblink.xml +++ b/chipsets/cst85_wblink.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/dayu200.xml b/chipsets/dayu200.xml index cc8fca90..07d70b35 100755 --- a/chipsets/dayu200.xml +++ b/chipsets/dayu200.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/dayu200/dayu200.xml b/chipsets/dayu200/dayu200.xml index bbb3986f..e930280f 100755 --- a/chipsets/dayu200/dayu200.xml +++ b/chipsets/dayu200/dayu200.xml @@ -3,7 +3,7 @@ - + diff --git a/chipsets/dev_wifi_a.xml b/chipsets/dev_wifi_a.xml index 1d5f4770..3a8688c0 100755 --- a/chipsets/dev_wifi_a.xml +++ b/chipsets/dev_wifi_a.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/evb_oh1.xml b/chipsets/evb_oh1.xml index 3f209a67..6befe56c 100755 --- a/chipsets/evb_oh1.xml +++ b/chipsets/evb_oh1.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/gr5515_sk.xml b/chipsets/gr5515_sk.xml index 2fc89e58..2dac979e 100755 --- a/chipsets/gr5515_sk.xml +++ b/chipsets/gr5515_sk.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/hispark_aries.xml b/chipsets/hispark_aries.xml index adcc3a13..072cb9c5 100755 --- a/chipsets/hispark_aries.xml +++ b/chipsets/hispark_aries.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/hispark_pegasus.xml b/chipsets/hispark_pegasus.xml index adcc3a13..072cb9c5 100755 --- a/chipsets/hispark_pegasus.xml +++ b/chipsets/hispark_pegasus.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/hispark_taurus.xml b/chipsets/hispark_taurus.xml index adcc3a13..072cb9c5 100755 --- a/chipsets/hispark_taurus.xml +++ b/chipsets/hispark_taurus.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/rk3568.xml b/chipsets/niobe407.xml similarity index 84% rename from chipsets/rk3568.xml rename to chipsets/niobe407.xml index 1fda0a07..f98e0dc0 100755 --- a/chipsets/rk3568.xml +++ b/chipsets/niobe407.xml @@ -4,5 +4,5 @@ - + diff --git a/all.xml b/chipsets/niobe407/niobe407.xml similarity index 53% rename from all.xml rename to chipsets/niobe407/niobe407.xml index 97278e65..1ca1c4b8 100755 --- a/all.xml +++ b/chipsets/niobe407/niobe407.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/qemu.xml b/chipsets/qemu.xml index 2b3bab98..a37b7f1d 100755 --- a/chipsets/qemu.xml +++ b/chipsets/qemu.xml @@ -3,6 +3,6 @@ - - + + diff --git a/chipsets/rk3568/rk3568.xml b/chipsets/rk3568/rk3568.xml deleted file mode 100755 index bbb3986f..00000000 --- a/chipsets/rk3568/rk3568.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/chipsets/v200zr.xml b/chipsets/v200zr.xml index 52069361..f8f39543 100755 --- a/chipsets/v200zr.xml +++ b/chipsets/v200zr.xml @@ -3,6 +3,6 @@ - - + + diff --git a/default.xml b/default.xml index 7f406f9a..0d51754a 100755 --- a/default.xml +++ b/default.xml @@ -1,369 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/ohos/ohos.xml b/ohos/ohos.xml index bc0e6599..418eb513 100644 --- a/ohos/ohos.xml +++ b/ohos/ohos.xml @@ -29,22 +29,17 @@ - - - - - - + - + - + @@ -55,7 +50,7 @@ - + @@ -71,38 +66,33 @@ - - - + + - + - - - - - + - + @@ -111,12 +101,6 @@ - - - - - - @@ -128,17 +112,28 @@ - + - - - - - - + + + + + + + + + + + + + + + + + @@ -151,29 +146,27 @@ - + - + - - - - + + - + - - + + @@ -188,12 +181,12 @@ - - - - - - + + + + + + @@ -206,14 +199,14 @@ - + - + @@ -224,14 +217,11 @@ - - - @@ -253,9 +243,9 @@ - + - + @@ -319,12 +309,6 @@ - - - - - - @@ -347,10 +331,9 @@ - - - + +