Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / spi_flash.h

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 0d26b8a5aa0f5c8b5846afc650fe9dc89ff1bcc2..f3c4e834247a0de3e1ca791643f3e38a16b35d00 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -4,12 +4,7 @@
  * Copyright (C) 2008 Atmel Corporation
  * Copyright (C) 2013 Jagannadha Sutradharudu Teki, Xilinx Inc.
  *
- * 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
- * version 2 as published by the Free Software Foundation.
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #ifndef _SPI_FLASH_H_
@@ -199,18 +194,6 @@ void sandbox_sf_unbind_emul(struct sandbox_state *state, int busnum, int cs);
 struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
                unsigned int max_hz, unsigned int spi_mode);
 
-/**
- * Set up a new SPI flash from an fdt node
- *
- * @param blob         Device tree blob
- * @param slave_node   Pointer to this SPI slave node in the device tree
- * @param spi_node     Cached pointer to the SPI interface this node belongs
- *                     to
- * @return 0 if ok, -1 on error
- */
-struct spi_flash *spi_flash_probe_fdt(const void *blob, int slave_node,
-                                     int spi_node);
-
 void spi_flash_free(struct spi_flash *flash);
 
 static inline int spi_flash_read(struct spi_flash *flash, u32 offset,
@@ -244,7 +227,4 @@ static inline int spi_flash_protect(struct spi_flash *flash, u32 ofs, u32 len,
                return flash->flash_unlock(flash, ofs, len);
 }
 
-void spi_boot(void) __noreturn;
-void spi_spl_load_image(uint32_t offs, unsigned int size, void *vdst);
-
 #endif /* _SPI_FLASH_H_ */