From 6328f30269e86726482da77acb90c009bde751e0 Mon Sep 17 00:00:00 2001 From: Alp Akpinar Date: Tue, 11 Oct 2022 10:23:57 -0400 Subject: [PATCH 1/5] Track the branch of ApolloSM plugin with SVF syntax fix --- plugins/ApolloSM_plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ApolloSM_plugin b/plugins/ApolloSM_plugin index 261863a..a883b98 160000 --- a/plugins/ApolloSM_plugin +++ b/plugins/ApolloSM_plugin @@ -1 +1 @@ -Subproject commit 261863aa6c68d1fc902d90f583dab68c1580efb8 +Subproject commit a883b98ce9b18412f5007766816f8b6a8ed25000 From 7ad65edd5c9008bbab0ee7383373bbd6c146f68b Mon Sep 17 00:00:00 2001 From: Alp Akpinar Date: Tue, 11 Oct 2022 14:19:21 -0400 Subject: [PATCH 2/5] Update Apollo SM plugin --- plugins/ApolloSM_plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ApolloSM_plugin b/plugins/ApolloSM_plugin index a883b98..26f0800 160000 --- a/plugins/ApolloSM_plugin +++ b/plugins/ApolloSM_plugin @@ -1 +1 @@ -Subproject commit a883b98ce9b18412f5007766816f8b6a8ed25000 +Subproject commit 26f0800e490c4fcbae78013371159d21464731bb From 228f0091887adbc7191fa98d26f5566e7b4a7701 Mon Sep 17 00:00:00 2001 From: Alp Akpinar Date: Tue, 11 Oct 2022 14:20:30 -0400 Subject: [PATCH 3/5] Fixup in ApolloSM plugin --- plugins/ApolloSM_plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ApolloSM_plugin b/plugins/ApolloSM_plugin index 26f0800..ef61dba 160000 --- a/plugins/ApolloSM_plugin +++ b/plugins/ApolloSM_plugin @@ -1 +1 @@ -Subproject commit 26f0800e490c4fcbae78013371159d21464731bb +Subproject commit ef61dba728cd1b256d19c5a9cd262c377cb75eb2 From c2d04278481c0352500aad7f61838534458f9c4d Mon Sep 17 00:00:00 2001 From: Dan Gastler Date: Mon, 5 Dec 2022 21:03:40 +0000 Subject: [PATCH 4/5] Updated submodules to fix grafana issues --- BUTool | 2 +- README.md | 40 +++++----------------------------------- plugins/ApolloSM_plugin | 2 +- 3 files changed, 7 insertions(+), 37 deletions(-) diff --git a/BUTool b/BUTool index 64e9015..2c53828 160000 --- a/BUTool +++ b/BUTool @@ -1 +1 @@ -Subproject commit 64e90153ea205162881aa0f480989635a3e470a3 +Subproject commit 2c5382860724b48afa2c2f8bd15cbe4f5190f6a6 diff --git a/README.md b/README.md index 17e67a6..42c190b 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,18 @@ # Apollo Tool -This repo is to simplify building the BUTool & friends software for the Apollo SM Petalinux system via cross compiling. +This repo is to simplify building the BUTool & friends software for the Apollo SM Currently this adds the BUTool-IPBus-helpers, ApolloSM_plugin, and genericIPBus_plugin. ### Common pre-req's -* petalinux 2018.2 * boost-devel * readline-devel * ld -* uHAL (with plugin support) +* uHAL * UIOuHAL plugin -### Zynq build via SM_ZYNQ_FW CentOS makefile -* cd SM_ZYNQ_FW/os/centos -* make (builds full centos image for zynq including this repo) -### "local" x86 (for syntax checking) -* make local +### building on an apollo blade - -### How-to old with cross-compile -* Build the petalinux image for the Apollo SM via https://github.com/apollo-lhc/SM_ZYNQ_FW -* Mount the ext4 image generated from that in /mnt -* Build the feature-UIOuHAL branch from https://github.com/dgastler/ipbus-software -* Set IPBUS_PATH CACTUS_ROOT to point to whhere you checked out the ipbus-software repo -* make -* cd BUTool; ZYNQ_IP=1.2.3.4 ./make/copyZynq.sh -* Yay! you are done! - -### StatusDisplay name parser for BUTool - -Currently, there are two versions of name parsers (for row and column names in status tables) used in `BUTool::StatusDisplay` class: - -**Older version:** Will treat a single underscore character (`'_'`) in the beginning as a spcecial character. As an example, if we had a register with name `A.B.C.D` and parameter `Row=_3`, the row name for this register would be `C`. - -**Newer version:** Will treat double and triple underscore characters as special. Double underscore replaces the single underscore functionality in the older version, while triple underscore implies a reverse count. Using the same example from before, if we had a register with name `A.B.C.D`, the following is true: - -- If this register specifies `Row=__3`, the row name would be `C`. -- If this register specifies `Row=___3`, the row name would be `B`. - -By default, when the `BUTool::StatusDisplay` class parses the XML address table, it will use the older version of the name parser. This behavior can be updated by using a compile-time flag however, called `BUTOOL_SD_USE_NEW_PARSER`. To use the new name parser, the user can simply add `BUTOOL_SD_USE_NEW_PARSER=true` to the `make` command while building `ApolloTool`. - -### TODO -* Simplify the petalinux image use by downloading tagged releases of the system images. -* Add option to automatically checkout and build ipbus or use an existing installation -* Add IPMI plugin to build system +CACTUS_ROOT=/opt/cactus LINTER=: make local UHAL_VER_MAJOR=2 UHAL_VER_MINOR=8 -j4 RUNTIME_LDPATH=/opt/BUTool COMPILETIME_ROOT=--sysroot=/ +CACTUS_ROOT=/opt/cactus LINTER=: make install UHAL_VER_MAJOR=2 UHAL_VER_MINOR=8 RUNTIME_LDPATH=/opt/BUTool COMPILETIME_ROOT=--sysroot=/ INSTALL_PATH=/opt/BUTool \ No newline at end of file diff --git a/plugins/ApolloSM_plugin b/plugins/ApolloSM_plugin index ef61dba..0885539 160000 --- a/plugins/ApolloSM_plugin +++ b/plugins/ApolloSM_plugin @@ -1 +1 @@ -Subproject commit ef61dba728cd1b256d19c5a9cd262c377cb75eb2 +Subproject commit 0885539e059d4157a50395d2db5ae64b04831a78 From 912cf4bf7f089856d96be26ed2c6a861a2940190 Mon Sep 17 00:00:00 2001 From: Dan Gastler Date: Tue, 6 Dec 2022 20:24:40 +0000 Subject: [PATCH 5/5] Finalizing submodules --- BUTool | 2 +- README.md | 4 ++-- plugins/ApolloSM_plugin | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BUTool b/BUTool index 2c53828..5836054 160000 --- a/BUTool +++ b/BUTool @@ -1 +1 @@ -Subproject commit 2c5382860724b48afa2c2f8bd15cbe4f5190f6a6 +Subproject commit 5836054918cf42c245e49b2412cb317283f9a940 diff --git a/README.md b/README.md index 42c190b..1a72c1c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Apollo Tool +B65;6602;1c# Apollo Tool This repo is to simplify building the BUTool & friends software for the Apollo SM @@ -15,4 +15,4 @@ Currently this adds the BUTool-IPBus-helpers, ApolloSM_plugin, and genericIPBus_ ### building on an apollo blade CACTUS_ROOT=/opt/cactus LINTER=: make local UHAL_VER_MAJOR=2 UHAL_VER_MINOR=8 -j4 RUNTIME_LDPATH=/opt/BUTool COMPILETIME_ROOT=--sysroot=/ -CACTUS_ROOT=/opt/cactus LINTER=: make install UHAL_VER_MAJOR=2 UHAL_VER_MINOR=8 RUNTIME_LDPATH=/opt/BUTool COMPILETIME_ROOT=--sysroot=/ INSTALL_PATH=/opt/BUTool \ No newline at end of file +CACTUS_ROOT=/opt/cactus LINTER=: make install UHAL_VER_MAJOR=2 UHAL_VER_MINOR=8 RUNTIME_LDPATH=/opt/BUTool COMPILETIME_ROOT=--sysroot=/ INSTALL_PATH=/opt/BUTool diff --git a/plugins/ApolloSM_plugin b/plugins/ApolloSM_plugin index 0885539..7585505 160000 --- a/plugins/ApolloSM_plugin +++ b/plugins/ApolloSM_plugin @@ -1 +1 @@ -Subproject commit 0885539e059d4157a50395d2db5ae64b04831a78 +Subproject commit 758550589bd5ecd9b2b739429c11c72ae1766959