From 82baae51013305f1727fce12b636ca63feabbfab Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 7 Mar 2018 13:37:53 -0600 Subject: [PATCH] Makefile.unix: This seems to eliminate the spuriouis errors reported by 'make savedefconfig' --- Makefile.unix | 6 +++--- configs/stm32f4discovery/README.txt | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.unix b/Makefile.unix index ffe8d7ed63..ca89cf878e 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -521,9 +521,9 @@ savedefconfig: do_savedefconfig $(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --savedefconfig defconfig.tmp Kconfig $(Q) sed -i -e "/CONFIG_APPS_DIR=/d" defconfig.tmp $(Q) grep "CONFIG_ARCH=" .config >> defconfig.tmp - -$(Q) grep "^CONFIG_ARCH_CHIP_" .config >> defconfig.tmp - -$(Q) grep "CONFIG_ARCH_BOARD=" .config && grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp - -$(Q) grep "^CONFIG_ARCH_CUSTOM" .config && grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp + $(Q) grep "^CONFIG_ARCH_CHIP_" .config >> defconfig.tmp; true + $(Q) grep "CONFIG_ARCH_BOARD=" .config && grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp; true + $(Q) grep "^CONFIG_ARCH_CUSTOM" .config && grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp; true $(Q) cat defconfig.tmp | sort | uniq > defconfig $(Q) rm -f defconfig.tmp diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt index 1cead4669e..360711e85e 100644 --- a/configs/stm32f4discovery/README.txt +++ b/configs/stm32f4discovery/README.txt @@ -19,7 +19,8 @@ further information about this board. NOTE: This port was developed on the original board, order code STM32F4DISCOVERY. That board has been replaced with the new order code -STM32F407G-DISC1. The new board differs in at least these ways: +STM32F407VG-DISC1. The new version of the board differs in at least these +ways: - The ST-LINK/V2 has been updated to ST-LINK/V2-A on STM32F407G-DISC1 with a Virtual Com port and Mass storage.