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

Commit d5dbeafe authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 5db9253d on remote branch 

Change-Id: I2e37be66f305591313c058fe8d3ab0397fbdf003
parents 4869a99b 5db9253d

arch/arm/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -2175,6 +2175,17 @@ config AUTO_ZRELADDR 
config EFI_STUB

	bool



config ARM_DECOMPRESSOR_LIMIT

        hex "Limit the decompressor memory area"

        default 0x3200000

        help

          Allows overriding of the memory size that decompressor maps with

          read, write and execute permissions to avoid speculative prefetch.



          By default ARM_DECOMPRESSOR_LIMIT maps first 1GB of memory

          with read, write and execute permissions and reset of the memory

          as strongly ordered.



config EFI

	bool "UEFI runtime support"

	depends on OF && !CPU_BIG_ENDIAN && MMU && AUTO_ZRELADDR && !XIP_KERNEL

arch/arm/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ __setup_mmu: sub r3, r4, #16384 @ Page directory size 
		mov	r0, r3

		mov	r9, r0, lsr #18

		mov	r9, r9, lsl #18		@ start of RAM

		add	r10, r9, #0x10000000	@ a reasonable RAM size

		add	r10, r9, #CONFIG_ARM_DECOMPRESSOR_LIMIT

		mov	r1, #0x12		@ XN|U + section mapping

		orr	r1, r1, #3 << 10	@ AP=11

		add	r2, r3, #16384

arch/arm/boot/dts/qcom/sdxpoorwills-adp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -27,3 +27,7 @@ 
&blsp1_uart2b_hs {

	status = "okay";

};



&mss_mem {

	reg = <0x86400000 0x9300000>;

};

arch/arm/boot/dts/qcom/sdxpoorwills-v2-ttp.dts

+4 −0
Original line number Diff line number Diff line
@@ -25,3 +25,7 @@ 
&blsp1_uart2b_hs {

	status = "okay";

};



&mss_mem {

	reg = <0x86400000 0x9300000>;

};

arch/arm/configs/sdxpoorwills-auto-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ CONFIG_USB_GADGET_DEBUG_FILES=y 
CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_ECM=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y