Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -24,6 +24,9 @@ UBOOT_SITE_METHOD = git
|
||||
else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y)
|
||||
UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
|
||||
UBOOT_SITE_METHOD = hg
|
||||
else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_SVN),y)
|
||||
UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
|
||||
UBOOT_SITE_METHOD = svn
|
||||
else
|
||||
# Handle stable official U-Boot versions
|
||||
UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot
|
||||
@@ -35,6 +38,10 @@ endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
|
||||
UBOOT_BIN = u-boot
|
||||
# To make elf usable for debuging on ARC use special target
|
||||
ifeq ($(BR2_arc),y)
|
||||
UBOOT_MAKE_TARGET = mdbtrick
|
||||
endif
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
|
||||
UBOOT_BIN = u-boot.kwb
|
||||
UBOOT_MAKE_TARGET = $(UBOOT_BIN)
|
||||
@@ -47,6 +54,7 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
|
||||
UBOOT_BIN = u-boot-nand.bin
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_IMG),y)
|
||||
UBOOT_BIN = u-boot-dtb.img
|
||||
UBOOT_MAKE_TARGET = all $(UBOOT_BIN)
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
|
||||
UBOOT_BIN = u-boot.img
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y)
|
||||
@@ -54,16 +62,17 @@ UBOOT_BIN = u-boot.imx
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
|
||||
UBOOT_BIN = u-boot.sb
|
||||
UBOOT_MAKE_TARGET = $(UBOOT_BIN)
|
||||
UBOOT_DEPENDENCIES += host-elftosb
|
||||
# mxsimage needs OpenSSL
|
||||
UBOOT_DEPENDENCIES += host-elftosb host-openssl
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SD),y)
|
||||
# BootStream (.sb) is generated by U-Boot, we convert it to SD format
|
||||
UBOOT_BIN = u-boot.sd
|
||||
UBOOT_MAKE_TARGET = u-boot.sb
|
||||
UBOOT_DEPENDENCIES += host-elftosb
|
||||
UBOOT_DEPENDENCIES += host-elftosb host-openssl
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND),y)
|
||||
UBOOT_BIN = u-boot.nand
|
||||
UBOOT_MAKE_TARGET = u-boot.sb
|
||||
UBOOT_DEPENDENCIES += host-elftosb
|
||||
UBOOT_DEPENDENCIES += host-elftosb host-openssl
|
||||
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
|
||||
UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
|
||||
else
|
||||
@@ -83,7 +92,9 @@ endif
|
||||
|
||||
UBOOT_MAKE_OPTS += \
|
||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
ARCH=$(UBOOT_ARCH)
|
||||
ARCH=$(UBOOT_ARCH) \
|
||||
HOSTCC="$(HOSTCC) $(HOST_CFLAGS)" \
|
||||
HOSTLDFLAGS="$(HOST_LDFLAGS)"
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
|
||||
UBOOT_DEPENDENCIES += host-dtc
|
||||
@@ -100,16 +111,6 @@ endef
|
||||
UBOOT_POST_EXTRACT_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE
|
||||
UBOOT_POST_RSYNC_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE
|
||||
|
||||
# Prior to Buildroot 2015.05, only patch directories were supported. New
|
||||
# configurations use BR2_TARGET_UBOOT_PATCH instead.
|
||||
ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
|
||||
define UBOOT_APPLY_CUSTOM_PATCHES
|
||||
$(APPLY_PATCHES) $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch
|
||||
endef
|
||||
|
||||
UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_CUSTOM_PATCHES
|
||||
endif
|
||||
|
||||
# Analogous code exists in linux/linux.mk. Basically, the generic
|
||||
# package infrastructure handles downloading and applying remote
|
||||
# patches. Local patches are handled depending on whether they are
|
||||
@@ -169,11 +170,15 @@ define UBOOT_INSTALL_IMAGES_CMDS
|
||||
$(if $(BR2_TARGET_UBOOT_FORMAT_NAND),
|
||||
cp -dpf $(@D)/$(UBOOT_MAKE_TARGET) $(BINARIES_DIR))
|
||||
$(if $(BR2_TARGET_UBOOT_SPL),
|
||||
cp -dpf $(@D)/$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)) $(BINARIES_DIR)/)
|
||||
$(foreach f,$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)), \
|
||||
cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
|
||||
)
|
||||
)
|
||||
$(if $(BR2_TARGET_UBOOT_ENVIMAGE),
|
||||
$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
|
||||
$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
|
||||
-o $(BINARIES_DIR)/uboot-env.bin $(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE))
|
||||
cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) | \
|
||||
$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
|
||||
$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
|
||||
-o $(BINARIES_DIR)/uboot-env.bin -)
|
||||
endef
|
||||
|
||||
define UBOOT_INSTALL_OMAP_IFT_IMAGE
|
||||
@@ -196,14 +201,27 @@ endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_ZYNQ_IMAGE),y)
|
||||
define UBOOT_GENERATE_ZYNQ_IMAGE
|
||||
$(HOST_DIR)/usr/bin/python2 $(HOST_DIR)/usr/bin/zynq-boot-bin.py \
|
||||
-u $(@D)/$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)) \
|
||||
$(HOST_DIR)/usr/bin/python2 \
|
||||
$(HOST_DIR)/usr/bin/zynq-boot-bin.py \
|
||||
-u $(@D)/$(firstword $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))) \
|
||||
-o $(BINARIES_DIR)/BOOT.BIN
|
||||
endef
|
||||
UBOOT_DEPENDENCIES += host-zynq-boot-bin
|
||||
UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_GENERATE_ZYNQ_IMAGE
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC),y)
|
||||
define UBOOT_CRC_ALTERA_SOCFPGA_IMAGE
|
||||
$(foreach f,$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)), \
|
||||
$(HOST_DIR)/usr/bin/mkpimage \
|
||||
-o $(BINARIES_DIR)/$(notdir $(call qstrip,$(f))).crc \
|
||||
$(@D)/$(call qstrip,$(f))
|
||||
)
|
||||
endef
|
||||
UBOOT_DEPENDENCIES += host-mkpimage
|
||||
UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_CRC_ALTERA_SOCFPGA_IMAGE
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_ENVIMAGE),y)
|
||||
ifeq ($(BR_BUILDING),y)
|
||||
ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)),)
|
||||
|
||||
Reference in New Issue
Block a user