Merge branch 'master' into fix-rr-scheduler

Author: mlouielu

Makefile

@@ -1,11 +1,11 @@
 NAME = piko
 
-# select QEMU when the target is unspecified
-TARGET ?= stm32f429
+# select QEMU when the platform is unspecified
+PLAT ?= f429disco
 CMSIS = external/cmsis
 
 # The platform Makefile contains hw details and flags
-include target/$(TARGET)/Makefile
+include platform/$(PLAT)/Makefile
 
 # arch-specific
 SSRC += arch/v7m-head.S arch/v7m-entry.S arch/v7m-svcall.S
@@ -39,14 +39,14 @@ deps := $(OBJS:%.o=.%.o.d)
 
 .PHONY: all check clean distclean
 
-all: $(CMSIS)/$(TARGET) $(NAME).lds $(NAME).bin SCHED_FLAGS
+all: $(CMSIS)/$(PLAT) $(NAME).lds $(NAME).bin SCHED_FLAGS
 
 # generic build rules
 include mk/flags.mk
 include mk/rules.mk
 include mk/cmsis.mk
 
-prebuild: $(CMSIS)/$(TARGET)
+prebuild: $(CMSIS)/$(PLAT)
 
 check:
 	python3 tests/runner.py
@@ -70,6 +70,6 @@ distclean: clean
 	rm -rf $(CMSIS)
 
 # platform build contains flashing and running rules
-include target/$(TARGET)/build.mk
+include platform/$(PLAT)/build.mk
 
 -include $(deps)

README.md

@@ -7,7 +7,7 @@ This is `Piko/RT`, a tiny Linux-like real-time operating system kernel, optimize
 
 ```
 # Run all test
-$ make TARGET=stm32p103 check
+$ make PLAT=stm32p103 check
 
 # Run all test with command line tools
 $ python -m tests

libc/v7m-pthread.S

@@ -58,4 +58,4 @@ ENTRY(pthread_mutex_unlock)
 	mov	r1, #SYS_PTHREAD_MUTEX_UNLOCK
 	svc	#1
 2:	bx	lr
-ENDPROC(pthread_mutex_lock)
+ENDPROC(pthread_mutex_unlock)

mk/cmsis.mk

@@ -1,19 +1,22 @@
 SVN_REV = 27441
 
+ARM_CMSIS_ASSETS = \
+	mbed_preprocessor.h \
+	mbed_assert.h
+
+ARM_CMSIS_ASSETS := $(addprefix $(CMSIS)/util/, $(ARM_CMSIS_ASSETS))
+
 $(CMSIS):
 	@mkdir -p $@
 
-$(CMSIS)/$(TARGET): $(CMSIS)/arm $(CMSIS)/TARGET_STM $(CMSIS)/util
+$(CMSIS)/$(PLAT): $(CMSIS)/arm $(CMSIS)/TARGET_STM $(ARM_CMSIS_ASSETS)
 
 $(CMSIS)/arm:
 	svn export -r$(SVN_REV) --force https://github.com/ARMmbed/mbed-os/trunk/cmsis/ $(CMSIS)/arm
 
 $(CMSIS)/TARGET_STM:
 	svn export -r$(SVN_REV) --force https://github.com/ARMmbed/mbed-os/trunk/targets/TARGET_STM/ $(CMSIS)/TARGET_STM
 
-$(CMSIS)/util:
-	@mkdir -p $(CMSIS)/util
-# Reference: https://stackoverflow.com/questions/1125476/retrieve-a-single-file-from-a-repository
-#            https://stackoverflow.com/questions/1078524/how-to-specify-the-location-with-wget
-	wget https://raw.github.com/ARMmbed/mbed-os/master/platform/mbed_preprocessor.h -P $(CMSIS)/util
-	wget https://raw.github.com/ARMmbed/mbed-os/master/platform/mbed_assert.h -P $(CMSIS)/util
+$(ARM_CMSIS_ASSETS):
+	$(VECHO) "  WGET\t\t$@\n"
+	$(Q)$(WGET) -q https://raw.github.com/ARMmbed/mbed-os/master/platform/$(notdir $@) -P $(CMSIS)/util

mk/flags.mk

@@ -5,6 +5,7 @@ AR = $(CROSS_COMPILE)ar
 OBJCOPY = $(CROSS_COMPILE)objcopy
 GDB = $(CROSS_COMPILE)gdb
 HOSTCC  = gcc
+WGET = wget
 
 # FIXME: configurable via menuconfig or command line
 CFLAGS_OPT = -Os # -flto
@@ -13,7 +14,7 @@ CFLAGS += \
     -std=c99 \
     -W -Wall \
     -Iinclude -Iinclude/libc -I. \
-    -I$(CMSIS)/arm -I$(CMSIS)/$(TARGET) -I$(CMSIS)/$(TARGET)/hal \
+    -I$(CMSIS)/arm -I$(CMSIS)/$(PLAT) -I$(CMSIS)/$(PLAT)/hal \
     -Iinclude/kernel \
     -D_POSIX_THREADS=1 -D_POSIX_TIMERS=1 -D_POSIX_REALTIME_SIGNALS=1 \
     -Wno-main -fdiagnostics-color \

target/stm32f429/Makefile platform/f429disco/Makefiletarget/stm32f429/Makefile renamed to platform/f429disco/Makefile

@@ -5,7 +5,7 @@ ROMSZ = 2048k
 RAMSZ = 192k
 
 CFLAGS += \
-    -Itarget/stm32f429 \
+    -Iplatform/f429disco \
     -I$(CMSIS)/util \
     -I$(CMSIS)/arm \
     -I$(CMSIS)/arm/TARGET_CORTEX_M \
@@ -18,8 +18,8 @@ CFLAGS += \
     -I$(CMSIS)/TARGET_STM//TARGET_STM32F4/TARGET_STM32F429xI/TARGET_DISCO_F429ZI
 
 CSRC += \
-    target/stm32f429/halt.c \
-    target/stm32f429/init.c
+    platform/f429disco/halt.c \
+    platform/f429disco/init.c
 
 # CMSIS files
 ## STM32 HAL