Commit: 4fd46888bc4e97f259e455899b151c3c888a5ffc - uboot (git)

Commit MetaInfo

• Revisión: 4fd46888bc4e97f259e455899b151c3c888a5ffc (tree)
• Tiempo: 2016-03-20 23:10:22
• Autor: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

SPL: PCI / IDE support

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

Cambiar Resumen

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

Diferencia incremental

--- a/common/Makefile
+++ b/common/Makefile
@@ -208,6 +208,9 @@ endif
 ifdef CONFIG_SPL_SATA_SUPPORT
 obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o
 endif
+ifdef CONFIG_SPL_IDE_SUPPORT
+obj-$(CONFIG_CMD_IDE) += cmd_ide.o
+endif
 ifneq ($(CONFIG_SPL_NET_SUPPORT),y)
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
@@ -220,8 +223,9 @@ endif
 endif
 # core command
 obj-y += cmd_nvedit.o
+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
 ifdef CONFIG_DDR_SPD
 SPD := y

--- a/common/spl/Makefile
+++ b/common/spl/Makefile
@@ -19,4 +19,5 @@ obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
 obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o
 obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.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
@@ -215,6 +215,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 		spl_sata_load_image();
 		break;
 #endif
+#ifdef CONFIG_SPL_IDE_SUPPORT
+	case BOOT_DEVICE_IDE:
+		spl_ide_load_image();
+		break;
+#endif
 	default:
 		debug("SPL: Un-supported Boot Device\n");
 		hang();

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

--- a/spl/Makefile
+++ b/spl/Makefile
@@ -80,7 +80,6 @@ head-y := $(START_PATH)/start.o
 head-$(CONFIG_X86) += $(START_PATH)/start16.o $(START_PATH)/resetvec.o
 head-$(CONFIG_4xx) += $(START_PATH)/resetvec.o
 head-$(CONFIG_MPC85xx) += $(START_PATH)/resetvec.o
-
 libs-y += arch/$(ARCH)/lib/
 
 libs-y += $(CPUDIR)/
@@ -119,6 +118,8 @@ libs-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/
 libs-$(CONFIG_SPL_USB_HOST_SUPPORT) += drivers/usb/host/
 libs-$(CONFIG_OMAP_USB_PHY) += drivers/usb/phy/
 libs-$(CONFIG_SPL_SATA_SUPPORT) += drivers/block/
+libs-$(CONFIG_SPL_IDE_SUPPORT) += drivers/block/
+libs-$(CONFIG_SPL_PCI_SUPPORT) += drivers/pci/
 
 ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
 libs-y += arch/$(ARCH)/imx-common/
@@ -147,7 +148,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