diff --git a/boards/x86/arduino_101/Kconfig.defconfig b/boards/x86/arduino_101/Kconfig.defconfig index ebe635d8500..2ac7585ff16 100644 --- a/boards/x86/arduino_101/Kconfig.defconfig +++ b/boards/x86/arduino_101/Kconfig.defconfig @@ -13,8 +13,10 @@ config SS_RESET_VECTOR config ROM_SIZE default 144 +if !HAS_DTS config PHYS_LOAD_ADDR default 0x40010000 +endif if BLUETOOTH_H4 diff --git a/boards/x86/arduino_101/Makefile.board b/boards/x86/arduino_101/Makefile.board index a7ef9587b97..a989e6da7db 100644 --- a/boards/x86/arduino_101/Makefile.board +++ b/boards/x86/arduino_101/Makefile.board @@ -9,7 +9,7 @@ FLASH_SCRIPT = openocd.sh endif DEBUG_SCRIPT = openocd.sh OPENOCD_PRE_CMD = "targets 1" -OPENOCD_LOAD_CMD = "load_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}" -OPENOCD_VERIFY_CMD = "verify_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_PHYS_LOAD_ADDR}" +OPENOCD_LOAD_CMD = "load_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}" +OPENOCD_VERIFY_CMD = "verify_image ${O}/${KERNEL_BIN_NAME} ${CONFIG_FLASH_BASE_ADDRESS}" export FLASH_SCRIPT OPENOCD_VERIFY_CMD OPENOCD_LOAD_CMD OPENOCD_PRE_CMD diff --git a/boards/x86/arduino_101/arduino_101_defconfig b/boards/x86/arduino_101/arduino_101_defconfig index 5a11f02128a..11dccf740a2 100644 --- a/boards/x86/arduino_101/arduino_101_defconfig +++ b/boards/x86/arduino_101/arduino_101_defconfig @@ -7,8 +7,8 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_QMSI=y -CONFIG_UART_QMSI_0_BAUDRATE=1000000 CONFIG_UART_QMSI_0_HW_FC=y CONFIG_PRINTK=y CONFIG_PINMUX=y CONFIG_GPIO=y +CONFIG_HAS_DTS=y diff --git a/dts/x86/arduino_101.dts b/dts/x86/arduino_101.dts new file mode 100644 index 00000000000..1716442888d --- /dev/null +++ b/dts/x86/arduino_101.dts @@ -0,0 +1,29 @@ +/dts-v1/; + +#include "intel_curie.dtsi" + +/ { + model = "Arduino 101"; + compatible = "arduino,101","intel,quark"; + + aliases { + uart_0 = &uart0; + uart_1 = &uart1; + }; + + chosen { + zephyr,sram = &sram0; + zephyr,flash = &flash0; + zephyr,console = &uart1; + }; +}; + +&uart0 { + status = "ok"; + current-speed = <1000000>; +}; + +&uart1 { + status = "ok"; + current-speed = <115200>; +}; diff --git a/dts/x86/arduino_101.fixup b/dts/x86/arduino_101.fixup new file mode 100644 index 00000000000..d446604356a --- /dev/null +++ b/dts/x86/arduino_101.fixup @@ -0,0 +1,9 @@ +#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