From 361a879902a3cbdb692149a1ac580e3199e771ba Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 9 Dec 2016 07:56:54 -0500 Subject: Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze" This reverts commit 3edc0c252257e4afed163a3a74aba24a5509b198, reversing changes made to bb135a0180c31fbd7456021fb9700b49bba7f533. --- include/ahci.h | 2 +- include/configs/xilinx_zynqmp.h | 1 + include/configs/xilinx_zynqmp_ep.h | 1 + include/configs/xilinx_zynqmp_zcu102.h | 2 ++ include/dm/uclass-id.h | 1 - include/miiphy.h | 1 - include/sata.h | 2 -- include/scsi.h | 20 +------------------- 8 files changed, 6 insertions(+), 24 deletions(-) (limited to 'include') diff --git a/include/ahci.h b/include/ahci.h index 4876b41..a956c6f 100644 --- a/include/ahci.h +++ b/include/ahci.h @@ -145,7 +145,7 @@ struct ahci_ioports { }; struct ahci_probe_ent { -#if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SCSI) +#ifdef CONFIG_DM_PCI struct udevice *dev; #else pci_dev_t dev; diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index fb4f6d6..d480990 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -181,6 +181,7 @@ #ifdef CONFIG_SATA_CEVA #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI +#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h index 3a572b7..d0ce768 100644 --- a/include/configs/xilinx_zynqmp_ep.h +++ b/include/configs/xilinx_zynqmp_ep.h @@ -16,6 +16,7 @@ #define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 #define CONFIG_ZYNQ_SDHCI_MIN_FREQ (CONFIG_ZYNQ_SDHCI_MAX_FREQ >> 9) #define CONFIG_ZYNQ_EEPROM +#define CONFIG_SATA_CEVA #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \ ZYNQMP_USB1_XHCI_BASEADDR} diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index 8d018da..adf2321 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -41,6 +41,8 @@ #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO +#define CONFIG_SATA_CEVA + #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR} #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index 8c92d0b..eb78c4d 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -66,7 +66,6 @@ enum uclass_id { UCLASS_REMOTEPROC, /* Remote Processor device */ UCLASS_RESET, /* Reset controller device */ UCLASS_RTC, /* Real time clock device */ - UCLASS_SCSI, /* SCSI device */ UCLASS_SERIAL, /* Serial UART */ UCLASS_SPI, /* SPI bus */ UCLASS_SPMI, /* System Power Management Interface bus */ diff --git a/include/miiphy.h b/include/miiphy.h index 47923bf..83141b4 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -48,7 +48,6 @@ void miiphy_listdev(void); struct mii_dev *mdio_alloc(void); void mdio_free(struct mii_dev *bus); int mdio_register(struct mii_dev *bus); -int mdio_register_seq_name(struct mii_dev *bus, int seq); int mdio_unregister(struct mii_dev *bus); void mdio_list_devices(void); diff --git a/include/sata.h b/include/sata.h index d18cc9a..b35359a 100644 --- a/include/sata.h +++ b/include/sata.h @@ -2,7 +2,6 @@ #define __SATA_H__ #include -#if !defined(CONFIG_DM_SCSI) int init_sata(int dev); int reset_sata(int dev); int scan_sata(int dev); @@ -16,6 +15,5 @@ int __sata_stop(void); int sata_port_status(int dev, int port); extern struct blk_desc sata_dev_desc[]; -#endif #endif diff --git a/include/scsi.h b/include/scsi.h index 190dacd..c879678 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -166,11 +166,8 @@ typedef struct SCSI_cmd_block{ void scsi_print_error(ccb *pccb); int scsi_exec(ccb *pccb); void scsi_bus_reset(void); -#if !defined(CONFIG_DM_SCSI) void scsi_low_level_init(int busdevfunc); -#else -void scsi_low_level_init(int busdevfunc, struct udevice *dev); -#endif + /*************************************************************************** * functions residing inside cmd_scsi.c @@ -178,21 +175,6 @@ void scsi_low_level_init(int busdevfunc, struct udevice *dev); void scsi_init(void); int scsi_scan(int mode); -#if defined(CONFIG_DM_SCSI) -/** - * struct scsi_platdata - stores information about SCSI controller - * - * @base: Controller base address - * @max_lun: Maximum number of logical units - * @max_id: Maximum number of target ids - */ -struct scsi_platdata { - unsigned long base; - unsigned long max_lun; - unsigned long max_id; -}; -#endif - #define SCSI_IDENTIFY 0xC0 /* not used */ /* Hardware errors */ -- cgit v1.1