diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-10 13:35:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-10 13:35:17 -0400 |
| commit | 3d5ced9e22d32112a20f9dc0f5fb1f22ef088079 (patch) | |
| tree | 2c1e1f34c4dad05dfd08bd3687e6aee634c58500 /configs | |
| parent | 98068b3be51a77d8b931a2f5097b5c22c57bcea5 (diff) | |
| parent | 41b781ddf1869f5349e05ace888979f3673fe8c6 (diff) | |
Merge tag 'dm-9oct18' of git://git.denx.de/u-boot-dm
Test improvements to tidy up output and drop duplicate tests
Sandbox SPL/TPL support
Various dm-related improvements
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/chromebook_link64_defconfig | 1 | ||||
| -rw-r--r-- | configs/edison_defconfig | 1 | ||||
| -rw-r--r-- | configs/malta64_defconfig | 1 | ||||
| -rw-r--r-- | configs/malta64el_defconfig | 1 | ||||
| -rw-r--r-- | configs/malta_defconfig | 1 | ||||
| -rw-r--r-- | configs/maltael_defconfig | 1 | ||||
| -rw-r--r-- | configs/sandbox_defconfig | 2 | ||||
| -rw-r--r-- | configs/sandbox_flattree_defconfig | 1 |
8 files changed, 9 insertions, 0 deletions
diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index fe6544b31ab..2c51a2f7f79 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -69,6 +69,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_CROS_EC=y CONFIG_CROS_EC_LPC=y +CONFIG_SPL_DM_RTC=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_SPL_TIMER=y diff --git a/configs/edison_defconfig b/configs/edison_defconfig index f0f3449464c..eb9f9a089f1 100644 --- a/configs/edison_defconfig +++ b/configs/edison_defconfig @@ -33,6 +33,7 @@ CONFIG_CPU=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DM_PCI_COMPAT=y +CONFIG_RTC_MC146818=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Intel" diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig index c509581ee80..99503260115 100644 --- a/configs/malta64_defconfig +++ b/configs/malta64_defconfig @@ -23,4 +23,5 @@ CONFIG_DEFAULT_DEVICE_TREE="mti,malta" CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_PCI=y +CONFIG_RTC_MC146818=y CONFIG_SYS_NS16550=y diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig index 992c855579d..63989ce2888 100644 --- a/configs/malta64el_defconfig +++ b/configs/malta64el_defconfig @@ -24,4 +24,5 @@ CONFIG_DEFAULT_DEVICE_TREE="mti,malta" CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_PCI=y +CONFIG_RTC_MC146818=y CONFIG_SYS_NS16550=y diff --git a/configs/malta_defconfig b/configs/malta_defconfig index 585440584ee..8265daec8e7 100644 --- a/configs/malta_defconfig +++ b/configs/malta_defconfig @@ -22,4 +22,5 @@ CONFIG_DEFAULT_DEVICE_TREE="mti,malta" CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_PCI=y +CONFIG_RTC_MC146818=y CONFIG_SYS_NS16550=y diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig index 9cba7229f1a..c9c4c8fd4bd 100644 --- a/configs/maltael_defconfig +++ b/configs/maltael_defconfig @@ -23,4 +23,5 @@ CONFIG_DEFAULT_DEVICE_TREE="mti,malta" CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_PCI=y +CONFIG_RTC_MC146818=y CONFIG_SYS_NS16550=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 1c4a3330b4f..2ce336fc81c 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_TEXT_BASE=0 CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ANDROID_BOOT_IMAGE=y @@ -173,6 +174,7 @@ CONFIG_REMOTEPROC_SANDBOX=y CONFIG_DM_RESET=y CONFIG_SANDBOX_RESET=y CONFIG_DM_RTC=y +CONFIG_DEBUG_UART_SANDBOX=y CONFIG_SANDBOX_SERIAL=y CONFIG_SMEM=y CONFIG_SANDBOX_SMEM=y diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index 9f672e50635..2f8a98c379c 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -15,6 +15,7 @@ CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 CONFIG_CONSOLE_RECORD=y CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000 CONFIG_SILENT_CONSOLE=y +CONFIG_LOG_MAX_LEVEL=6 CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_CPU=y CONFIG_CMD_LICENSE=y |