Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[9.14.r1] Add appended DTB support #2475

Draft
wants to merge 2 commits into
base: aosp/LA.UM.9.14.r1
Choose a base branch
from

Conversation

konradybcio
Copy link
Contributor

No description provided.

Apparently nobody seems to have tested clang 13 before release, as the whole
coding paradigm of calling a function by assigning its return value to a
variable, which is used all throughout the Linux kernel, becomes broken,
as clang seems utterly drunk when it comes to the actual judgement whether
the variable is really used or not..
@konradybcio konradybcio marked this pull request as draft December 28, 2021 14:33
@konradybcio
Copy link
Contributor Author

required configs:

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y
CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES="qcom/lahaina qcom/lahaina-v2 qcom/lahaina-v2.1"

@konradybcio konradybcio marked this pull request as ready for review December 28, 2021 14:43
Comment on lines +149 to +154
ifeq ($(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE),y)
# Warning! Uncompressed kernel + appended DTB + DTBO WILL NOT WORK!
KBUILD_IMAGE := $(KBUILD_TARGET)-dtb
else
KBUILD_IMAGE := $(KBUILD_TARGET)
endif
Copy link
Contributor

Choose a reason for hiding this comment

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

The original commit has this inside ifeq ($(CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP),y).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this way it will work with uncompressed kernel without dtbo

Copy link
Contributor

Choose a reason for hiding this comment

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

I dout uncompressed kernel + appended dtb works? Does it?

Copy link
Collaborator

Choose a reason for hiding this comment

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

It was working on 4.19

Comment on lines +35 to +51
dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(subdir), $(wildcard $(dtstree)/$(d)/*.dts)))

always := $(dtb-y)

targets += dtbs

DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES))
ifneq ($(DTB_NAMES),)
DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
else
DTB_LIST := $(dtb-y)
endif
targets += $(DTB_LIST)

dtbs: $(addprefix $(obj)/, $(DTB_LIST))

clean-files := dts/*.dtb *.dtb
Copy link
Contributor

Choose a reason for hiding this comment

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

This was moved to arch/arm64/boot/Makefile.

@MarijnS95
Copy link
Contributor

With vendor_boot working, I don't think we need this anymore (pending some refactoring of the kernel setup and build before I can PR the entire thing). Unless someone likes spending their time porting other devices to 5.4, we could wait with these patches - at least not set aforementioned CONFIG_ flags for Sagami.

@konradybcio
Copy link
Contributor Author

konradybcio commented Jan 4, 2022

setting as draft in case somebody wants to pick this up for new (old) devices

@konradybcio konradybcio marked this pull request as draft January 4, 2022 09:02
@konradybcio konradybcio changed the title [9.14.r1] Add appended DTB support and fix ecc node on 8350 [9.14.r1] Add appended DTB support Jan 4, 2022
Allows a defconfig to set a list of dtbs to concatenate with an
Image.gz to create a Image.gz-dtb.

Includes 8adb162 arm64: Fix correct dtb clean-files location

Change-Id: I0b462322d5c970f1fdf37baffece7ad058099f4a
Signed-off-by: Alex Ray <[email protected]>
[rishabhb] Use subdir to descend into device tree directories
Signed-off-by: Rishabh Bhatnagar <[email protected]>

konrad: fast-forward it to msm-5.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants