diff options
| author | Tom Rini | 2020-06-08 08:51:30 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-06-08 08:51:30 -0400 |
| commit | 325b83e04072e22c19d6395f69264bf6bf800146 (patch) | |
| tree | 84097b656cae3180a483f8843a2d8070bc959970 /include | |
| parent | 62005e20832135bda2d7539a29f7d2e9026f590a (diff) | |
| parent | 187ab38e766393cda7bf3bf4926c1e55f48ad0cb (diff) | |
Merge tag 'u-boot-rockchip-20200607' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- revive rk3399 puma board to adapt mainline dts;
- Fix rk3399-evb stdout path;
- Enable PCIe for rk3399: Rockpro64, firefly, pinebookpro;
- Add rk3328 Rock-pi-e board;
- Enable SPI boot for rockpro64 and roc-pc-rk3399;
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/roc-pc-rk3399.h | 4 | ||||
| -rw-r--r-- | include/configs/rockpro64_rk3399.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h index d4cbc3532e1..59fe22289cf 100644 --- a/include/configs/roc-pc-rk3399.h +++ b/include/configs/roc-pc-rk3399.h @@ -13,10 +13,6 @@ #include <configs/rk3399_common.h> -#if defined(CONFIG_ENV_IS_IN_MMC) -# define CONFIG_SYS_MMC_ENV_DEV 0 -#endif - #define SDRAM_BANK_SIZE (2UL << 30) #endif diff --git a/include/configs/rockpro64_rk3399.h b/include/configs/rockpro64_rk3399.h index 37a08b2c00f..903e9df527c 100644 --- a/include/configs/rockpro64_rk3399.h +++ b/include/configs/rockpro64_rk3399.h @@ -13,8 +13,6 @@ #include <configs/rk3399_common.h> -#define CONFIG_SYS_MMC_ENV_DEV 0 - #define SDRAM_BANK_SIZE (2UL << 30) #define CONFIG_USB_OHCI_NEW |