recovery: code trimming

all configs are merged to '$(RECOVERY_BLOCK)/config.mk'

diff --git a/recovery/board/samsung/universal/Makefile b/recovery/board/samsung/universal/Makefile
index 5789bdb..c25c4ff 100644 (file)
--- a/recovery/board/samsung/universal/Makefile
+++ b/recovery/board/samsung/universal/Makefile
@@ -11,7 +11,7 @@
 # the License, or (at your option) any later version.
 #
 
-include $(TOPDIR)/recovery/config.mk
+include $(TOPDIR)/$(RECOVERY_BLOCK)/config.mk
 
 LIB    := $(obj)lib$(BOARD).a
 

diff --git a/recovery/config.mk b/recovery/config.mk
index 9019aa1..7d76189 100644 (file)
--- a/recovery/config.mk
+++ b/recovery/config.mk
@@ -116,12 +116,12 @@ else
 BOARDDIR = $(BOARD)
 endif
 ifdef  BOARD
-sinclude $(TOPDIR)/recovery/board/$(BOARDDIR)/config.mk
+sinclude $(TOPDIR)/$(RECOVERY_BLOCK)/board/$(BOARDDIR)/config.mk
 endif
 
 #########################################################################
 
-# sinclude $(TOPDIR)/recovery/lib_$(ARCH)/config.mk
+# sinclude $(TOPDIR)/lib_$(ARCH)/config.mk
 
 CROSS_COMPILE ?= arm-linux-
 
@@ -155,11 +155,11 @@ ifeq (,$(findstring lib_arm/eabi_compat.o,$(PLATFORM_LIBS)))
 PLATFORM_LIBS += $(OBJTREE)/lib_arm/eabi_compat.o
 endif
 endif
-LDSCRIPT := $(SRCTREE)/recovery/board/$(BOARDDIR)/recovery.lds
+LDSCRIPT := $(SRCTREE)/$(RECOVERY_BLOCK)/board/$(BOARDDIR)/recovery.lds
 
 #########################################################################
 
-# sinclude $(TOPDIR)/recovery/cpu/$(CPU)/config.mk
+# sinclude $(TOPDIR)/cpu/$(CPU)/config.mk
 PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \
                     -msoft-float
 
@@ -175,13 +175,6 @@ PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,\
 
 #########################################################################
 
-#########################################################################
-
-#########################################################################
-
-
-#########################################################################
-
 ifneq (,$(findstring s,$(MAKEFLAGS)))
 ARFLAGS = cr
 else

diff --git a/recovery/drivers/onenand/Makefile b/recovery/drivers/onenand/Makefile
index 8b989c1..a245532 100644 (file)
--- a/recovery/drivers/onenand/Makefile
+++ b/recovery/drivers/onenand/Makefile
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
-include $(TOPDIR)/recovery/config.mk
+include $(TOPDIR)/$(RECOVERY_BLOCK)/config.mk
 
 LIB := $(obj)libonenand.a
 

diff --git a/recovery/drivers/usb/Makefile b/recovery/drivers/usb/Makefile
index 6cda9ae..2140d76 100644 (file)
--- a/recovery/drivers/usb/Makefile
+++ b/recovery/drivers/usb/Makefile
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
-include $(TOPDIR)/recovery/config.mk
+include $(TOPDIR)/$(RECOVERY_BLOCK)/config.mk
 
 LIB := $(obj)libusb.a