Open jpablobr opened 6 years ago
tmk
commented
6 years ago I guess Chibios or Chibios-Contrib changed something before and is not compatible now. I can build teensy_lc_oneky with using d78431c638 of ChibiOS(Jan 2017) and b54282fa of ChibiOS-Contrib(Dec 2016). I would be grateful if you can look into this problem and find fix to use the latest ChibiOS.
btw, Why did you try that fork by di0ib ? I'm interested if the repo has any good change or fix.
jpablobr
commented
6 years ago Ok, here's what I've tried so far:
1. Rollback ChibiOS to make sure everything compiles fine with those previous versions.
cd $tmkchibios & git checkout d78431c638
cd $tmkchibiosc & git checkout 328f640
cd $tmktlco & makeAll good.
2. Only revert ChibiOS (not ChibiOS-Contrib).
cd $tmkchibios & git checkout d78431c638
cd $tmkchibiosc & git checkout master
cd $tmktlco & makeAll good, so doesn't seem to be a problem with ChibiOS-Contrib.
3. Only revert ChibiOS-Contrib (not ChibiOS).
cd $tmkchibios & git checkout master
cd $tmkchibiosc & git checkout 328f640
cd $tmktlco & makeSame "missing core_cm0plus.h file" error. So seems to be a problem with ChibiOS
First ChibiOS commit (6b9d13411 - msg: PAL synchronous API.) to break the build
gco 6b9d13411
cd $tmktlco & makeError:
In file included from ../../tmk_core/tool/chibios/ChibiOS/os/hal/include/hal.h:124:0,
from ../../tmk_core/tool/chibios/ChibiOS/os/hal/src/hal.c:25:
../../tmk_core/tool/chibios/ChibiOS/os/hal/include/hal_pal.h:933:45: error: unknown type name 'iopadid_t'; did you mean 'ioportid_t'?
msg_t palWaitPadTimeoutS(ioportid_t port, iopadid_t pad, systime_t timeout);
^~~~~~~~~
ioportid_t
make: *** [build/obj/hal.o] Error 1Fixed it with (not sure if defining a type similar to ioportid_id would be better):
modified os/hal/include/hal_pal.h
@@ -1001,12 +1001,12 @@ extern "C" {
void palWriteBus(IOBus *bus, ioportmask_t bits);
void palSetBusMode(IOBus *bus, iomode_t mode);
#if PAL_USE_CALLBACKS || defined(__DOXYGEN__)
- void palSetPadCallbackI(ioportid_t port, iopadid_t pad,
+ void palSetPadCallbackI(ioportid_uint16_t pad,
palcallback_t cb, void *arg);
void palSetLineCallbackI(ioline_t line, palcallback_t cb, void *arg);
#endif /* PAL_USE_CALLBACKS */
#if PAL_USE_WAIT || defined(__DOXYGEN__)
- msg_t palWaitPadTimeoutS(ioportid_t port, iopadid_t pad,
+ msg_t palWaitPadTimeoutS(ioportid_t port, uint16_t pad,
sysinterval_t timeout);
msg_t palWaitLineTimeoutS(ioline_t line, sysinterval_t timeout);
#endif /* PAL_USE_WAIT */
modified os/hal/src/hal_pal.c
@@ -128,7 +128,7 @@ void palSetBusMode(IOBus *bus, iomode_t mode) {
*
* @api
*/
-void palSetPadCallbackI(ioportid_t port, iopadid_t pad,
+void palSetPadCallbackI(ioportid_t port, uint16_t pad,
palcallback_t cb, void *arg) {
palevent_t *pep = pal_lld_get_pad_event(port, pad);
@@ -168,7 +168,7 @@ void palSetLineCallbackI(ioline_t line, palcallback_t cb, void *arg) {
* @sclass
*/
msg_t palWaitPadTimeoutS(ioportid_t port,
- iopadid_t pad,
+ uint16_t pad,
sysinterval_t timeout) {
palevent_t *pep = pal_lld_get_pad_event(port, pad);5. Next commit to break the build.
gco 33a3c8f73 # CMSIS update and cleanup. (3 months ago)Lots of "/ChibioOS/os/common/" file/directory renames.
Error:
Compiling crt1.c
Compiling vectors.c
Compiling chsys.c
In file included from ../../tmk_core/tool/chibios/ChibiOS/os/rt/src/chsys.c:36:0:
../../tmk_core/tool/chibios/ChibiOS/os/rt/include/ch.h:78:2: error: #error "obsolete or unknown configuration file"
#error "obsolete or unknown configuration file"
^~~~~
make: *** [build/obj/chsys.o] Error 1Fixed with:
modified keyboard/teensy_lc_onekey/chconf.h
@@ -29,6 +29,7 @@
#define CHCONF_H
#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_5_0_
/*===========================================================================*/
/**6. Next error at same commit (33a3c8f73).
Compiling crt0_v6m.S
Compiling chcoreasm_v6m.S
Compiling crt1.c
In file included from ../../tmk_core/tool/chibios/ChibiOS-Contrib/os/common/ext/CMSIS/KINETIS/kl2xz.h:32:0,
from ../../tmk_core/tool/chibios/ChibiOS-Contrib/os/common/startup/ARMCMx/devices/KL2x/cmparams.h:78,
from ../../tmk_core/tool/chibios/ChibiOS/os/common/startup/ARMCMx/compilers/GCC/crt1.c:27:
../../tmk_core/tool/chibios/ChibiOS-Contrib/os/common/ext/CMSIS/KINETIS/kl26z.h:85:10: fatal error: core_cm0plus.h: No such file or directory
#include "core_cm0plus.h" /* Cortex-M0+ processor and core peripherals */
^~~~~~~~~~~~~~~~
compilation terminated.
make: *** [build/obj/crt1.o] Error 1Fixed with:
modified tmk_core/tool/chibios/chibios.mk
@@ -175,6 +174,7 @@ ASMSRC =
ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
INCDIR = $(CHIBIOS)/os/license \
+ $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(STREAMSINC) $(CHIBIOS)/os/various \
The next set errors (on the same commit and master) are(seem) mostly due to the outdated chconf.h and possibly the chibios/usb_main.c which I'm also not familiar with. I'm getting errors along the lines of "undefined reference to MS2ST'" in functionkeyboard_idle_time_cb'.
I'll see if I can play with it a bit more to get the teensylc* keyboards to build with the latest ChibiOS, but if not, at least, I can rollback to those previous versions (which too bad since the ChibiOS project seems quite active and probably it'll be well worth it).
jpablobr
commented
6 years ago btw, Why did you try that fork by di0ib ?
It was mostly because his teensy_lc examples are closer to what I want. I want to build something similar to the Planck. He also have other teensy_lc based keyboards - so I was just curious.
tmk
commented
6 years ago Nice catch! Keep us updated.
As for not found error of "core_cm0plus.h" I think ChibiOS-Contrib should be updated, but it seems that not so many users of Kinetis are around there and the repo is not updated actively unfortunately. Yes, we Kinetis ChibiOS users should update it!
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk [0/1804]
index ca67f10..bf9bad3 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk
@@ -6,7 +6,7 @@ STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S
STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
$(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/KL2x \
- $(CHIBIOS)/os/common/ext/CMSIS/include \
+ $(CHIBIOS)/os/common/ext/ARM/CMSIS/Core/Include \
$(CHIBIOS_CONTRIB)/os/common/ext/CMSIS/KINETIS
STARTUPLD = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
Hi,
I just cloned the repo (also the ChibiOS and ChibiOS-Contrib repos) and then
cd'd into thekeyboard/teensy_lc_onekeydirectory and ran themakecommand but it failed with the following:I then tried to
includethe "core_cm0plus.h" file by modifying:But still got this other error:
Seems like that isn't the right place (or way) to include those files, or not sure. Obviously I have very little idea of what I'm doing. Any help as to getting me in the right direction would be great.
I also tried building the teensy_lc* keyboards on this fork but they all failed in the same way.
(I'm on OS X)