diff options
author | Stefan Roese <sr@denx.de> | 2015-01-19 11:33:39 +0100 |
---|---|---|
committer | Luka Perkov <luka.perkov@sartura.hr> | 2015-02-06 17:25:08 +0100 |
commit | 68102b81e8fb699087ec5757a75676c6c65af3fd (patch) | |
tree | 1921d8b1a3daafdb900881ea537cba4d790792a6 | |
parent | f8d25d7466142c1d4ebf879e2a83a9cfc19559cb (diff) | |
download | talos-obmc-uboot-68102b81e8fb699087ec5757a75676c6c65af3fd.tar.gz talos-obmc-uboot-68102b81e8fb699087ec5757a75676c6c65af3fd.zip |
arm: mvebu: maxbcm: Fix compilation warning and add Spansion SPI NOR support
This patch fixes the following compilation warning for maxbcm:
Building maxbcm board...
text data bss dec hex filename
160075 6596 38240 204911 3206f ./u-boot
board/maxbcm/maxbcm.c: In function 'reset_phy':
board/maxbcm/maxbcm.c:68:6: warning: unused variable 'reg' [-Wunused-variable]
u16 reg;
^
board/maxbcm/maxbcm.c:66:6: warning: unused variable 'devadr' [-Wunused-variable]
u16 devadr = CONFIG_PHY_BASE_ADDR;
^
Additionally support Spansion SPI NOR flash is added. With larger SPI device
support via the CONFIG_SPI_FLASH_BAR define.
Signed-off-by: Stefan Roese <sr@denx.de>
Reviewed-by: Luka Perkov <luka.perkov@sartura.hr>
-rw-r--r-- | board/maxbcm/maxbcm.c | 2 | ||||
-rw-r--r-- | include/configs/maxbcm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c index a833cc3501..46b16ac29c 100644 --- a/board/maxbcm/maxbcm.c +++ b/board/maxbcm/maxbcm.c @@ -142,9 +142,7 @@ int checkboard(void) /* Configure and enable MV88E6185 switch */ void reset_phy(void) { - u16 devadr = CONFIG_PHY_BASE_ADDR; char *name = "neta0"; - u16 reg; if (miiphy_set_current_dev(name)) return; diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 4e962a3604..5999d60146 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -43,6 +43,8 @@ #define CONFIG_SF_DEFAULT_SPEED 1000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 #define CONFIG_SPI_FLASH_STMICRO +#define CONFIG_SPI_FLASH_SPANSION +#define CONFIG_SPI_FLASH_BAR /* Environment in SPI NOR flash */ #define CONFIG_ENV_IS_IN_SPI_FLASH |