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

Commit bcc3555d 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 0x40000000"

parents 1c0cba03 15b06f7e

arch/arm/mach-msm/Kconfig

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

	default "0x00000000" if ARCH_MSMSAMARIUM

	default "0x10000000" if ARCH_FSM9XXX

	default "0x00000000" if ARCH_FSM9900

	default "0x40000000" if ARCH_FSM9900

	default "0x00300000" if ARCH_MSM9625

	default "0x00000000" if ARCH_MSMKRYPTON

	default "0x00200000" if !MSM_STACKED_MEMORY

arch/arm/mach-msm/Makefile.boot

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ params_phys-$(CONFIG_ARCH_FSM9XXX) := 0x10000100 
initrd_phys-$(CONFIG_ARCH_FSM9XXX)	:= 0x12000000



# FSM9900

   zreladdr-$(CONFIG_ARCH_FSM9900)	:= 0x00008000

   zreladdr-$(CONFIG_ARCH_FSM9900)	:= 0x40008000



# MPQ8092

   zreladdr-$(CONFIG_ARCH_MPQ8092)	:= 0x00008000