summaryrefslogtreecommitdiff
path: root/board/renesas
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-05-29 17:01:36 -0400
committerJagan Teki <jagan@amarulasolutions.com>2019-06-13 12:51:06 +0530
commit88369d33e322e0cdfbb1f0c33021ad424578619e (patch)
tree305f61ff4f38045b2d40f19543a63e127c7a21bf /board/renesas
parentea73ec08d17ea5c1213b8014b1171d45655d35cf (diff)
configs: Disable now unbuildable SPI options for boards
Now that various SPI related options depend on CONFIG_DEPRECATED, in order for platforms to build out of the box they need to disable various other options. Cc: Albert ARIBAUD <albert.aribaud@3adev.fr> Cc: Marek Vasut <marex@denx.de> Cc: Vladimir Zapolskiy <vz@mleia.com> Cc: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
Diffstat (limited to 'board/renesas')
-rw-r--r--board/renesas/sh7752evb/sh7752evb.c4
-rw-r--r--board/renesas/sh7753evb/sh7753evb.c4
-rw-r--r--board/renesas/sh7757lcr/sh7757lcr.c9
3 files changed, 17 insertions, 0 deletions
diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index 480933b3cc..da33a0bd8a 100644
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -174,6 +174,7 @@ int board_mmc_init(bd_t *bis)
static int get_sh_eth_mac_raw(unsigned char *buf, int size)
{
+#ifdef CONFIG_DEPRECATED
struct spi_flash *spi;
int ret;
@@ -190,6 +191,7 @@ static int get_sh_eth_mac_raw(unsigned char *buf, int size)
return 1;
}
spi_flash_free(spi);
+#endif
return 0;
}
@@ -239,6 +241,7 @@ int board_late_init(void)
return 0;
}
+#ifdef CONFIG_DEPRECATED
int do_write_mac(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int i, ret;
@@ -302,3 +305,4 @@ U_BOOT_CMD(
"write MAC address for GETHERC",
"[GETHERC ch0] [GETHERC ch1]\n"
);
+#endif
diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c
index dfdc6b79b7..5ddddb6571 100644
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -190,6 +190,7 @@ int board_mmc_init(bd_t *bis)
static int get_sh_eth_mac_raw(unsigned char *buf, int size)
{
+#ifdef CONFIG_DEPRECATED
struct spi_flash *spi;
int ret;
@@ -206,6 +207,7 @@ static int get_sh_eth_mac_raw(unsigned char *buf, int size)
return 1;
}
spi_flash_free(spi);
+#endif
return 0;
}
@@ -255,6 +257,7 @@ int board_late_init(void)
return 0;
}
+#ifdef CONFIG_DEPRECATED
int do_write_mac(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int i, ret;
@@ -318,3 +321,4 @@ U_BOOT_CMD(
"write MAC address for GETHERC",
"[GETHERC ch0] [GETHERC ch1]\n"
);
+#endif
diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index 90c5508e43..3222701ad2 100644
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -30,6 +30,7 @@ static void init_gctrl(void)
static int init_pcie_bridge_from_spi(void *buf, size_t size)
{
+#ifdef CONFIG_DEPRECATED
struct spi_flash *spi;
int ret;
unsigned long pcie_addr;
@@ -54,6 +55,10 @@ static int init_pcie_bridge_from_spi(void *buf, size_t size)
spi_flash_free(spi);
return 0;
+#else
+ printf("No SPI support so no PCIe support\n");
+ return 1;
+#endif
}
static void init_pcie_bridge(void)
@@ -231,6 +236,7 @@ int board_mmc_init(bd_t *bis)
static int get_sh_eth_mac_raw(unsigned char *buf, int size)
{
+#ifdef CONFIG_DEPRECATED
struct spi_flash *spi;
int ret;
@@ -247,6 +253,7 @@ static int get_sh_eth_mac_raw(unsigned char *buf, int size)
return 1;
}
spi_flash_free(spi);
+#endif
return 0;
}
@@ -352,6 +359,7 @@ U_BOOT_CMD(
"enable SH-G200 bus (disable PCIe-G200)"
);
+#ifdef CONFIG_DEPRECATED
int do_write_mac(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int i, ret;
@@ -418,3 +426,4 @@ U_BOOT_CMD(
"write MAC address for ETHERC/GETHERC",
"[ETHERC ch0] [ETHERC ch1] [GETHERC ch0] [GETHERC ch1]\n"
);
+#endif