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

Commit 3e599496 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: fsm9900: Relocate kernel to 0x0b600000"

parents bb27c068 cce67d0e

arch/arm/mach-msm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ config PHYS_OFFSET 
	default "0x00000000" if ARCH_MSM8226

	default "0x00000000" if ARCH_MSM8610

	default "0x00000000" if ARCH_MSMSAMARIUM

	default "0x11400000" if ARCH_FSM9900

	default "0x0b600000" if ARCH_FSM9900

	default "0x00000000" if ARCH_MDM9630

	default "0x80000000" if ARCH_MSMZIRC

	default "0x00200000" if !MSM_STACKED_MEMORY

arch/arm/mach-msm/Makefile.boot

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
   zreladdr-$(CONFIG_ARCH_MSM8226)	:= 0x00008000



# FSM9900

   zreladdr-$(CONFIG_ARCH_FSM9900)	:= 0x11408000

   zreladdr-$(CONFIG_ARCH_FSM9900)	:= 0x0b608000



# MPQ8092

   zreladdr-$(CONFIG_ARCH_MPQ8092)	:= 0x00008000