igep00x0: Minor cleanup
v2 cover igep00x0: Minor cleanup
Hi Tom,
The following patches are minor cleanups that I think are safe to apply. I know that we're very close to next release so it's up to you apply now or wait for the next merge window. I'd like to see it merged but I don't any objection if you decide wait.
Thanks,
Enric
Enric Balletbo i Serra (1):
igep00x0: enable CONFIG_NET_RANDOM_ETHADDR
Ladislav Michl (4):
igep00x0: Cleanup ethernet support
igep00x0: Do not include config_distro_defaults.h
igep00x0: Fix config header indentation
igep00x0: Remove no-op macros from config header
board/isee/igep00x0/igep00x0.c | 33 +++++++++++++++++++-------------- configs/igep0020_defconfig | 1 + configs/igep0020_nand_defconfig | 1 + configs/igep0032_defconfig | 1 + include/configs/omap3_igep00x0.h | 13 +++---------- 5 files changed, 25 insertions(+), 24 deletions(-)
Signature · 1 line
2.1.0
PATCH v2 1/5 igep00x0: enable CONFIG_NET_RANDOM_ETHADDR
Enable CONFIG_NET_RANDOM_ETHADDR to generate a random MAC address when ETHADDR is not set.
--- configs/igep0020_defconfig | 1 + configs/igep0020_nand_defconfig | 1 + configs/igep0032_defconfig | 1 + 3 files changed, 3 insertions(+)
configs/igep0020_defconfig +1 -0
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND" CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_NS16550=y +CONFIG_NET_RANDOM_ETHADDR=y
configs/igep0020_nand_defconfig +1 -0
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND" CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_NS16550=y +CONFIG_NET_RANDOM_ETHADDR=y
configs/igep0032_defconfig +1 -0
@@ -8,3 +8,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_NS16550=y +CONFIG_NET_RANDOM_ETHADDR=y
Signature · 1 line
2.1.0
PATCH v2 1/5 igep00x0: enable CONFIG_NET_RANDOM_ETHADDR
Quoted 4 lines · Enric Balletbo i Serra
Enable
CONFIG_NET_RANDOM_ETHADDRto generate a random MAC address when ETHADDR is not set.Signed-off-by Enric Balletbo i Serra <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160104/a71aba86/attachment.sig>
PATCH v2 1/5 igep00x0: enable CONFIG_NET_RANDOM_ETHADDR
Hello Tom,
Am 04.01.2016 um 23:23 schrieb Tom Rini:
Quoted 8 lines · Enric Balletbo i Serra
Quoted 5 lines
Enable
CONFIG_NET_RANDOM_ETHADDRto generate a random MAC address when ETHADDR is not set.Signed-off-by Enric Balletbo i Serra <[email protected]>Reviewed-by Tom Rini <[email protected]>
Tom? Is it OK if I apply this patch to u-boot-ubi.git, as the SPL ubi patches depend on this series?
bye,
Heiko
Quoted 8 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v2 1/5 igep00x0: enable CONFIG_NET_RANDOM_ETHADDR
In reply to Enric Balletbo i SerraQuoted 6 lines · Enric Balletb? i Serra
Enable
CONFIG_NET_RANDOM_ETHADDRto generate a random MAC address when ETHADDR is not set.Signed-off-by Enric Balletbo i Serra <[email protected]>Reviewed-by Tom Rini <[email protected]>Reviewed-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/ec97140d/attachment.sig>
PATCH v2 2/5 igep00x0: Cleanup ethernet support
In reply to Enric Balletbo i SerraFrom: Ladislav Michl <[email protected]>
- move chip reset to separate function
- use CONFIG_SMC911X_BASE instead of hardcoded value
- remove unneeded local variable from board_eth_init.
--- board/isee/igep00x0/igep00x0.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
board/isee/igep00x0/igep00x0.c +19 -14
@@ -101,6 +101,19 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)#endif #if defined(CONFIG_CMD_NET ) + +static void reset_net_chip (int gpio) +{ +if (!gpio_request (gpio,"eth nrst" )) { +gpio_direction_output (gpio,1 ); +udelay (1 ); +gpio_set_value (gpio,0 ); +udelay (40 ); +gpio_set_value (gpio,1 ); +mdelay (10 ); + } +} +/* * Routine: setup_net_chip * Description: Setting up the configuration GPMC registers specific to the
@@ -110,8 +123,8 @@ static void setup_net_chip(void) {struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE ; -enable_gpmc_cs_config (gpmc_lan_config, &gpmc_cfg->cs[5 ],0x2C000000 , -GPMC_SIZE_16M ); +enable_gpmc_cs_config (gpmc_lan_config, &gpmc_cfg->cs[5 ], +CONFIG_SMC911X_BASE ,GPMC_SIZE_16M );/* Enable off mode for NWE in PADCONF_GPMC_NWE register */ writew (readw (&ctrl_base->gpmc_nwe) |0x0E00 , &ctrl_base->gpmc_nwe);
@@ -121,15 +134,7 @@ static void setup_net_chip(void)writew (readw (&ctrl_base->gpmc_nadv_ale) |0x0E00 , &ctrl_base->gpmc_nadv_ale); -/* Make GPIO 64 as output pin and send a magic pulse through it */ -if (!gpio_request (64 ,"" )) { -gpio_direction_output (64 ,0 ); -gpio_set_value (64 ,1 ); -udelay (1 ); -gpio_set_value (64 ,0 ); -udelay (1 ); -gpio_set_value (64 ,1 ); - } + reset_net_chip(64); }#else static inline void setup_net_chip (void ) {}
@@ -200,10 +205,10 @@ void set_muxconf_regs(void)#if defined(CONFIG_CMD_NET )int board_eth_init (bd_t *bis) { -int rc =0 ;#ifdef CONFIG_SMC911X - rc =smc911x_initialize (0 ,CONFIG_SMC911X_BASE ); +return smc911x_initialize (0 ,CONFIG_SMC911X_BASE ); +#else +return 0 ;#endif -return rc; }#endif
Signature · 1 line
2.1.0
PATCH v2 2/5 igep00x0: Cleanup ethernet support
Hello Tom,
Am 04.01.2016 um 23:07 schrieb Enric Balletb? i Serra:
Quoted 6 lines
From: Ladislav Michl <[email protected]>
- move chip reset to separate function
- useCONFIG_SMC911X_BASEinstead of hardcoded value
- remove unneeded local variable fromboard_eth_init.
Quoted 6 lines
Signed-off-by Ladislav Michl <[email protected]>Reviewed-by Tom Rini <[email protected]>--- board/isee/igep00x0/igep00x0.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
Tom? Is it OK if I apply this patch to u-boot-ubi.git, as the SPL ubi patches depend on this series?
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v2 2/5 igep00x0: Cleanup ethernet support
Quoted 16 lines · Heiko Schocher
Hello Tom,
Am 04.01.2016 um 23:07 schrieb Enric Balletb? i Serra:
Quoted 6 lines
From: Ladislav Michl <[email protected]>
- move chip reset to separate function
- useCONFIG_SMC911X_BASEinstead of hardcoded value
- remove unneeded local variable fromboard_eth_init.Quoted 6 lines
Signed-off-by Ladislav Michl <[email protected]>Reviewed-by Tom Rini <[email protected]>--- board/isee/igep00x0/igep00x0.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
Quoted 4 lines
Reviewed-by Heiko Schocher <[email protected]>Tom? Is it OK if I apply this patch to u-boot-ubi.git, as the SPL ubi patches depend on this series?
I'll pick up this series (and some other TI platform stuff) in the next day or two, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/2eb133bc/attachment.sig>
PATCH v2 2/5 igep00x0: Cleanup ethernet support
In reply to Enric Balletbo i SerraQuoted 10 lines · Enric Balletb? i Serra
From: Ladislav Michl <[email protected]>
- move chip reset to separate function
- useCONFIG_SMC911X_BASEinstead of hardcoded value
- remove unneeded local variable fromboard_eth_init.Signed-off-by Ladislav Michl <[email protected]>Reviewed-by Tom Rini <[email protected]>Reviewed-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/8724ece2/attachment.sig>
PATCH v2 3/5 igep00x0: Do not include config_distro_defaults.h
In reply to Enric Balletbo i SerraFrom: Ladislav Michl <[email protected]>
File is already included:omap3_igep00x0.h -> ti_omap3_common.h -> ti_armv7_omap.h -> ti_armv7_common.h -> config_distro_defaults.h
--- include/configs/omap3_igep00x0.h | 2 -- 1 file changed, 2 deletions(-)
include/configs/omap3_igep00x0.h +0 -2
@@ -85,8 +85,6 @@#ifndef CONFIG_SPL_BUILD -#include <config_distro_defaults.h> -/* Environment */ #define ENV_DEVICE_SETTINGS \ "stdin=serial\0" \
Signature · 1 line
2.1.0
PATCH v2 3/5 igep00x0: Do not include config_distro_defaults.h
Quoted 8 lines · Enric Balletbo i Serra
From: Ladislav Michl <[email protected]>
File is already included:
omap3_igep00x0.h->ti_omap3_common.h->ti_armv7_omap.h->ti_armv7_common.h->config_distro_defaults.hSigned-off-by Ladislav Michl <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160104/26857422/attachment.sig>
PATCH v2 3/5 igep00x0: Do not include config_distro_defaults.h
Hello Tom,
Am 04.01.2016 um 23:23 schrieb Tom Rini:
Quoted 12 lines · Enric Balletbo i Serra
Quoted 9 lines
From: Ladislav Michl <[email protected]>
File is already included:
omap3_igep00x0.h->ti_omap3_common.h->ti_armv7_omap.h->ti_armv7_common.h->config_distro_defaults.hSigned-off-by Ladislav Michl <[email protected]>Reviewed-by Tom Rini <[email protected]>
Tom? Is it OK if I apply this patch to u-boot-ubi.git, as the SPL ubi patches depend on this series?
bye,
Heiko
Quoted 8 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v2 3/5 igep00x0: Do not include config_distro_defaults.h
In reply to Enric Balletbo i SerraQuoted 10 lines · Enric Balletb? i Serra
From: Ladislav Michl <[email protected]>
File is already included:
omap3_igep00x0.h->ti_omap3_common.h->ti_armv7_omap.h->ti_armv7_common.h->config_distro_defaults.hSigned-off-by Ladislav Michl <[email protected]>Reviewed-by Tom Rini <[email protected]>Reviewed-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/d089928e/attachment.sig>
PATCH v2 4/5 igep00x0: Fix config header indentation
In reply to Enric Balletbo i SerraFrom: Ladislav Michl <[email protected]>
The patch fixes some indentation style problems in omap3_igep00x0.h file.
--- include/configs/omap3_igep00x0.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/omap3_igep00x0.h +3 -3
@@ -43,7 +43,7 @@#else #error "status LED not defined for this machine."#endif -#define RED_LED_DEV 0 +#define RED_LED_DEV 0#define STATUS_LED_BIT RED_LED_GPIO#define STATUS_LED_STATE STATUS_LED_ON#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2)
@@ -56,7 +56,7 @@#define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ /* USB */ -#define CONFIG_USB_MUSB_UDC 1 +#define CONFIG_USB_MUSB_UDC 1#define CONFIG_USB_OMAP3 1#define CONFIG_TWL4030_USB 1
@@ -136,7 +136,7 @@#if defined(CONFIG_CMD_NET )#define CONFIG_SMC911X #define CONFIG_SMC911X_32_BIT -#define CONFIG_SMC911X_BASE 0x2C000000 +#define CONFIG_SMC911X_BASE 0x2C000000#endif /* (CONFIG_CMD_NET) */ /* OneNAND boot config */
Signature · 1 line
2.1.0
PATCH v2 4/5 igep00x0: Fix config header indentation
Quoted 6 lines · Enric Balletbo i Serra
From: Ladislav Michl <[email protected]>
The patch fixes some indentation style problems in
omap3_igep00x0.hfile.Signed-off-by Ladislav Michl <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160104/03aa73e2/attachment.sig>
PATCH v2 4/5 igep00x0: Fix config header indentation
Hello Tom,
Am 04.01.2016 um 23:24 schrieb Tom Rini:
Quoted 10 lines · Enric Balletbo i Serra
Quoted 7 lines
From: Ladislav Michl <[email protected]>
The patch fixes some indentation style problems in
omap3_igep00x0.hfile.Signed-off-by Ladislav Michl <[email protected]>Reviewed-by Tom Rini <[email protected]>
Tom? Is it OK if I apply this patch to u-boot-ubi.git, as the SPL ubi patches depend on this series?
bye,
Heiko
Quoted 8 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v2 4/5 igep00x0: Fix config header indentation
In reply to Enric Balletbo i SerraQuoted 8 lines · Enric Balletb? i Serra
From: Ladislav Michl <[email protected]>
The patch fixes some indentation style problems in
omap3_igep00x0.hfile.Signed-off-by Ladislav Michl <[email protected]>Reviewed-by Tom Rini <[email protected]>Reviewed-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/cf7ca3ad/attachment.sig>
PATCH v2 5/5 igep00x0: Remove no-op macros from config header
In reply to Enric Balletbo i SerraFrom: Ladislav Michl <[email protected]>
The patch removes some macros that are not used.
--- include/configs/omap3_igep00x0.h | 5 ----- 1 file changed, 5 deletions(-)
include/configs/omap3_igep00x0.h +0 -5
@@ -75,14 +75,9 @@#ifdef CONFIG_BOOT_ONENAND #define CONFIG_CMD_ONENAND /* ONENAND support */ #endif -#if (CONFIG_MACH_TYPE ==MACH_TYPE_IGEP0020 ) || \ - (CONFIG_MACH_TYPE ==MACH_TYPE_IGEP0032 ) -#endif #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING -/*#undef CONFIG_ENV_IS_NOWHERE*/ -#ifndef CONFIG_SPL_BUILD /* Environment */
Signature · 1 line
2.1.0
PATCH v2 5/5 igep00x0: Remove no-op macros from config header
Quoted 6 lines · Enric Balletbo i Serra
From: Ladislav Michl <[email protected]>
The patch removes some macros that are not used.
Signed-off-by Ladislav Michl <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160104/33f6e215/attachment.sig>
PATCH v2 5/5 igep00x0: Remove no-op macros from config header
Hello Tom,
Am 04.01.2016 um 23:24 schrieb Tom Rini:
Quoted 10 lines · Enric Balletbo i Serra
Quoted 7 lines
From: Ladislav Michl <[email protected]>
The patch removes some macros that are not used.
Signed-off-by Ladislav Michl <[email protected]>Reviewed-by Tom Rini <[email protected]>
Tom? Is it OK if I apply this patch to u-boot-ubi.git, as the SPL ubi patches depend on this series?
bye,
Heiko
Quoted 8 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v2 5/5 igep00x0: Remove no-op macros from config header
In reply to Enric Balletbo i SerraQuoted 8 lines · Enric Balletb? i Serra
From: Ladislav Michl <[email protected]>
The patch removes some macros that are not used.
Signed-off-by Ladislav Michl <[email protected]>Reviewed-by Tom Rini <[email protected]>Reviewed-by Heiko Schocher <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160120/d05f5444/attachment.sig>
v2 cover igep00x0: Minor cleanup
In reply to Enric Balletbo i SerraQuoted 6 lines · Enric Balletbo i Serra
Hi Tom,
The following patches are minor cleanups that I think are safe to apply. I know that we're very close to next release so it's up to you apply now or wait for the next merge window. I'd like to see it merged but I don't any objection if you decide wait.
I'll pull them in after the release then, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160104/d9a205ec/attachment.sig>