michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Kbuild: Fix sanity checks for quark

Browse source 
Change-Id: Id142f337f715590fa63d9f7b957f51c203743566
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2015-05-14 08:48:17 -04:00
commit d2ca03270e
10 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/bsp/Kconfig
View file

@ -51,6 +51,7 @@ config BSP_QUARK
select LINK_AUX_COMPILER_LIBS
select DRV_NS16550
select DRV_SERIAL
select DRV_PCI
endchoice

2
arch/x86/configs/micro_quark_defconfig
View file

@ -148,7 +148,7 @@ CONFIG_HPET_TIMER=y
# Interrupt Controller Configuration
#
CONFIG_IOAPIC=y
# CONFIG_LOAPIC is not set
CONFIG_LOAPIC=y
#
# General Setup

2
arch/x86/configs/nano_quark_defconfig
View file

@ -111,7 +111,7 @@ CONFIG_HPET_TIMER=y
# Interrupt Controller Configuration
#
CONFIG_IOAPIC=y
# CONFIG_LOAPIC is not set
CONFIG_LOAPIC=y
#
# General Setup

1
arch/x86/timer/Makefile
View file

@ -2,6 +2,7 @@ EXTRA_CFLAGS +=-I$(srctree)/include/drivers
ifeq (${CONFIG_BSP_GENERIC_PC},y)
EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
endif
ifeq (${CONFIG_BSP_QUARK},y)
EXTRA_CFLAGS +=-I$(srctree)/arch/x86/quark
endif

2
drivers/bluetooth/Makefile
View file

@ -5,7 +5,7 @@ EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
endif
ifeq (${CONFIG_BSP_QUARK},y)
EXTRA_CFLAGS +=-I$(srctree)/arch/x86/quark
EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
endif
ifeq (${CONFIG_BSP_FSL_FRDM_K64F},y)

11
drivers/pci/Makefile
View file

@ -1 +1,12 @@
ifeq (${CONFIG_BSP_GENERIC_PC},y)
EXTRA_CFLAGS +=-I$(srctree)/arch/x86
EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
endif
ifeq (${CONFIG_BSP_QUARK},y)
EXTRA_CFLAGS +=-I$(srctree)/arch/x86
EXTRA_CFLAGS +=-I$(srctree)/arch/x86/quark
endif
EXTRA_CFLAGS += -I$(srctree)/include/drivers
obj-y = pci.o pci_config.o pci_interface.o

4
samples/microkernel/benchmark/boot_time/Makefile
View file

@ -7,7 +7,7 @@ CONF_generic_pc = generic_pc/prj_pentium4_${BOOTTIME_QUALIFIER}.conf
CONF_pentium4 = generic_pc/prj_pentium4_${BOOTTIME_QUALIFIER}.conf
CONF_minuteia = generic_pc/prj.conf
CONF_atom_n28xx = generic_pc/prj_expert_test.conf
CONF_quark_ = quark/prj.conf
CONF_quark = quark/prj.conf
VPFILE = prj.vpf
KERNEL_TYPE = micro
@ -18,7 +18,7 @@ $(if $(CONF_OVERLAY),,$(error no prj.conf file available))
$(if $(wildcard $(CONF_OVERLAY)),,$(error no $(CONF_OVERLAY) file available))
NO_QUALIFIED_PRJ_CONF_WARNING = $(strip \
no prj.conf for $(BOOTTIME_QUALIFIER) for $(BSP), using default prj.conf \
no prj.conf for $(BOOTTIME_QUALIFIER) and $(BSP), using default prj.conf \
)
$(if $(filter $(BSP)/prj.conf,$(CONF_OVERLAY)),$(warning *** $(NO_QUALIFIED_PRJ_CONF_WARNING) ***),)

2
samples/microkernel/benchmark/boot_time/quark/prj.conf
View file

@ -1,5 +1,5 @@
CONFIG_EXPERIMENTAL=y
CONFIG_PERFORMANCE_METRICS=y
CONFIG_BOOT_TIME_MEASUREMENT=y
CONFIG_CPU_CLOCK_FREQ_MHZ=533
CONFIG_TEST_RANDOM_GENERATOR=y

4
samples/nanokernel/benchmark/boot_time/Makefile
View file

@ -7,7 +7,7 @@ CONF_generic_pc = generic_pc/prj_pentium4_$(BOOTTIME_QUALIFIER).conf
CONF_pentium4 = generic_pc/prj_pentium4_$(BOOTTIME_QUALIFIER).conf
CONF_minuteia = generic_pc/prj.conf
CONF_atom_n28xx = generic_pc/prj_expert_test.conf
CONF_quark_ = quark/prj.conf
CONF_quark = quark/prj.conf
KERNEL_TYPE = nano
CONF_OVERLAY = $(CONF_$(BSP))
@ -19,7 +19,7 @@ $(if $(CONF_OVERLAY),,$(error no prj.conf file available))
$(if $(wildcard $(CONF_OVERLAY)),,$(error no $(CONF_OVERLAY) file available))
NO_QUALIFIED_PRJ_CONF_WARNING = $(strip \
no prj.conf for $(BOOTTIME_QUALIFIER) for $(BSP), using default prj.conf \
no prj.conf for $(BOOTTIME_QUALIFIER) and $(BSP), using default prj.conf \
)
$(if $(filter $(BSP)/prj.conf,$(CONF_OVERLAY)),$(warning *** $(NO_QUALIFIED_PRJ_CONF_WARNING) ***),)

3
samples/nanokernel/benchmark/boot_time/quark/prj.conf
View file

@ -1,4 +1,5 @@
CONFIG_EXPERIMENTAL=y
CONFIG_PERFORMANCE_METRICS=y
CONFIG_BOOT_TIME_MEASUREMENT=y
CONFIG_CPU_CLOCK_FREQ_MHZ=533
CONFIG_TEST_RANDOM_GENERATOR=y