From 477bb5d09f45c370a0d5807c2ddfce2be0205649 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 23 Mar 2020 14:10:09 +0800 Subject: [PATCH 1/2] Move CXD56_BINARY to boards/arm/cxd56xx/spresense/Kconfig Signed-off-by: Xiang Xiao --- Kconfig | 7 ------- boards/arm/cxd56xx/spresense/Kconfig | 7 +++++++ boards/arm/cxd56xx/{ => spresense}/scripts/Config.mk | 2 +- boards/arm/cxd56xx/spresense/scripts/Make.defs | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename boards/arm/cxd56xx/{ => spresense}/scripts/Config.mk (97%) diff --git a/Kconfig b/Kconfig index 069d8ed80a457..29cd711775950 100644 --- a/Kconfig +++ b/Kconfig @@ -279,13 +279,6 @@ endmenu # Build Setup menu "Binary Output Formats" -config CXD56_BINARY - bool "spk binary format" - default n - ---help--- - Create nuttx.spk binary format used on spresense board and boards - based on cxd56xx arch. - config INTELHEX_BINARY bool "Intel HEX binary format" default n diff --git a/boards/arm/cxd56xx/spresense/Kconfig b/boards/arm/cxd56xx/spresense/Kconfig index ed0fe315d0649..2f4486aafa4c3 100644 --- a/boards/arm/cxd56xx/spresense/Kconfig +++ b/boards/arm/cxd56xx/spresense/Kconfig @@ -125,4 +125,11 @@ endif # CXD56_LTE_SPI4 endif # CXD56_LTE +config CXD56_BINARY + bool "spk binary format" + default n + ---help--- + Create nuttx.spk binary format used on spresense board and boards + based on cxd56xx arch. + endif diff --git a/boards/arm/cxd56xx/scripts/Config.mk b/boards/arm/cxd56xx/spresense/scripts/Config.mk similarity index 97% rename from boards/arm/cxd56xx/scripts/Config.mk rename to boards/arm/cxd56xx/spresense/scripts/Config.mk index 5af62679a40b2..8c9bd3bf2a8b7 100644 --- a/boards/arm/cxd56xx/scripts/Config.mk +++ b/boards/arm/cxd56xx/spresense/scripts/Config.mk @@ -1,5 +1,5 @@ ############################################################################ -# board/arm/cxd56xx/script/Config.mk +# board/arm/cxd56xx/spresense/script/Config.mk # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with diff --git a/boards/arm/cxd56xx/spresense/scripts/Make.defs b/boards/arm/cxd56xx/spresense/scripts/Make.defs index c7df6e0f342d5..f4e33cedfe7c6 100644 --- a/boards/arm/cxd56xx/spresense/scripts/Make.defs +++ b/boards/arm/cxd56xx/spresense/scripts/Make.defs @@ -35,7 +35,7 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk -include ${TOPDIR}/boards/arm/cxd56xx/scripts/Config.mk +include ${TOPDIR}/boards/arm/cxd56xx/spresense/scripts/Config.mk include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs # Setup for the kind of memory that we are executing from From 3b71ffdb9331689a7df56aaf670f6b8838a74ab8 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 23 Mar 2020 14:04:40 +0800 Subject: [PATCH 2/2] esp32: Guard the binary generation with CONFIG_ESP32CORE_BINARY Signed-off-by: Xiang Xiao --- boards/xtensa/esp32/esp32-core/Kconfig | 6 ++++++ boards/xtensa/esp32/esp32-core/scripts/Config.mk | 2 ++ 2 files changed, 8 insertions(+) diff --git a/boards/xtensa/esp32/esp32-core/Kconfig b/boards/xtensa/esp32/esp32-core/Kconfig index 4b4a9ce1c512a..aaaa65785c656 100644 --- a/boards/xtensa/esp32/esp32-core/Kconfig +++ b/boards/xtensa/esp32/esp32-core/Kconfig @@ -38,4 +38,10 @@ config ESP32CORE_RUN_IRAM allows interoperability with the esp-idf system but makes you reliant on the esp-idf design for these parts. Both are possible. +config ESP32CORE_FLASH_IMAGE + bool "esp32 flash image" + default n + ---help--- + Create flash_image.bin mainly used for QEMU. + endif # ARCH_BOARD_ESP32CORE diff --git a/boards/xtensa/esp32/esp32-core/scripts/Config.mk b/boards/xtensa/esp32/esp32-core/scripts/Config.mk index ee7710cc67c20..4e60251124b83 100644 --- a/boards/xtensa/esp32/esp32-core/scripts/Config.mk +++ b/boards/xtensa/esp32/esp32-core/scripts/Config.mk @@ -24,6 +24,7 @@ # POSTBUILD -- Perform post build operations +ifeq ($(CONFIG_ESP32CORE_FLASH_IMAGE),y) define POSTBUILD @echo "MKIMAGE: ESP32 binary" $(Q) if ! esptool.py version ; then \ @@ -47,3 +48,4 @@ define POSTBUILD echo "Generated: flash_image.bin (it can be run with 'qemu-system-xtensa -nographic -machine esp32 -drive file=flash_image.bin,if=mtd,format=raw')"; \ fi endef +endif