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 /arch/powerpc/include/asm | |
parent | a77a8fde7bb850178c2e4ad3db354b536114ea32 (diff) | |
parent | 08898e8b22d74a4511eadee9b06b11aab43e809c (diff) |
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 'arch/powerpc/include/asm')
-rw-r--r-- | arch/powerpc/include/asm/config.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index 849a69aced..c9c9964630 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -18,13 +18,6 @@ #define HWCONFIG_BUFFER_SIZE 256 #endif -/* CONFIG_HARD_SPI triggers SPI bus initialization in PowerPC */ -#if defined(CONFIG_MPC8XXX_SPI) || defined(CONFIG_FSL_ESPI) -# ifndef CONFIG_HARD_SPI -# define CONFIG_HARD_SPI -# endif -#endif - #define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH |