[U-Boot] [PATCH] cosmetic: config: Remove empty #ifdefs
After running tools/moveconfig.py it turned out that for various boards there are an empty #ifdef statements.
Remove them to clean u-boot source code.
Signed-off-by: Lukasz Majewski lukma@denx.de --- include/configs/bg0900.h | 4 ---- include/configs/dreamplug.h | 3 --- include/configs/ds109.h | 3 --- include/configs/km/km_arm.h | 3 --- 4 files changed, 13 deletions(-)
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 832dbbaafc..c05b06a417 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -19,10 +19,6 @@ #define CONFIG_FEC_MXC #endif
-/* SPI FLASH */ -#ifdef CONFIG_CMD_SF -#endif - /* Boot Linux */ #define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTCOMMAND "bootm" diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 28bda14c3d..f7f9141dd0 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -34,9 +34,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */ #endif
-#ifdef CONFIG_CMD_SF -#endif - /* * max 4k env size is enough, but in case of nand * it has to be rounded to sector size diff --git a/include/configs/ds109.h b/include/configs/ds109.h index 07367cfef0..31abb4bc85 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -37,9 +37,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */ #endif
-#ifdef CONFIG_CMD_SF -#endif - /* * max 4k env size is enough, but in case of nand * it has to be rounded to sector size diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index a2e9cf1fa5..8a00ac015a 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -34,9 +34,6 @@
/* SPI NOR Flash default params, used by sf commands */
-#if defined CONFIG_KM_ENV_IS_IN_SPI_NOR -#endif - /* Reserve 4 MB for malloc */ #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024)
Signed-off-by: Lukasz Majewski lukma@denx.de --- include/configs/kp_imx53.h | 2 -- 1 file changed, 2 deletions(-)
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index 080eec47ca..3ea75fa120 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -20,8 +20,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1
-/* Eth Configs */ - /* USB Configs */ #define CONFIG_USB_EHCI_MX5 #define CONFIG_MXC_USB_PORT 1
After the commit: "eth: dm: fec: Add gpio phy reset binding" SHA1: efd0b791069af93e9d439a70d1fe2ae8994dbbfa
The FEC ETH driver switched to PHY GPIO reset performed with data defined in DTS. For the HSC|DDC boards the GPIO reset signal is active low and hence the wrong DTS description must be changed (otherwise the reset for ETH is not properly setup).
Signed-off-by: Lukasz Majewski lukma@denx.de --- arch/arm/dts/imx53-kp.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/imx53-kp.dts b/arch/arm/dts/imx53-kp.dts index d3018f32b3..3ce4445c18 100644 --- a/arch/arm/dts/imx53-kp.dts +++ b/arch/arm/dts/imx53-kp.dts @@ -23,7 +23,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_eth>; phy-mode = "rmii"; - phy-reset-gpios = <&gpio7 6 0>; + phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_LOW>; status = "okay"; };
Hi Lukasz,
On Mon, Apr 1, 2019 at 11:02 AM Lukasz Majewski lukma@denx.de wrote:
After the commit: "eth: dm: fec: Add gpio phy reset binding" SHA1: efd0b791069af93e9d439a70d1fe2ae8994dbbfa
The FEC ETH driver switched to PHY GPIO reset performed with data defined in DTS. For the HSC|DDC boards the GPIO reset signal is active low and hence the wrong DTS description must be changed (otherwise the reset for ETH is not properly setup).
We should probably use the same approach as in the kernel to avoid regressions with old dtbs.
In the kernel the GPIO polarity passed in the 'phy-reset-gpios' property is ignored and it is assumed to be active low, unless 'phy-reset-active-high' is passed.
Thanks
Hi Fabio,
Hi Lukasz,
On Mon, Apr 1, 2019 at 11:02 AM Lukasz Majewski lukma@denx.de wrote:
After the commit: "eth: dm: fec: Add gpio phy reset binding" SHA1: efd0b791069af93e9d439a70d1fe2ae8994dbbfa
The FEC ETH driver switched to PHY GPIO reset performed with data defined in DTS. For the HSC|DDC boards the GPIO reset signal is active low and hence the wrong DTS description must be changed (otherwise the reset for ETH is not properly setup).
We should probably use the same approach as in the kernel to avoid regressions with old dtbs.
In the kernel the GPIO polarity passed in the 'phy-reset-gpios' property is ignored and it is assumed to be active low, unless 'phy-reset-active-high' is passed.
This may be a good solution.
However, I do hope that this fix will be accepted to v2019.04 as it is necessary to have ETH working (and it is the only convenient way to update u-boot on this board).
The other needed patch is to Revert "drivers/net/fec: phy_init: remove redundant logic" as pointed out by Marcel.
Thanks
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
Hi Lukasz,
On Mon, Apr 1, 2019 at 5:49 PM Lukasz Majewski lukma@denx.de wrote:
We should probably use the same approach as in the kernel to avoid regressions with old dtbs.
In the kernel the GPIO polarity passed in the 'phy-reset-gpios' property is ignored and it is assumed to be active low, unless 'phy-reset-active-high' is passed.
This may be a good solution.
However, I do hope that this fix will be accepted to v2019.04 as it is necessary to have ETH working (and it is the only convenient way to update u-boot on this board).
Yes, agreed.
On 02/04/19 13:22, Fabio Estevam wrote:
Hi Lukasz,
On Mon, Apr 1, 2019 at 5:49 PM Lukasz Majewski lukma@denx.de wrote:
We should probably use the same approach as in the kernel to avoid regressions with old dtbs.
In the kernel the GPIO polarity passed in the 'phy-reset-gpios' property is ignored and it is assumed to be active low, unless 'phy-reset-active-high' is passed.
This may be a good solution.
However, I do hope that this fix will be accepted to v2019.04 as it is necessary to have ETH working (and it is the only convenient way to update u-boot on this board).
Yes, agreed.
+1
It is just a small fix, I pick it up.
Stefano
participants (3)
-
Fabio Estevam -
Lukasz Majewski -
Stefano Babic