diff options
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/Makefile | 13 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/clocks-common.c (renamed from arch/arm/cpu/armv7/omap4/clocks.c) | 0 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/emif-common.c (renamed from arch/arm/cpu/armv7/omap4/emif.c) | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/hwinit-common.c (renamed from arch/arm/cpu/armv7/omap4/board.c) | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/lowlevel_init.S (renamed from arch/arm/cpu/armv7/omap4/lowlevel_init.S) | 0 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/mem-common.c (renamed from arch/arm/cpu/armv7/omap4/mem.c) | 0 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap4/Makefile | 6 |
7 files changed, 16 insertions, 9 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile index 1dee81f..ea2545d 100644 --- a/arch/arm/cpu/armv7/omap-common/Makefile +++ b/arch/arm/cpu/armv7/omap-common/Makefile @@ -33,6 +33,13 @@ ifdef CONFIG_OMAP COBJS += gpio.o endif +ifdef CONFIG_OMAP44XX +COBJS += hwinit-common.o +COBJS += clocks-common.o +COBJS += emif-common.o +SOBJS += lowlevel_init.o +endif + ifdef CONFIG_SPL_BUILD COBJS += spl.o ifdef CONFIG_SPL_NAND_SUPPORT @@ -43,6 +50,12 @@ COBJS += spl_mmc.o endif endif +ifndef CONFIG_SPL_BUILD +ifdef CONFIG_OMAP44XX +COBJS += mem-common.o +endif +endif + SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/arch/arm/cpu/armv7/omap4/clocks.c b/arch/arm/cpu/armv7/omap-common/clocks-common.c index 095ba39..095ba39 100644 --- a/arch/arm/cpu/armv7/omap4/clocks.c +++ b/arch/arm/cpu/armv7/omap-common/clocks-common.c diff --git a/arch/arm/cpu/armv7/omap4/emif.c b/arch/arm/cpu/armv7/omap-common/emif-common.c index 988b205..94c8bed 100644 --- a/arch/arm/cpu/armv7/omap4/emif.c +++ b/arch/arm/cpu/armv7/omap-common/emif-common.c @@ -1218,9 +1218,9 @@ void sdram_init(void) in_sdram = running_from_sdram(); debug("in_sdram = %d\n", in_sdram); - if (!in_sdram) { + if (!in_sdram) bypass_dpll(&prcm->cm_clkmode_dpll_core); - } + do_sdram_init(OMAP44XX_EMIF1); do_sdram_init(OMAP44XX_EMIF2); diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c index 2497e3e..8e765cf 100644 --- a/arch/arm/cpu/armv7/omap4/board.c +++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c @@ -34,7 +34,7 @@ #include <asm/sizes.h> #include <asm/arch/emif.h> #include <asm/arch/gpio.h> -#include "omap4_mux_data.h" +#include "../omap4/omap4_mux_data.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/armv7/omap4/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S index 91525ec..91525ec 100644 --- a/arch/arm/cpu/armv7/omap4/lowlevel_init.S +++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S diff --git a/arch/arm/cpu/armv7/omap4/mem.c b/arch/arm/cpu/armv7/omap-common/mem-common.c index 878f0e3..878f0e3 100644 --- a/arch/arm/cpu/armv7/omap4/mem.c +++ b/arch/arm/cpu/armv7/omap-common/mem-common.c diff --git a/arch/arm/cpu/armv7/omap4/Makefile b/arch/arm/cpu/armv7/omap4/Makefile index e7ee0b8..d912729 100644 --- a/arch/arm/cpu/armv7/omap4/Makefile +++ b/arch/arm/cpu/armv7/omap4/Makefile @@ -25,15 +25,9 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o -SOBJS += lowlevel_init.o - -COBJS += board.o -COBJS += clocks.o -COBJS += emif.o COBJS += sdram_elpida.o ifndef CONFIG_SPL_BUILD -COBJS += mem.o COBJS += sys_info.o endif |