From d88cefee8549d22b951a9013e2926c1e136b389f Mon Sep 17 00:00:00 2001 From: jjlange Date: Mon, 19 Aug 2019 19:49:55 +0000 Subject: [PATCH] Merged in jjlange/nuttx (pull request #1006) Added a missing '=' in the second grep statement * Save CONFIG_ARCH_BOARD_CUSTOM when running 'make savedefconfig' * Only use PCLKSEL0 for ADC on LPC176x family. * Made grep search expression more specific. * Added missing '=' to second grep * Revert "Only use PCLKSEL0 for ADC on LPC176x family." This reverts commit 835b5e9d6fcbea02cb0203c063b0e121fa57ba9e. * Revert "Added missing '=' to second grep" This reverts commit 38b51f0c6d9612de755c102a53846ca7488cdf14. * Added a missing '=' in the second grep statement Approved-by: Gregory Nutt --- tools/Makefile.unix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile.unix b/tools/Makefile.unix index 26c3385388..c8c964eed1 100644 --- a/tools/Makefile.unix +++ b/tools/Makefile.unix @@ -561,7 +561,7 @@ savedefconfig: do_savedefconfig $(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) grep "^CONFIG_ARCH_BOARD_CUSTOM=" .config && grep "^CONFIG_ARCH_BOARD_CUSTOM" .config >> defconfig.tmp; true + $(Q) grep "^CONFIG_ARCH_BOARD_CUSTOM=" .config && grep "^CONFIG_ARCH_BOARD_CUSTOM=" .config >> defconfig.tmp; true $(Q) export LC_ALL=C; cat defconfig.tmp | sort | uniq > sortedconfig.tmp $(Q) echo "#" > warning.tmp $(Q) echo "# This file is autogenerated: PLEASE DO NOT EDIT IT." >> warning.tmp