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.12.r1] Add initial 4.19 defconfigs #88

Merged

Conversation

konradybcio
Copy link
Contributor

No description provided.

@konradybcio konradybcio marked this pull request as draft January 19, 2021 14:29
Copy link
Contributor

@pablomh pablomh left a comment

Choose a reason for hiding this comment

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

Please, chmod +x update-defconfig.sh.

${KERNEL_CFG}/android-recommended-arm64.config \
${KERNEL_CFG}/base_${SOC}_defconfig \
${KERNEL_CFG}/base_${platform}"_"${device}\_defconfig \
${KERNEL_CFG}/android-extra.config 2>&1);
Copy link
Contributor

Choose a reason for hiding this comment

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

This file is not included in the PR and we should decide where to get it from (4.14???).

update-defconfig.sh Outdated Show resolved Hide resolved
pablomh and others added 5 commits January 20, 2021 15:26
 the config files

In my testing I run into this, which wasn't caught properly:

. . .
Merging arch/arm64/configs/sony/android-extra.config
The merge file 'arch/arm64/configs/sony/android-extra.config' does not exist.  Exit
Google stopped shipping the gcc binary for GCC4.9 (for now?).
Not setting the variable makes the script not fail.

Signed-off-by: Konrad Dybcio <[email protected]>
@pablomh
Copy link
Contributor

pablomh commented Jan 21, 2021

The options in base_sm8250_defconfig should override the ones defined before and I see a lot of duplication (I've provided a list of them privately to not pollute this PR).

@konradybcio konradybcio marked this pull request as ready for review January 21, 2021 11:11
Konrad Dybcio added 2 commits January 21, 2021 13:12
Signed-off-by: Konrad Dybcio <[email protected]>
Signed-off-by: Konrad Dybcio <[email protected]>
@jerpelea jerpelea merged commit d19f507 into sonyxperiadev:aosp/LA.UM.9.12.r1 Jan 21, 2021
CONFIG_LEDS_QPNP_FLASH_V2=y
CONFIG_LEDS_QTI_TRI_LED=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LOCALVERSION="-perf"
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we use this on open devices?

Comment on lines +7 to +8
#export CROSS_COMPILE=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-
export BUILD="make O=$KERNEL_TMP ARCH=arm64 CROSS_COMPILE=$CROSS_COMPILE -j$(nproc)"
Copy link
Contributor

Choose a reason for hiding this comment

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

Might as well remove entirely? Or set to the compiler that is to be used by -prebuilts?

@@ -0,0 +1,179 @@
# KEEP ALPHABETICALLY SORTED
Copy link
Contributor

Choose a reason for hiding this comment

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

Iirc I asked this before, android-extra.config is not an "android" config (https://android.googlesource.com/kernel/configs/+/refs/tags/android-11.0.0_r28/r/android-4.19/) but something we as SODP add on top, shared by all devices.

Suggestion is to rename it to sony/sodp-base.config.

Copy link
Contributor

@pablomh pablomh Jan 21, 2021

Choose a reason for hiding this comment

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

I'd prefer base_sodp_defconfig or even better base_sodp.config (why do we append _defconfig to our files instead of the common .config?).

Copy link
Contributor

Choose a reason for hiding this comment

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

@pablomh I don't mind either, as long as it is consistent 👌

The kernel uses <snake_case_target>_defconfig, AOSP uses <file>.config for the extra bits.

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.

4 participants