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

Commit 832bf32f 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: Move kernel to 0x3AC00000"

parents 292d28ab ec757ce2

arch/arm/mach-msm/Kconfig

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

	default "0x00000000" if ARCH_MSM8610

	default "0x00000000" if ARCH_MSMSAMARIUM

	default "0x40000000" if ARCH_FSM9900

	default "0x3AC00000" if ARCH_FSM9900

	default "0x00000000" if ARCH_MDM9630

	default "0x00200000" if !MSM_STACKED_MEMORY

	default "0x10000000"

arch/arm/mach-msm/Makefile.boot

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



# FSM9900

   zreladdr-$(CONFIG_ARCH_FSM9900)	:= 0x40008000

   zreladdr-$(CONFIG_ARCH_FSM9900)	:= 0x3AC08000



# MPQ8092

   zreladdr-$(CONFIG_ARCH_MPQ8092)	:= 0x00008000