michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "dts: x86: quark_se_c1000_devboard: Add device tree support"

Browse source 
This reverts commit c0d95f03c7.

Breaks UART and other things on this board, see Jira ZEP-2459.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-08-02 07:32:00 -04:00 • committed by Anas Nashif
commit 4daabbd94e
6 changed files with 25 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

20
boards/x86/quark_se_c1000_devboard/Kconfig.defconfig
View file

@ -4,9 +4,26 @@ if BOARD_QUARK_SE_C1000_DEVBOARD
config BOARD config BOARD
default "quark_se_c1000_devboard" default "quark_se_c1000_devboard"
if BLUETOOTH_H4
config BLUETOOTH_UART_ON_DEV_NAME
default UART_QMSI_0_NAME
config UART_QMSI_0_BAUDRATE
default 1000000
config UART_QMSI_0_HW_FC config UART_QMSI_0_HW_FC
def_bool y def_bool y
endif
if UART_PIPE
config UART_PIPE_ON_DEV_NAME
default UART_QMSI_1_NAME
endif
if SYS_POWER_MANAGEMENT if SYS_POWER_MANAGEMENT
config BUSY_WAIT_USES_ALTERNATE_CLOCK config BUSY_WAIT_USES_ALTERNATE_CLOCK
@ -14,6 +31,9 @@ config BUSY_WAIT_USES_ALTERNATE_CLOCK
endif endif
config BLUETOOTH_MONITOR_ON_DEV_NAME
default UART_QMSI_1_NAME if BLUETOOTH_DEBUG_MONITOR
if IEEE802154_CC2520 if IEEE802154_CC2520
config SPI config SPI

4
boards/x86/quark_se_c1000_devboard/Makefile.board
View file

@ -1,8 +1,8 @@
FLASH_SCRIPT = openocd.sh FLASH_SCRIPT = openocd.sh
DEBUG_SCRIPT = openocd.sh DEBUG_SCRIPT = openocd.sh
OPENOCD_PRE_CMD = "targets 1" OPENOCD_PRE_CMD = "targets 1"
OPENOCD_LOAD_CMD = "load_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}" OPENOCD_LOAD_CMD = "load_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}"
OPENOCD_VERIFY_CMD = "verify_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}" OPENOCD_VERIFY_CMD = "verify_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}"
export FLASH_SCRIPT OPENOCD_VERIFY_CMD OPENOCD_LOAD_CMD OPENOCD_PRE_CMD export FLASH_SCRIPT OPENOCD_VERIFY_CMD OPENOCD_LOAD_CMD OPENOCD_PRE_CMD

1
boards/x86/quark_se_c1000_devboard/quark_se_c1000_devboard_defconfig
View file

@ -11,4 +11,3 @@ CONFIG_UART_CONSOLE=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_PRINTK=y CONFIG_PRINTK=y
CONFIG_PINMUX=y CONFIG_PINMUX=y
CONFIG_HAS_DTS=y

7
dts/x86/Makefile
View file

@ -1,7 +1,6 @@
ifeq ($(CONFIG_HAS_DTS),y) ifeq ($(CONFIG_HAS_DTS),y)
dtb-$(CONFIG_SOC_QUARK_SE_C1000) = arduino_101.dts_compiled dtb-$(CONFIG_SOC_QUARK_SE_C1000) = arduino_101.dts_compiled
dtb-$(CONFIG_BOARD_QUARK_D2000_CRB) = quark_d2000_crb.dts_compiled dtb-$(CONFIG_BOARD_QUARK_D2000_CRB) = quark_d2000_crb.dts_compiled
dtb-$(CONFIG_BOARD_TINYTILE) = tinytile.dts_compiled dtb-$(CONFIG_BOARD_TINYTILE) = tinytile.dts_compiled
dtb-$(CONFIG_BOARD_QUARK_SE_C1000_DEVBOARD) = quark_se_c1000_devboard.dts_compiled
always := $(dtb-y) always := $(dtb-y)
endif endif

32
dts/x86/quark_se_c1000_devboard.dts
View file

@ -1,32 +0,0 @@
/dts-v1/;
#include "intel_curie.dtsi"
/ {
model = "quark_se_c1000_devboard";
compatible = "intel,quark_se_c1000_devboard", "intel,quark_se_c1000";
aliases {
uart_0 = &uart0;
uart_1 = &uart1;
};
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &uart1;
zephyr,bt-uart = &uart0;
zephyr,uart-pipe = &uart1;
zephyr,bt-mon-uart = &uart1;
};
};
&uart0 {
status = "ok";
current-speed = <1000000>;
};
&uart1 {
status = "ok";
current-speed = <115200>;
};

9
dts/x86/quark_se_c1000_devboard.fixup
View file

@ -1,9 +0,0 @@
#define CONFIG_UART_QMSI_0_BAUDRATE INTEL_QMSI_UART_B0002000_CURRENT_SPEED
#define CONFIG_UART_QMSI_0_NAME INTEL_QMSI_UART_B0002000_LABEL
#define CONFIG_UART_QMSI_1_BAUDRATE INTEL_QMSI_UART_B0002400_CURRENT_SPEED
#define CONFIG_UART_QMSI_1_NAME INTEL_QMSI_UART_B0002400_LABEL
#define CONFIG_PHYS_RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
#define CONFIG_PHYS_LOAD_ADDR CONFIG_FLASH_BASE_ADDRESS