summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-10-12 08:30:38 -0400
committerTom Rini <trini@konsulko.com>2016-10-12 08:30:38 -0400
commit3c594d34c4addc962b2bd6ed2d16f3ce24ab1627 (patch)
tree771baefba46fda48848257e6c5313e977ad07370 /include
parent99615d812f1c5f954c8bbc1e0cdfcb15e5cbe675 (diff)
parent4fb96c48c183128c00b21c7858bb05897a1b80de (diff)
downloadu-boot-imx-3c594d34c4addc962b2bd6ed2d16f3ce24ab1627.zip
u-boot-imx-3c594d34c4addc962b2bd6ed2d16f3ce24ab1627.tar.gz
u-boot-imx-3c594d34c4addc962b2bd6ed2d16f3ce24ab1627.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include')
-rw-r--r--include/configs/uniphier.h21
-rw-r--r--include/reset-uclass.h1
2 files changed, 11 insertions, 11 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index ead935e..7331d13 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -15,12 +15,6 @@
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10
-#define CONFIG_SMC911X
-
-/* dummy: referenced by examples/standalone/smc911x_eeprom.c */
-#define CONFIG_SMC911X_BASE 0
-#define CONFIG_SMC911X_32_BIT
-
/*-----------------------------------------------------------------------
* MMU and Cache Setting
*----------------------------------------------------------------------*/
@@ -38,10 +32,15 @@
/* FLASH related */
#define CONFIG_MTD_DEVICE
-/*
- * uncomment the following to disable FLASH related code.
- */
-/* #define CONFIG_SYS_NO_FLASH */
+#define CONFIG_SMC911X_32_BIT
+/* dummy: referenced by examples/standalone/smc911x_eeprom.c */
+#define CONFIG_SMC911X_BASE 0
+
+#ifdef CONFIG_MICRO_SUPPORT_CARD
+#define CONFIG_SMC911X
+#else
+#define CONFIG_SYS_NO_FLASH
+#endif
#define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_SYS_FLASH_CFI
@@ -52,7 +51,7 @@
#define CONFIG_SYS_FLASH_BASE 0
/*
- * flash_toggle does not work for out supoort card.
+ * flash_toggle does not work for our support card.
* We need to use flash_status_poll.
*/
#define CONFIG_SYS_CFI_FLASH_STATUS_POLL
diff --git a/include/reset-uclass.h b/include/reset-uclass.h
index 50adeca..38c716ff 100644
--- a/include/reset-uclass.h
+++ b/include/reset-uclass.h
@@ -11,6 +11,7 @@
#include <reset.h>
+struct fdtdec_phandle_args;
struct udevice;
/**