sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'master' of jbe@octopus:/home/git/projects/u-boot-v2

This commit is contained in:
Juergen Beisert 2007-10-17 21:09:54 +02:00
parent 4c03bb1d58 f002246610
commit c054a3682d
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -787,7 +787,11 @@ include/asm:
include/config.h:
@echo ' SYMLINK $@ -> include/configs/$(board-y).h'
ifneq ($(KBUILD_SRC),)
$(Q)ln -fsn $(srctree)/include/configs/$(board-y).h $@
else
@ln -fsn configs/$(board-y).h $@
endif
# Generate some files
# ---------------------------------------------------------------------------

5
arch/arm/Makefile
View File

@ -41,7 +41,12 @@ else
$(Q)ln -fsn $(INCDIR) include/asm-arm/arch
endif
@echo ' SYMLINK include/asm-arm/proc -> include/asm-arm/proc-armv'
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm-arm
$(Q)ln -fsn $(srctree)/include/asm-arm/proc-armv include/asm-arm/proc
else
$(Q)ln -fsn proc-armv include/asm-arm/proc
endif
@touch $@
uboot.netx: uboot.bin

2
scripts/Makefile.clean
View File

@ -14,7 +14,7 @@ clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj
# The filename Kbuild has precedence over Makefile
kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
#include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
# Figure out what we need to build from the various variables
# ==========================================================================