diff --git a/modules/Makefile.modules.default b/modules/Makefile.modules.default index c3497ecfc..e09b369f3 100644 --- a/modules/Makefile.modules.default +++ b/modules/Makefile.modules.default @@ -19,5 +19,5 @@ ML_MODULES ?= \ selftest \ adv_int \ crop_rec \ - edmac \ + dev_tools/edmac \ yolo \ diff --git a/modules/adtg_gui/Makefile b/modules/dev_tools/adtg_gui/Makefile similarity index 93% rename from modules/adtg_gui/Makefile rename to modules/dev_tools/adtg_gui/Makefile index b09d14255..798a06b7c 100644 --- a/modules/adtg_gui/Makefile +++ b/modules/dev_tools/adtg_gui/Makefile @@ -1,6 +1,6 @@ # this is a very simple makefile for modules -TOP_DIR=../.. +TOP_DIR=../../.. # define the module name - make sure name is max 8 characters MODULE_NAME=adtg_gui diff --git a/modules/adtg_gui/README.rst b/modules/dev_tools/adtg_gui/README.rst similarity index 100% rename from modules/adtg_gui/README.rst rename to modules/dev_tools/adtg_gui/README.rst diff --git a/modules/adtg_gui/adtg_gui.c b/modules/dev_tools/adtg_gui/adtg_gui.c similarity index 100% rename from modules/adtg_gui/adtg_gui.c rename to modules/dev_tools/adtg_gui/adtg_gui.c diff --git a/modules/adtg_log/Makefile b/modules/dev_tools/adtg_log/Makefile similarity index 93% rename from modules/adtg_log/Makefile rename to modules/dev_tools/adtg_log/Makefile index 4d8677b17..2cc4e5f75 100644 --- a/modules/adtg_log/Makefile +++ b/modules/dev_tools/adtg_log/Makefile @@ -1,6 +1,6 @@ # this is a very simple makefile for modules -TOP_DIR=../.. +TOP_DIR=../../.. # define the module name - make sure name is max 8 characters MODULE_NAME=adtg_log diff --git a/modules/adtg_log/README.rst b/modules/dev_tools/adtg_log/README.rst similarity index 100% rename from modules/adtg_log/README.rst rename to modules/dev_tools/adtg_log/README.rst diff --git a/modules/adtg_log/adtg_log.c b/modules/dev_tools/adtg_log/adtg_log.c similarity index 100% rename from modules/adtg_log/adtg_log.c rename to modules/dev_tools/adtg_log/adtg_log.c diff --git a/modules/adtg_log/parse_bin.py b/modules/dev_tools/adtg_log/parse_bin.py similarity index 100% rename from modules/adtg_log/parse_bin.py rename to modules/dev_tools/adtg_log/parse_bin.py diff --git a/modules/edmac/Makefile b/modules/dev_tools/edmac/Makefile similarity index 91% rename from modules/edmac/Makefile rename to modules/dev_tools/edmac/Makefile index 38385869e..ba8ee262c 100644 --- a/modules/edmac/Makefile +++ b/modules/dev_tools/edmac/Makefile @@ -1,9 +1,11 @@ +TOP_DIR=../../.. + # define the module name - make sure name is max 8 characters MODULE_NAME=edmac MODULE_OBJS=edmac.o edmac_util.o edmac_test.o md5.o # include modules environment -include ../Makefile.modules +include $(TOP_DIR)/modules/Makefile.modules # fixme: cleaner way to localize symbols? edmac.sym: edmac.mo diff --git a/modules/edmac/README.rst b/modules/dev_tools/edmac/README.rst similarity index 100% rename from modules/edmac/README.rst rename to modules/dev_tools/edmac/README.rst diff --git a/modules/edmac/edmac.c b/modules/dev_tools/edmac/edmac.c similarity index 100% rename from modules/edmac/edmac.c rename to modules/dev_tools/edmac/edmac.c diff --git a/modules/edmac/edmac_test.c b/modules/dev_tools/edmac/edmac_test.c similarity index 100% rename from modules/edmac/edmac_test.c rename to modules/dev_tools/edmac/edmac_test.c diff --git a/modules/edmac/edmac_util.c b/modules/dev_tools/edmac/edmac_util.c similarity index 100% rename from modules/edmac/edmac_util.c rename to modules/dev_tools/edmac/edmac_util.c diff --git a/modules/edmac/md5.c b/modules/dev_tools/edmac/md5.c similarity index 100% rename from modules/edmac/md5.c rename to modules/dev_tools/edmac/md5.c diff --git a/modules/edmac/md5.h b/modules/dev_tools/edmac/md5.h similarity index 100% rename from modules/edmac/md5.h rename to modules/dev_tools/edmac/md5.h diff --git a/modules/iso_test/Makefile b/modules/dev_tools/iso_test/Makefile similarity index 93% rename from modules/iso_test/Makefile rename to modules/dev_tools/iso_test/Makefile index 6200a4276..6946f62ef 100644 --- a/modules/iso_test/Makefile +++ b/modules/dev_tools/iso_test/Makefile @@ -1,5 +1,5 @@ # this is a very simple makefile for modules -TOP_DIR=../.. +TOP_DIR=../../.. # define the module name - make sure name is max 8 characters MODULE_NAME=iso_test diff --git a/modules/iso_test/README.rst b/modules/dev_tools/iso_test/README.rst similarity index 100% rename from modules/iso_test/README.rst rename to modules/dev_tools/iso_test/README.rst diff --git a/modules/iso_test/iso_test.c b/modules/dev_tools/iso_test/iso_test.c similarity index 100% rename from modules/iso_test/iso_test.c rename to modules/dev_tools/iso_test/iso_test.c diff --git a/modules/mem_chk/Makefile b/modules/dev_tools/mem_chk/Makefile similarity index 69% rename from modules/mem_chk/Makefile rename to modules/dev_tools/mem_chk/Makefile index 9b61e240c..034fd81d5 100644 --- a/modules/mem_chk/Makefile +++ b/modules/dev_tools/mem_chk/Makefile @@ -1,7 +1,8 @@ +TOP_DIR=../../.. # define the module name - make sure name is max 8 characters MODULE_NAME=mem_chk MODULE_OBJS=mem_chk.o # include modules environment -include ../Makefile.modules +include $(TOP_DIR)/modules/Makefile.modules diff --git a/modules/mem_chk/README.rst b/modules/dev_tools/mem_chk/README.rst similarity index 100% rename from modules/mem_chk/README.rst rename to modules/dev_tools/mem_chk/README.rst diff --git a/modules/mem_chk/mem_chk.c b/modules/dev_tools/mem_chk/mem_chk.c similarity index 100% rename from modules/mem_chk/mem_chk.c rename to modules/dev_tools/mem_chk/mem_chk.c diff --git a/modules/mem_prot/Makefile b/modules/dev_tools/mem_prot/Makefile similarity index 69% rename from modules/mem_prot/Makefile rename to modules/dev_tools/mem_prot/Makefile index e770b3d19..08e7cb153 100644 --- a/modules/mem_prot/Makefile +++ b/modules/dev_tools/mem_prot/Makefile @@ -1,7 +1,8 @@ +TOP_DIR=../../.. # define the module name - make sure name is max 8 characters MODULE_NAME=mem_prot MODULE_OBJS=mem_prot.o # include modules environment -include ../Makefile.modules +include $(TOP_DIR)/modules/Makefile.modules diff --git a/modules/mem_prot/README.rst b/modules/dev_tools/mem_prot/README.rst similarity index 100% rename from modules/mem_prot/README.rst rename to modules/dev_tools/mem_prot/README.rst diff --git a/modules/mem_prot/mem_prot.c b/modules/dev_tools/mem_prot/mem_prot.c similarity index 100% rename from modules/mem_prot/mem_prot.c rename to modules/dev_tools/mem_prot/mem_prot.c diff --git a/modules/mem_spy/Makefile b/modules/dev_tools/mem_spy/Makefile similarity index 69% rename from modules/mem_spy/Makefile rename to modules/dev_tools/mem_spy/Makefile index 3fa28621a..37048469d 100644 --- a/modules/mem_spy/Makefile +++ b/modules/dev_tools/mem_spy/Makefile @@ -1,9 +1,10 @@ +TOP_DIR=../../.. # define the module name - make sure name is max 8 characters MODULE_NAME=mem_spy MODULE_OBJS=mem_spy.o # include modules environment -include ../Makefile.modules +include $(TOP_DIR)/modules/Makefile.modules diff --git a/modules/mem_spy/README.rst b/modules/dev_tools/mem_spy/README.rst similarity index 100% rename from modules/mem_spy/README.rst rename to modules/dev_tools/mem_spy/README.rst diff --git a/modules/mem_spy/mem_spy.c b/modules/dev_tools/mem_spy/mem_spy.c similarity index 100% rename from modules/mem_spy/mem_spy.c rename to modules/dev_tools/mem_spy/mem_spy.c diff --git a/modules/mpu_dump/Makefile b/modules/dev_tools/mpu_dump/Makefile similarity index 68% rename from modules/mpu_dump/Makefile rename to modules/dev_tools/mpu_dump/Makefile index 7e7e8f081..06934c672 100644 --- a/modules/mpu_dump/Makefile +++ b/modules/dev_tools/mpu_dump/Makefile @@ -1,6 +1,8 @@ +TOP_DIR=../../.. + # define the module name - make sure name is max 8 characters MODULE_NAME=mpu_dump MODULE_OBJS=mpu_dump.o # include modules environment -include ../Makefile.modules +include $(TOP_DIR)/modules/Makefile.modules diff --git a/modules/mpu_dump/README.rst b/modules/dev_tools/mpu_dump/README.rst similarity index 100% rename from modules/mpu_dump/README.rst rename to modules/dev_tools/mpu_dump/README.rst diff --git a/modules/mpu_dump/mpu_dump.c b/modules/dev_tools/mpu_dump/mpu_dump.c similarity index 100% rename from modules/mpu_dump/mpu_dump.c rename to modules/dev_tools/mpu_dump/mpu_dump.c diff --git a/modules/mrc_dump/Makefile b/modules/dev_tools/mrc_dump/Makefile similarity index 68% rename from modules/mrc_dump/Makefile rename to modules/dev_tools/mrc_dump/Makefile index 641a5333c..920db5a74 100644 --- a/modules/mrc_dump/Makefile +++ b/modules/dev_tools/mrc_dump/Makefile @@ -1,6 +1,8 @@ +TOP_DIR=../../.. + # define the module name - make sure name is max 8 characters MODULE_NAME=mrc_dump MODULE_OBJS=mrc_dump.o # include modules environment -include ../Makefile.modules +include $(TOP_DIR)/modules/Makefile.modules diff --git a/modules/mrc_dump/README.rst b/modules/dev_tools/mrc_dump/README.rst similarity index 100% rename from modules/mrc_dump/README.rst rename to modules/dev_tools/mrc_dump/README.rst diff --git a/modules/mrc_dump/mrc_dump.c b/modules/dev_tools/mrc_dump/mrc_dump.c similarity index 100% rename from modules/mrc_dump/mrc_dump.c rename to modules/dev_tools/mrc_dump/mrc_dump.c diff --git a/modules/sf_dump/Makefile b/modules/dev_tools/sf_dump/Makefile similarity index 99% rename from modules/sf_dump/Makefile rename to modules/dev_tools/sf_dump/Makefile index 805c50101..701572573 100644 --- a/modules/sf_dump/Makefile +++ b/modules/dev_tools/sf_dump/Makefile @@ -1,4 +1,3 @@ - # this is a very simple makefile for modules TOP_DIR=../.. diff --git a/modules/sf_dump/README.rst b/modules/dev_tools/sf_dump/README.rst similarity index 100% rename from modules/sf_dump/README.rst rename to modules/dev_tools/sf_dump/README.rst diff --git a/modules/sf_dump/sf_dump.c b/modules/dev_tools/sf_dump/sf_dump.c similarity index 100% rename from modules/sf_dump/sf_dump.c rename to modules/dev_tools/sf_dump/sf_dump.c