c815fa4511
This patch permits interrupts to be generated by both the I2C and GPIO controllers for simultaneously-executing applications. The controllers share a single interrupt pin, INTC. Prior to this patch, quarkX1000_gpio_init() routed INTA to PIRQC and IRQ 10 (due to an incorrect assumption that INTA is connected to the GPIO controller), and quarkX1000_i2c_init() routed INTC to PIRQC and IRQ 9. The I2C controller initialization is a prerequisite for GPIO initialization, so the final configuration was that INTA and INTC were both routed to PIRQC and IRQ 10. Thus, only the GPIO ISR was being invoked, even if the I2C controller was actually responsible for the interrupt. This patch refactors the I2C and GPIO ISR setup and handler code so that the shared portions are combined in cpu/x86/drivers/legacy_pc/shared-isr.[ch]. The I2C and GPIO drivers communicate their interrupt information to the shared component by placing structures in a specific section of the binary.
34 lines
1 KiB
Makefile
34 lines
1 KiB
Makefile
include $(CONTIKI)/cpu/x86/Makefile.x86_common
|
|
|
|
CONTIKI_CPU_DIRS += drivers/legacy_pc drivers/quarkX1000 init/legacy_pc
|
|
|
|
CONTIKI_SOURCEFILES += bootstrap_quarkX1000.S rtc.c pit.c pic.c irq.c nmi.c pci.c uart-16x50.c uart.c gpio.c i2c.c eth.c shared-isr.c
|
|
|
|
CFLAGS += -m32 -march=i586 -mtune=i586
|
|
LDFLAGS += -m32 -Xlinker -T -Xlinker $(CONTIKI)/cpu/x86/quarkX1000.ld
|
|
ASFLAGS += --32 -march=i586 -mtune=i586
|
|
|
|
### UEFI support
|
|
|
|
UEFI_DIR = $(CONTIKI_CPU)/uefi
|
|
|
|
ifndef EN_UEFI
|
|
# Include a Makefile generated by the build_uefi.sh script, if available.
|
|
# If that script was not run, then UEFI support will not be built.
|
|
-include $(UEFI_DIR)/Makefile.uefi
|
|
endif
|
|
|
|
ifeq ($(EN_UEFI),1)
|
|
EDK2_DIR = $(UEFI_DIR)/edk2
|
|
|
|
GEN_FW = $(EDK2_DIR)/BaseTools/Source/C/bin/GenFw
|
|
|
|
CONTIKI_CPU_DIRS += uefi
|
|
CONTIKI_SOURCEFILES += bootstrap_uefi.c
|
|
CFLAGS += -I$(EDK2_DIR)/MdePkg/Include -I$(EDK2_DIR)/MdePkg/Include/Ia32
|
|
else
|
|
$(info Note: UEFI support is disabled.)
|
|
$(info To enable UEFI support, run $(CONTIKI_CPU)/uefi/build_uefi.sh prior)
|
|
$(info to building Contiki.)
|
|
endif
|