From e670d2b70c16d8cfb1cd2eb6479e0757fd1abaa0 Mon Sep 17 00:00:00 2001
From: Gautier Hattenberger <gautier.hattenberger@enac.fr>
Date: Fri, 14 Nov 2014 15:09:16 +0100
Subject: [PATCH] [build] remove 'load' target from makefile

It is a special command in Make 4.0
---
 conf/Makefile.ardrone2               | 2 +-
 conf/Makefile.geode                  | 2 +-
 conf/Makefile.lpc21                  | 2 +-
 conf/Makefile.pentium-m              | 2 +-
 sw/airborne/arch/lpc21/test/Makefile | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/conf/Makefile.ardrone2 b/conf/Makefile.ardrone2
index ad6e9f254ba..3a8967ef2aa 100644
--- a/conf/Makefile.ardrone2
+++ b/conf/Makefile.ardrone2
@@ -32,7 +32,7 @@ upload_extra:
 
 
 # Program the device and start it.
-load upload program: upload_extra $(OBJDIR)/$(TARGET).elf
+upload program: upload_extra $(OBJDIR)/$(TARGET).elf
 	$(Q)$(DRONE) --host=$(HOST) insmod $(PAPARAZZI_SRC)/sw/ext/ardrone2_drivers/cdc-acm.ko
 	$(Q)$(DRONE) --host=$(HOST) upload_file_and_run $(OBJDIR)/$(TARGET).elf $(SUB_DIR)
 	$(Q)$(DRONE) --host=$(HOST) status
diff --git a/conf/Makefile.geode b/conf/Makefile.geode
index ce38405faa8..ffff7d98eab 100644
--- a/conf/Makefile.geode
+++ b/conf/Makefile.geode
@@ -67,7 +67,7 @@ $(OBJDIR):
 elf: $(OBJDIR)/$(TARGET).elf
 
 # Program the device.
-load upload program: $(OBJDIR)/$(TARGET).elf
+upload program: $(OBJDIR)/$(TARGET).elf
 	scp $(OBJDIR)/$(TARGET).elf $(USER)@$(HOST):$(TARGET_DIR)
 
 # Link: create ELF output file from object files.
diff --git a/conf/Makefile.lpc21 b/conf/Makefile.lpc21
index 117cf4607e4..1e1654f52b8 100644
--- a/conf/Makefile.lpc21
+++ b/conf/Makefile.lpc21
@@ -192,7 +192,7 @@ sym: $(OBJDIR)/$(TARGET).sym
 
 
 # Program the device.
-load upload program: $(OBJDIR)/$(TARGET).hex
+upload program: $(OBJDIR)/$(TARGET).hex
 ifeq ($(FLASH_MODE),IAP)
 	$(SUDO) $(LPC21IAP)  $(OBJDIR)/$(TARGET).elf
 else ifeq ($(FLASH_MODE),JTAG)
diff --git a/conf/Makefile.pentium-m b/conf/Makefile.pentium-m
index ed9ee530d44..a40f49da0c4 100644
--- a/conf/Makefile.pentium-m
+++ b/conf/Makefile.pentium-m
@@ -76,7 +76,7 @@ $(OBJDIR):
 elf: $(OBJDIR)/$(TARGET).elf
 
 # Program the device.
-load upload program: $(OBJDIR)/$(TARGET).elf
+upload program: $(OBJDIR)/$(TARGET).elf
 ifdef USER
 	ssh $(USER)@$(HOST) "sudo mount -o remount,rw /"
 	scp $(OBJDIR)/$(TARGET).elf $(USER)@$(HOST):$(TARGET_DIR)
diff --git a/sw/airborne/arch/lpc21/test/Makefile b/sw/airborne/arch/lpc21/test/Makefile
index 374f0684bd7..852607074f2 100644
--- a/sw/airborne/arch/lpc21/test/Makefile
+++ b/sw/airborne/arch/lpc21/test/Makefile
@@ -15,7 +15,7 @@
 #
 # make clean = Clean out built project files.
 #
-# make load = Download the hex file to the device, using lpc21isp
+# make upload = Download the hex file to the device, using lpc21isp
 #
 # (TODO: make filename.s = Just compile filename.c into the assembler code only)
 #
@@ -297,7 +297,7 @@ gccversion :
 
 
 # Program the device.
-load upload program: $(TARGET).hex
+upload program: $(TARGET).hex
 ifeq ($(FLASH_MODE),IAP)
 	$(LPC21IAP)  $(TARGET).elf
 else
@@ -423,4 +423,4 @@ clean_list :
 
 # Listing of phony targets.
 .PHONY : all begin finish end sizebefore sizeafter gccversion \
-build elf hex lss sym clean clean_list load
+build elf hex lss sym clean clean_list