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

Commit 5692fcee authored by Dave Gerlach's avatar Dave Gerlach Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Fix build when using split object directories 



The sleep33xx and sleep43xx files should not depend on a header file
generated in drivers/memory. Remove this dependency and instead allow
both drivers/memory and arch/arm/mach-omap2 to generate all macros
needed in headers local to their own paths.

This fixes an issue where the build fail will when using O= to set a
split object directory and arch/arm/mach-omap2 is built before
drivers/memory with the following error:

.../drivers/memory/emif-asm-offsets.c:1:0: fatal error: can't open
drivers/memory/emif-asm-offsets.s for writing: No such file or directory
compilation terminated.

Fixes: 41d9d44d ("ARM: OMAP2+: pm33xx-core: Add platform code needed for PM")
Reviewed-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarDave Gerlach <d-gerlach@ti.com>
Acked-by: default avatarSantosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 60cc43fc

arch/arm/mach-omap2/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -243,8 +243,4 @@ arch/arm/mach-omap2/pm-asm-offsets.s: arch/arm/mach-omap2/pm-asm-offsets.c 
include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORCE

	$(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__)



# For rule to generate ti-emif-asm-offsets.h dependency

include drivers/memory/Makefile.asm-offsets



arch/arm/mach-omap2/sleep33xx.o: include/generated/ti-pm-asm-offsets.h include/generated/ti-emif-asm-offsets.h

arch/arm/mach-omap2/sleep43xx.o: include/generated/ti-pm-asm-offsets.h include/generated/ti-emif-asm-offsets.h
 
$(obj)/sleep33xx.o $(obj)/sleep43xx.o: include/generated/ti-pm-asm-offsets.h

arch/arm/mach-omap2/pm-asm-offsets.c

+3 −0
Original line number Diff line number Diff line
@@ -7,9 +7,12 @@ 


#include <linux/kbuild.h>

#include <linux/platform_data/pm33xx.h>

#include <linux/ti-emif-sram.h>



int main(void)

{

	ti_emif_asm_offsets();



	DEFINE(AMX3_PM_WFI_FLAGS_OFFSET,

	       offsetof(struct am33xx_pm_sram_data, wfi_flags));

	DEFINE(AMX3_PM_L2_AUX_CTRL_VAL_OFFSET,

arch/arm/mach-omap2/sleep33xx.S

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
 *	Dave Gerlach, Vaibhav Bedia

 */



#include <generated/ti-emif-asm-offsets.h>

#include <generated/ti-pm-asm-offsets.h>

#include <linux/linkage.h>

#include <linux/ti-emif-sram.h>

arch/arm/mach-omap2/sleep43xx.S

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
 *	Dave Gerlach, Vaibhav Bedia

 */



#include <generated/ti-emif-asm-offsets.h>

#include <generated/ti-pm-asm-offsets.h>

#include <linux/linkage.h>

#include <linux/ti-emif-sram.h>

drivers/memory/emif-asm-offsets.c

+1 −71
Original line number Diff line number Diff line
@@ -16,77 +16,7 @@ 


int main(void)

{

	DEFINE(EMIF_SDCFG_VAL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_sdcfg_val));

	DEFINE(EMIF_TIMING1_VAL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_timing1_val));

	DEFINE(EMIF_TIMING2_VAL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_timing2_val));

	DEFINE(EMIF_TIMING3_VAL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_timing3_val));

	DEFINE(EMIF_REF_CTRL_VAL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_ref_ctrl_val));

	DEFINE(EMIF_ZQCFG_VAL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_zqcfg_val));

	DEFINE(EMIF_PMCR_VAL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_pmcr_val));

	DEFINE(EMIF_PMCR_SHDW_VAL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_pmcr_shdw_val));

	DEFINE(EMIF_RD_WR_LEVEL_RAMP_CTRL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_rd_wr_level_ramp_ctrl));

	DEFINE(EMIF_RD_WR_EXEC_THRESH_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_rd_wr_exec_thresh));

	DEFINE(EMIF_COS_CONFIG_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_cos_config));

	DEFINE(EMIF_PRIORITY_TO_COS_MAPPING_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_priority_to_cos_mapping));

	DEFINE(EMIF_CONNECT_ID_SERV_1_MAP_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_connect_id_serv_1_map));

	DEFINE(EMIF_CONNECT_ID_SERV_2_MAP_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_connect_id_serv_2_map));

	DEFINE(EMIF_OCP_CONFIG_VAL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_ocp_config_val));

	DEFINE(EMIF_LPDDR2_NVM_TIM_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_lpddr2_nvm_tim));

	DEFINE(EMIF_LPDDR2_NVM_TIM_SHDW_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_lpddr2_nvm_tim_shdw));

	DEFINE(EMIF_DLL_CALIB_CTRL_VAL_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_dll_calib_ctrl_val));

	DEFINE(EMIF_DLL_CALIB_CTRL_VAL_SHDW_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_dll_calib_ctrl_val_shdw));

	DEFINE(EMIF_DDR_PHY_CTLR_1_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_ddr_phy_ctlr_1));

	DEFINE(EMIF_EXT_PHY_CTRL_VALS_OFFSET,

	       offsetof(struct emif_regs_amx3, emif_ext_phy_ctrl_vals));

	DEFINE(EMIF_REGS_AMX3_SIZE, sizeof(struct emif_regs_amx3));



	BLANK();



	DEFINE(EMIF_PM_BASE_ADDR_VIRT_OFFSET,

	       offsetof(struct ti_emif_pm_data, ti_emif_base_addr_virt));

	DEFINE(EMIF_PM_BASE_ADDR_PHYS_OFFSET,

	       offsetof(struct ti_emif_pm_data, ti_emif_base_addr_phys));

	DEFINE(EMIF_PM_CONFIG_OFFSET,

	       offsetof(struct ti_emif_pm_data, ti_emif_sram_config));

	DEFINE(EMIF_PM_REGS_VIRT_OFFSET,

	       offsetof(struct ti_emif_pm_data, regs_virt));

	DEFINE(EMIF_PM_REGS_PHYS_OFFSET,

	       offsetof(struct ti_emif_pm_data, regs_phys));

	DEFINE(EMIF_PM_DATA_SIZE, sizeof(struct ti_emif_pm_data));



	BLANK();



	DEFINE(EMIF_PM_SAVE_CONTEXT_OFFSET,

	       offsetof(struct ti_emif_pm_functions, save_context));

	DEFINE(EMIF_PM_RESTORE_CONTEXT_OFFSET,

	       offsetof(struct ti_emif_pm_functions, restore_context));

	DEFINE(EMIF_PM_ENTER_SR_OFFSET,

	       offsetof(struct ti_emif_pm_functions, enter_sr));

	DEFINE(EMIF_PM_EXIT_SR_OFFSET,

	       offsetof(struct ti_emif_pm_functions, exit_sr));

	DEFINE(EMIF_PM_ABORT_SR_OFFSET,

	       offsetof(struct ti_emif_pm_functions, abort_sr));

	DEFINE(EMIF_PM_FUNCTIONS_SIZE, sizeof(struct ti_emif_pm_functions));

	ti_emif_asm_offsets();



	return 0;

}