From e63b865756a5e31ff96ccdfab0d9cb944a34c2c6 Mon Sep 17 00:00:00 2001 From: Jacob Kjaergaard Date: Wed, 12 Feb 2014 14:57:12 +0100 Subject: [PATCH] conf/u-boot.conf: make UBOOT_IMAGE use flag dependent. Use use flags instead of a variable override in machine.conf or whatever. Variables in machine.conf will propagate to all signatures whereas use flags is only relavant for specific recipes. --- conf/u-boot.conf | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/conf/u-boot.conf b/conf/u-boot.conf index c9ad7180..88d80fbd 100644 --- a/conf/u-boot.conf +++ b/conf/u-boot.conf @@ -3,21 +3,35 @@ ## @useflag uboot_extra_env Set this to extra env in u-boot. Will be appended ## to the existing default environment. Is empty by default. ## @useflag uboot_config_file Filename of the uboot config to use. +## @useflag uboot_image makefile target to build. +## @useflag uboot_image_base Name of elf image. +## @useflag uboot_image_filename Name of file to install. ## @useflag uboot_maxsize Enables checking of sizecheck. Default disabled. ## Set this to the maximum size allowed of your u-boot image. -CLASS_FLAGS += "uboot_config uboot_config_file uboot_extra_env uboot_maxsize" +CLASS_FLAGS += " \ + uboot_config \ + uboot_config_file \ + uboot_extra_env \ + uboot_maxsize \ + uboot_image \ + uboot_image_base \ + uboot_image_filename \ +" DEFAULT_USE_uboot_config ?= "${MACHINE}_config" DEFAULT_USE_uboot_extra_env ?= "" +DEFAULT_USE_uboot_image ?= "u-boot.bin" +DEFAULT_USE_uboot_image_base ?= "u-boot" +DEFAULT_USE_uboot_image_filename ?= "${USE_uboot_image}" COMPATIBLE_MACHINES = ".*" ## @var UBOOT_IMAGE Name of the image to build. Is u-boot.bin by default. -UBOOT_IMAGE ?= "u-boot.bin" +UBOOT_IMAGE ?= "${USE_uboot_image}" ## @var UBOOT_IMAGE_BASE Basename of the deployed image. U-boot by default. -UBOOT_IMAGE_BASE ?= "u-boot" +UBOOT_IMAGE_BASE ?= "${USE_uboot_image_base}" ## @var UBOOT_IMAGE_FILENAME Filename of the compiled uboot image. -UBOOT_IMAGE_FILENAME ?= "u-boot.bin" +UBOOT_IMAGE_FILENAME ?= "${USE_uboot_image_filename}" ## @var UBOOT_IMAGE_DEPLOY_NAME Set the deployed name of the compiled u-boot ## bootloader. Is ${PN} by default. UBOOT_IMAGE_DEPLOY_NAME ?= "${PN}"