diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-05 15:06:24 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-05 15:06:24 -0500 |
| commit | 9450ab2ba8d720bd9f73bccc0af2e2b5a2c2aaf1 (patch) | |
| tree | b0566746ed9a8dd261e61113c19cf0a234a6417b /common | |
| parent | a77a8fde7bb850178c2e4ad3db354b536114ea32 (diff) | |
| parent | 08898e8b22d74a4511eadee9b06b11aab43e809c (diff) | |
| download | u-boot-9450ab2ba8d720bd9f73bccc0af2e2b5a2c2aaf1.zip u-boot-9450ab2ba8d720bd9f73bccc0af2e2b5a2c2aaf1.tar.gz u-boot-9450ab2ba8d720bd9f73bccc0af2e2b5a2c2aaf1.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
- Various MTD fixes from Boris
- Zap various unused / legacy paths.
- pxa3xx NAND update from Miquel
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 14 | ||||
| -rw-r--r-- | common/board_r.c | 18 |
2 files changed, 0 insertions, 32 deletions
diff --git a/common/board_f.c b/common/board_f.c index 835b724..149a722 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -24,7 +24,6 @@ #include <os.h> #include <post.h> #include <relocate.h> -#include <spi.h> #ifdef CONFIG_SPL #include <spl.h> #endif @@ -262,16 +261,6 @@ __weak int init_func_vid(void) } #endif -#if defined(CONFIG_HARD_SPI) -static int init_func_spi(void) -{ - puts("SPI: "); - spi_init(); - puts("ready\n"); - return 0; -} -#endif - static int setup_mon_len(void) { #if defined(__ARM__) || defined(__MICROBLAZE__) @@ -913,9 +902,6 @@ static const init_fnc_t init_sequence_f[] = { #if defined(CONFIG_VID) && !defined(CONFIG_SPL) init_func_vid, #endif -#if defined(CONFIG_HARD_SPI) - init_func_spi, -#endif announce_dram_init, dram_init, /* configure available RAM banks */ #ifdef CONFIG_POST diff --git a/common/board_r.c b/common/board_r.c index 21d3b3c..5f3d27a 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -36,7 +36,6 @@ #include <onenand_uboot.h> #include <scsi.h> #include <serial.h> -#include <spi.h> #include <stdio_dev.h> #include <timer.h> #include <trace.h> @@ -379,20 +378,6 @@ static int initr_flash(void) } #endif -#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI) -static int initr_spi(void) -{ - /* MPC8xx does this here */ -#ifdef CONFIG_MPC8XX_SPI -#if !defined(CONFIG_ENV_IS_IN_EEPROM) - spi_init_f(); -#endif - spi_init_r(); -#endif - return 0; -} -#endif - #ifdef CONFIG_CMD_NAND /* go init the NAND */ static int initr_nand(void) @@ -744,9 +729,6 @@ static init_fnc_t init_sequence_r[] = { /* initialize higher level parts of CPU like time base and timers */ cpu_init_r, #endif -#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI) - initr_spi, -#endif #ifdef CONFIG_CMD_NAND initr_nand, #endif |