diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-26 10:40:13 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-26 10:40:13 +0100 |
commit | ebd749da69f423a26222d2cdde9a77007fd8b4b7 (patch) | |
tree | ea0bff7917f8695f31ce4da58b01d298ab2d981a /include/configs/trimslice.h | |
parent | 412665b46134f93464c09405e02f08ac9c62526d (diff) | |
parent | f789be6086f3e6302fe4b163fa9b7bd6b358c4ce (diff) | |
download | u-boot-imx-ebd749da69f423a26222d2cdde9a77007fd8b4b7.zip u-boot-imx-ebd749da69f423a26222d2cdde9a77007fd8b4b7.tar.gz u-boot-imx-ebd749da69f423a26222d2cdde9a77007fd8b4b7.tar.bz2 |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/trimslice.h')
-rw-r--r-- | include/configs/trimslice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 0644f7a..b925314 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -46,7 +46,7 @@ #define CONFIG_BOARD_EARLY_INIT_F /* SPI */ -#define CONFIG_TEGRA_SPI +#define CONFIG_TEGRA20_SFLASH #define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 |