diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-13 18:27:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-13 21:05:17 -0500 |
| commit | 20d08f59fa7cdde0da1eb7aca7915c91dbdeaf51 (patch) | |
| tree | f1cefba44b166b5f698d2b9aa8ec988a369c8e15 /include | |
| parent | 774da4b9aadeea4d6973a16debc02a6801ff9344 (diff) | |
| parent | fc82edd8440721aadf3bfc784f29a513ad7680be (diff) | |
| download | u-boot-imx-20d08f59fa7cdde0da1eb7aca7915c91dbdeaf51.zip u-boot-imx-20d08f59fa7cdde0da1eb7aca7915c91dbdeaf51.tar.gz u-boot-imx-20d08f59fa7cdde0da1eb7aca7915c91dbdeaf51.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'include')
| -rw-r--r-- | include/config_uncmd_spl.h | 1 | ||||
| -rw-r--r-- | include/configs/socfpga_common.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h index 6e299f6..3b198ae 100644 --- a/include/config_uncmd_spl.h +++ b/include/config_uncmd_spl.h @@ -29,7 +29,6 @@ #endif #undef CONFIG_DM_WARN -#undef CONFIG_DM_SEQ_ALIAS #undef CONFIG_DM_STDIO #endif /* CONFIG_SPL_BUILD */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index a09e906..8de0ab9 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -370,7 +370,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); /* SPL QSPI boot support */ #ifdef CONFIG_SPL_SPI_SUPPORT -#define CONFIG_DM_SEQ_ALIAS 1 #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 |