Commit Graph

29 Commits

Author SHA1 Message Date
qctecmdr
4db4031c57 Merge "ANDROID: enable pineapple kleaf build" 2022-11-04 09:00:35 -07:00
John Moon
59ff6820c9 ANDROID: enable pineapple kleaf build
Kleaf replaces build.sh. Define pineapple target in Bazel
so it may be built with the following command:

tools/bazel run //msm-kernel:pineapple_gki

Change-Id: If78ea5482898f92b751cad8542401ba12d9663bf
Signed-off-by: John Moon <quic_johmoo@quicinc.com>
2022-10-31 11:09:02 -07:00
John Moon
e32903b9a6 ANDROID: bazel: add GKI consolidate Bazel build
Adds //common:kernel_aarch64_consolidate Bazel build target.

Bug: 255878221
Change-Id: I76b44a2764d461d6267ff217e8914298fe560544
Signed-off-by: John Moon <quic_johmoo@quicinc.com>
2022-10-26 23:26:28 -07:00
Alistair Delva
763cc48471 ANDROID: kleaf: add 16k variant of kernel_aarch64
Bug: 234045848
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: Ie8ba8a49347fc28ac9caa37dbcf82597344464e9
2022-10-03 16:53:02 +00:00
Alistair Delva
c5a38e7ab5 ANDROID: GKI: Build-in REGMAP_SPMI
REGMAP_SPMI is a hidden symbol normally selected by other SPMI drivers,
but it wasn't built-in to GKI like other REGMAP APIs so vendors had to
build it downstream.

This is a small amount of code and can be modularized later.

For allmodconfig, select SPMI via Kconfig.gki instead of gki_defconfig,
because otherwise allmodconfig will build SPMI=m and REGMAP_SPMI=y,
which is not allowed.

Bug: 248307451
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: Ic3833e3a2dc44386c12a2422562994a1581a549c
2022-09-23 12:39:42 -07: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
Yifan Hong
0f3b768c95 ANDROID: kleaf: Do not include GKI modules in default output of //common:kernel_aarch64.
When a device kernel builds their own modules that
conflicts with the GKI modules (zram and zsmalloc
for android13-5.15), the dist target will produce a
warning about conflicting source files.

Hence, do not include zram and zsmalloc to the device
dist targets by default when they include //common:kernel_aarch64
only.

If they wish to include zram and zsmalloc in
the distribution on the android13-5.15 branch,
they may add the following to the
dist target:

  "//common:kernel_aarch64_modules",

or individual modules:

  "//common:kernel_aarch64/drivers/block/zram/zram.ko",
  "//common:kernel_aarch64/mm/zsmalloc.ko",

//common:kernel_aarch64_dist continues to include GKI
modules defined by the branch.

Bug: 244215515
Test: manual
Change-Id: Iae701d7d452e6ed3a849fdfd03550551ca2af17e
Signed-off-by: Yifan Hong <elsk@google.com>
2022-09-06 17:16:39 +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
Greg Kroah-Hartman
99ff927bd3 ANDROID: fix up db845c build
In commit 3158e39aa5 ("phy: qcom-qmp: switch to new split QMP PHY
driver") the qcom-qmp driver got split up into smaller drivers, so
update the BUILD.bazel file so that the build can continue to work
properly.

Fixes: 3158e39aa5 ("phy: qcom-qmp: switch to new split QMP PHY driver")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I23da8f220c78a497d2a7d2406cbcca36c4637b6f
Signed-off-by: Will McVicker <willmcvicker@google.com>
2022-08-23 05:41:27 +00:00
Amit Pundir
6c3aa6981b ANDROID: db845c_gki: Enable PINCTRL_SM8250_LPASS_LPI
Upsteam commit 9ce49018c6 ("pinctrl: qcom: Extract chip
specific LPASS LPI code") moved the RB5 (SM8250) specific
code from the LPASS LPI pinctrl driver to a new SM8250
LPASS LPI pinctrl driver. So enable that driver explicitly
otherwise sound drivers on RB5 won't probe.

Bug: 146449535
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Change-Id: Idfe2a097f11f0203f0ffb7cbaad780bd82271441
2022-07-11 21:04:59 +05:30
Greg Kroah-Hartman
d5fe95e161 ANDROID: BUILD.bazel: the ufs-qcom module moved.
Commit dd11376b9f ("scsi: ufs: Split the drivers/scsi/ufs directory")
moved the UFS host drivers into drivers/scsi/ufs/host/ so fix that up in
the BUILD.bazel file for when it tries to find the built modules.

Fixes: dd11376b9f ("scsi: ufs: Split the drivers/scsi/ufs directory")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7cb54980c50822ecbda244882b1481be16d0f3aa
2022-07-08 10:38:26 +02:00
Greg Kroah-Hartman
6de0a2769e ANDROID: add drivers/leds/rgb/leds-qcom-lpg.ko to db845c module list
Add the drivers/leds/rgb/leds-qcom-lpg.ko driver to the list of modules
that the db845c build needs as it is now upstream and actually builds.

Fixes: 24e2d05d1b ("leds: Add driver for Qualcomm LPG")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5bb6ffe688c5c9fe85313d1d7302d248789508ab
2022-06-29 20:08:57 +02: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
John Stultz
7d10ec0559 ANDROID: BUILD.bazel: db845c: Fix up modules_out for drm_dp_helper -> drm_display_helper change
In commit 1e0f66420b ("drm/display: Introduce a DRM display-helper
module") the generated module file names were changed. This patch
updates the BUILD.bazel db845c section to update it with the new
module names.

Additionally commit f5d0164492 ("drm/msm: select DRM_DP_AUX_BUS
for the AUX bus support") added a dependency on the drm_dp_aux_bus
module.

Fixes: 1a016dd7ce28 ("Merge 2518f226c6 ("Merge tag 'drm-next-2022-05-25' of git://anongit.freedesktop.org/drm/drm") into android-mainline")
Reported-by: Greg Kroah-Hartman <gregkh@google.com>
Signed-off-by: John Stultz <jstultz@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5b0695c92e9627d3b5f3ac38b32ee7240a8a894b
2022-06-09 09:45:32 +02:00
Ramji Jiyani
3b54ba0076 ANDROID: db845c: Add zram and zsmalloc to module_outs
db845c is not a mixed build yet, so need to add GKI
modules to it's module_outs for kleaf builds to
resolve hard failures in kleaf build for module copy.

Bug: 230519159
Test: tools/bazel run //common:db845c_dist
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: If3ce64a2b5f6b2f019a393f4674de30ac7437069
(cherry picked from commit eb38c6d799525c89bc3b1817dc22c34fa2281e09)
2022-06-08 21:44:24 +00:00
Ramji Jiyani
08ae9a7975 ANDROID: GKI: ZSMALLOC & ZRAM as modules for arm64
Enable zram and zsmalloc (dependency for zram) as
unprotected modules for aarch64. These are already
being used as modules by the vendor currently; so
needs to be unprotected.

Bug: 230519159
Test: TH
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I7c617c1a24f6e083301cbed67d0d323388cbd622
(cherry picked from commit 0fe423433bb3fa0b5003409bbd59a972e6c235e2)
2022-06-08 21:44:10 +00:00
Yifan Hong
bbe44ba330 ANDROID: kleaf: db845c drop ax88179_178a.ko.
Remove because the config is no longer enabled.
This fixes the kleaf build for db845c.

Test: manual
Bug: 229913034
Change-Id: Ie54e843d4dce6216ac25be0a57cd84b4ee8537b1
Signed-off-by: Yifan Hong <elsk@google.com>
2022-05-03 13:21:09 -07:00
Yifan Hong
32787ef6d2 ANDROID: enable db845c kleaf build.
Kleaf replaces build.sh. Define db845c target in Bazel
so it may be built with the following command.

Kleaf requires the list of in-tree kernel modules to be
listed explicitly.

Test: tools/bazel run //common:db845c_dist

Bug: 229913034

Change-Id: I725d7d6c4e9897cad58f970821cd2b222ac64889
Signed-off-by: Yifan Hong <elsk@google.com>
2022-04-26 18:46:59 +00:00
Yifan Hong
e681fef273 ANDROID: kleaf: build/kleaf -> build/kernel/kleaf
This is part of a migration process from build/
to build/kernel.

Test: builds
Bug: 204425264
Change-Id: Id29f8e476fbb3590196789b2b578865798f24cd3
Signed-off-by: Yifan Hong <elsk@google.com>
2022-02-04 21:58:34 +00:00
Yifan Hong
15cc1a6f99 ANDROID: kleaf: drop toolchain_version = CLANG_VERSION
This is the default now.

Test: TH
Bug: 212640658
Change-Id: I3fc1d7149f4e180ff1919339beb6432adf73dab3
Signed-off-by: Yifan Hong <elsk@google.com>
2022-01-10 19:39:59 -08:00
Matthias Maennich
b3a2cd885d ANDROID: Kleaf: Fix branch-specific toolchain_version
In order to update the Clang version per branch, use the branch specific
value defined in build.config.constants instead of falling back to the
default toolchain defined in the Kleaf implementation.

Bug: 210296725
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: I8929ec4b4174fc286710a5c66741b140656bb455
2021-12-13 20:57:52 +00:00
Yifan Hong
2eefbec0f3 ANDROID: Kleaf: common kernel public
.... so it can be referenced in mixed builds.

Test: build cuttlefish
Bug: 202075496
Change-Id: I8d79847c54c639fa619edf3280c021f02ba76645
Signed-off-by: Yifan Hong <elsk@google.com>
Signed-off-by: Matthias Maennich <maennich@google.com>
2021-11-03 18:52:00 +00:00
Matthias Maennich
d04a5c4694 ANDROID: Kleaf: use 'define_common_kernels()' macro
Using the macro avoids duplication and boilerplate across branches.

Bug: 192655270
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Ie0034ae396baaaaf07035c3532b71a70918e0aba
2021-08-16 22:14:36 +00:00
Matthias Maennich
c7ca969870 ANDROID: Kleaf: adopt new way of expressing the build config
Build config files can now be expressed as files relative to the
BUILD.bazel file. That makes this mechanism much more portable.

Bug: 192656402
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Iefa7277f21e9412e71c9738664d006246b05be6e
2021-07-14 17:42:33 +01:00
Yifan Hong
bb61c74c3e ANDROID: kleaf: sources -> srcs.
That's the common keyword we use.

Test: pass
Bug: 192655270
Signed-off-by: Yifan Hong <elsk@google.com>
Change-Id: I77d58fb99e0186e88a63ba8576ac23eabc72833e
2021-07-09 18:12:01 +00:00
Matthias Maennich
d32d9e8471 ANDROID: Kleaf: drop kernel header outputs
For the moment, do not bother with the kernel headers as outputs. While
splitting up the bazel build build/build.sh invocation, this will get
in the way as those will not be immediately produced by the new macros.
Hence, do not not expect them.

Bug: 192656402
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Ieb041d34cf5667f7e3cee14b4cea41a7c6024998
2021-07-02 16:17:17 +01:00
Matthias Maennich
3b77e032e0 ANDROID: Kleaf: use globs to express sources
The updated kernel_build macro requires the usage of glob() to express
the sources involved.

Bug: 189451175
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Ib5953fe4ed2c4a219f2296c1991daa317032f64e
2021-06-29 08:45:22 +00:00
Matthias Maennich
3334b77042 ANDROID: Kleaf: initial bazel based GKI kernel build
Add build rules to build the GKI kernels using the hermetic bazel build.
The rules understand how to set up a build environment from build_config
and locations of the sources and build_configs.

Sample invocations:

    $ bazel build //common:kernel_aarch64
    $ bazel build //common:kernel_aarch64_debug
    $ bazel build //common:kernel_x86_64
    $ bazel build //common:kernel_x86_64_debug

Bug: 189451175
Change-Id: I2f06b2b79dbcbf197cb23d68b3c2f6786191e19d
Signed-off-by: Matthias Maennich <maennich@google.com>
2021-06-26 13:38:00 +00:00