Commit Graph

15 Commits

Author SHA1 Message Date
Greg Kroah-Hartman
3ca4271578 Reapply "Merge tag 'android14-6.1.75_r00' into android14-6.1"
This reverts commit 6bad1052c2, it is the
LTS merge that had to previously get reverted due to being merged too
early.

Cc: Todd Kjos <tkjos@google.com>
Change-Id: I31b7d660bd833cf022ac4870f6d01e723fda5182
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2024-04-02 19:49:12 +00:00
Todd Kjos
6bad1052c2 Revert "Merge tag 'android14-6.1.75_r00' into android14-6.1"
This reverts commit 1dbafe61e3.

Reason for revert: Too early. Needs to wait until 2024-03-27

Change-Id: I769b944bd089aa2278659ec87f7ba4ac4e74ee4a
Signed-off-by: Todd Kjos <tkjos@google.com>
2024-03-07 21:18:27 +00:00
Amit Pundir
1eda34ffd5 ANDROID: db845c: Enable device tree overlay support
This DTC_FLAGS will build the base platform dtbs with
overlay support. Otherwise fdtoverlay command throws
"FDT_ERR_NOTFOUND" error at the build time.

Missing/broken DTBO partition support on DB845c and RB5 is
the primary reason we have to apply DTB overlays at the
build time.

This patch will help enable currently out-of-tree/WIP (GKI)
features on supported devboards, and help us start testing
them in the LKFT builds.

Bug: 146449535
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Change-Id: Ie1510d93532544683a1408e88473da5a83fc3a60
2024-01-16 21:11:03 +00:00
Ulises Mendez Martinez
81509f85f3 ANDROID: db845c: Remove MAKE_GOALS from build.config
* Instead use the equivalent kernel_build attribute.
* This migrates rockpi4 `MAKE_GOALS` too.

Bug: 236012223
Change-Id: Icf47eb42795100b4955f02170a002689c7566194
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
2023-05-15 07:01:39 +00:00
Ulises Mendez Martinez
ebf227d078 ANDROID: Convert db845c to a mixed build.
* This means using GKI[0] artifacts as base for the kernel.

[0] https://source.android.com/docs/core/architecture/kernel/generic-kernel-image#fragmentation-fix-gki

* It was initially submitted as part of https://r.android.com/q/topic:db845c_mixed_build but then reverted in https://r.android.com/q/topic:revert-2188970-db845c_mixed_build-YESQWWKQCV

* https://android-review.googlesource.com/c/kernel/common/+/2203435 fixes the previous reason for reverting, making it safe to submit it again.

Bug: 233404531
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
Change-Id: Id7986dacf4bcdb9a54193c5277e2c6d968b3aaa6
2022-09-06 23:21:51 +00:00
Ulises Mendez Martinez
ea97a30864 Revert "ANDROID: Convert db845c to a mixed build."
Revert submission 2188970-db845c_mixed_build

Reason for revert: It breaks android-mainline
Reverted Changes:
I6cfb1ef19:ANDROID: Convert db845c to a mixed build.
I6680cb8ef:kleaf: Convert db845c to a mixed build.
I6cfb1ef19:ANDROID: Convert db845c to a mixed build.

Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
Change-Id: I337800cc4483877587f0a25d1fde2dadc444a81e
2022-08-23 23:31:35 +00:00
Ulises Mendez Martinez
5caceeff5b ANDROID: Convert db845c to a mixed build.
* This means using GKI[0] artifacts as base for the kernel.

[0] https://source.android.com/docs/core/architecture/kernel/generic-kernel-image#fragmentation-fix-gki

Bug: 233404531
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
Change-Id: I6cfb1ef1904e4b8d2755552ea139f150ce09db90
2022-08-23 18:49:56 +00:00
Peter Collingbourne
1e0ed73b2e ANDROID: Enable SM8450 drivers and DTB in the db845c config
Bug: 217455793
Change-Id: I710c1e40161bb49ad68ae7ef8804fa25c7b8a232
Signed-off-by: Peter Collingbourne <pcc@google.com>
2022-06-10 15:08:55 -07:00
Amit Pundir
9061aa223d ANDROID: Add RB5 support in db845c build and config fragment
RB5 is Qcom's next gen Robotics Board and a successor of RB3
aka db845c devboard. Since RB5 and RB3 share a lot of low
level platfrom core blocks, lets merge RB5's support in the
existing db845c build and gki config fragment.

Bug: 146449535
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Change-Id: I5eb3380a2e697df5221a6704d4ed8730fdd34bb0
2021-08-17 15:28:30 +00:00
Elliot Berman
197212f24f ANDROID: db845c: Use FRAGMENT_CONFIG
./build/config.sh provides Kbuild's configuration editor in kernel/build
environment, plus support for editing config fragments. Set
FRAGMENT_CONFIG for ./build/config.sh.

Bug: 169398826
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
[jstultz: Dropped sorting the config fragment]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Id09967bb06d0652788d17373ade2619a310c9e87
2021-02-15 23:31:33 +00:00
Will McVicker
67a1d5d3be ANDROID: drop KERNEL_DIR setting in build.config.common
And replace many references of ${ROOT_DIR}/common with
${ROOT_DIR}/${KERNEL_DIR}, which makes it a lot easier
to branch off of ACK and update the KERNEL_DIR.

The variable of KERNEL_DIR will be set in build/_setup_env.sh
to the directory of the build config file by default if it's
not set explicitly in the build config file or in environment.

Test: build test with following configs
        common/build.config.gki.aarch64
        common/build.config.db845c
        common/build.config.hikey960
        cuttlefish-modules/build.config.cuttlefish.aarch64

Bug: 162785964
Change-Id: I790ac0ded10bd790484f14c6f93d53e06c38b830
Signed-off-by: Will McVicker <willmcvicker@google.com>
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
(cherry picked from commit 931718fa65fe5e34d143250c048f591a7d74e5f8)
[elavila: resolve conflicts]
Signed-off-by: J. Avila <elavila@google.com>
2020-08-31 15:20:37 +00:00
Todd Kjos
3b2fed2f23 ANDROID: db845c: set BUILD_INITRAMFS=1
To create boot images for multiple kernels for CI testing, we
need the initramfs image.

Bug: 162034308
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I08fc4a45402dfff78da4d322ee70c2f63a262468
2020-08-17 18:30:04 +00:00
Todd Kjos
924e8b8f33 ANDROID: db845c build: Use merge_configs
Previously the db845c build was cat'ng the db845c_gki.fragment
with the gki_defconfig. The correct way to merge fragments is to use
the merge_configs script.

Bug: 152231482
Test: Treehugger
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I32d5d6576bb4bdc115b32e7e7ef3ef1e9daa2323
2020-04-01 11:16:34 -07:00
Alistair Delva
b194c75018 ANDROID: Specify MAKE_GOALS and optimize targets
The default goals for an ARCH=arm64 kernel will build all of the dtb
files available in the tree, and hard-codes the generation of a
gzip-compressed Image artifact. For GKI, we want to support various
compression methods (gz, lz4 and uncompressed) and this can be handled
outside of kbuild where compressor flags can be tuned. Also, GKI does
not need to build any dtb files because it is board-neutral, and in most
cases the dtbs will come from downstream kernels, not ACK.

On arm and aarch64, this suppresses the generation of the useless gzip
compressed Image artifact, and dtbs on the gki configs, which do not make
sense. The x86 defaults were already optimal but make them match
aarch64. On db845c, this builds only the needed dtb file and a compressed
artifact for backwards compatibility.

Bug: 152546767
Change-Id: If90ea331fc7564358b77a777fb367d7d2f95e6a6
Signed-off-by: Alistair Delva <adelva@google.com>
2020-03-27 01:55:37 +00:00
Amit Pundir
265170b6ba ANDROID: db845c: Add build config
Add a build config for db845c.

This one uses cat to merge the gki_defconfig with
the db845c_gki.fragment.

This isn't as ideal as using merge_config.sh which
provides more useful warnings but I couldn't manage
to get merge_config.sh to run properly within the
context of the PRE_DEFCONFIG_CMDS.

This does however result in a .config identical
to the  merge_config result.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
[jstultz: overhauled for android-mainline]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Bug: 146449535
Change-Id: Ib32bb07590adcb10e9e208f33773900054202e68
2020-01-15 00:48:32 +00:00