]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
SPL: Move the omap SPL framework to common/spl
authorTom Rini <trini@ti.com>
Mon, 13 Aug 2012 19:03:19 +0000 (12:03 -0700)
committerTom Rini <trini@ti.com>
Thu, 27 Sep 2012 16:49:59 +0000 (09:49 -0700)
Add a new flag, CONFIG_SPL_FRAMEWORK to opt into the common/spl SPL
framework, enable on all of the previously using boards.  We move the
spl_ymodem.c portion to common/ and spl_mmc.c to drivers/mmc/.  We leave
the NAND one in-place as we plan to replace it later in this series.

We use common/spl to avoid linker problems with respect to merging
constant strings in objects.   Otherwise all strings in common/ will be
linked in and kept which grows SPL in size too much.

Signed-off-by: Tom Rini <trini@ti.com>
28 files changed:
README
arch/arm/cpu/armv7/am33xx/board.c
arch/arm/cpu/armv7/omap-common/Makefile
arch/arm/cpu/armv7/omap-common/boot-common.c
arch/arm/cpu/armv7/omap-common/hwinit-common.c
arch/arm/cpu/armv7/omap-common/spl_nand.c
arch/arm/cpu/armv7/omap3/board.c
arch/arm/include/asm/spl.h
common/spl/Makefile [new file with mode: 0644]
common/spl/spl.c [moved from arch/arm/cpu/armv7/omap-common/spl.c with 98% similarity]
common/spl/spl_ymodem.c [moved from arch/arm/cpu/armv7/omap-common/spl_ymodem.c with 97% similarity]
drivers/mmc/Makefile
drivers/mmc/spl_mmc.c [moved from arch/arm/cpu/armv7/omap-common/spl_mmc.c with 99% similarity]
include/configs/am335x_evm.h
include/configs/am3517_crane.h
include/configs/am3517_evm.h
include/configs/devkit8000.h
include/configs/igep00x0.h
include/configs/mcx.h
include/configs/omap3_beagle.h
include/configs/omap3_evm_common.h
include/configs/omap3_overo.h
include/configs/omap4_common.h
include/configs/omap5_evm.h
include/configs/tam3517-common.h
include/configs/tricorder.h
include/spl.h [new file with mode: 0644]
spl/Makefile

diff --git a/README b/README
index 309d88dce426dbee66022a4a4cd6e22e729805c4..c5e6a1a4c8501caed773ad7b5b1e33d2df48c98c 100644 (file)
--- a/README
+++ b/README
@@ -2597,6 +2597,11 @@ FIT uImage format:
                CONFIG_SYS_SPL_MALLOC_SIZE
                The size of the malloc pool used in SPL.
 
+               CONFIG_SPL_FRAMEWORK
+               Enable the SPL framework under common/.  This framework
+               supports MMC, NAND and YMODEM loading of U-Boot and NAND
+               NAND loading of the Linux Kernel.
+
                CONFIG_SPL_DISPLAY_PRINT
                For ARM, enable an optional function to print more information
                about the running system.
index e89df8e3355d66273256d008725b7fb952573461..c45b19b913cc86fa0137cc3861a7e92b98cc4606 100644 (file)
@@ -18,6 +18,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
@@ -29,7 +30,6 @@
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
-#include <asm/spl.h>
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
index d37b22d98a8dc1dc9fa4937a4932ffa303b23dab..6e815c674d9442fc3808f4c816eaffb32707c6c6 100644 (file)
@@ -43,16 +43,9 @@ 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
-ifdef CONFIG_SPL_YMODEM_SUPPORT
-COBJS  += spl_ymodem.o
-endif
 endif
 
 ifndef CONFIG_SPL_BUILD
index ed398fdec743ef8fc49bbfdbd80f9e68a31aa4ff..0f19141cc23ab362c5c66f5ff4d907cd2bb29067 100644 (file)
@@ -17,7 +17,7 @@
  */
 
 #include <common.h>
-#include <asm/spl.h>
+#include <spl.h>
 #include <asm/omap_common.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/mmc_host_def.h>
index d5fde38f80e36acf6a9d89724ec40b15d27b7bea..ad8b5acce1d04af77781fba2793c4c3ee72a333a 100644 (file)
  * MA 02111-1307 USA
  */
 #include <common.h>
+#include <spl.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/sizes.h>
 #include <asm/emif.h>
-#include <asm/spl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
index 1e6b5f0db9516f18c8159d4b717945ffa4021c01..9e9206ce3b62092973e28508d764de3968ca3f0b 100644 (file)
@@ -21,7 +21,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
-#include <asm/spl.h>
+#include <spl.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
 #include <asm/io.h>
index 52196c8f66e91be062d6aa55383c6cb0a8a99c4e..42e2fd9198ea9a80294b2dcef238fa776e3cdd7f 100644 (file)
  * MA 02111-1307 USA
  */
 #include <common.h>
+#include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mem.h>
 #include <asm/cache.h>
 #include <asm/armv7.h>
 #include <asm/arch/gpio.h>
-#include <asm/spl.h>
 #include <asm/omap_common.h>
 #include <asm/arch/mmc_host_def.h>
 #include <i2c.h>
index 47ca1b6678c4665a5128fe345f09feb55d58cdc5..ad619905acfcb5645f4ec393186d5b73c3eafab9 100644 (file)
 /* Platform-specific defines */
 #include <asm/arch/spl.h>
 
-/* Boot type */
-#define MMCSD_MODE_UNDEFINED   0
-#define MMCSD_MODE_RAW         1
-#define MMCSD_MODE_FAT         2
-
-struct spl_image_info {
-       const char *name;
-       u8 os;
-       u32 load_addr;
-       u32 entry_point;
-       u32 size;
-};
-
-extern struct spl_image_info spl_image;
-extern u32 *boot_params_ptr;
-
-/* SPL common functions */
-void preloader_console_init(void);
-u32 spl_boot_device(void);
-u32 spl_boot_mode(void);
-void spl_parse_image_header(const struct image_header *header);
-void spl_board_prepare_for_linux(void);
-int spl_start_uboot(void);
-void spl_display_print(void);
-
-/* NAND SPL functions */
-void spl_nand_load_image(void);
-
-/* MMC SPL functions */
-void spl_mmc_load_image(void);
-
-/* YMODEM SPL functions */
-void spl_ymodem_load_image(void);
-
-/* SPI SPL functions */
-void spi_boot(void);
-
-#ifdef CONFIG_SPL_BOARD_INIT
-void spl_board_init(void);
-#endif
 #endif
diff --git a/common/spl/Makefile b/common/spl/Makefile
new file mode 100644 (file)
index 0000000..b61b438
--- /dev/null
@@ -0,0 +1,37 @@
+#
+# (C) Copyright 2012
+# Texas Instruments Incorporated - http://www.ti.com/
+# Aneesh V <aneesh@ti.com>
+#
+# This file is released under the terms of GPL v2 and any later version.
+# See the file COPYING in the root directory of the source tree for details.
+#
+# Based on common/Makefile.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB    = $(obj)libspl.o
+
+ifdef CONFIG_SPL_BUILD
+COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o
+COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o
+endif
+
+COBJS  := $(sort $(COBJS-y))
+SRCS   := $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS-y))
+
+all:   $(obj).depend $(LIB)
+
+$(LIB):        $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
similarity index 98%
rename from arch/arm/cpu/armv7/omap-common/spl.c
rename to common/spl/spl.c
index dc2675021806704bb94d85543ecb8a61b336592c..1562f2a16226f292b7802529877c1cadb01e6298 100644 (file)
@@ -23,9 +23,8 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
-#include <asm/spl.h>
+#include <spl.h>
 #include <asm/u-boot.h>
-#include <asm/utils.h>
 #include <nand.h>
 #include <fat.h>
 #include <version.h>
@@ -36,7 +35,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-u32boot_params_ptr = NULL;
+u32 *boot_params_ptr = NULL;
 struct spl_image_info spl_image;
 
 /* Define global data structure pointer to it*/
similarity index 97%
rename from arch/arm/cpu/armv7/omap-common/spl_ymodem.c
rename to common/spl/spl_ymodem.c
index 65565e3e624f617367b07b4bd3dddeeee77c9779..40e50356f9e782205e155cf21e1866ded39f69bc 100644 (file)
  * MA 02111-1307 USA
  */
 #include <common.h>
-#include <asm/spl.h>
+#include <spl.h>
 #include <xyzModem.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
-#include <asm/arch/sys_proto.h>
 
 #define BUF_SIZE 1024
 
index 2b96cdcd403a76e65348004f48bc527252a4f443..941a909395fd07239a7d1c44efb88ee6bbda3291 100644 (file)
@@ -25,8 +25,11 @@ include $(TOPDIR)/config.mk
 
 LIB    := $(obj)libmmc.o
 
-ifdef CONFIG_SPL_MMC_LOAD
+ifdef CONFIG_SPL_BUILD
 COBJS-$(CONFIG_SPL_MMC_LOAD)   += spl_mmc_load.o
+ifdef CONFIG_SPL_FRAMEWORK
+COBJS-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
+endif
 endif
 
 COBJS-$(CONFIG_BFIN_SDH) += bfin_sdh.o
similarity index 99%
rename from arch/arm/cpu/armv7/omap-common/spl_mmc.c
rename to drivers/mmc/spl_mmc.c
index fdecf94c24c777612a07b68afdccfdba429d171e..753c6a014a65d0306e99e2dcfe8fff4414f422a3 100644 (file)
@@ -23,7 +23,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
-#include <asm/spl.h>
+#include <spl.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
 #include <mmc.h>
index a3752bca671dc2574b42c1c93633c9efa734ff8f..263a5adb3534f60d03c8f8d27292da98a00eb08f 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x402F0400
 #define CONFIG_SPL_MAX_SIZE            (46 * 1024)
 #define CONFIG_SPL_STACK               CONFIG_SYS_INIT_SP_ADDR
index 254ed576c7e448a2ba452196183d1353d0b68a93..8ddeff46f44cf744354afd88c346a79ab7f77e9c 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_TEXT_BASE           0x40200800
index ca39c72b181dfefe6ece0d75471efa6fe8813f3a..698081100eea549c70328514552309e84db38458 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_TEXT_BASE           0x40200800
index de75dafc97d855b02bc80135609165288b852815..2d2ee5f1a1a84371b7884bc1281b87e25147bc6f 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
index 5468a1a210ff15df36f4dd7321fc52196d187b02..b1071e892c82a0d7cfc692703be9fa4b3bc8b460 100644 (file)
 
 /* SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_TEXT_BASE           0x40200800
 #define CONFIG_SPL_MAX_SIZE            (54 * 1024)
index a841c7037c9ee7a18b1e8f4ae7966e7163933aa7..359522a649c31b059e7e003920cc0f72f6697c59 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_NAND_SOFTECC
index 782a4c5988c67b0011ea5f1d116ed226acfc3278..f79f996450d52697ba92467fb573be41500ea282 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_TEXT_BASE           0x40200800
 #define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
index d9578f47b03890f107482363411a49648162078f..2ef3aaa18706d948f743487f9695d983100fffc7 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x40200800
 #define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
 #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
index dd4b2c0e88e4c888d71cf2d59636f35734328009..f6d6f75fca42a76804ab1767d1a7d279f1657905 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_TEXT_BASE           0x40200800
 #define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
index c1c2fa9f3cccb093b11aa7476b5f402352a1561d..cbc9bdb402634bdb33f2226c76115dd6a9d248d0 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x40304350
 #define CONFIG_SPL_MAX_SIZE            (38 * 1024)
 #define CONFIG_SPL_STACK               CONFIG_SYS_INIT_SP_ADDR
index b4a237ac0c2e8456005a9f01ef523204fa6fdb12..743edfdcc593f00888dd0743affc6df3bceb3155 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x40300350
 #define CONFIG_SPL_MAX_SIZE            0x19000 /* 100K */
 #define CONFIG_SPL_STACK               CONFIG_SYS_INIT_SP_ADDR
index b34cb78a3640c26e986af5b3eb2da8f5f0d1cfd0..cbb6c7ec3916ed75e4ea9589633d88319d3a9191 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_CONSOLE
 #define CONFIG_SPL_NAND_SIMPLE
index 63c98dc723112c94046632e17ecb02ca7309d368..00d02e8ca055278fd57b39f41d4dca96b198aac4 100644 (file)
 
 /* Defines for SPL */
 #define CONFIG_SPL
+#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 
 #define CONFIG_SPL_BOARD_INIT
diff --git a/include/spl.h b/include/spl.h
new file mode 100644 (file)
index 0000000..af9ef71
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * (C) Copyright 2012
+ * Texas Instruments, <www.ti.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#ifndef        _SPL_H_
+#define        _SPL_H_
+
+/* Platform-specific defines */
+#include <asm/spl.h>
+
+/* Boot type */
+#define MMCSD_MODE_UNDEFINED   0
+#define MMCSD_MODE_RAW         1
+#define MMCSD_MODE_FAT         2
+
+struct spl_image_info {
+       const char *name;
+       u8 os;
+       u32 load_addr;
+       u32 entry_point;
+       u32 size;
+};
+
+extern struct spl_image_info spl_image;
+extern u32 *boot_params_ptr;
+
+/* SPL common functions */
+void preloader_console_init(void);
+u32 spl_boot_device(void);
+u32 spl_boot_mode(void);
+void spl_parse_image_header(const struct image_header *header);
+void spl_board_prepare_for_linux(void);
+int spl_start_uboot(void);
+void spl_display_print(void);
+
+/* NAND SPL functions */
+void spl_nand_load_image(void);
+
+/* MMC SPL functions */
+void spl_mmc_load_image(void);
+
+/* YMODEM SPL functions */
+void spl_ymodem_load_image(void);
+
+/* SPI SPL functions */
+void spi_boot(void);
+
+#ifdef CONFIG_SPL_BOARD_INIT
+void spl_board_init(void);
+#endif
+#endif
index d4cb6685d475b671ce9af9a47b9c64c66ffbb361..d9b1c2ff8ec20dd78f923440ce8cf71ce31743df 100644 (file)
@@ -41,6 +41,7 @@ endif
 LIBS-y += board/$(BOARDDIR)/lib$(BOARD).o
 LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o
 
+LIBS-$(CONFIG_SPL_FRAMEWORK) += common/spl/libspl.o
 LIBS-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/libcommon.o
 LIBS-$(CONFIG_SPL_LIBDISK_SUPPORT) += disk/libdisk.o
 LIBS-$(CONFIG_SPL_I2C_SUPPORT) += drivers/i2c/libi2c.o