Commit: a4dd6c6b629659db27306737d237d23f123854b5 - uboot (git)

Commit MetaInfo

• Revision: a4dd6c6b629659db27306737d237d23f123854b5 (tree)
• Zeit: 2016-04-17 18:04:09
• Autor: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

SPL: PCI / IDE support

Signed-off-by: Yoshinori Sato <[e-mail]>

Ändern Zusammenfassung

• modified: common/Makefile
• modified: common/spl/Makefile
• modified: common/spl/spl.c
• modified: include/spl.h
• modified: scripts/Makefile.spl

Diff

--- a/common/Makefile
+++ b/common/Makefile
@@ -112,8 +112,9 @@ obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
 endif
 endif
+obj-y += cmd_disk.o
 #environment
-obj-y += env_common.o
+obj-y += env_common.o env_flags.o env_attr.o env_callback.o
 #others
 obj-$(CONFIG_DDR_SPD) += ddr_spd.o
 obj-$(CONFIG_SPD_EEPROM) += ddr_spd.o

--- a/common/spl/Makefile
+++ b/common/spl/Makefile
@@ -21,4 +21,5 @@ obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o
 obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o
 obj-$(CONFIG_SPL_EXT_SUPPORT) += spl_ext.o
 obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o
+obj-$(CONFIG_SPL_IDE_SUPPORT) += spl_ide.o
 endif

--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -330,6 +330,11 @@ static int spl_load_image(u32 boot_device)
 	case BOOT_DEVICE_BOARD:
 		return spl_board_load_image();
 #endif
+#ifdef CONFIG_SPL_IDE_SUPPORT
+	case BOOT_DEVICE_IDE:
+		spl_ide_load_image();
+		break;
+#endif
 	default:
 #if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
 		puts("SPL: Unsupported Boot Device!\n");

--- a/include/spl.h
+++ b/include/spl.h
@@ -89,6 +89,9 @@ int spl_usb_load_image(void);
 /* SATA SPL functions */
 int spl_sata_load_image(void);
 
+/* IDE SPL functions */
+void spl_ide_load_image(void);
+
 /* SPL FAT image functions */
 int spl_load_image_fat(struct blk_desc *block_dev, int partition,
 		       const char *filename);

--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -61,6 +61,8 @@ libs-y += fs/
 libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/
 libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/
 libs-$(CONFIG_SPL_NET_SUPPORT) += net/
+libs-$(CONFIG_SPL_IDE_SUPPORT) += drivers/block/
+libs-$(CONFIG_SPL_PCI_SUPPORT) += drivers/pci/
 
 head-y		:= $(addprefix $(obj)/,$(head-y))
 libs-y		:= $(addprefix $(obj)/,$(libs-y))
@@ -82,7 +84,6 @@ ifdef CONFIG_SPL_LDSCRIPT
 # need to strip off double quotes
 LDSCRIPT := $(addprefix $(srctree)/,$(CONFIG_SPL_LDSCRIPT:"%"=%))
 endif
-
 ifeq ($(wildcard $(LDSCRIPT)),)
 	LDSCRIPT := $(srctree)/board/$(BOARDDIR)/u-boot-spl.lds
 endif