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

classes/kernel: add useflag kernel_dts_vendor #193

Merged
merged 1 commit into from
Dec 3, 2016

Conversation

sknsean
Copy link
Contributor

@sknsean sknsean commented Nov 16, 2016

No description provided.

@@ -287,12 +291,12 @@ do_compile_kernel_dtc() {

KERNEL_COMPILE_POSTFUNCS:>USE_kernel_dts += " do_compile_kernel_dts"
do_compile_kernel_dts() {
oe_runmake "${KERNEL_DTB_FILE}"
oe_runmake "${KERNEL_DTB_VENDOR}/${KERNEL_DTB_FILE}"
Copy link
Contributor

Choose a reason for hiding this comment

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

I was afraid the this would break if ${KERNEL_DTB_VENDOR} is empty, but my test shows otherwise:

% make ARCH=arm CROSS_COMPILE=arm-cortexa9neon-linux-gnueabi- /imx6dl-wandboard.dtb
  DTC     arch/arm/boot/dts//imx6dl-wandboard.dtb

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right its not very pretty there... I'll look into it
The other places you only end up with arch/arm/boot/dts//imx6dl-wandboard.dtb

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't really mind the heading slash...

KERNEL_DTB_FILE = ""

addhook kernel_devicetree_init to post_recipe_parse after set_useflags
def kernel_devicetree_init(d):
kernel_dtb = d.get('USE_kernel_external_dtb')
kernel_dts_vendor = d.get('USE_kernel_dts_vendor')
Copy link
Contributor

Choose a reason for hiding this comment

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

Without any setting of USE_kernel_dts_vendor, will we end up with None? And how is that handled later on?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

does the @mnhu comments answer this question?

Copy link
Contributor

Choose a reason for hiding this comment

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

That depends on how d.set('KERNEL_DTB_VENDOR', kernel_dts_vendor) is handled by oe-lite...

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, I will re-formulate. Have you tested this change with USE_kernel_dts set, but without USE_kernel_dts_vendor set?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes and it fails 👎
CRITICAL: bake failed: Exception: Cannot expand variable ${KERNEL_DTB_VENDOR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Now have tested this with and without USE_kernel_dts_vendor set...

Copy link
Contributor

Choose a reason for hiding this comment

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

Better do kernel_dts_vendor = d.get('USE_kernel_dts_vendor') or '' instead of the conditional below.

@esben esben added this to the 6.3.0 milestone Nov 17, 2016
this makes it posible to build an dtb file in aarch64/arm64 mode,
in arm64/boot/dts directory the dts files is located in a "vendor" subdirectory

Signed-off-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
Copy link
Contributor

@esben esben left a comment

Choose a reason for hiding this comment

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

It would be nice if the slash on empty KERNEL_DTB_VENDOR would have been removed, but I am ok with merging it as it is now.

@esben esben merged commit fd7e1b0 into oe-lite:master Dec 3, 2016
@esben esben removed the in progress label Dec 3, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants