diff options
| author | Tom Rini <trini@ti.com> | 2014-12-10 14:07:25 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-10 14:07:25 (GMT) |
| commit | 9b416a9f4ca7cf5ac4d5f7143d67edde7f7d7326 (patch) | |
| tree | 3860918ed8ce1a395d7dea349faee5485dd45948 /include | |
| parent | d51aae64236878b72283bd135df716e30f7f5ded (diff) | |
| parent | 9e89a64fbd0ddfde17741b38cc95fbdc02679d86 (diff) | |
| download | u-boot-9b416a9f4ca7cf5ac4d5f7143d67edde7f7d7326.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include')
| -rw-r--r-- | include/config_fallbacks.h | 4 | ||||
| -rw-r--r-- | include/configs/mx53loco.h | 1 | ||||
| -rw-r--r-- | include/configs/mx6sabre_common.h | 3 | ||||
| -rw-r--r-- | include/configs/mx6sxsabresd.h | 10 | ||||
| -rw-r--r-- | include/configs/tbs2910.h | 2 |
5 files changed, 16 insertions, 4 deletions
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index 7d8daa2..508db56 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -79,6 +79,10 @@ #define CONFIG_SYS_PROMPT "=> " #endif +#ifndef CONFIG_SYS_PBSIZE +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + 128) +#endif + #ifndef CONFIG_FIT_SIGNATURE #define CONFIG_IMAGE_FORMAT_LEGACY #endif diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 10fb1f4..42bc3c8 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -94,6 +94,7 @@ /* Command definition */ #include <config_cmd_default.h> #define CONFIG_CMD_BOOTZ +#define CONFIG_SUPPORT_RAW_INITRD #undef CONFIG_CMD_IMLS diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 9fdd841..f0f721e 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -220,9 +220,6 @@ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 - -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index d8ab291..5e0edab 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -208,6 +208,16 @@ #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1) #endif +#define CONFIG_DM +#define CONFIG_DM_THERMAL +#define CONFIG_SYS_MALLOC_F_LEN (1 << 10) +#define CONFIG_IMX6_THERMAL + +#define CONFIG_CMD_FUSE +#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL) +#define CONFIG_MXC_OCOTP +#endif + /* FLASH and environment organization */ #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 6ab2184..c097b98 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -167,7 +167,7 @@ #define CONFIG_USB_STORAGE #define CONFIG_USB_KEYBOARD #ifdef CONFIG_USB_KEYBOARD -#define CONFIG_SYS_USB_EVENT_POLL +#define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE #define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_PREBOOT "if hdmidet; then usb start; fi" #endif /* CONFIG_USB_KEYBOARD */ |