| Message ID | 1324049833-18143-11-git-send-email-sbabic@denx.de |
|---|---|
| State | RFC |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, Dec 16, 2011 at 8:37 AM, Stefano Babic <sbabic@denx.de> wrote: > The SPL used on OMAPx can be reused by other SOCs from different > architectures. Move common files into common/ directory. Thanks for tackling this. My immediate concern however is that this breaks building nand_spl/ boards, but is that really a good concern still?
On 16/12/2011 16:55, Tom Rini wrote: > On Fri, Dec 16, 2011 at 8:37 AM, Stefano Babic <sbabic@denx.de> wrote: >> The SPL used on OMAPx can be reused by other SOCs from different >> architectures. Move common files into common/ directory. > > Thanks for tackling this. My immediate concern however is that this > breaks building nand_spl/ boards, but is that really a good concern > still? I think the way we have to do is to accept boards implementing the new SPL framework, and put nand_spl in obsolescence. If a board is broken, it must be fixed porting it to the new SPL. Stefano
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile index a684611..e65e992 100644 --- a/arch/arm/cpu/armv7/omap-common/Makefile +++ b/arch/arm/cpu/armv7/omap-common/Makefile @@ -40,16 +40,6 @@ COBJS += emif-common.o SOBJS += lowlevel_init.o endif -ifdef CONFIG_SPL_BUILD -COBJS += spl.o -ifdef CONFIG_SPL_NAND_SUPPORT -COBJS += spl_nand.o -endif -ifdef CONFIG_SPL_MMC_SUPPORT -COBJS += spl_mmc.o -endif -endif - ifndef CONFIG_SPL_BUILD ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) COBJS += mem-common.o diff --git a/common/Makefile b/common/Makefile index 91f3f2e..41b67ca 100644 --- a/common/Makefile +++ b/common/Makefile @@ -186,6 +186,10 @@ COBJS-$(CONFIG_MENU) += menu.o COBJS-$(CONFIG_MODEM_SUPPORT) += modem.o COBJS-$(CONFIG_UPDATE_TFTP) += update.o COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o +else +COBJS-y += spl.o +COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o +COBJS-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o endif COBJS-y += console.o
The SPL used on OMAPx can be reused by other SOCs from different architectures. Move common files into common/ directory. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Tom Rini <tom.rini@gmail.com> CC: Wolfgang Denk <wd@denx.de> CC: Simon Schwarz <simonschwarzcor@gmail.com> --- arch/arm/cpu/armv7/omap-common/Makefile | 10 ---------- common/Makefile | 4 ++++ {arch/arm/cpu/armv7/omap-common => common}/spl.c | 0 .../arm/cpu/armv7/omap-common => common}/spl_mmc.c | 0 .../cpu/armv7/omap-common => common}/spl_nand.c | 0 5 files changed, 4 insertions(+), 10 deletions(-) rename {arch/arm/cpu/armv7/omap-common => common}/spl.c (100%) rename {arch/arm/cpu/armv7/omap-common => common}/spl_mmc.c (100%) rename {arch/arm/cpu/armv7/omap-common => common}/spl_nand.c (100%) diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/common/spl.c similarity index 100% rename from arch/arm/cpu/armv7/omap-common/spl.c rename to common/spl.c diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/common/spl_mmc.c similarity index 100% rename from arch/arm/cpu/armv7/omap-common/spl_mmc.c rename to common/spl_mmc.c diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/common/spl_nand.c similarity index 100% rename from arch/arm/cpu/armv7/omap-common/spl_nand.c rename to common/spl_nand.c