powerpc/85xx: Add support for RMan LIODN initialization

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index ddcf5332b487418dc95751fe30efc1269c85bda5..e9a153cc61ef2f6e3b1fd9fbe220f731338eb52b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,8 @@ U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION)
 endif
-TIMESTAMP_FILE = $(obj)include/timestamp_autogenerated.h
-VERSION_FILE = $(obj)include/version_autogenerated.h
+TIMESTAMP_FILE = $(obj)include/generated/timestamp_autogenerated.h
+VERSION_FILE = $(obj)include/generated/version_autogenerated.h
 
 HOSTARCH := $(shell uname -m | \
        sed -e s/i.86/x86/ \
@@ -137,11 +137,9 @@ unexport CDPATH
 
 # The "tools" are needed early, so put this first
 # Don't include stuff already done in $(LIBS)
-SUBDIRS        = tools \
-         examples/standalone \
-         examples/api
+SUBDIRS        = tools
 
-.PHONY : $(SUBDIRS) $(VERSION_FILE)
+.PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)
 
 ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
 
@@ -156,6 +154,11 @@ sinclude $(obj)include/autoconf.mk
 include $(obj)include/config.mk
 export ARCH CPU BOARD VENDOR SOC
 
+ifndef CONFIG_SANDBOX
+SUBDIRS += examples/standalone \
+         examples/api
+endif
+
 # set default to nothing for native builds
 ifeq ($(HOSTARCH),$(ARCH))
 CROSS_COMPILE ?=
@@ -296,7 +299,7 @@ LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
 endif
 
 LIBS := $(addprefix $(obj),$(sort $(LIBS)))
-.PHONY : $(LIBS) $(TIMESTAMP_FILE)
+.PHONY : $(LIBS)
 
 LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
 LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
@@ -400,12 +403,20 @@ $(obj)u-boot.ubl:       $(obj)u-boot-nand.bin
                $(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \
                -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
 
+ifeq ($(CONFIG_SANDBOX),y)
+GEN_UBOOT = \
+               cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
+                       -Wl,--start-group $(__LIBS) -Wl,--end-group \
+                       $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot
+else
 GEN_UBOOT = \
                UNDEF_SYM=`$(OBJDUMP) -x $(LIBBOARD) $(LIBS) | \
                sed  -n -e 's/.*\($(SYM_PREFIX)__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
                cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $$UNDEF_SYM $(__OBJS) \
                        --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
                        -Map u-boot.map -o u-boot
+endif
+
 $(obj)u-boot:  depend \
                $(SUBDIRS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds
                $(GEN_UBOOT)
@@ -455,10 +466,6 @@ $(obj)mmc_spl/u-boot-mmc-spl.bin:  mmc_spl
 $(obj)spl/u-boot-spl.bin:              depend
                $(MAKE) -C spl all
 
-$(TIMESTAMP_FILE):
-               @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
-               @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
-
 updater:
                $(MAKE) -C tools/updater all
 
@@ -549,12 +556,12 @@ $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s:     $(obj)include/autoconf.mk.dep
 else   # !config.mk
 all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
 $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
-$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) \
+$(filter-out tools,$(SUBDIRS)) \
 updater depend dep tags ctags etags cscope $(obj)System.map:
        @echo "System not configured - see README" >&2
        @ exit 1
 
-tools: $(VERSION_FILE)
+tools: $(VERSION_FILE) $(TIMESTAMP_FILE)
        $(MAKE) -C $@ all
 endif  # config.mk
 
@@ -572,11 +579,17 @@ $(VERSION_FILE):
                 '$(shell $(LD) -v | head -n 1)' )>>  $@.tmp
                @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
 
+$(TIMESTAMP_FILE):
+               @mkdir -p $(dir $(TIMESTAMP_FILE))
+               @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@.tmp
+               @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@.tmp
+               @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
+
 easylogo env gdb:
        $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
 gdbtools: gdb
 
-tools-all: easylogo env gdb $(VERSION_FILE)
+tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE)
        $(MAKE) -C tools HOST_TOOLS_ALL=y
 
 .PHONY : CHANGELOG
@@ -866,10 +879,6 @@ SX1_config:                unconfig
        fi;
        @$(MKCONFIG) -n $@ SX1 arm arm925t sx1
 
-tx25_config    : unconfig
-       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-       @$(MKCONFIG) $@ arm arm926ejs tx25 karo mx25
-
 #########################################################################
 ## XScale Systems
 #########################################################################
@@ -892,24 +901,6 @@ apollon_config             : unconfig
        @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
        @$(MKCONFIG) $@ arm arm1136 apollon - omap24xx
 
-imx31_phycore_eet_config \
-imx31_phycore_config   : unconfig
-       @mkdir -p $(obj)include
-       @if [ -n "$(findstring _eet_,$@)" ]; then                       \
-               echo "#define CONFIG_IMX31_PHYCORE_EET" >> $(obj)include/config.h;      \
-       fi
-       @$(MKCONFIG) -n $@ -a imx31_phycore arm arm1136 imx31_phycore - mx31
-
-mx31pdk_config \
-mx31pdk_nand_config    : unconfig
-       @mkdir -p $(obj)include
-       @if [ -n "$(findstring _nand_,$@)" ]; then                                      \
-               echo "#define CONFIG_NAND_U_BOOT" >> $(obj)include/config.h;            \
-       else                                                                            \
-               echo "#define CONFIG_SKIP_LOWLEVEL_INIT" >> $(obj)include/config.h;     \
-       fi
-       @$(MKCONFIG) -n $@ -a mx31pdk arm arm1136 mx31pdk freescale mx31
-
 #########################################################################
 ## ARM1176 Systems
 #########################################################################
@@ -972,7 +963,7 @@ clean:
                | xargs rm -f
 
 clobber:       clean
-       @find $(OBJTREE) -type f \( -name '*.depend' \
+       @find $(OBJTREE) -type f \( -name '*.depend*' \
                -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
                -print0 \
                | xargs -0 rm -f