diff --git a/.gitattributes b/.gitattributes index 0f9dbc44b3e91b71b0f634618f881974613bf1de..87e81460c929e6d0ace091570cf2ff962fca062e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -172,18 +172,6 @@ CMake/makeversion -text CMake/variants/variants.bgfen0 -text CMake/variants/variants.macdiepen -text CMake/variants/variants.rs002 -text -Firmware/images/ap3b_v5_12.hex -text -Firmware/images/bp3b_v5_13.hex -text -Firmware/images/mp7_4.hex -text -Firmware/images/mp_lp2_2.hex -text -Firmware/images/tp3_6.hex -text -Firmware/tools/bootstrap -text -Firmware/tools/src/flash_images.sh -text -Firmware/tools/src/restart_images.sh -text -Firmware/tools/src/rsuctl3 -text -Firmware/tools/src/rsuctl3.pl -text -Firmware/tools/src/rsuctl3_reset -text -Firmware/tools/src/view_images.sh -text JAVA/CEP/jParmFacade/nbproject/.cvsignore -text JAVA/GUI/MAC/jRSP/.cvsignore -text JAVA/GUI/MAC/jRSP/nbproject/.cvsignore -text @@ -298,6 +286,128 @@ LCS/Tools/src/processgcov -text LCS/lofar_config.h.cmake -text LCS/pyparameterset/bootstrap -text LCS/pytools/bootstrap -text +LCU/Firmware/images/ap3b_v5_12.hex -text +LCU/Firmware/images/bp3b_v5_13.hex -text +LCU/Firmware/images/mp7_4.hex -text +LCU/Firmware/images/mp_lp2_2.hex -text +LCU/Firmware/images/tp3_6.hex -text +LCU/Firmware/tools/bootstrap -text +LCU/Firmware/tools/src/flash_images.sh -text +LCU/Firmware/tools/src/restart_images.sh -text +LCU/Firmware/tools/src/rsuctl3 -text +LCU/Firmware/tools/src/rsuctl3.pl -text +LCU/Firmware/tools/src/rsuctl3_reset -text +LCU/Firmware/tools/src/view_images.sh -text +LCU/StationTest/README.txt -text +LCU/StationTest/bootstrap -text +LCU/StationTest/crc_dir_test.py -text +LCU/StationTest/gold/prbs_dir_test.gold -text +LCU/StationTest/gold/rsp_version.gold -text +LCU/StationTest/gold/tbb_memory.gold -text +LCU/StationTest/gold/tbb_memory0.gold -text +LCU/StationTest/gold/tbb_memory1.gold -text +LCU/StationTest/gold/tbb_memory10.gold -text +LCU/StationTest/gold/tbb_memory11.gold -text +LCU/StationTest/gold/tbb_memory2.gold -text +LCU/StationTest/gold/tbb_memory3.gold -text +LCU/StationTest/gold/tbb_memory4.gold -text +LCU/StationTest/gold/tbb_memory5.gold -text +LCU/StationTest/gold/tbb_memory6.gold -text +LCU/StationTest/gold/tbb_memory7.gold -text +LCU/StationTest/gold/tbb_memory8.gold -text +LCU/StationTest/gold/tbb_memory9.gold -text +LCU/StationTest/gold/tbb_size.gold -text +LCU/StationTest/gold/tbb_version.gold -text +LCU/StationTest/gold/xst.m -text +LCU/StationTest/gold/xst_160.gold -text +LCU/StationTest/gold/xst_200_even.gold -text +LCU/StationTest/gold/xst_200_odd.gold -text +LCU/StationTest/hbacontrol.txt -text +LCU/StationTest/i2c_spu.py -text +LCU/StationTest/i2c_td.py -text +LCU/StationTest/modules/cli.py -text +LCU/StationTest/modules/mep.py -text +LCU/StationTest/modules/rsp.py -text +LCU/StationTest/modules/smbus.py -text +LCU/StationTest/modules/testcase.py -text +LCU/StationTest/modules/testlog.py -text +LCU/StationTest/power_ctrl.py -text +LCU/StationTest/prbs_dir_test.py -text +LCU/StationTest/prbs_test.py -text +LCU/StationTest/rmfiles.sh -text +LCU/StationTest/rsp_version.sh -text +LCU/StationTest/rsp_xc_160.sh -text +LCU/StationTest/rsp_xc_200.sh -text +LCU/StationTest/station_production.py -text +LCU/StationTest/subrack_production.py -text +LCU/StationTest/subrackplustest.sh -text +LCU/StationTest/subracktest.sh -text +LCU/StationTest/tbb_memory.sh -text +LCU/StationTest/tbb_prbs_tester.sh -text +LCU/StationTest/tbb_size.sh -text +LCU/StationTest/tbb_version.sh -text +LCU/StationTest/tc/bist.py -text +LCU/StationTest/tc/cdo_ctrl.py -text +LCU/StationTest/tc/empty.py -text +LCU/StationTest/tc/hba_client.py -text +LCU/StationTest/tc/hba_server.py -text +LCU/StationTest/tc/prsg.py -text +LCU/StationTest/tc/rad_lanemode.py -text +LCU/StationTest/tc/rad_latency.py -text +LCU/StationTest/tc/rsr_overwrite.py -text +LCU/StationTest/tc/serdes.py -text +LCU/StationTest/tc/spustat.py -text +LCU/StationTest/tc/status.py -text +LCU/StationTest/tc/sync_delay.py -text +LCU/StationTest/tc/tdstat.py -text +LCU/StationTest/test/Makefile.am -text +LCU/StationTest/test/beamformertest/Makefile.am -text +LCU/StationTest/test/beamformertest/beamformertest_HBA_RCU192.sh -text +LCU/StationTest/test/beamformertest/beamformertest_HBA_RCU96.sh -text +LCU/StationTest/test/beamformertest/beamformertest_LBA_RCU192.sh -text +LCU/StationTest/test/beamformertest/beamformertest_LBA_RCU96.sh -text +LCU/StationTest/test/beamformertest/beamformertest_LBHLBL_RCU96.sh -text +LCU/StationTest/test/envcontroltest/Makefile.am -text +LCU/StationTest/test/envcontroltest/ec_ctrl.py -text +LCU/StationTest/test/envcontroltest/power_ctrl.py -text +LCU/StationTest/test/hbatest/Makefile.am -text +LCU/StationTest/test/hbatest/determinepeak.py -text +LCU/StationTest/test/hbatest/gold/Makefile.am -text +LCU/StationTest/test/hbatest/gold/hba_modem1.gold -text +LCU/StationTest/test/hbatest/gold/hba_modem2.gold -text +LCU/StationTest/test/hbatest/gold/hba_modem3.gold -text +LCU/StationTest/test/hbatest/hba_new_address.sh -text +LCU/StationTest/test/hbatest/hba_read_all.sh -text +LCU/StationTest/test/hbatest/hbaelementtest.py -text +LCU/StationTest/test/hbatest/hbaquicktest.py -text +LCU/StationTest/test/hbatest/modemtest.sh -text +LCU/StationTest/test/subbandstatistics/Makefile.am -text +LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-5.sh -text +LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-6.sh -text +LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-7.sh -text +LCU/StationTest/test/subbandstatistics/subbandstatistics_lbh-3.sh -text +LCU/StationTest/test/subbandstatistics/subbandstatistics_lbh-4.sh -text +LCU/StationTest/test/subbandstatistics/subbandstatistics_lbl-1.sh -text +LCU/StationTest/test/subbandstatistics/subbandstatistics_lbl-2.sh -text +LCU/StationTest/test/systemnoise/Makefile.am -text +LCU/StationTest/test/systemnoise/systemnoise_hba.sh -text +LCU/StationTest/test/systemnoise/systemnoise_lbh.sh -text +LCU/StationTest/test/systemnoise/systemnoise_lbl.sh -text +LCU/StationTest/test/timing/Makefile.am -text +LCU/StationTest/test/timing/gps.sh -text +LCU/StationTest/test/timing/ntpd.sh -text +LCU/StationTest/test/timing/ntpd_restart.sh -text +LCU/StationTest/test/timing/pps.sh -text +LCU/StationTest/test/xcstatistics/Makefile.am -text +LCU/StationTest/test/xcstatistics/waveform-generator-test.sh -text +LCU/StationTest/test/xcstatistics/xcstatistics_lbh.sh -text +LCU/StationTest/test/xcstatistics/xcstatistics_lbl.sh -text +LCU/StationTest/verify.py -text +LCU/StationTest/wgtest.sh -text +LCU/StationTest/xc_160_setup.sh -text +LCU/StationTest/xc_160_verify.sh -text +LCU/StationTest/xc_200_setup.sh -text +LCU/StationTest/xc_200_verify.sh -text MAC/APL/APLCommon/bootstrap -text svneol=native#application/octet-stream MAC/APL/APLCommon/src/StartDaemon_Protocol.prot -text svneol=native#application/octet-stream MAC/APL/CEPCU/src/ApplController/CMakeLists.txt -text @@ -1357,116 +1467,6 @@ SHM/Components/WebInterface/testing/djstart/playpen/urls.py -text SHM/apache_config/httpd.conf -text SHM/apache_config/sites-enabled/001-shmprod -text SHM/apache_config/sites-enabled/002-shmdev -text -StationTest/README.txt -text -StationTest/bootstrap -text -StationTest/crc_dir_test.py -text -StationTest/gold/prbs_dir_test.gold -text -StationTest/gold/rsp_version.gold -text -StationTest/gold/tbb_memory.gold -text -StationTest/gold/tbb_memory0.gold -text -StationTest/gold/tbb_memory1.gold -text -StationTest/gold/tbb_memory10.gold -text -StationTest/gold/tbb_memory11.gold -text -StationTest/gold/tbb_memory2.gold -text -StationTest/gold/tbb_memory3.gold -text -StationTest/gold/tbb_memory4.gold -text -StationTest/gold/tbb_memory5.gold -text -StationTest/gold/tbb_memory6.gold -text -StationTest/gold/tbb_memory7.gold -text -StationTest/gold/tbb_memory8.gold -text -StationTest/gold/tbb_memory9.gold -text -StationTest/gold/tbb_size.gold -text -StationTest/gold/tbb_version.gold -text -StationTest/gold/xst.m -text -StationTest/gold/xst_160.gold -text -StationTest/gold/xst_200_even.gold -text -StationTest/gold/xst_200_odd.gold -text -StationTest/hbacontrol.txt -text -StationTest/i2c_spu.py -text -StationTest/i2c_td.py -text -StationTest/modules/cli.py -text -StationTest/modules/mep.py -text -StationTest/modules/rsp.py -text -StationTest/modules/smbus.py -text -StationTest/modules/testcase.py -text -StationTest/modules/testlog.py -text -StationTest/power_ctrl.py -text -StationTest/prbs_dir_test.py -text -StationTest/prbs_test.py -text -StationTest/rmfiles.sh -text -StationTest/rsp_version.sh -text -StationTest/rsp_xc_160.sh -text -StationTest/rsp_xc_200.sh -text -StationTest/station_production.py -text -StationTest/subrack_production.py -text -StationTest/subrackplustest.sh -text -StationTest/subracktest.sh -text -StationTest/tbb_memory.sh -text -StationTest/tbb_prbs_tester.sh -text -StationTest/tbb_size.sh -text -StationTest/tbb_version.sh -text -StationTest/tc/bist.py -text -StationTest/tc/cdo_ctrl.py -text -StationTest/tc/empty.py -text -StationTest/tc/hba_client.py -text -StationTest/tc/hba_server.py -text -StationTest/tc/prsg.py -text -StationTest/tc/rad_lanemode.py -text -StationTest/tc/rad_latency.py -text -StationTest/tc/rsr_overwrite.py -text -StationTest/tc/serdes.py -text -StationTest/tc/spustat.py -text -StationTest/tc/status.py -text -StationTest/tc/sync_delay.py -text -StationTest/tc/tdstat.py -text -StationTest/test/Makefile.am -text -StationTest/test/beamformertest/Makefile.am -text -StationTest/test/beamformertest/beamformertest_HBA_RCU192.sh -text -StationTest/test/beamformertest/beamformertest_HBA_RCU96.sh -text -StationTest/test/beamformertest/beamformertest_LBA_RCU192.sh -text -StationTest/test/beamformertest/beamformertest_LBA_RCU96.sh -text -StationTest/test/beamformertest/beamformertest_LBHLBL_RCU96.sh -text -StationTest/test/envcontroltest/Makefile.am -text -StationTest/test/envcontroltest/ec_ctrl.py -text -StationTest/test/envcontroltest/power_ctrl.py -text -StationTest/test/hbatest/Makefile.am -text -StationTest/test/hbatest/determinepeak.py -text -StationTest/test/hbatest/gold/Makefile.am -text -StationTest/test/hbatest/gold/hba_modem1.gold -text -StationTest/test/hbatest/gold/hba_modem2.gold -text -StationTest/test/hbatest/gold/hba_modem3.gold -text -StationTest/test/hbatest/hba_new_address.sh -text -StationTest/test/hbatest/hba_read_all.sh -text -StationTest/test/hbatest/hbaelementtest.py -text -StationTest/test/hbatest/hbaquicktest.py -text -StationTest/test/hbatest/modemtest.sh -text -StationTest/test/subbandstatistics/Makefile.am -text -StationTest/test/subbandstatistics/subbandstatistics_hba-5.sh -text -StationTest/test/subbandstatistics/subbandstatistics_hba-6.sh -text -StationTest/test/subbandstatistics/subbandstatistics_hba-7.sh -text -StationTest/test/subbandstatistics/subbandstatistics_lbh-3.sh -text -StationTest/test/subbandstatistics/subbandstatistics_lbh-4.sh -text -StationTest/test/subbandstatistics/subbandstatistics_lbl-1.sh -text -StationTest/test/subbandstatistics/subbandstatistics_lbl-2.sh -text -StationTest/test/systemnoise/Makefile.am -text -StationTest/test/systemnoise/systemnoise_hba.sh -text -StationTest/test/systemnoise/systemnoise_lbh.sh -text -StationTest/test/systemnoise/systemnoise_lbl.sh -text -StationTest/test/timing/Makefile.am -text -StationTest/test/timing/gps.sh -text -StationTest/test/timing/ntpd.sh -text -StationTest/test/timing/ntpd_restart.sh -text -StationTest/test/timing/pps.sh -text -StationTest/test/xcstatistics/Makefile.am -text -StationTest/test/xcstatistics/waveform-generator-test.sh -text -StationTest/test/xcstatistics/xcstatistics_lbh.sh -text -StationTest/test/xcstatistics/xcstatistics_lbl.sh -text -StationTest/verify.py -text -StationTest/wgtest.sh -text -StationTest/xc_160_setup.sh -text -StationTest/xc_160_verify.sh -text -StationTest/xc_200_setup.sh -text -StationTest/xc_200_verify.sh -text SubSystems/CCU_MAC/lofarconf.in -text SubSystems/LCU_MAC/lofarconf.in -text SubSystems/MCU_MAC/lofarconf.in -text diff --git a/.gitignore b/.gitignore index 0ae6e789560ea71c55f0e6fb54a47d858de26c10..aa0e53f35f815f25cb8de428e8c7c33c098bb47a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,9 +33,6 @@ CEP/pyparmdb/Makefile.common CEP/pyparmdb/autoconf_share CEP/pyparmdb/lofarconf CEP/pyparmdb/py-compile -Firmware/tools/Makefile.common -Firmware/tools/autoconf_share -Firmware/tools/lofarconf JAVA/CEP/jParmFacade/Makefile.common JAVA/CEP/jParmFacade/autoconf_share JAVA/CEP/jParmFacade/lofarconf @@ -96,6 +93,9 @@ LCS/pytools/Makefile.common LCS/pytools/autoconf_share LCS/pytools/lofarconf LCS/pytools/py-compile +LCU/Firmware/tools/Makefile.common +LCU/Firmware/tools/autoconf_share +LCU/Firmware/tools/lofarconf MAC/APL/APLCommon/Makefile.common MAC/APL/APLCommon/autoconf_share MAC/APL/APLCommon/lofarconf diff --git a/Firmware/images/ap3b_v5_12.hex b/LCU/Firmware/images/ap3b_v5_12.hex similarity index 100% rename from Firmware/images/ap3b_v5_12.hex rename to LCU/Firmware/images/ap3b_v5_12.hex diff --git a/Firmware/images/bp3b_v5_13.hex b/LCU/Firmware/images/bp3b_v5_13.hex similarity index 100% rename from Firmware/images/bp3b_v5_13.hex rename to LCU/Firmware/images/bp3b_v5_13.hex diff --git a/Firmware/images/mp7_4.hex b/LCU/Firmware/images/mp7_4.hex similarity index 100% rename from Firmware/images/mp7_4.hex rename to LCU/Firmware/images/mp7_4.hex diff --git a/Firmware/images/mp_lp2_2.hex b/LCU/Firmware/images/mp_lp2_2.hex similarity index 100% rename from Firmware/images/mp_lp2_2.hex rename to LCU/Firmware/images/mp_lp2_2.hex diff --git a/Firmware/images/tp3_6.hex b/LCU/Firmware/images/tp3_6.hex similarity index 100% rename from Firmware/images/tp3_6.hex rename to LCU/Firmware/images/tp3_6.hex diff --git a/Firmware/tools/Makefile.am b/LCU/Firmware/tools/Makefile.am similarity index 100% rename from Firmware/tools/Makefile.am rename to LCU/Firmware/tools/Makefile.am diff --git a/Firmware/tools/bootstrap b/LCU/Firmware/tools/bootstrap similarity index 100% rename from Firmware/tools/bootstrap rename to LCU/Firmware/tools/bootstrap diff --git a/Firmware/tools/configure.in b/LCU/Firmware/tools/configure.in similarity index 100% rename from Firmware/tools/configure.in rename to LCU/Firmware/tools/configure.in diff --git a/Firmware/tools/src/Makefile.am b/LCU/Firmware/tools/src/Makefile.am similarity index 100% rename from Firmware/tools/src/Makefile.am rename to LCU/Firmware/tools/src/Makefile.am diff --git a/Firmware/tools/src/README.rsuctl b/LCU/Firmware/tools/src/README.rsuctl similarity index 100% rename from Firmware/tools/src/README.rsuctl rename to LCU/Firmware/tools/src/README.rsuctl diff --git a/Firmware/tools/src/flash_images.sh b/LCU/Firmware/tools/src/flash_images.sh similarity index 100% rename from Firmware/tools/src/flash_images.sh rename to LCU/Firmware/tools/src/flash_images.sh diff --git a/Firmware/tools/src/flash_tbb.sh b/LCU/Firmware/tools/src/flash_tbb.sh similarity index 100% rename from Firmware/tools/src/flash_tbb.sh rename to LCU/Firmware/tools/src/flash_tbb.sh diff --git a/Firmware/tools/src/restart_images.sh b/LCU/Firmware/tools/src/restart_images.sh similarity index 100% rename from Firmware/tools/src/restart_images.sh rename to LCU/Firmware/tools/src/restart_images.sh diff --git a/Firmware/tools/src/rsuctl b/LCU/Firmware/tools/src/rsuctl similarity index 100% rename from Firmware/tools/src/rsuctl rename to LCU/Firmware/tools/src/rsuctl diff --git a/Firmware/tools/src/rsuctl3 b/LCU/Firmware/tools/src/rsuctl3 similarity index 100% rename from Firmware/tools/src/rsuctl3 rename to LCU/Firmware/tools/src/rsuctl3 diff --git a/Firmware/tools/src/rsuctl3.pl b/LCU/Firmware/tools/src/rsuctl3.pl similarity index 100% rename from Firmware/tools/src/rsuctl3.pl rename to LCU/Firmware/tools/src/rsuctl3.pl diff --git a/Firmware/tools/src/rsuctl3_reset b/LCU/Firmware/tools/src/rsuctl3_reset similarity index 100% rename from Firmware/tools/src/rsuctl3_reset rename to LCU/Firmware/tools/src/rsuctl3_reset diff --git a/Firmware/tools/src/view_images.sh b/LCU/Firmware/tools/src/view_images.sh similarity index 100% rename from Firmware/tools/src/view_images.sh rename to LCU/Firmware/tools/src/view_images.sh diff --git a/StationTest/Makefile.am b/LCU/StationTest/Makefile.am similarity index 100% rename from StationTest/Makefile.am rename to LCU/StationTest/Makefile.am diff --git a/StationTest/README.txt b/LCU/StationTest/README.txt similarity index 100% rename from StationTest/README.txt rename to LCU/StationTest/README.txt diff --git a/StationTest/bootstrap b/LCU/StationTest/bootstrap similarity index 100% rename from StationTest/bootstrap rename to LCU/StationTest/bootstrap diff --git a/StationTest/configure.in b/LCU/StationTest/configure.in similarity index 100% rename from StationTest/configure.in rename to LCU/StationTest/configure.in diff --git a/StationTest/crc_dir_test.py b/LCU/StationTest/crc_dir_test.py similarity index 100% rename from StationTest/crc_dir_test.py rename to LCU/StationTest/crc_dir_test.py diff --git a/StationTest/gold/Makefile.am b/LCU/StationTest/gold/Makefile.am similarity index 100% rename from StationTest/gold/Makefile.am rename to LCU/StationTest/gold/Makefile.am diff --git a/StationTest/gold/prbs_dir_test.gold b/LCU/StationTest/gold/prbs_dir_test.gold similarity index 100% rename from StationTest/gold/prbs_dir_test.gold rename to LCU/StationTest/gold/prbs_dir_test.gold diff --git a/StationTest/gold/rsp_version.gold b/LCU/StationTest/gold/rsp_version.gold similarity index 100% rename from StationTest/gold/rsp_version.gold rename to LCU/StationTest/gold/rsp_version.gold diff --git a/StationTest/gold/tbb_memory.gold b/LCU/StationTest/gold/tbb_memory.gold similarity index 100% rename from StationTest/gold/tbb_memory.gold rename to LCU/StationTest/gold/tbb_memory.gold diff --git a/StationTest/gold/tbb_memory0.gold b/LCU/StationTest/gold/tbb_memory0.gold similarity index 100% rename from StationTest/gold/tbb_memory0.gold rename to LCU/StationTest/gold/tbb_memory0.gold diff --git a/StationTest/gold/tbb_memory1.gold b/LCU/StationTest/gold/tbb_memory1.gold similarity index 100% rename from StationTest/gold/tbb_memory1.gold rename to LCU/StationTest/gold/tbb_memory1.gold diff --git a/StationTest/gold/tbb_memory10.gold b/LCU/StationTest/gold/tbb_memory10.gold similarity index 100% rename from StationTest/gold/tbb_memory10.gold rename to LCU/StationTest/gold/tbb_memory10.gold diff --git a/StationTest/gold/tbb_memory11.gold b/LCU/StationTest/gold/tbb_memory11.gold similarity index 100% rename from StationTest/gold/tbb_memory11.gold rename to LCU/StationTest/gold/tbb_memory11.gold diff --git a/StationTest/gold/tbb_memory2.gold b/LCU/StationTest/gold/tbb_memory2.gold similarity index 100% rename from StationTest/gold/tbb_memory2.gold rename to LCU/StationTest/gold/tbb_memory2.gold diff --git a/StationTest/gold/tbb_memory3.gold b/LCU/StationTest/gold/tbb_memory3.gold similarity index 100% rename from StationTest/gold/tbb_memory3.gold rename to LCU/StationTest/gold/tbb_memory3.gold diff --git a/StationTest/gold/tbb_memory4.gold b/LCU/StationTest/gold/tbb_memory4.gold similarity index 100% rename from StationTest/gold/tbb_memory4.gold rename to LCU/StationTest/gold/tbb_memory4.gold diff --git a/StationTest/gold/tbb_memory5.gold b/LCU/StationTest/gold/tbb_memory5.gold similarity index 100% rename from StationTest/gold/tbb_memory5.gold rename to LCU/StationTest/gold/tbb_memory5.gold diff --git a/StationTest/gold/tbb_memory6.gold b/LCU/StationTest/gold/tbb_memory6.gold similarity index 100% rename from StationTest/gold/tbb_memory6.gold rename to LCU/StationTest/gold/tbb_memory6.gold diff --git a/StationTest/gold/tbb_memory7.gold b/LCU/StationTest/gold/tbb_memory7.gold similarity index 100% rename from StationTest/gold/tbb_memory7.gold rename to LCU/StationTest/gold/tbb_memory7.gold diff --git a/StationTest/gold/tbb_memory8.gold b/LCU/StationTest/gold/tbb_memory8.gold similarity index 100% rename from StationTest/gold/tbb_memory8.gold rename to LCU/StationTest/gold/tbb_memory8.gold diff --git a/StationTest/gold/tbb_memory9.gold b/LCU/StationTest/gold/tbb_memory9.gold similarity index 100% rename from StationTest/gold/tbb_memory9.gold rename to LCU/StationTest/gold/tbb_memory9.gold diff --git a/StationTest/gold/tbb_size.gold b/LCU/StationTest/gold/tbb_size.gold similarity index 100% rename from StationTest/gold/tbb_size.gold rename to LCU/StationTest/gold/tbb_size.gold diff --git a/StationTest/gold/tbb_version.gold b/LCU/StationTest/gold/tbb_version.gold similarity index 100% rename from StationTest/gold/tbb_version.gold rename to LCU/StationTest/gold/tbb_version.gold diff --git a/StationTest/gold/xst.m b/LCU/StationTest/gold/xst.m similarity index 100% rename from StationTest/gold/xst.m rename to LCU/StationTest/gold/xst.m diff --git a/StationTest/gold/xst_160.gold b/LCU/StationTest/gold/xst_160.gold similarity index 100% rename from StationTest/gold/xst_160.gold rename to LCU/StationTest/gold/xst_160.gold diff --git a/StationTest/gold/xst_200_even.gold b/LCU/StationTest/gold/xst_200_even.gold similarity index 100% rename from StationTest/gold/xst_200_even.gold rename to LCU/StationTest/gold/xst_200_even.gold diff --git a/StationTest/gold/xst_200_odd.gold b/LCU/StationTest/gold/xst_200_odd.gold similarity index 100% rename from StationTest/gold/xst_200_odd.gold rename to LCU/StationTest/gold/xst_200_odd.gold diff --git a/StationTest/hbacontrol.txt b/LCU/StationTest/hbacontrol.txt similarity index 100% rename from StationTest/hbacontrol.txt rename to LCU/StationTest/hbacontrol.txt diff --git a/StationTest/i2c_spu.py b/LCU/StationTest/i2c_spu.py similarity index 100% rename from StationTest/i2c_spu.py rename to LCU/StationTest/i2c_spu.py diff --git a/StationTest/i2c_td.py b/LCU/StationTest/i2c_td.py similarity index 100% rename from StationTest/i2c_td.py rename to LCU/StationTest/i2c_td.py diff --git a/StationTest/modules/Makefile.am b/LCU/StationTest/modules/Makefile.am similarity index 100% rename from StationTest/modules/Makefile.am rename to LCU/StationTest/modules/Makefile.am diff --git a/StationTest/modules/cli.py b/LCU/StationTest/modules/cli.py similarity index 100% rename from StationTest/modules/cli.py rename to LCU/StationTest/modules/cli.py diff --git a/StationTest/modules/mep.py b/LCU/StationTest/modules/mep.py similarity index 100% rename from StationTest/modules/mep.py rename to LCU/StationTest/modules/mep.py diff --git a/StationTest/modules/rsp.py b/LCU/StationTest/modules/rsp.py similarity index 100% rename from StationTest/modules/rsp.py rename to LCU/StationTest/modules/rsp.py diff --git a/StationTest/modules/smbus.py b/LCU/StationTest/modules/smbus.py similarity index 100% rename from StationTest/modules/smbus.py rename to LCU/StationTest/modules/smbus.py diff --git a/StationTest/modules/testcase.py b/LCU/StationTest/modules/testcase.py similarity index 100% rename from StationTest/modules/testcase.py rename to LCU/StationTest/modules/testcase.py diff --git a/StationTest/modules/testlog.py b/LCU/StationTest/modules/testlog.py similarity index 100% rename from StationTest/modules/testlog.py rename to LCU/StationTest/modules/testlog.py diff --git a/StationTest/power_ctrl.py b/LCU/StationTest/power_ctrl.py similarity index 100% rename from StationTest/power_ctrl.py rename to LCU/StationTest/power_ctrl.py diff --git a/StationTest/prbs_dir_test.py b/LCU/StationTest/prbs_dir_test.py similarity index 100% rename from StationTest/prbs_dir_test.py rename to LCU/StationTest/prbs_dir_test.py diff --git a/StationTest/prbs_test.py b/LCU/StationTest/prbs_test.py similarity index 100% rename from StationTest/prbs_test.py rename to LCU/StationTest/prbs_test.py diff --git a/StationTest/rmfiles.sh b/LCU/StationTest/rmfiles.sh similarity index 100% rename from StationTest/rmfiles.sh rename to LCU/StationTest/rmfiles.sh diff --git a/StationTest/rsp_version.sh b/LCU/StationTest/rsp_version.sh similarity index 100% rename from StationTest/rsp_version.sh rename to LCU/StationTest/rsp_version.sh diff --git a/StationTest/rsp_xc_160.sh b/LCU/StationTest/rsp_xc_160.sh similarity index 100% rename from StationTest/rsp_xc_160.sh rename to LCU/StationTest/rsp_xc_160.sh diff --git a/StationTest/rsp_xc_200.sh b/LCU/StationTest/rsp_xc_200.sh similarity index 100% rename from StationTest/rsp_xc_200.sh rename to LCU/StationTest/rsp_xc_200.sh diff --git a/StationTest/station_production.py b/LCU/StationTest/station_production.py similarity index 100% rename from StationTest/station_production.py rename to LCU/StationTest/station_production.py diff --git a/StationTest/subrack_production.py b/LCU/StationTest/subrack_production.py similarity index 100% rename from StationTest/subrack_production.py rename to LCU/StationTest/subrack_production.py diff --git a/StationTest/subrackplustest.sh b/LCU/StationTest/subrackplustest.sh similarity index 100% rename from StationTest/subrackplustest.sh rename to LCU/StationTest/subrackplustest.sh diff --git a/StationTest/subracktest.sh b/LCU/StationTest/subracktest.sh similarity index 100% rename from StationTest/subracktest.sh rename to LCU/StationTest/subracktest.sh diff --git a/StationTest/tbb_memory.sh b/LCU/StationTest/tbb_memory.sh similarity index 100% rename from StationTest/tbb_memory.sh rename to LCU/StationTest/tbb_memory.sh diff --git a/StationTest/tbb_prbs_tester.sh b/LCU/StationTest/tbb_prbs_tester.sh similarity index 100% rename from StationTest/tbb_prbs_tester.sh rename to LCU/StationTest/tbb_prbs_tester.sh diff --git a/StationTest/tbb_size.sh b/LCU/StationTest/tbb_size.sh similarity index 100% rename from StationTest/tbb_size.sh rename to LCU/StationTest/tbb_size.sh diff --git a/StationTest/tbb_version.sh b/LCU/StationTest/tbb_version.sh similarity index 100% rename from StationTest/tbb_version.sh rename to LCU/StationTest/tbb_version.sh diff --git a/StationTest/tc/Makefile.am b/LCU/StationTest/tc/Makefile.am similarity index 100% rename from StationTest/tc/Makefile.am rename to LCU/StationTest/tc/Makefile.am diff --git a/StationTest/tc/bist.py b/LCU/StationTest/tc/bist.py similarity index 100% rename from StationTest/tc/bist.py rename to LCU/StationTest/tc/bist.py diff --git a/StationTest/tc/cdo_ctrl.py b/LCU/StationTest/tc/cdo_ctrl.py similarity index 100% rename from StationTest/tc/cdo_ctrl.py rename to LCU/StationTest/tc/cdo_ctrl.py diff --git a/StationTest/tc/empty.py b/LCU/StationTest/tc/empty.py similarity index 100% rename from StationTest/tc/empty.py rename to LCU/StationTest/tc/empty.py diff --git a/StationTest/tc/hba_client.py b/LCU/StationTest/tc/hba_client.py similarity index 100% rename from StationTest/tc/hba_client.py rename to LCU/StationTest/tc/hba_client.py diff --git a/StationTest/tc/hba_server.py b/LCU/StationTest/tc/hba_server.py similarity index 100% rename from StationTest/tc/hba_server.py rename to LCU/StationTest/tc/hba_server.py diff --git a/StationTest/tc/prsg.py b/LCU/StationTest/tc/prsg.py similarity index 100% rename from StationTest/tc/prsg.py rename to LCU/StationTest/tc/prsg.py diff --git a/StationTest/tc/rad_lanemode.py b/LCU/StationTest/tc/rad_lanemode.py similarity index 100% rename from StationTest/tc/rad_lanemode.py rename to LCU/StationTest/tc/rad_lanemode.py diff --git a/StationTest/tc/rad_latency.py b/LCU/StationTest/tc/rad_latency.py similarity index 100% rename from StationTest/tc/rad_latency.py rename to LCU/StationTest/tc/rad_latency.py diff --git a/StationTest/tc/rsr_overwrite.py b/LCU/StationTest/tc/rsr_overwrite.py similarity index 100% rename from StationTest/tc/rsr_overwrite.py rename to LCU/StationTest/tc/rsr_overwrite.py diff --git a/StationTest/tc/serdes.py b/LCU/StationTest/tc/serdes.py similarity index 100% rename from StationTest/tc/serdes.py rename to LCU/StationTest/tc/serdes.py diff --git a/StationTest/tc/spustat.py b/LCU/StationTest/tc/spustat.py similarity index 100% rename from StationTest/tc/spustat.py rename to LCU/StationTest/tc/spustat.py diff --git a/StationTest/tc/status.py b/LCU/StationTest/tc/status.py similarity index 100% rename from StationTest/tc/status.py rename to LCU/StationTest/tc/status.py diff --git a/StationTest/tc/sync_delay.py b/LCU/StationTest/tc/sync_delay.py similarity index 100% rename from StationTest/tc/sync_delay.py rename to LCU/StationTest/tc/sync_delay.py diff --git a/StationTest/tc/tdstat.py b/LCU/StationTest/tc/tdstat.py similarity index 100% rename from StationTest/tc/tdstat.py rename to LCU/StationTest/tc/tdstat.py diff --git a/StationTest/test/Makefile.am b/LCU/StationTest/test/Makefile.am similarity index 100% rename from StationTest/test/Makefile.am rename to LCU/StationTest/test/Makefile.am diff --git a/StationTest/test/beamformertest/Makefile.am b/LCU/StationTest/test/beamformertest/Makefile.am similarity index 100% rename from StationTest/test/beamformertest/Makefile.am rename to LCU/StationTest/test/beamformertest/Makefile.am diff --git a/StationTest/test/beamformertest/beamformertest_HBA_RCU192.sh b/LCU/StationTest/test/beamformertest/beamformertest_HBA_RCU192.sh similarity index 100% rename from StationTest/test/beamformertest/beamformertest_HBA_RCU192.sh rename to LCU/StationTest/test/beamformertest/beamformertest_HBA_RCU192.sh diff --git a/StationTest/test/beamformertest/beamformertest_HBA_RCU96.sh b/LCU/StationTest/test/beamformertest/beamformertest_HBA_RCU96.sh similarity index 100% rename from StationTest/test/beamformertest/beamformertest_HBA_RCU96.sh rename to LCU/StationTest/test/beamformertest/beamformertest_HBA_RCU96.sh diff --git a/StationTest/test/beamformertest/beamformertest_LBA_RCU192.sh b/LCU/StationTest/test/beamformertest/beamformertest_LBA_RCU192.sh similarity index 100% rename from StationTest/test/beamformertest/beamformertest_LBA_RCU192.sh rename to LCU/StationTest/test/beamformertest/beamformertest_LBA_RCU192.sh diff --git a/StationTest/test/beamformertest/beamformertest_LBA_RCU96.sh b/LCU/StationTest/test/beamformertest/beamformertest_LBA_RCU96.sh similarity index 100% rename from StationTest/test/beamformertest/beamformertest_LBA_RCU96.sh rename to LCU/StationTest/test/beamformertest/beamformertest_LBA_RCU96.sh diff --git a/StationTest/test/beamformertest/beamformertest_LBHLBL_RCU96.sh b/LCU/StationTest/test/beamformertest/beamformertest_LBHLBL_RCU96.sh similarity index 100% rename from StationTest/test/beamformertest/beamformertest_LBHLBL_RCU96.sh rename to LCU/StationTest/test/beamformertest/beamformertest_LBHLBL_RCU96.sh diff --git a/StationTest/test/envcontroltest/Makefile.am b/LCU/StationTest/test/envcontroltest/Makefile.am similarity index 100% rename from StationTest/test/envcontroltest/Makefile.am rename to LCU/StationTest/test/envcontroltest/Makefile.am diff --git a/StationTest/test/envcontroltest/ec_ctrl.py b/LCU/StationTest/test/envcontroltest/ec_ctrl.py similarity index 100% rename from StationTest/test/envcontroltest/ec_ctrl.py rename to LCU/StationTest/test/envcontroltest/ec_ctrl.py diff --git a/StationTest/test/envcontroltest/power_ctrl.py b/LCU/StationTest/test/envcontroltest/power_ctrl.py similarity index 100% rename from StationTest/test/envcontroltest/power_ctrl.py rename to LCU/StationTest/test/envcontroltest/power_ctrl.py diff --git a/StationTest/test/hbatest/Makefile.am b/LCU/StationTest/test/hbatest/Makefile.am similarity index 100% rename from StationTest/test/hbatest/Makefile.am rename to LCU/StationTest/test/hbatest/Makefile.am diff --git a/StationTest/test/hbatest/determinepeak.py b/LCU/StationTest/test/hbatest/determinepeak.py similarity index 100% rename from StationTest/test/hbatest/determinepeak.py rename to LCU/StationTest/test/hbatest/determinepeak.py diff --git a/StationTest/test/hbatest/gold/Makefile.am b/LCU/StationTest/test/hbatest/gold/Makefile.am similarity index 100% rename from StationTest/test/hbatest/gold/Makefile.am rename to LCU/StationTest/test/hbatest/gold/Makefile.am diff --git a/StationTest/test/hbatest/gold/hba_modem1.gold b/LCU/StationTest/test/hbatest/gold/hba_modem1.gold similarity index 100% rename from StationTest/test/hbatest/gold/hba_modem1.gold rename to LCU/StationTest/test/hbatest/gold/hba_modem1.gold diff --git a/StationTest/test/hbatest/gold/hba_modem2.gold b/LCU/StationTest/test/hbatest/gold/hba_modem2.gold similarity index 100% rename from StationTest/test/hbatest/gold/hba_modem2.gold rename to LCU/StationTest/test/hbatest/gold/hba_modem2.gold diff --git a/StationTest/test/hbatest/gold/hba_modem3.gold b/LCU/StationTest/test/hbatest/gold/hba_modem3.gold similarity index 100% rename from StationTest/test/hbatest/gold/hba_modem3.gold rename to LCU/StationTest/test/hbatest/gold/hba_modem3.gold diff --git a/StationTest/test/hbatest/hba_new_address.sh b/LCU/StationTest/test/hbatest/hba_new_address.sh similarity index 100% rename from StationTest/test/hbatest/hba_new_address.sh rename to LCU/StationTest/test/hbatest/hba_new_address.sh diff --git a/StationTest/test/hbatest/hba_read_all.sh b/LCU/StationTest/test/hbatest/hba_read_all.sh similarity index 100% rename from StationTest/test/hbatest/hba_read_all.sh rename to LCU/StationTest/test/hbatest/hba_read_all.sh diff --git a/StationTest/test/hbatest/hbaelementtest.py b/LCU/StationTest/test/hbatest/hbaelementtest.py similarity index 100% rename from StationTest/test/hbatest/hbaelementtest.py rename to LCU/StationTest/test/hbatest/hbaelementtest.py diff --git a/StationTest/test/hbatest/hbaquicktest.py b/LCU/StationTest/test/hbatest/hbaquicktest.py similarity index 100% rename from StationTest/test/hbatest/hbaquicktest.py rename to LCU/StationTest/test/hbatest/hbaquicktest.py diff --git a/StationTest/test/hbatest/modemtest.sh b/LCU/StationTest/test/hbatest/modemtest.sh similarity index 100% rename from StationTest/test/hbatest/modemtest.sh rename to LCU/StationTest/test/hbatest/modemtest.sh diff --git a/StationTest/test/subbandstatistics/Makefile.am b/LCU/StationTest/test/subbandstatistics/Makefile.am similarity index 100% rename from StationTest/test/subbandstatistics/Makefile.am rename to LCU/StationTest/test/subbandstatistics/Makefile.am diff --git a/StationTest/test/subbandstatistics/subbandstatistics_hba-5.sh b/LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-5.sh similarity index 100% rename from StationTest/test/subbandstatistics/subbandstatistics_hba-5.sh rename to LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-5.sh diff --git a/StationTest/test/subbandstatistics/subbandstatistics_hba-6.sh b/LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-6.sh similarity index 100% rename from StationTest/test/subbandstatistics/subbandstatistics_hba-6.sh rename to LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-6.sh diff --git a/StationTest/test/subbandstatistics/subbandstatistics_hba-7.sh b/LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-7.sh similarity index 100% rename from StationTest/test/subbandstatistics/subbandstatistics_hba-7.sh rename to LCU/StationTest/test/subbandstatistics/subbandstatistics_hba-7.sh diff --git a/StationTest/test/subbandstatistics/subbandstatistics_lbh-3.sh b/LCU/StationTest/test/subbandstatistics/subbandstatistics_lbh-3.sh similarity index 100% rename from StationTest/test/subbandstatistics/subbandstatistics_lbh-3.sh rename to LCU/StationTest/test/subbandstatistics/subbandstatistics_lbh-3.sh diff --git a/StationTest/test/subbandstatistics/subbandstatistics_lbh-4.sh b/LCU/StationTest/test/subbandstatistics/subbandstatistics_lbh-4.sh similarity index 100% rename from StationTest/test/subbandstatistics/subbandstatistics_lbh-4.sh rename to LCU/StationTest/test/subbandstatistics/subbandstatistics_lbh-4.sh diff --git a/StationTest/test/subbandstatistics/subbandstatistics_lbl-1.sh b/LCU/StationTest/test/subbandstatistics/subbandstatistics_lbl-1.sh similarity index 100% rename from StationTest/test/subbandstatistics/subbandstatistics_lbl-1.sh rename to LCU/StationTest/test/subbandstatistics/subbandstatistics_lbl-1.sh diff --git a/StationTest/test/subbandstatistics/subbandstatistics_lbl-2.sh b/LCU/StationTest/test/subbandstatistics/subbandstatistics_lbl-2.sh similarity index 100% rename from StationTest/test/subbandstatistics/subbandstatistics_lbl-2.sh rename to LCU/StationTest/test/subbandstatistics/subbandstatistics_lbl-2.sh diff --git a/StationTest/test/systemnoise/Makefile.am b/LCU/StationTest/test/systemnoise/Makefile.am similarity index 100% rename from StationTest/test/systemnoise/Makefile.am rename to LCU/StationTest/test/systemnoise/Makefile.am diff --git a/StationTest/test/systemnoise/systemnoise_hba.sh b/LCU/StationTest/test/systemnoise/systemnoise_hba.sh similarity index 100% rename from StationTest/test/systemnoise/systemnoise_hba.sh rename to LCU/StationTest/test/systemnoise/systemnoise_hba.sh diff --git a/StationTest/test/systemnoise/systemnoise_lbh.sh b/LCU/StationTest/test/systemnoise/systemnoise_lbh.sh similarity index 100% rename from StationTest/test/systemnoise/systemnoise_lbh.sh rename to LCU/StationTest/test/systemnoise/systemnoise_lbh.sh diff --git a/StationTest/test/systemnoise/systemnoise_lbl.sh b/LCU/StationTest/test/systemnoise/systemnoise_lbl.sh similarity index 100% rename from StationTest/test/systemnoise/systemnoise_lbl.sh rename to LCU/StationTest/test/systemnoise/systemnoise_lbl.sh diff --git a/StationTest/test/timing/Makefile.am b/LCU/StationTest/test/timing/Makefile.am similarity index 100% rename from StationTest/test/timing/Makefile.am rename to LCU/StationTest/test/timing/Makefile.am diff --git a/StationTest/test/timing/gps.sh b/LCU/StationTest/test/timing/gps.sh similarity index 100% rename from StationTest/test/timing/gps.sh rename to LCU/StationTest/test/timing/gps.sh diff --git a/StationTest/test/timing/ntpd.sh b/LCU/StationTest/test/timing/ntpd.sh similarity index 100% rename from StationTest/test/timing/ntpd.sh rename to LCU/StationTest/test/timing/ntpd.sh diff --git a/StationTest/test/timing/ntpd_restart.sh b/LCU/StationTest/test/timing/ntpd_restart.sh similarity index 100% rename from StationTest/test/timing/ntpd_restart.sh rename to LCU/StationTest/test/timing/ntpd_restart.sh diff --git a/StationTest/test/timing/pps.sh b/LCU/StationTest/test/timing/pps.sh similarity index 100% rename from StationTest/test/timing/pps.sh rename to LCU/StationTest/test/timing/pps.sh diff --git a/StationTest/test/xcstatistics/Makefile.am b/LCU/StationTest/test/xcstatistics/Makefile.am similarity index 100% rename from StationTest/test/xcstatistics/Makefile.am rename to LCU/StationTest/test/xcstatistics/Makefile.am diff --git a/StationTest/test/xcstatistics/waveform-generator-test.sh b/LCU/StationTest/test/xcstatistics/waveform-generator-test.sh similarity index 100% rename from StationTest/test/xcstatistics/waveform-generator-test.sh rename to LCU/StationTest/test/xcstatistics/waveform-generator-test.sh diff --git a/StationTest/test/xcstatistics/xcstatistics_lbh.sh b/LCU/StationTest/test/xcstatistics/xcstatistics_lbh.sh similarity index 100% rename from StationTest/test/xcstatistics/xcstatistics_lbh.sh rename to LCU/StationTest/test/xcstatistics/xcstatistics_lbh.sh diff --git a/StationTest/test/xcstatistics/xcstatistics_lbl.sh b/LCU/StationTest/test/xcstatistics/xcstatistics_lbl.sh similarity index 100% rename from StationTest/test/xcstatistics/xcstatistics_lbl.sh rename to LCU/StationTest/test/xcstatistics/xcstatistics_lbl.sh diff --git a/StationTest/verify.py b/LCU/StationTest/verify.py similarity index 100% rename from StationTest/verify.py rename to LCU/StationTest/verify.py diff --git a/StationTest/wgtest.sh b/LCU/StationTest/wgtest.sh similarity index 100% rename from StationTest/wgtest.sh rename to LCU/StationTest/wgtest.sh diff --git a/StationTest/xc_160_setup.sh b/LCU/StationTest/xc_160_setup.sh similarity index 100% rename from StationTest/xc_160_setup.sh rename to LCU/StationTest/xc_160_setup.sh diff --git a/StationTest/xc_160_verify.sh b/LCU/StationTest/xc_160_verify.sh similarity index 100% rename from StationTest/xc_160_verify.sh rename to LCU/StationTest/xc_160_verify.sh diff --git a/StationTest/xc_200_setup.sh b/LCU/StationTest/xc_200_setup.sh similarity index 100% rename from StationTest/xc_200_setup.sh rename to LCU/StationTest/xc_200_setup.sh diff --git a/StationTest/xc_200_verify.sh b/LCU/StationTest/xc_200_verify.sh similarity index 100% rename from StationTest/xc_200_verify.sh rename to LCU/StationTest/xc_200_verify.sh diff --git a/SubSystems/LCU_MAC/lofarconf.in b/SubSystems/LCU_MAC/lofarconf.in index 4dacf588c88393bfaf09eccb4328eb346107d2a8..afc08e0448b3460bef577d6750450c176c8217de 100644 --- a/SubSystems/LCU_MAC/lofarconf.in +++ b/SubSystems/LCU_MAC/lofarconf.in @@ -6,6 +6,6 @@ /MAC/Deployment /MAC/Navigator2 /LCS/AMC -/Firmware/tools -/StationTest +/LCU/Firmware/tools +/LCU/StationTest /MAC/Tools