mirror of
https://xff.cz/git/u-boot/
synced 2025-12-30 21:07:11 +01:00
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
This commit is contained in:
@@ -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" \
|
||||
|
||||
@@ -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" \
|
||||
|
||||
@@ -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" \
|
||||
|
||||
@@ -13,8 +13,6 @@
|
||||
|
||||
#include <configs/rk3288_common.h>
|
||||
|
||||
#define CONFIG_SPI_FLASH_GIGADEVICE
|
||||
|
||||
#define CONFIG_KEYBOARD
|
||||
|
||||
#endif
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user