Merge branch 'master' of jbe@octopus:/home/git/projects/u-boot-v2
This commit is contained in:
commit
c054a3682d
4
Makefile
4
Makefile
|
@ -787,7 +787,11 @@ include/asm:
|
||||||
|
|
||||||
include/config.h:
|
include/config.h:
|
||||||
@echo ' SYMLINK $@ -> include/configs/$(board-y).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 $@
|
@ln -fsn configs/$(board-y).h $@
|
||||||
|
endif
|
||||||
|
|
||||||
# Generate some files
|
# Generate some files
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
|
@ -41,7 +41,12 @@ else
|
||||||
$(Q)ln -fsn $(INCDIR) include/asm-arm/arch
|
$(Q)ln -fsn $(INCDIR) include/asm-arm/arch
|
||||||
endif
|
endif
|
||||||
@echo ' SYMLINK include/asm-arm/proc -> include/asm-arm/proc-armv'
|
@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
|
$(Q)ln -fsn proc-armv include/asm-arm/proc
|
||||||
|
endif
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
uboot.netx: uboot.bin
|
uboot.netx: uboot.bin
|
||||||
|
|
|
@ -14,7 +14,7 @@ clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj
|
||||||
|
|
||||||
# The filename Kbuild has precedence over Makefile
|
# The filename Kbuild has precedence over Makefile
|
||||||
kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
|
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
|
# Figure out what we need to build from the various variables
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
|
|
Loading…
Reference in New Issue