Skip to content
This repository was archived by the owner on Jan 27, 2019. It is now read-only.

conf/u-boot.conf: make UBOOT_IMAGE use flag dependent. #120

Open
hundeboll wants to merge 1 commit into
base: master
Choose a base branch
from
Open

conf/u-boot.conf: make UBOOT_IMAGE use flag dependent. #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions conf/u-boot.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Copy link
Contributor

@esben esben Mar 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add

DEFAULT_USE_uboot_image = "u-boot.bin"

Which should be a sane default, and give us backwards compatibility.

Copy link
Author

@hundeboll hundeboll Mar 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See line 13 above...

Copy link
Contributor

@esben esben Mar 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bah :)

## @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}"
Expand Down