From d739b1446bd92a72e82b66cb00f3fb1c93d27509 Mon Sep 17 00:00:00 2001
From: AlviseDeFaveri <elvisilde@gmail.com>
Date: Tue, 13 Nov 2018 19:09:27 +0100
Subject: [PATCH] [Makefile] Customized Makefile and miosix_settings.h for
Skyward
- Makefile.inc : added version 1.07S instead of 1.07 to distinguish from
original kernel
- miosix_settings.h : removed error define and added JTAG define
---
miosix/config/Makefile.inc | 4 +---
miosix/config/miosix_settings.h | 5 +++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/miosix/config/Makefile.inc b/miosix/config/Makefile.inc
index 27d51a85..96aa67de 100644
--- a/miosix/config/Makefile.inc
+++ b/miosix/config/Makefile.inc
@@ -485,7 +485,6 @@ ifeq ($(OPT_BOARD),stm32f429zi_skyward_homeone)
endif
##---------------------------------------------------------------------------
--
## stm32f429zi_skyward_rogallina
##
ifeq ($(OPT_BOARD),stm32f429zi_skyward_rogallina)
@@ -519,7 +518,6 @@ ifeq ($(OPT_BOARD),stm32f429zi_skyward_rogallina)
endif
##---------------------------------------------------------------------------
--
## stm32f401re_nucleo
##
@@ -566,7 +564,7 @@ endif
## a new board or porting Miosix to a new architecture ##
############################################################################
-ifneq ($(MAKEFILE_VERSION),1.07)
+ifneq ($(MAKEFILE_VERSION),1.07S)
$(info You are using an incompatible makefile. Make sure it matches \
the one distributed with the current version of the kernel)
$(error Error)
diff --git a/miosix/config/miosix_settings.h b/miosix/config/miosix_settings.h
index 440baad1..8b603de2 100644
--- a/miosix/config/miosix_settings.h
+++ b/miosix/config/miosix_settings.h
@@ -34,7 +34,7 @@
// The PARSING_FROM_IDE is because Netbeans gets confused by this, it is never
// defined when compiling the code.
#ifndef PARSING_FROM_IDE
-#error This error is a reminder that you have not edited miosix_settings.h yet.
+//#error This error is a reminder that you have not edited miosix_settings.h yet.
#endif //PARSING_FROM_IDE
/**
@@ -149,7 +149,7 @@ const unsigned char MAX_OPEN_FILES=8;
* mode, so to use debugging it is necessary to disable sleep in the idle thread.
* By default it is not defined (idle thread calls sleep).
*/
-//#define JTAG_DISABLE_SLEEP
+#define JTAG_DISABLE_SLEEP
/// Minimum stack size (MUST be divisible by 4)
const unsigned int STACK_MIN=256;
@@ -221,6 +221,7 @@ const unsigned int STACK_FILL=0xbbbbbbbb;
#error "You are using a too old compiler. Get the latest one from https://miosix.org/wiki/index.php?title=Miosix_Toolchain"
#endif
+
/**
* \}
*/
--
GitLab