Move api_examples to examples/api

Also add a rule to remove demo.bin which was previously leftover
after a "make clean"

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/Makefile b/Makefile
index 9ffba2e..25a6254 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,7 @@ endif
 # Don't include stuff already done in $(LIBS)
 SUBDIRS        = tools \
          examples/standalone \
-         api_examples
+         examples/api
 
 .PHONY : $(SUBDIRS)
 
@@ -3601,6 +3601,7 @@ clean:
               $(obj)examples/standalone/smc91111_eeprom                  \
               $(obj)examples/standalone/test_burst                       \
               $(obj)examples/standalone/timer
+       @rm -f $(obj)examples/api/demo{,.bin}
        @rm -f $(obj)tools/bmp_logo        $(obj)tools/easylogo/easylogo  \
               $(obj)tools/env/{fw_printenv,fw_setenv}                    \
               $(obj)tools/envcrc                                         \
@@ -3617,7 +3618,7 @@ clean:
        @rm -f $(obj)include/bmp_logo.h
        @rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map}
        @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl-2k.bin,ipl-4k.bin,ipl.map}
-       @rm -f $(obj)api_examples/demo $(TIMESTAMP_FILE) $(VERSION_FILE)
+       @rm -f $(TIMESTAMP_FILE) $(VERSION_FILE)
        @find $(OBJTREE) -type f \
                \( -name 'core' -o -name '*.bak' -o -name '*~' \
                -o -name '*.o'  -o -name '*.a' -o -name '*.exe' \) -print \

diff --git a/api_examples/.gitignore b/examples/api/.gitignore
similarity index 100%
rename from api_examples/.gitignore
rename to examples/api/.gitignore

diff --git a/api_examples/Makefile b/examples/api/Makefile
similarity index 91%
rename from api_examples/Makefile
rename to examples/api/Makefile
index 2a30bef..2d05a01 100644 (file)
--- a/api_examples/Makefile
+++ b/examples/api/Makefile
@@ -33,13 +33,13 @@ include $(TOPDIR)/config.mk
 OUTPUT-$(CONFIG_API) = $(obj)demo
 OUTPUT = $(OUTPUT-y)
 
-# Source files located in the api_examples directory
+# Source files located in the examples/api directory
 SOBJ_FILES-$(CONFIG_API) += crt0.o
 COBJ_FILES-$(CONFIG_API) += demo.o
 COBJ_FILES-$(CONFIG_API) += glue.o
 COBJ_FILES-$(CONFIG_API) += libgenwrap.o
 
-# Source files which exist outside the api_examples directory
+# Source files which exist outside the examples/api directory
 EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/crc32.o
 EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/ctype.o
 EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o
@@ -51,8 +51,8 @@ endif
 # Create a list of source files so their dependencies can be auto-generated
 SRCS   += $(addprefix $(SRCTREE)/,$(EXT_COBJ_FILES-y:.o=.c))
 SRCS   += $(addprefix $(SRCTREE)/,$(EXT_SOBJ_FILES-y:.o=.S))
-SRCS   += $(addprefix $(SRCTREE)/api_examples/,$(COBJ_FILES-y:.o=.c))
-SRCS   += $(addprefix $(SRCTREE)/api_examples/,$(SOBJ_FILES-y:.o=.S))
+SRCS   += $(addprefix $(SRCTREE)/examples/api/,$(COBJ_FILES-y:.o=.c))
+SRCS   += $(addprefix $(SRCTREE)/examples/api/,$(SOBJ_FILES-y:.o=.S))
 
 # Create a list of object files to be compiled
 OBJS   += $(addprefix $(obj),$(SOBJ_FILES-y))

diff --git a/api_examples/crt0.S b/examples/api/crt0.S
similarity index 100%
rename from api_examples/crt0.S
rename to examples/api/crt0.S

diff --git a/api_examples/demo.c b/examples/api/demo.c
similarity index 100%
rename from api_examples/demo.c
rename to examples/api/demo.c

diff --git a/api_examples/glue.c b/examples/api/glue.c
similarity index 100%
rename from api_examples/glue.c
rename to examples/api/glue.c

diff --git a/api_examples/glue.h b/examples/api/glue.h
similarity index 100%
rename from api_examples/glue.h
rename to examples/api/glue.h

diff --git a/api_examples/libgenwrap.c b/examples/api/libgenwrap.c
similarity index 100%
rename from api_examples/libgenwrap.c
rename to examples/api/libgenwrap.c