Author: adrian
Date: Sun Apr 17 02:05:45 2016
New Revision: 298136
URL: https://svnweb.freebsd.org/changeset/base/298136
Log:
Only compile the FDT bits when we are using FDT.
Modified:
head/sys/dev/flash/at45d.c
head/sys/dev/flash/mx25l.c
Modified: head/sys/dev/flash/at45d.c
==============================================================================
--- head/sys/dev/flash/at45d.c Sun Apr 17 01:38:37 2016 (r298135)
+++ head/sys/dev/flash/at45d.c Sun Apr 17 02:05:45 2016 (r298136)
@@ -121,7 +121,7 @@ static int
at45d_get_status(device_t dev, uint8_t *status)
{
uint8_t rxBuf[8], txBuf[8];
- struct spi_command cmd;
+ struct spi_command cmd = SPI_COMMAND_INITIALIZER;
int err;
memset(&cmd, 0, sizeof(cmd));
@@ -141,7 +141,7 @@ static int
at45d_get_mfg_info(device_t dev, uint8_t *resp)
{
uint8_t rxBuf[8], txBuf[8];
- struct spi_command cmd;
+ struct spi_command cmd = SPI_COMMAND_INITIALIZER;
int err;
memset(&cmd, 0, sizeof(cmd));
@@ -303,7 +303,7 @@ at45d_task(void *arg)
uint8_t rxBuf[8], txBuf[8];
struct at45d_softc *sc;
struct bio *bp;
- struct spi_command cmd;
+ struct spi_command cmd = SPI_COMMAND_INITIALIZER;
device_t dev, pdev;
caddr_t buf;
u_long len, resid;
Modified: head/sys/dev/flash/mx25l.c
==============================================================================
--- head/sys/dev/flash/mx25l.c Sun Apr 17 01:38:37 2016 (r298135)
+++ head/sys/dev/flash/mx25l.c Sun Apr 17 02:05:45 2016 (r298136)
@@ -432,11 +432,13 @@ mx25l_set_4b_mode(device_t dev, uint8_t
return (err);
}
+#ifdef FDT
static struct ofw_compat_data compat_data[] = {
{ "st,m25p", 1 },
{ "jedec,spi-nor", 1 },
{ NULL, 0 },
};
+#endif
static int
mx25l_probe(device_t dev)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
