From 031a5270d0de9d4e4a90260b1a2377637cf54fa3 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Tue, 1 Oct 2019 11:42:18 -0600
Subject: [PATCH] apps/Makefile:  Remove EXE_DIR and put binary into bin folder
 like nuttx

---
 .gitignore          | 2 +-
 Makefile            | 9 +++------
 tools/mkromfsimg.sh | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 67a8ede2b..336c6fd2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ core
 cscope.out
 /Kconfig
 /bin
-/exe
 /external
 /.context
 /.config
@@ -20,5 +19,6 @@ cscope.out
 /*.lib
 /romfs.img
 /boot_romfsimg.h
+/symtab_apps.c
 /*/*/.built
 
diff --git a/Makefile b/Makefile
index dcfbad2fa..7aedee40d 100644
--- a/Makefile
+++ b/Makefile
@@ -72,8 +72,7 @@ LIBPATH ?= $(TOPDIR)$(DELIM)staging
 
 # The install path
 
-EXE_DIR = $(APPDIR)$(DELIM)exe
-BIN_DIR = $(EXE_DIR)$(DELIM)system$(DELIM)bin
+BIN_DIR = $(APPDIR)$(DELIM)bin
 
 # The final build target
 
@@ -81,7 +80,7 @@ BIN = libapps$(LIBEXT)
 
 # Symbol table for loadable apps.
 
-SYMTABSRC = $(EXE_DIR)$(DELIM)symtab_apps.c
+SYMTABSRC = symtab_apps.c
 SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
 
 # Build targets
@@ -139,7 +138,7 @@ else
 
 $(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
 	$(Q) $(MAKE) install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
-	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(EXE_DIR)$(DELIM)system $(SYMTABSRC)
+	$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BIN_DIR) $(SYMTABSRC)
 
 $(SYMTABOBJ): %$(OBJEXT): %.c
 ifeq ($(WINTOOL),y)
@@ -213,7 +212,6 @@ clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean)
 	$(call DELFILE, $(BIN))
 	$(call DELFILE, Kconfig)
 	$(call DELDIR, $(BIN_DIR))
-	$(call DELDIR, $(EXE_DIR))
 	$(call CLEAN)
 
 distclean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_distclean)
@@ -237,5 +235,4 @@ endif
 	$(call DELFILE, $(BIN))
 	$(call DELFILE, Kconfig)
 	$(call DELDIR, $(BIN_DIR))
-	$(call DELDIR, $(EXE_DIR))
 	$(call CLEAN)
diff --git a/tools/mkromfsimg.sh b/tools/mkromfsimg.sh
index bdf651eea..50965b43e 100755
--- a/tools/mkromfsimg.sh
+++ b/tools/mkromfsimg.sh
@@ -47,7 +47,7 @@ fi
 # Environmental stuff
 
 topdir=$PWD
-fsdir=${topdir}/exe/system
+fsdir=${topdir}/bin
 romfsimg=romfs.img
 headerfile=boot_romfsimg.h