deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
osd-contiki/cpu/x86/Makefile.x86_quarkX1000

8 lines
227 B
Text
Raw Normal View History

x86: Break Makefile.x86 into common and pc specific ones Now the cpu/x86/ provides a Makefile.x86_common and a Makefile.x86_pc. The former includes the common Makefile and adds legacy pc specific implementations (currently, drivers only) into the building context, while the latter has everything that defines the bootstrap of a x86 CPU. This commit also fixes platform/galileo/ so it includes the correct makefile - Makefile.x86_quarkX1000. Galileo uses a Quark X1000 SoC which is not an IBM Generic PC-like CPU, but it does provide most of a PCs peripherals through its "Legacy Bridge". Thus, it makes sense that QuarkX1000's Makefile includes code from the legacy_pc x86 cpu.
2015-04-29 14:58:29 -03:00
include $(CONTIKI)/cpu/x86/Makefile.x86_common
x86: Isolate SoC specific cpu_init code This commit turns cpu_init() into a SoC-agnostic function by removing any SoC specific calls and isolating them into their own SoC implementation. We start this by isolating all IRQs initialization code from the legacy-pc target, pic_init() and spurious IRQ7 registration, into a new interface: irq_init() from irq.h. Future SoCs will have to provide their own implementation of this interface. This model is to be followed by future initialization code that we may need to add and which is not common to all x86 SoCs.
2015-05-08 09:34:32 -03:00
CONTIKI_CPU_DIRS += drivers/legacy_pc init/legacy_pc
x86: Break Makefile.x86 into common and pc specific ones Now the cpu/x86/ provides a Makefile.x86_common and a Makefile.x86_pc. The former includes the common Makefile and adds legacy pc specific implementations (currently, drivers only) into the building context, while the latter has everything that defines the bootstrap of a x86 CPU. This commit also fixes platform/galileo/ so it includes the correct makefile - Makefile.x86_quarkX1000. Galileo uses a Quark X1000 SoC which is not an IBM Generic PC-like CPU, but it does provide most of a PCs peripherals through its "Legacy Bridge". Thus, it makes sense that QuarkX1000's Makefile includes code from the legacy_pc x86 cpu.
2015-04-29 14:58:29 -03:00
x86: Disable NMI while initializing RTC According to [1], we should disable non-maskable and maskable interrupts while initializing RTC. Otherwise, the RTC may be left in an undefined state (non-functional) if an interrupt occurs. Currently, maskable interrupts are already disabled, but NMI is not. This patch adds helpers APIs to enable/disable non-maskable interrupts (NMI) and changes rtc_init() to disable NMI while initializing the RTC. NMI enable/disable code is legacy-PC specific therefore it was put in driver/legacy_pc/ directory. Regarding the RTC initialization changes, just calling nmi_disable() and nmi_enable is not enough since NMI and RTC share the same IO port. So We should also set the NMI_ENABLE bit while selecting the RTC_INDEX. Additionally, the nmi_disable() call is not strictly required since we set the NMI_ENABLE bit while selecting the RTC_INDEX. However, to make clear hat we are disabling NMI and to improve readability (by matching NMI disable/enable), the nmi_disable() call was purposely used. [1] http://wiki.osdev.org/RTC
2015-05-06 15:24:43 -03:00
CONTIKI_SOURCEFILES += bootstrap_quarkX1000.S rtc.c pit.c pic.c irq.c nmi.c
x86: Move bootstrap code and linker script to cpu/x86 This is a refactoring patch, no functionality is changed. It moves loader.S and galileo.ld from platform/galileo/ to cpu/x86/ directory since they seem to be more SoC-specific than platform-specific. It also renames galileo.ld to quarkX1000.ld since it can be used by any platform based on Quark X1000 SoC, not only Galileo. Furthermore, this patch also renames loader.S to bootstrap_quarkX1000.S since it is pretty much a bootstrap code to any platform based on Quark X1000 SoC.
2015-05-07 19:20:14 -03:00
LINKERSCRIPT = $(CONTIKI)/cpu/x86/quarkX1000.ld
Reference in a new issue Copy permalink