diff options
author | Tom Rini <trini@konsulko.com> | 2021-09-27 09:45:36 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-09-27 09:45:36 -0400 |
commit | e908d20fcbd847e17345591fc171b59d9a156516 (patch) | |
tree | def104237fd9b8888a37a5c3378b4ef7e26b6d43 /include/configs/bcmstb.h | |
parent | bb38d77ca779cc8bdad3d4ceb6cecc687f4987c2 (diff) | |
parent | 0b9bcf665cd98fe9db0956c894006b250a7d465f (diff) | |
download | u-boot-e908d20fcbd847e17345591fc171b59d9a156516.zip u-boot-e908d20fcbd847e17345591fc171b59d9a156516.tar.gz u-boot-e908d20fcbd847e17345591fc171b59d9a156516.tar.bz2 |
Merge tag 'v2021.10-rc5' into next
Prepare v2021.10-rc5
Diffstat (limited to 'include/configs/bcmstb.h')
-rw-r--r-- | include/configs/bcmstb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 564425e..c3c28ea 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -126,7 +126,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * Flash configuration. */ -#define CONFIG_ST_SMI #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_MACRONIX |