summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-03-01 21:07:53 -0500
committerTom Rini <trini@konsulko.com>2015-03-01 21:07:53 -0500
commit1da7ce4155d0839d9d56525379493bb0f80b5330 (patch)
treea29a93170e68b30d1a5b73a8210ddb92b5aaa3c7 /include
parentfc834100950ab630f442aece500d8c9ccfa2b992 (diff)
parent105a9e705efaeeac63e795e2a184b0a18db0ac5a (diff)
downloadtalos-obmc-uboot-1da7ce4155d0839d9d56525379493bb0f80b5330.tar.gz
talos-obmc-uboot-1da7ce4155d0839d9d56525379493bb0f80b5330.zip
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include')
-rw-r--r--include/configs/uniphier.h3
-rw-r--r--include/fdtdec.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 3f738fb642..df89d14cc3 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -88,6 +88,8 @@
/* #define CONFIG_SYS_ICACHE_OFF */
/* #define CONFIG_SYS_DCACHE_OFF */
+#define CONFIG_SYS_CACHELINE_SIZE 32
+
/* Comment out the following to enable L2 cache */
#define CONFIG_UNIPHIER_L2CACHE_ON
@@ -186,6 +188,7 @@
/* USB */
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
+#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 4
#define CONFIG_CMD_FAT
#define CONFIG_FAT_WRITE
#define CONFIG_DOS_PARTITION
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 1bc70dba21..1233dfb280 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -168,6 +168,7 @@ enum fdt_compat_id {
COMPAT_AMS_AS3722, /* AMS AS3722 PMIC */
COMPAT_INTEL_ICH_SPI, /* Intel ICH7/9 SPI controller */
COMPAT_INTEL_QRK_MRC, /* Intel Quark MRC */
+ COMPAT_PANASONIC_XHCI, /* Panasonic UniPhier xHCI */
COMPAT_COUNT,
};
OpenPOWER on IntegriCloud