From a7f70af0dbb1cf4b4e61ed842a5e7eab17c4344a Mon Sep 17 00:00:00 2001 From: Andre Guedes Date: Tue, 6 Sep 2016 17:46:00 -0300 Subject: [PATCH] quark_d2000/se: Don't setup GDT during initialization Quark D2000 and SE based boards (but Arduino 101) use QMSI bootloader by default. QMSI bootloader sets up GDT in the so-called 'basic flat model' just like Zephyr does by default. This patch changes Quark D2000 and SE boards default configuration so they rely on QMSI bootloader and we don't sets up GDT twice. Change-Id: Ic6e520148b732bd48c00657c6c8138a8d865faef Signed-off-by: Andre Guedes --- arch/x86/soc/quark_d2000/Kconfig.soc | 1 - arch/x86/soc/quark_se/Kconfig.soc | 1 - boards/quark_d2000_crb/quark_d2000_crb_defconfig | 1 + boards/quark_se_devboard/quark_se_devboard_defconfig | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/soc/quark_d2000/Kconfig.soc b/arch/x86/soc/quark_d2000/Kconfig.soc index 60421f9f3c4..869e2e88cc7 100644 --- a/arch/x86/soc/quark_d2000/Kconfig.soc +++ b/arch/x86/soc/quark_d2000/Kconfig.soc @@ -3,7 +3,6 @@ config SOC_QUARK_D2000 bool "Quark D2000" select CPU_MINUTEIA select LOAPIC_TIMER - select BOOTLOADER_UNKNOWN select XIP select MVIC select X86_IAMCU diff --git a/arch/x86/soc/quark_se/Kconfig.soc b/arch/x86/soc/quark_se/Kconfig.soc index 550589a19af..f78e55eec85 100644 --- a/arch/x86/soc/quark_se/Kconfig.soc +++ b/arch/x86/soc/quark_se/Kconfig.soc @@ -6,7 +6,6 @@ config SOC_QUARK_SE select IOAPIC select LOAPIC select LOAPIC_TIMER - select BOOTLOADER_UNKNOWN select XIP select X86_IAMCU select SYS_POWER_LOW_POWER_STATE_SUPPORTED diff --git a/boards/quark_d2000_crb/quark_d2000_crb_defconfig b/boards/quark_d2000_crb/quark_d2000_crb_defconfig index e2d2e7841d5..e1edb0f764b 100644 --- a/boards/quark_d2000_crb/quark_d2000_crb_defconfig +++ b/boards/quark_d2000_crb/quark_d2000_crb_defconfig @@ -2,6 +2,7 @@ CONFIG_X86=y CONFIG_SOC_QUARK_D2000=y CONFIG_BOARD_QUARK_D2000_CRB=y CONFIG_CPU_MINUTEIA=y +CONFIG_SET_GDT=n CONFIG_IDT_NUM_VECTORS=64 CONFIG_UART_QMSI=y CONFIG_UART_CONSOLE=y diff --git a/boards/quark_se_devboard/quark_se_devboard_defconfig b/boards/quark_se_devboard/quark_se_devboard_defconfig index 8a95ecf3439..8c4c4e1711c 100644 --- a/boards/quark_se_devboard/quark_se_devboard_defconfig +++ b/boards/quark_se_devboard/quark_se_devboard_defconfig @@ -2,6 +2,7 @@ CONFIG_X86=y CONFIG_SOC_QUARK_SE=y CONFIG_BOARD_QUARK_SE_DEVBOARD=y CONFIG_CPU_MINUTEIA=y +CONFIG_SET_GDT=n CONFIG_CONSOLE=y CONFIG_UART_QMSI=y CONFIG_UART_CONSOLE=y