Merge branch 'master' of git://git.denx.de/u-boot-rockchip

This commit is contained in:
Tom Rini 2018-01-01 09:04:35 -05:00
commit d167dd4883
2 changed files with 4 additions and 1 deletions

View file

@ -17,6 +17,8 @@
chosen { chosen {
stdout-path = &uart2; stdout-path = &uart2;
u-boot,spl-boot-order = \
&sdhci, &sdmmc;
}; };
vdd_center: vdd-center { vdd_center: vdd-center {
@ -154,6 +156,7 @@
}; };
&sdmmc { &sdmmc {
u-boot,dm-pre-reloc;
bus-width = <4>; bus-width = <4>;
status = "okay"; status = "okay";
}; };

View file

@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
config ENV_SIZE config ENV_SIZE
default 0x2000 if ENV_IS_IN_SPI_FLASH default 0x2000
config ENV_OFFSET config ENV_OFFSET
default 0x3c000 if ENV_IS_IN_SPI_FLASH default 0x3c000 if ENV_IS_IN_SPI_FLASH