diff options
| author | Paul Selkirk <paul@psgd.org> | 2017-05-02 17:10:02 -0400 |
|---|---|---|
| committer | Paul Selkirk <paul@psgd.org> | 2017-05-02 17:10:02 -0400 |
| commit | 1175ff63f2a8c4762692551403862f9f0789aef8 (patch) | |
| tree | d7d004e639ffa35296b6c91a64711bcc34f63a9b /projects/cli-test | |
| parent | 716694ae77259e31526a6d64db867ced5c231ced (diff) | |
Merge branch 'init_cleanup' into no-rtos
Clean up Makefiles and initialization code.
Diffstat (limited to 'projects/cli-test')
| -rw-r--r-- | projects/cli-test/Makefile | 1 | ||||
| -rw-r--r-- | projects/cli-test/mgmt-test.c | 12 | ||||
| -rw-r--r-- | projects/cli-test/test_sdram.c | 1 |
3 files changed, 0 insertions, 14 deletions
diff --git a/projects/cli-test/Makefile b/projects/cli-test/Makefile index 189a15d..e01b243 100644 --- a/projects/cli-test/Makefile +++ b/projects/cli-test/Makefile @@ -14,7 +14,6 @@ OBJS = \ test_sdram.o CFLAGS += -I$(LIBCLI_SRC) -I$(LIBHAL_SRC) -CFLAGS += -I$(RTOS_DIR)/rtos -I$(RTOS_DIR)/rtx/TARGET_CORTEX_M LIBS += $(LIBCLI_BLD)/libcli.a $(LIBHAL_BLD)/libhal.a $(LIBTFM_BLD)/libtfm.a diff --git a/projects/cli-test/mgmt-test.c b/projects/cli-test/mgmt-test.c index 59f0b6e..1a22996 100644 --- a/projects/cli-test/mgmt-test.c +++ b/projects/cli-test/mgmt-test.c @@ -50,7 +50,6 @@ static int cmd_test_sdram(struct cli_def *cli, const char *command, char *argv[], int argc) { // run external memory initialization sequence - HAL_StatusTypeDef status; int ok, num_cycles = 1, i, test_completed; if (argc == 1) { @@ -59,13 +58,6 @@ static int cmd_test_sdram(struct cli_def *cli, const char *command, char *argv[] if (num_cycles < 1) num_cycles = 1; } - cli_print(cli, "Initializing SDRAM"); - status = sdram_init(); - if (status != HAL_OK) { - cli_print(cli, "Failed initializing SDRAM: %i", (int) status); - return CLI_OK; - } - for (i = 1; i <= num_cycles; i++) { cli_print(cli, "Starting SDRAM test (%i/%i)", i, num_cycles); test_completed = 0; @@ -136,10 +128,6 @@ static int cmd_test_fmc(struct cli_def *cli, const char *command, char *argv[], } } - // prepare fmc interface - cli_print(cli, "Initializing FMC interface"); - fmc_init(); - // turn on green led, turn off other leds led_on(LED_GREEN); led_off(LED_YELLOW); diff --git a/projects/cli-test/test_sdram.c b/projects/cli-test/test_sdram.c index e720667..4961b94 100644 --- a/projects/cli-test/test_sdram.c +++ b/projects/cli-test/test_sdram.c @@ -31,7 +31,6 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "stm32f4xx_hal.h"
#include "stm-led.h"
#include "stm-sdram.h"
#include "test_sdram.h"
|