From 66deb91ec0113d545ece62130e0823a74edc10e6 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 8 Oct 2016 13:25:26 +0900 Subject: ARM: uniphier: fix typos in a comment block Signed-off-by: Masahiro Yamada --- include/configs/uniphier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 29be00a..bb873a4 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -54,7 +54,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 -- cgit v1.1 From f4c93a4f4d73a838954a2b546799fb18e48eab56 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 8 Oct 2016 13:25:27 +0900 Subject: ARM: uniphier: enable CONFIG_SYS_NO_FLASH if no CONFIG_MICRO_SUPPORT_CARD NOR flash devices are seldom used on UniPhier platforms these days. The only use case I see is the Micro Support Card is connected. Otherwise, define CONFIG_SYS_NO_FLASH to disable NOR FLASH. Signed-off-by: Masahiro Yamada --- include/configs/uniphier.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index bb873a4..2cd7dce 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -40,10 +40,9 @@ /* FLASH related */ #define CONFIG_MTD_DEVICE -/* - * uncomment the following to disable FLASH related code. - */ -/* #define CONFIG_SYS_NO_FLASH */ +#ifndef CONFIG_MICRO_SUPPORT_CARD +#define CONFIG_SYS_NO_FLASH +#endif #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI -- cgit v1.1 From f1d9a9edb94989a1dd6cb4e2e3ce626bc08b5d96 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 8 Oct 2016 13:25:28 +0900 Subject: ARM: uniphier: define CONFIG_SMC911X along with CONFIG_MICRO_SUPPORT_CARD This is an on-board Ethernet device. It has no point if the Micro Support Card is not available. Signed-off-by: Masahiro Yamada --- include/configs/uniphier.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 2cd7dce..3b78eff 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 *----------------------------------------------------------------------*/ @@ -40,7 +34,13 @@ /* FLASH related */ #define CONFIG_MTD_DEVICE -#ifndef CONFIG_MICRO_SUPPORT_CARD +#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 -- cgit v1.1 From d9f5d99245a32d95ae6aeb89a4ed258f7d1cea97 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 8 Oct 2016 13:25:30 +0900 Subject: reset: declare fdtdec_phandle_args as struct to fix warning The of_xlate() callback needs to know fdtdec_phandle_args is struct. Otherwise, the following warning is displayed. include/reset-uclass.h:40:11: warning: 'struct fdtdec_phandle_args' declared inside parameter list struct fdtdec_phandle_args *args); ^ include/reset-uclass.h:40:11: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Masahiro Yamada --- include/reset-uclass.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') 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 +struct fdtdec_phandle_args; struct udevice; /** -- cgit v1.1