Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe92d85 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo

parents 2124c5b4 17aa58b1

build/tasks/kernel.mk

+22 −4
Original line number Diff line number Diff line
@@ -69,6 +69,14 @@ 
#                                          modules in root instead of vendor

#   NEED_KERNEL_MODULE_SYSTEM          = Optional, if true, install kernel

#                                          modules in system instead of vendor

#

#   TARGET_DTBO_IMAGE_NAME             = Device Tree Binary Overlay (DTBO) image name

#                                          Should be 'dtbo' for most devices

#                                          Some MediaTek devices use 'odmdtbo'

#   TARGET_DTBO_IMAGE_TARGET           = Similar to TARGET_DTBO_IMAGE_NAME, but the full file name

#                                          Should be 'dtbo.img' for most devices

#                                          Some MediaTek devices use 'odmdtboimage'

#   TARGET_DTBO_IMAGE_PATH             = Path to generated DTBO image in inline kernel build tree



ifneq ($(TARGET_NO_KERNEL),true)
@@ -114,6 +122,14 @@ ifneq ($(TARGET_KERNEL_APPEND_DTB),) 
$(error TARGET_KERNEL_APPEND_DTB is deprecated.)

endif

TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/$(BOARD_KERNEL_IMAGE_NAME)

TARGET_DTBO_IMAGE_NAME ?= dtbo

TARGET_DTBO_IMAGE_TARGET ?= dtbo.img

TARGET_DTBO_IMAGE_PATH ?= dtbo/arch/$(KERNEL_ARCH)/boot/$(TARGET_DTBO_IMAGE_NAME).img



dtbo_avbtool_signing_enabled :=

ifeq ($(BOARD_AVB_ENABLE), true)

  dtbo_avbtool_signing_enabled := true

endif



# Clear this first to prevent accidental poisoning from env

MAKE_FLAGS :=
@@ -419,16 +435,18 @@ alldefconfig: 


endif # FULL_KERNEL_BUILD



TARGET_PREBUILT_DTBO = $(PRODUCT_OUT)/dtbo/arch/$(KERNEL_ARCH)/boot/dtbo.img

TARGET_PREBUILT_DTBO = $(PRODUCT_OUT)/$(TARGET_DTBO_IMAGE_PATH)

$(TARGET_PREBUILT_DTBO): $(AVBTOOL)

	echo -e ${CL_GRN}"Building DTBO.img"${CL_RST}

	echo -e ${CL_GRN}"Building $(TARGET_DTBO_IMAGE_NAME).img"${CL_RST}

	$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_DEFCONFIG)

	$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbo.img

	$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(TARGET_DTBO_IMAGE_TARGET)

ifdef dtbo_avbtool_signing_enabled

	$(AVBTOOL) add_hash_footer \

		--image $@ \

		--partition_size $(BOARD_DTBOIMG_PARTITION_SIZE) \

		--partition_name dtbo $(INTERNAL_AVB_DTBO_SIGNING_ARGS) \

		--partition_name $(TARGET_DTBO_IMAGE_NAME) $(INTERNAL_AVB_DTBO_SIGNING_ARGS) \

		$(BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS)

endif



## Install it

prebuilt/common/etc/apns-conf.xml

+2 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ 
  <apn carrier="Yoigo Internet" mcc="214" mnc="04" apn="internet" mmsc="" user="" password="" type="default,supl" />

  <apn carrier="Yoigo MMS" mcc="214" mnc="04" apn="mms" proxy="" port="" user="" password="" mmsc="http://mmss/" mmsproxy="193.209.134.141" mmsport="80" type="mms" />

  <apn carrier="Tuenti" mcc="214" mnc="05" apn="tuenti.com" user="tuenti" password="tuenti" mmsc="http://tuenti.com" mmsproxy="10.138.255.43" mmsport="8080" type="default,supl,mms" />

  <apn carrier="INET Roaming" mcc="214" mnc="05" apn="inet.es" user="" password="" port="" proxy="" type="default,supl,foat,hipri" roaming_protocol="IPV4V6" mvno_type="imsi" mvno_match_data="214050104xxxxxx" />

  <apn carrier="Tuenti Internet" mcc="214" mnc="05" apn="tuenti.com" proxy="" port="" user="tuenti" password="tuenti" mmsc="" mvno_type="spn" mvno_match_data="Tuenti" type="default,supl" />

  <apn carrier="Tuenti MMS" mcc="214" mnc="05" apn="tuenti.com" proxy="" port="" user="tuenti" password="tuenti" mmsc="http://tuenti.com" mmsproxy="10.138.255.43" mmsport="8080" mvno_type="spn" mvno_match_data="Tuenti" authtype="1" type="mms" />

  <apn carrier="Pepephone 4G Internet" mcc="214" mnc="05" apn="gprs.pepephone.com" type="default,supl" />
@@ -309,6 +310,7 @@ 
  <apn carrier="Truphone" mcc="214" mnc="27" apn="truphone.com" proxy="" port="" user="" password="" mmsc="" authtype="1" type="default,supl" />

  <apn carrier="Tuenti" mcc="214" mnc="32" apn="tuenti.com" proxy="" port="" user="tuenti" password="tuenti" mmsc="" mvno_type="spn" mvno_match_data="Tuenti" type="default,supl,mms" />

  <apn carrier="Masmovil" mcc="214" mnc="32" apn="internetmas" type="default,supl" />

  <apn carrier="INET Internet" mcc="214" mnc="34" apn="inet.es" user="" password="" port="" proxy="" type="default,supl,foat,hipri" protocol="IPV4V6" />

  <apn carrier="Telenor Net" mcc="216" mnc="01" apn="net" type="default,supl" />

  <apn carrier="Telenor online" mcc="216" mnc="01" apn="online" user="" password="" type="default,supl" />

  <apn carrier="Telenor MMS" mcc="216" mnc="01" apn="mms" proxy="" port="" mmsproxy="84.225.255.1" mmsport="8080" mmsc="http://mmsc.telenor.hu/" user="" password="" type="mms" />