Commit graph

106 commits

Author SHA1 Message Date
Petri Gynther
50f56ac8c9 gs101: re-enable prebuilt boot.img/boot-user.img usage
When $(TARGET_KERNEL_DIR) contains:
* boot.img
* boot-user.img

then use those as prebuilt boot images for the target build.

Note that debug kernels (e.g. $(TARGET_KERNEL_DIR)/kasan) only have
Image.lz4, so the debug build ends up building boot.img from source.

Bug: 199997188
Change-Id: I6bb70644d8ab7356986f6ca6a77f3098d1ee0f83
2021-09-28 10:56:06 -07:00
Vince Leung
972bcdfe6e gs101: add haptics actuator model config am: ed5333f0cc am: 80be097132
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15688905

Change-Id: If0d29f9b887dd9c3cc125085af1d0130ed243a2c
2021-09-04 00:23:11 +00:00
Vince Leung
58180f0c16 gs101: add haptics actuator model config
Actuator models can vary across devices. Actuator models can have
different characteristics that need to be handled appropriately. Add
support to define the actuator model used in Soong makefiles.

Bug: 195894512
Test: verified that different actuator model configs are used on
different targets

Change-Id: Ic7fd5f52c3bfed252fa3956f3e926c90c1632013
2021-09-03 23:44:04 +00:00
Sasha Smundak
70f028eb27 Simplify the check
Fixes: 198503238
Test: treehugger
Change-Id: Ia27a4413e42821310d1fe0bcad4cfc78595c6841
2021-09-03 18:58:30 +00:00
Petri Gynther
299ca16835 gs101: clean up kernel variables
1) remove TARGET_BOARD_KERNEL_HEADERS
2) remove TARGET_PREBUILT_KERNEL

Bug: 198682676
Change-Id: I9ab161ee75dc33e135ad87e084b3373350ca0c93
2021-09-03 12:35:16 +00:00
Eric Biggers
f739cf68c0 Generate a separate fstab file for FIPS mode
Add a file "fstab.gs101-fips" alongside the existing "fstab.gs101" in
order to specify different encryption settings in FIPS mode.

"androidboot.fstab_suffix=gs101-fips" on the kernel command line will be
used to select the FIPS fstab when needed.

As the two fstabs should be otherwise identical, generate them from a
template file so that they will stay in sync.

Note that generating the fstabs requires that they be installed as build
system modules rather than via PRODUCT_COPY_FILES, which results in the
vendor_ramdisk copy of the fstabs being installed to system/etc rather
than /.  This shouldn't cause any problem, now that Android has been
updated to look for the fstab in this location too.

Bug: 191417025
Change-Id: I1d115e014df8ba2fb83046ac0b9b791597364846
2021-08-30 14:09:06 -07:00
Petri Gynther
ccbd2c7431 Revert "gs101: use prebuilt GKI boot.img for production builds"
This reverts commit 96007d8f9cab5f6028cb4a1b15e30c6ffe8bf5dd.

Temporarily revert prebuilt boot.img usage on sc-qpr1-dev
until we have official signed GKI boot images available.

Bug: 188095549
Bug: 191417025
Change-Id: I2f9907d3674f8a8869aac3c926994e116c76a91b
2021-08-23 19:20:43 +00:00
linjoey
3097b78f95 Change prebuild path to gs101
Bug: 181204804
Test: Build passed and boot to home.

Change-Id: I4fdc6032ac16134de53675a5f00ee7e7765c7f32
SigSigned-off-by: linjoey <linjoey@google.com>
2021-08-04 12:17:24 +00:00
Petri Gynther
645bea6054 gs101: use prebuilt GKI boot.img for production builds
Use:
* boot-user.img for -user builds
* boot.img for -userdebug and -eng builds

Bug: 188095549
Test: make dist (oriole-user)
Test: make dist (oriole-userdebug)
Change-Id: Ic4df227f2b4c261297272f17e6645b7ce1f5d4f3
2021-07-22 16:08:00 +00:00
Chris Fries
091b1e141b Revert "gs101: use prebuilt GKI boot.img for production builds"
This reverts commit 63ba0cb1affa83446f10585d403c81cc618be71a.

Reason for revert: Tentatively trying to address, http://b/193588301 OTA full package does not exist in O6/R4_SD1A.210714.001 userdebug build [SD1A]

Bug: 193588301
Change-Id: I9d5d9fc132bc7eaf7c0adccee7a18558d80edb40
2021-07-14 16:22:17 +00:00
Petri Gynther
7eec55ab4e gs101: use prebuilt GKI boot.img for production builds
Use prebuilt GKI boot.img for production builds.
Debug builds continue to use their own Image.lz4.

Bug: 191764119
Change-Id: I2b4950ce334cc990e858e0ea410ad7e57d6decf6
2021-07-13 20:42:08 +00:00
Krzysztof Kosiński
74b7a2a871 Remove gralloc3 support for gs101.
All devices use gralloc4 now, so this code is unused.

Bug: 174998182
Test: builds for the affected devices
Change-Id: Icff36a0204f7f9fd10ae7269248aef8a08c5fc1e
2021-07-08 22:28:25 +00:00
Jeffrey Carlyle
15d83480cb add gs101-specific recovery library
This library is hooked into the recovery code via
hardware/google/pixel/recovery and contains routines specific to the
GS101-based hardware.

Bug: 182508814
Test: did master reset on device with keys, verified no keys present after reset
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>
Signed-off-by: Harpreet Eli Sangha <eliptus@google.com>
Change-Id: I18357f5ac8db7a765a5464fd3366af3d14928ce6
2021-06-30 17:39:37 +00:00
Kevin Han
432f3bc640 Revert "add gs101-specific recovery library"
Revert "recovery: enable support for device-specific WipeSe impl..."

Revert "clear secure element of Digital Car Keys during factory ..."

Revert submission 14983788-clear_keys

Reason for revert: b/192373955
Reverted Changes:
Ia8fc29e6c:add gs101-specific recovery library
Icc1eabfd4:clear secure element of Digital Car Keys during fa...
I943d97b26:recovery: enable support for device-specific WipeS...
I15c7fbd7f:allow recovery and fastboot to access secure elmen...

Change-Id: I545698bc7da1aa12f520c0190775358dae70de61
2021-06-29 19:19:24 +00:00
Jeffrey Carlyle
7af529801c add gs101-specific recovery library
This library is hooked into the recovery code via
hardware/google/pixel/recovery and contains routines specific to the
GS101-based hardware.

Bug: 182508814
Test: did master reset on device with keys, verified no keys present after reset
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>
Change-Id: Ia8fc29e6c043c58c09f189ac5dc91c4093cf64b6
2021-06-29 17:50:34 +00:00
Carter Hsu
977c44c195 audio: add AOSP build flag
Bug: 184016430
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I4a32e82fdcdd51f813c9dc6b013b26aabf66c078
2021-06-25 10:08:04 +00:00
Roger Wang
2b65b15e7c wifi: update interface combination.
In this commit, we update the interface combination
for P21.

Bug: 191020902
Test: local test on PP23935602 build.
      Check STA+STA, STA+SAP, STA+P2P and STA+NAN are workable.
Change-Id: I424c4ea854f3a4f7b615038db8d63729fd32adda
2021-06-22 17:03:54 +00:00
Daniel Mentz
24b12e2935 Add a kernel module blocklist file
Kernel modules on the blocklist are not automatically loaded during
second stage init. Modules are often put on the blocklist if we want
them to get loaded only under certain circumstances.

Bug: 190652328
Change-Id: Ib67463555f498f4dc85d5d175e0bf9e4150771dd
2021-06-18 15:41:21 +00:00
Daniel Mentz
6a6d8f81c2 Read vendor_boot.modules.load and vendor_dlkm.modules.load
Previously, we copied all available kernel modules into the vendor_boot
ramdisk except for approx. 14 modules that we explicitly excluded.

Going forward, the kernel build will distribute the two additional files
vendor_boot.modules.load and vendor_dlkm.modules.load which define,
respectively, the lists of modules that should be loaded from
vendor_boot and vendor_dlkm.

The contents of the two *.modules.load files will be copied almost
verbatim into modules.load files in the respective images except for the
fact that the directory names of the .ko files are stripped. So, for
example, kernel/net/core/pktgen.ko becomes just pktgen.ko.

Additionally, we only copy those .ko files into the vendor_boot image
that are listed in vendor_boot.modules.load. On the other hand, the
vendor_dlkm partition image will contain all .ko files regardless of
whether they are listed in vendor_dlkm.modules.load.

Bug: 190652328
Change-Id: Ibda5b9368547ad089575333e2566697ec0e8465f
2021-06-17 03:57:10 +00:00
Kelvin Zhang
a8fdc57387 Add a build time constant to disable VABC
Test: m
Bug: 185400304

Change-Id: I4ed5676f4a1195f084ed447196ee9e3ce71ec84a
(cherry picked from commit c76afcf1ef68ce4e6362032aaa8b5e2ea77f9233)
2021-06-16 20:48:14 +00:00
Daniel Mentz
c37a73b74f gs101: migrate to bootimg header v4 (second attempt)
We migrate to bootimg header v4 and build the following two vendor
ramdisk fragments.

Type: Platform, Name: "", Contents: Everything but kernel modules
Type: DLKM, Name: "dlkm", Contents: Kernel modules (incl. modules.load etc.)

Bug: 183237066
Change-Id: I626cb87ba8111d0615b80cf981ebc288893a0624
2021-06-08 22:29:48 +00:00
Philip Cuadra
0111d397d2 Target arm v8.2a and A55 for GS101
This will let bionic use 8.2a atomics which helps scudo locking.

Bug 189248298
Test: Presubmit

Change-Id: Ifa7a6d8386c8adcadb81cb762758b06a8164f700
2021-06-03 22:13:43 +00:00
Minchan Kim
c9f14081cd gs101: enable page_pinner
Enable Page Pinner.

Bug: 187552095
Test: adb bugreport <zip> and confirmed it contains page_pinner
      information at dumpstate_board.txt
Signed-off-by: Minchan Kim <minchan@google.com>
Change-Id: I509c5a825a798d8f1851cb65c5dd28dbddf11d33
2021-05-17 18:22:16 +00:00
Adam Shih
f2457f2d1e remove redundant setting
The path does not exist.
Bug: 187128213
Test: build pass and boot to home

Change-Id: I18aa60fafe1538972ad2111bfad483b54c6fab06
2021-05-07 04:31:02 +00:00
Carter Hsu
5bc59075bd haptic: add haptic ampilifer codec
Bug: 178431048
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Id20663a7469f04fda8dd49651fce88a815450af7
2021-05-07 03:10:19 +00:00
Sunil Ravi
3d015b03ab Revert "Wifi: Move supplicant service init to wpa_supplicant"
This reverts commit 788012640b

Reason for revert: Caused throughput issue in p2p b/187302501

Bug: 187302501
Bug: 186636898

Test: boot and wifi function is ok
Test: p2p connection and throughput tests.

Change-Id: I70f4015040f10452acff697ee504b02cfb3c1e27
2021-05-06 23:33:51 +00:00
Alex Hong
2f8fde91a1 Downgrade the PRODUCT_SHIPPING_API_LEVEL from 31 to 30
We should wait for the Android SC SDK finalization.
Remove the unnecessary "BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE".

Test: Build successfully and the device is bootable
      CtsOsTestCases: android.os.cts.BuildTest#testSdkInt pass
Bug: 187023500
Change-Id: Ib9adbb7a7c913790994a06ae1a57f95eebf84a78
2021-05-05 11:55:09 +00:00
Sunil Ravi
788012640b Wifi: Move supplicant service init to wpa_supplicant
Bug: 186636898
Test: boot and wifi function is ok
Change-Id: Idb6ebe962e50408c907f9d961a6f75e3ceddf0f2
2021-05-04 17:38:38 +00:00
Victor Liu
3f606543d5 Revert "gs101: don't load uwb module at boot"
This reverts commit 2207cb4b9f.

Reason for revert: uwb power controls are in place

Bug: 183896897
Change-Id: Ib52de732dc86f7fe8a3d688a34d32034de26e031
Signed-off-by: Victor Liu <victorliu@google.com>
2021-05-03 16:57:48 +00:00
Sean Callanan
13c4abd67c Enable Gralloc ion sync
Gralloc ion sync enables a cache sync when Gralloc buffers are
unlocked.  Buffers the GPU wrote don't need this, but buffers the
CPU wrote do.

Bug: 183735780
Test: RealCalc
Change-Id: I67a9ee15b172fb11d262c41723404c5b9cafde82
2021-04-29 16:55:16 +00:00
Robin Peng
c5b41648b3 shipping level 31, and keep target-level as-is
PRODUCT_SHIPPING_API_LEVEL := 31
kernel target-level="6"
target-level="3" or ="4"

Bug: 167997902
Change-Id: I110e251a108bbca7b63cd90142c82b35e93287b7
2021-04-27 07:14:20 +00:00
Tai Kuo
eba083050f BoardConfig: filter cl40l26 probe during the first stage init
Bug: 184610991
Test: probe timing was delayed
Signed-off-by: Tai Kuo <taikuo@google.com>
Change-Id: I8f90697112160849091b8347079c9590c8e18099
2021-04-20 11:49:50 +00:00
Victor Liu
2207cb4b9f gs101: don't load uwb module at boot
Uwb power controls are still being implement.  Disable
the uwb module from loading automatically until uwb power
controls are implemented.

Bug: 185471298
Change-Id: Ie7021f6015c564613ded10dec2c9b92ff619af81
2021-04-20 03:00:17 +00:00
J. Avila
df9dc5cf76 Explicitly set log_buf_len
By setting the log_buf_len via cmdline, devices using this cmdline will
be able to guarantee their preferred buffer size even if the underlying
CONFIG_LOG_BUF_SHIFT changes.

Bug: 185141673
Change-Id: Iafe7561dceef65fc47cb0bb54a8f84a5e10c51a9
2021-04-12 22:00:50 +00:00
Oleg Matcovschi
ae9494ee6b BoardConfig-common.mk: restore boot image version 3
Some of the components don't handle bootimage v4 yet.

Bug: 183237066
Bug: 183896891
Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
Change-Id: Ie8764f2d7da452f1941b0001c0c4be51f56e3a44
2021-04-06 18:51:32 +00:00
Ricky Niu
88313cf20b gs101: usb: remove flag "OLDER_GADGET"
The flag "OLDER_GADGET" is no need.
Using "11110000.dwc3" be the udc name.

Test: Build Pass and boot to home
Bug: 177879761
Signed-off-by: Ricky Niu <rickyniu@google.com>
Change-Id: I43c9e2815a6384c4dffdc47312fa0f372b34d9e9
2021-04-02 04:42:53 +00:00
Minchan Kim
3623b5745f BoardConfig: enable cma_sysfs
Bug: 179256052
Test: confirmed /sys/kernel/mm/cma/reserved/alloc_pages_success works
Signed-off-by: Minchan Kim <minchan@google.com>
Change-Id: Ib24f1ecabdc199bf9e8a2c0ac7dba778a40c1cf9
2021-03-29 13:57:59 -07:00
Adam Shih
48e389c89c Turn on SELinux
Bug: 171942789
Test: flashall, OTA, adb, bluetooth, wifi, LTE, phone call, SMS,
play audio, video, camera picture, recording, sensors, storage PTS,
thermal PTS, bugreport, GPS, lock screen

Change-Id: I85c22c7a7fd97aa30618455478974a71e19cfcab
2021-03-24 13:25:02 +00:00
Oleg Matcovschi
9963cf04e0 BoardConfig: move androidboot.console to cmdline
Bug: 183531243
Change-Id: Ida1dd4c8f3a2b57a64955f6002c6bace1d0b40c9
2021-03-23 14:08:58 -07:00
Oleg Matcovschi
9ef069c978 gs101: migrate to bootimg v4
Bug: 183237066
Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
Change-Id: If4ed53f3ea4964139b33ef691469a1dbbfa97e80
2021-03-22 19:28:26 +00:00
Minchan Kim
5d13529329 BoardConfig: enable dump migration failure
Enable dynamic debug to dump migration failure.

Bug: 182195592
Signed-off-by: Minchan Kim <minchan@google.com>
Change-Id: I4817f84c1d2e15dad48f7c475d7072b88bc12114
2021-03-18 08:00:09 +00:00
Charlie Chen
935a1dd591 Revert "Switch back from DMABUF to ION/BLOB allocator"
This reverts commit f35c9cb038.
To enable DMABUF again.
Patch: https://android-review.googlesource.com/c/platform/system/memory/libdmabufheap/+/1634146/
fixed the error when using DMABUF

Bug: 153786620
Test: reboot O6 device and confirm the error does not show up again
Change-Id: Id378fe1fe8b9615f72138575cec8e5e1e20caec9
2021-03-16 16:28:15 +08:00
Tianjie Xu
ad661aed61 Merge "Include the Pixel common board configuration" into sc-dev 2021-03-15 18:46:12 +00:00
Daniel Mentz
b494fcea4d Merge "Add vendor_dlkm partition (2nd attempt)" into sc-dev 2021-03-15 18:34:41 +00:00
Tianjie
a76d104aac Include the Pixel common board configuration
In particular, the config builds the hashtree with SHA256 for verified boot
2.0.

Bug: 156162446
Test: build an image, run avbtool info_image
Change-Id: Ib588472434f5df0265d8b457c184272ae4b566fb
2021-03-12 11:42:05 -08:00
Pat Tjin
977ea34b77 Adjust BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE to 8527020032
Subtract out 4MiB for overhead.

Test: build
Bug: 182237294
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: Idf07cf518ea0ab8e8586a85303e27538a8ee2885
2021-03-11 23:21:35 -08:00
Daniel Mentz
fc05a5f218 Add vendor_dlkm partition (2nd attempt)
Certain vendor kernel modules were previously stored in the vendor
partition. With this change, we create a new separate partition named
vendor_dlkm for these vendor modules.

Bug: 173653839
Change-Id: I1fc887bdfac958d3a65fb48a4bf7a398e756733e
2021-03-11 22:52:20 -08:00
Chris Fries
0e26f54d1f Merge "Switch back from DMABUF to ION/BLOB allocator" into sc-dev 2021-03-11 23:50:55 +00:00
TreeHugger Robot
10992cb965 Merge "Revert "Revert "Enable chained vbmeta for boot""" into sc-dev 2021-03-11 22:31:19 +00:00
Will McVicker
b5b92eadd1 Revert "Revert "Enable chained vbmeta for boot""
This reverts commit 8ed24f1c7f8923e0b0ac62c16abc5ea32c1a11e0 which
disables chained vbmeta for boot.

Bug: 176930600
Test: manually verify chained vbmeta is enforced
Change-Id: Iba79a072798ff4dd0eb9add3c36d7f6c1ffb4655
2021-03-11 22:30:45 +00:00