-
Notifications
You must be signed in to change notification settings - Fork 17
classes/kernel: add useflag kernel_dts_vendor #193
Conversation
@@ -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}" |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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') |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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...
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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...
There was a problem hiding this comment.
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.
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>
d892592
to
fa6486b
Compare
There was a problem hiding this 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.
No description provided.