diff options
| author | Tom Rini | 2019-08-19 09:22:57 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-08-19 09:22:57 -0400 |
| commit | a2ca54ff52146f2bbf52d87bf4e121e8e15e9e07 (patch) | |
| tree | 4e85487bc3da5aa7a918ca7bb2f8fffb2c8c0d20 /include/configs | |
| parent | 0ed2e2d825ac70d99ef89e3bb745979a22e2972e (diff) | |
| parent | b8050511c6ee4ab60ef4248dff42aff187696249 (diff) | |
Merge tag 'u-boot-rockchip-20190819' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Add ROC-RK3399-PC board support
- Move CONFIG_SPI_FLASH_GIGADEVICE and CONFIG_CMD_USB_MASS_STORAGE to
Kconfig
- using SYSRESET_POWER_OFF for poweroff
(Note that patch for rk8xx pmic is droped for it can not pass Travis
build)
- fix ofnode_get_name() assert
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/rk3036_common.h | 7 | ||||
| -rw-r--r-- | include/configs/rk322x_common.h | 5 | ||||
| -rw-r--r-- | include/configs/rk3288_common.h | 5 | ||||
| -rw-r--r-- | include/configs/veyron.h | 2 | ||||
| -rw-r--r-- | include/configs/vyasa-rk3288.h | 1 |
5 files changed, 0 insertions, 20 deletions
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index ec0e157ec50..66331a13766 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -28,15 +28,8 @@ #define SDRAM_BANK_SIZE (512UL << 20UL) #define SDRAM_MAX_SIZE (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE) -#define CONFIG_SPI_FLASH_GIGADEVICE - #ifndef CONFIG_SPL_BUILD -/* usb otg */ - -/* usb mass storage */ -#define CONFIG_CMD_USB_MASS_STORAGE -/* usb host */ #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 42a49c5502d..f2fb7e07b9b 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -31,12 +31,7 @@ #define SDRAM_MAX_SIZE 0x80000000 #ifndef CONFIG_SPL_BUILD -/* usb otg */ -/* usb mass storage */ -#define CONFIG_CMD_USB_MASS_STORAGE - -/* usb host */ #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x60000000\0" \ "pxefile_addr_r=0x60100000\0" \ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index eaa1c582e9b..84b474ac7bc 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -43,12 +43,7 @@ #define CONFIG_SYS_MONITOR_LEN (600 * 1024) #ifndef CONFIG_SPL_BUILD -/* usb otg */ -/* usb mass storage */ -#define CONFIG_CMD_USB_MASS_STORAGE - -/* usb host support */ #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00000000\0" \ "pxefile_addr_r=0x00100000\0" \ diff --git a/include/configs/veyron.h b/include/configs/veyron.h index 0761de3ad2f..2ab6d6c6aac 100644 --- a/include/configs/veyron.h +++ b/include/configs/veyron.h @@ -13,8 +13,6 @@ #include <configs/rk3288_common.h> -#define CONFIG_SPI_FLASH_GIGADEVICE - #define CONFIG_KEYBOARD #endif diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h index 382fdac4c07..3574a3b5a57 100644 --- a/include/configs/vyasa-rk3288.h +++ b/include/configs/vyasa-rk3288.h @@ -17,7 +17,6 @@ func(MMC, mmc, 1) \ #define CONFIG_SYS_MMC_ENV_DEV 1 -#undef CONFIG_CMD_USB_MASS_STORAGE #ifndef CONFIG_TPL_BUILD |