From f2ff81a0e3635920d3e5ac6e6b848f1be47ac934 Mon Sep 17 00:00:00 2001 From: Edvard Pettersen Date: Wed, 1 Aug 2018 09:06:51 +0200 Subject: [PATCH] Fixed CORE_SDK checks, and some grammar fixes --- arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx | 15 +++++++-------- arch/platform/simplelink/Makefile.simplelink | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx b/arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx index fc7ef5b62..c6eeae9d1 100644 --- a/arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx +++ b/arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx @@ -5,10 +5,11 @@ CC13x2_CC26x2_PRE_RTM ?= 1 # Core SDK is placed as a submodule under arch/cpu/cc13xx-cc26xx/lib. # Do a sanity check that Core SDK submodule has been initialized. -ifeq ($(CORE_SDK),) +ifndef CORE_SDK CORE_SDK := $(CONTIKI_CPU)/lib/coresdk_cc13xx_cc26xx CORE_SDK_INIT := $(shell [ -f $(CORE_SDK)/.git ] && echo 1) - ifeq ($(CORE_SDK_INIT),) + + ifneq ($(CORE_SDK_INIT),1) $(error The Core SDK submodule is not available. Please run 'git submodule update --init --recursive') endif # Note that Core SDK can be overriden with a user-specified SimpleLink SDK. @@ -17,14 +18,12 @@ ifeq ($(CORE_SDK),) else # Do a sanity check the path exists. CORE_SDK_VALID := $(shell [ -d $(CORE_SDK) ] && echo 1) - ifeq ($(CORE_SDK_VALID),) - $(error Supplied CORE_SDK is not a valid path.) + + ifneq ($(CORE_SDK_VALID),1) + $(error User-specified CORE_SDK is not a valid path.) endif endif -# Clean up the path. -CORE_SDK := $(realpath $(CORE_SDK)) - # Both ccfg-conf.c and startup_cc13xx_cc26xx_gcc.c is located locally in # the arch/cpu/cc13xx-cc26xx folder. CPU_START_SOURCEFILES += ccfg-conf.c startup_cc13xx_cc26xx_gcc.c @@ -47,7 +46,7 @@ ifeq ($(SUBFAMILY),cc13x2-cc26x2) SDK_LIB_NAME := $(DEVICE_FAMILY_LC)_v2 endif # CC13x0/CC26x0 does not have this, with both its devices name and library -# name he same as its own device family name. +# name the same as its own device family name. else SDK_DEVICES_NAME := $(DEVICE_FAMILY_LC) SDK_LIB_NAME := $(DEVICE_FAMILY_LC) diff --git a/arch/platform/simplelink/Makefile.simplelink b/arch/platform/simplelink/Makefile.simplelink index 1895c4d71..929bbc8b7 100644 --- a/arch/platform/simplelink/Makefile.simplelink +++ b/arch/platform/simplelink/Makefile.simplelink @@ -27,7 +27,7 @@ FAMILY := $(foreach FAMILY, $(SIMPLELINK_FAMILIES), $(call verify_family,$(FAMIL ifeq ($(FAMILY),) $(error Board '$(BOARD)' does not corresponding to any SimpleLink family. Make sure your BOARD variable is correct.) endif -# If multiple families are found, only the first one is chosen. If this every +# If multiple families are found, only the first one is chosen. If this ever # happens something is not correct. ifneq ($(words $(FAMILY)),1) FAMILY := $(firstword $(FAMILY))