jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: fix dependency on mkimage

Browse Source 
After the rework of the U-Boot configuration/compilation process, we
need to slightly rework how target/linux/Makefile.in.advanced depends
on mkimage on the host to produce an uImage.

target/linux/Makefile.in doesn't need to be fixed as it just doesn't
handle this dependency for the moment.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2010-06-07 23:11:26 +02:00
parent 6cc9d936a9
commit fa2a311b77
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/Config.in.advanced
View File

@ -383,7 +383,6 @@ config BR2_LINUX_BIN_BZIMAGE
config BR2_LINUX_BIN_UIMAGE config BR2_LINUX_BIN_UIMAGE
bool "uImage" bool "uImage"
depends on BR2_PACKAGE_LINUX depends on BR2_PACKAGE_LINUX
select BR2_TARGET_UBOOT
config BR2_LINUX_BIN_VMLINUX config BR2_LINUX_BIN_VMLINUX
bool "vmlinux" bool "vmlinux"

10
target/linux/Makefile.in.advanced
View File

@ -123,7 +123,6 @@ endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Has to be set by the target/device # Has to be set by the target/device
LINUX26_MKIMAGE_DIR:=
LINUX26_MKIMAGE_DEP:= LINUX26_MKIMAGE_DEP:=
# -------------- # --------------
@ -137,8 +136,7 @@ endif
# -------------- # --------------
# UIMAGE # UIMAGE
ifeq ($(LINUX26_FORMAT),uImage) ifeq ($(LINUX26_FORMAT),uImage)
LINUX26_MKIMAGE_DIR:=$(BUILD_DIR)/u-boot-tools LINUX26_MKIMAGE_DEP:=$(MKIMAGE)
LINUX26_MKIMAGE_DEP:=$(LINUX26_MKIMAGE_DIR)/mkimage
ifeq ($(LINUX26_BINLOC),) ifeq ($(LINUX26_BINLOC),)
LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT) LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
endif endif
@ -186,7 +184,7 @@ LINUX26_MAKE_FLAGS = HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \
CROSS_COMPILE=$(TARGET_CROSS) \ CROSS_COMPILE=$(TARGET_CROSS) \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
LZMA="$(LZMA)" \ LZMA="$(LZMA)" \
PATH=$(LINUX26_MKIMAGE_DIR):$(PATH) PATH=$(PATH)
# ============================================================================= # =============================================================================
# ifneq ($(strip $(LINUX26_VERSION)),$(strip $(LINUX_HEADERS_VERSION))) # ifneq ($(strip $(LINUX26_VERSION)),$(strip $(LINUX_HEADERS_VERSION)))
@ -449,10 +447,6 @@ $(BUILD_DIR)/.linux-version: $(LINUX26_KERNEL)
echo $(LINUX26_VERSION_PROBED) > $(BUILD_DIR)/.linux-version echo $(LINUX26_VERSION_PROBED) > $(BUILD_DIR)/.linux-version
echo LINUX_MODULES=`$(LINUX26_VERSION_PROBED)` echo LINUX_MODULES=`$(LINUX26_VERSION_PROBED)`
$(LINUX26_MKIMAGE_DIR)/mkimage: $(U_BOOT_TOOLS)
mkdir -p $(LINUX26_MKIMAGE_DIR)
cp $(MKIMAGE) $(LINUX26_MKIMAGE_DIR)
linux26: $(LINUX26_TARGETS) linux26: $(LINUX26_TARGETS)
linux26-version: $(BUILD_DIR)/.linux-version linux26-version: $(BUILD_DIR)/.linux-version