提交: 484715e5ccc5fa2afc321ac2e2f52b9261ac4c8b - uboot (git)

Commit MetaInfo

• 修訂: 484715e5ccc5fa2afc321ac2e2f52b9261ac4c8b (tree)
• 時間: 2016-03-23 02:49:17
• 作者: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

spl: Add IDE support.

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

Change Summary

• modified: cmd/Makefile
• modified: common/Makefile
• modified: common/spl/spl.c
• add: common/spl/spl_ide.c
• modified: disk/part.c
• modified: drivers/pci/pci.c
• modified: include/spl.h

差異

--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -158,6 +158,9 @@ ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_SATA_SUPPORT
 obj-$(CONFIG_CMD_SCSI) += scsi.o
 endif
+ifdef CONFIG_SPL_IDE_SUPPORT
+obj-$(CONFIG_CMD_IDE) += ide.o
+endif
 endif # CONFIG_SPL_BUILD
 
 obj-$(CONFIG_CMD_BLOB) += blob.o

--- a/common/Makefile
+++ b/common/Makefile
@@ -103,9 +103,6 @@ ifdef CONFIG_SPL_ENV_SUPPORT
 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o
 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
-ifdef CONFIG_SPL_IDE_SUPPORT
-obj-$(CONFIG_CMD_IDE) += cmd_ide.o
-endif
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
 obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
@@ -115,9 +112,8 @@ 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 env_flags.o env_attr.o env_callback.o
+obj-y += env_common.o
 #others
 obj-$(CONFIG_DDR_SPD) += ddr_spd.o
 obj-$(CONFIG_SPD_EEPROM) += ddr_spd.o

--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -247,6 +247,9 @@ struct boot_device_name boot_name_table[] = {
 #ifdef CONFIG_SPL_SATA_SUPPORT
 	{ BOOT_DEVICE_SATA, "SATA" },
 #endif
+#ifdef CONFIG_SPL_IDE_SUPPORT
+	{ BOOT_DEVICE_IDE, "IDE" },
+#endif
 	/* Keep this entry last */
 	{ BOOT_DEVICE_NONE, "unknown boot device" },
 };
@@ -334,8 +337,7 @@ static int spl_load_image(u32 boot_device)
 #endif
 #ifdef CONFIG_SPL_IDE_SUPPORT
 	case BOOT_DEVICE_IDE:
-		spl_ide_load_image();
-		break;
+		return spl_ide_load_image();
 #endif
 	default:
 #if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)

--- /dev/null
+++ b/common/spl/spl_ide.c
@@ -0,0 +1,39 @@
+/*
+ * (C) Copyright 2016 Yoshinori Sato <[e-mail]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ *
+ * Derived work from spl_sata.c
+ */
+
+#include <common.h>
+#include <spl.h>
+#include <asm/u-boot.h>
+#include <ide.h>
+#include <fat.h>
+#include <version.h>
+#include <image.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int spl_ide_load_image(void)
+{
+	int err;
+	struct blk_desc *stor_dev;
+
+	/* try to recognize storage devices immediately */
+	stor_dev = ide_get_dev(0);
+
+#ifdef CONFIG_SPL_OS_BOOT
+	if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
+									CONFIG_SYS_IDE_FAT_BOOT_PARTITION))
+#endif
+	err = spl_load_image_fat(stor_dev,
+				CONFIG_SYS_IDE_FAT_BOOT_PARTITION,
+				CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+	if (err) {
+		puts("Error loading IDE device\n");
+		return err;
+	}
+	return 0;
+}

--- a/disk/part.c
+++ b/disk/part.c
@@ -47,6 +47,9 @@ const struct block_drvr block_drvr[] = {
 #if defined(CONFIG_SANDBOX)
 	{ .name = "host", .get_dev = host_get_dev, },
 #endif
+#if defined(CONFIG_CMD_IDE)
+	{ .name = "ide", .get_dev = ide_get_dev, },
+#endif
 	{ },
 };
 

--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -14,6 +14,7 @@
  * Do not change this file. Instead, convert your board to use CONFIG_DM_PCI
  * and change pci-uclass.c.
  */
+
 #include <common.h>
 
 #include <command.h>
@@ -188,12 +189,6 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index)
 	return -1;
 }
 
-
-#if defined(CONFIG_SH4_PCI)
-		/* from Logic address to Physical address */
-		if( (phys_addr & 0xF0000000) == 0x80000000)
-			phys_addr &= ~0x80000000;
-#endif
 int pci_hose_config_device(struct pci_controller *hose,
 			   pci_dev_t dev,
 			   unsigned long io,

--- a/include/spl.h
+++ b/include/spl.h
@@ -90,7 +90,7 @@ int spl_usb_load_image(void);
 int spl_sata_load_image(void);
 
 /* IDE SPL functions */
-void spl_ide_load_image(void);
+int spl_ide_load_image(void);
 
 /* SPL FAT image functions */
 int spl_load_image_fat(struct blk_desc *block_dev, int partition,