From: Nikita Kiryanov <nikita@compulab.co.il>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 01/18] spl: improve spi configuration
Date: Sun, 3 Aug 2014 10:34:31 +0300 [thread overview]
Message-ID: <1407051288-17324-2-git-send-email-nikita@compulab.co.il> (raw)
In-Reply-To: <1407051288-17324-1-git-send-email-nikita@compulab.co.il>
Currently we can define CONFIG_SPL_SPI_<any parameter except SPI MODE>.
Define CONFIG_SPL_SPI_MODE option, and provide a default value for
backwards compatibility.
Default values are also provided for the rest of the spi_flash_probe
parameters (like we do in cmd_sf), to help with config file brevity.
Cc: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
Cc: Tom Rini <trini@ti.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
README | 7 +++++++
drivers/mtd/spi/spi_spl_load.c | 15 ++++++++++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/README b/README
index f704eb3..d7c55f8 100644
--- a/README
+++ b/README
@@ -2910,6 +2910,13 @@ CBFS (Coreboot Filesystem) support
CONFIG_SF_DEFAULT_MODE (see include/spi.h)
CONFIG_SF_DEFAULT_SPEED in Hz
+ The following defaults may be provided by the platform to
+ override SPL defaults for SPI.
+
+ CONFIG_SPL_SPI_MODE SPI mode Default SPI_MODE3
+ CONFIG_SPL_SPI_CS Chip-select Default 0
+ CONFIG_SPL_SPI_BUS Bus identifier Default 0
+
CONFIG_CMD_SF_TEST
Define this option to include a destructive SPI flash
diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c
index 1954b7e..b270b82 100644
--- a/drivers/mtd/spi/spi_spl_load.c
+++ b/drivers/mtd/spi/spi_spl_load.c
@@ -13,6 +13,19 @@
#include <spi_flash.h>
#include <spl.h>
+#ifndef CONFIG_SF_DEFAULT_SPEED
+# define CONFIG_SF_DEFAULT_SPEED 1000000
+#endif
+#ifndef CONFIG_SPL_SPI_MODE
+# define CONFIG_SPL_SPI_MODE SPI_MODE_3
+#endif
+#ifndef CONFIG_SPL_SPI_CS
+# define CONFIG_SPL_SPI_CS 0
+#endif
+#ifndef CONFIG_SPL_SPI_BUS
+# define CONFIG_SPL_SPI_BUS 0
+#endif
+
#ifdef CONFIG_SPL_OS_BOOT
/*
* Load the kernel, check for a valid header we can parse, and if found load
@@ -57,7 +70,7 @@ void spl_spi_load_image(void)
*/
flash = spi_flash_probe(CONFIG_SPL_SPI_BUS, CONFIG_SPL_SPI_CS,
- CONFIG_SF_DEFAULT_SPEED, SPI_MODE_3);
+ CONFIG_SF_DEFAULT_SPEED, CONFIG_SPL_SPI_MODE);
if (!flash) {
puts("SPI probe failed.\n");
hang();
--
1.9.1
next prev parent reply other threads:[~2014-08-03 7:34 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-03 7:34 [U-Boot] [PATCH 00/18] Introduce cm-fx6 board Nikita Kiryanov
2014-08-03 7:34 ` Nikita Kiryanov [this message]
2014-08-03 13:44 ` [U-Boot] [PATCH 01/18] spl: improve spi configuration Marek Vasut
2014-08-05 13:28 ` Nikita Kiryanov
2014-08-05 14:11 ` Marek Vasut
2014-08-06 10:53 ` Nikita Kiryanov
2014-08-06 11:32 ` Marek Vasut
2014-08-03 7:34 ` [U-Boot] [PATCH 02/18] mx6: add clock enabling functions Nikita Kiryanov
2014-08-03 7:34 ` [U-Boot] [PATCH 03/18] sf: fix sf probe Nikita Kiryanov
2014-08-03 13:46 ` Marek Vasut
2014-08-04 12:48 ` Nikita Kiryanov
2014-08-04 13:10 ` Marek Vasut
2014-08-04 13:45 ` Nikita Kiryanov
2014-08-04 13:51 ` Marek Vasut
2014-08-04 14:11 ` Nikita Kiryanov
2014-08-04 14:20 ` Marek Vasut
2014-08-04 14:02 ` Tom Rini
2014-08-04 14:09 ` Marek Vasut
2014-08-04 14:19 ` Nikita Kiryanov
2014-08-04 14:58 ` Tom Rini
2014-08-03 7:34 ` [U-Boot] [PATCH 04/18] mtd: spi: add support for M25PE16 and M25PX16 Nikita Kiryanov
2014-08-03 13:47 ` Marek Vasut
2014-08-03 7:34 ` [U-Boot] [PATCH 05/18] compulab: eeprom: add support for defining eeprom i2c bus Nikita Kiryanov
2014-08-03 13:48 ` Marek Vasut
2014-08-04 12:49 ` Nikita Kiryanov
2014-08-03 7:34 ` [U-Boot] [PATCH 06/18] sata: dwc_ahsata: implement sata_port_status Nikita Kiryanov
2014-08-03 13:49 ` Marek Vasut
2014-08-04 12:49 ` Nikita Kiryanov
2014-08-04 13:10 ` Marek Vasut
2014-08-03 7:34 ` [U-Boot] [PATCH 07/18] i2c: imx: add macros to setup pads for multiple SoC types Nikita Kiryanov
2014-08-04 4:28 ` Tim Harvey
2014-08-03 7:34 ` [U-Boot] [PATCH 08/18] arm: mx6: ddr: cleanup Nikita Kiryanov
2014-08-04 5:26 ` Tim Harvey
2014-08-03 7:34 ` [U-Boot] [PATCH 09/18] arm: mx6: ddr: do not write into reserved bit Nikita Kiryanov
2014-08-04 5:43 ` Tim Harvey
2014-08-04 12:49 ` Nikita Kiryanov
2014-08-06 8:18 ` Tim Harvey
2014-08-06 8:31 ` Stefano Babic
2014-08-03 7:34 ` [U-Boot] [PATCH 10/18] arm: mx6: ddr: configure MMDC for slow_pd Nikita Kiryanov
2014-08-04 5:42 ` Tim Harvey
2014-08-04 12:49 ` Nikita Kiryanov
2014-08-03 7:34 ` [U-Boot] [PATCH 11/18] arm: mx6: ddr: fix cs0_end calculation Nikita Kiryanov
2014-08-03 7:34 ` [U-Boot] [PATCH 12/18] arm: mx6: add support for Compulab cm-fx6 CoM Nikita Kiryanov
2014-08-03 14:09 ` Marek Vasut
2014-08-04 14:41 ` Nikita Kiryanov
2014-08-04 15:12 ` Marek Vasut
2014-08-05 7:36 ` Nikita Kiryanov
2014-08-05 7:58 ` Marek Vasut
2014-08-04 4:45 ` Tim Harvey
2014-08-04 13:36 ` Nikita Kiryanov
2014-08-06 17:29 ` Nikita Kiryanov
2014-08-08 7:19 ` Tim Harvey
2014-08-10 16:20 ` Nikita Kiryanov
2014-08-04 6:02 ` Tim Harvey
2014-08-04 14:24 ` Nikita Kiryanov
2014-08-07 11:27 ` Nikita Kiryanov
2014-08-03 7:34 ` [U-Boot] [PATCH 13/18] arm: mx6: cm_fx6: add nand support Nikita Kiryanov
2014-08-03 7:34 ` [U-Boot] [PATCH 14/18] arm: mx6: cm_fx6: add ethernet support Nikita Kiryanov
2014-08-03 7:34 ` [U-Boot] [PATCH 15/18] arm: mx6: cm_fx6: add usb support Nikita Kiryanov
2014-08-03 7:34 ` [U-Boot] [PATCH 16/18] arm: mx6: cm_fx6: add i2c support Nikita Kiryanov
2014-08-03 7:34 ` [U-Boot] [PATCH 17/18] arm: mx6: cm_fx6: use eeprom Nikita Kiryanov
2014-08-03 7:34 ` [U-Boot] [PATCH 18/18] arm: mx6: cm_fx6: add sata support Nikita Kiryanov
2014-08-03 14:10 ` Marek Vasut
2014-08-04 7:23 ` Igor Grinberg
2014-08-04 8:27 ` Marek Vasut
2014-08-04 10:47 ` Igor Grinberg
2014-08-04 10:53 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407051288-17324-2-git-send-email-nikita@compulab.co.il \
--to=nikita@compulab.co.il \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.