* [PATCH 1/3] ARM: dts: am335x-phytec-phycore-som: Disable mac node.
@ 2015-09-28 10:47 Wadim Egorov
2015-09-28 10:48 ` [PATCH 2/3] ARM: am33xx: Enable ethernet node on NET boot Wadim Egorov
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Wadim Egorov @ 2015-09-28 10:47 UTC (permalink / raw)
To: barebox
Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
---
arch/arm/dts/am335x-phytec-phycore-som-mlo.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts b/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts
index f70835f..32b43dd 100644
--- a/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts
+++ b/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts
@@ -27,3 +27,7 @@
&gpmc {
status = "disabled";
};
+
+&mac {
+ status = "disabled";
+};
--
1.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/3] ARM: am33xx: Enable ethernet node on NET boot
2015-09-28 10:47 [PATCH 1/3] ARM: dts: am335x-phytec-phycore-som: Disable mac node Wadim Egorov
@ 2015-09-28 10:48 ` Wadim Egorov
2015-09-28 10:48 ` [PATCH 3/3] net: dhcp: Fix CONFIG variable name Wadim Egorov
2015-09-29 7:36 ` [PATCH 1/3] ARM: dts: am335x-phytec-phycore-som: Disable mac node Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Wadim Egorov @ 2015-09-28 10:48 UTC (permalink / raw)
To: barebox
Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
---
arch/arm/mach-omap/am33xx_generic.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/mach-omap/am33xx_generic.c b/arch/arm/mach-omap/am33xx_generic.c
index ae0ee58..5eead5c 100644
--- a/arch/arm/mach-omap/am33xx_generic.c
+++ b/arch/arm/mach-omap/am33xx_generic.c
@@ -505,6 +505,9 @@ int am33xx_of_register_bootdevice(void)
case BOOTSOURCE_SPI:
dev = of_device_enable_and_register_by_name("spi@48030000");
break;
+ case BOOTSOURCE_NET:
+ dev = of_device_enable_and_register_by_name("ethernet@4a100000");
+ break;
default:
/* Use nand fallback */
dev = of_device_enable_and_register_by_name("gpmc@50000000");
--
1.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] net: dhcp: Fix CONFIG variable name
2015-09-28 10:47 [PATCH 1/3] ARM: dts: am335x-phytec-phycore-som: Disable mac node Wadim Egorov
2015-09-28 10:48 ` [PATCH 2/3] ARM: am33xx: Enable ethernet node on NET boot Wadim Egorov
@ 2015-09-28 10:48 ` Wadim Egorov
2015-09-29 7:36 ` [PATCH 1/3] ARM: dts: am335x-phytec-phycore-som: Disable mac node Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Wadim Egorov @ 2015-09-28 10:48 UTC (permalink / raw)
To: barebox
Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
---
net/dhcp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/dhcp.c b/net/dhcp.c
index e1625ec..fb8a713 100644
--- a/net/dhcp.c
+++ b/net/dhcp.c
@@ -158,7 +158,7 @@ static void env_str_handle(struct dhcp_opt *opt, unsigned char *popt, int optlen
if (opt->copy_only_if_valid && !strlen(tmp))
return;
- if (opt->barebox_var_name && IS_ENABLED(EVIRONMENT_VARIABLES))
+ if (opt->barebox_var_name && IS_ENABLED(CONFIG_ENVIRONMENT_VARIABLES))
setenv(opt->barebox_var_name, tmp);
if (opt->barebox_dhcp_global && IS_ENABLED(CONFIG_GLOBALVAR))
dhcp_set_barebox_global(opt->barebox_dhcp_global, tmp);
--
1.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] ARM: dts: am335x-phytec-phycore-som: Disable mac node.
2015-09-28 10:47 [PATCH 1/3] ARM: dts: am335x-phytec-phycore-som: Disable mac node Wadim Egorov
2015-09-28 10:48 ` [PATCH 2/3] ARM: am33xx: Enable ethernet node on NET boot Wadim Egorov
2015-09-28 10:48 ` [PATCH 3/3] net: dhcp: Fix CONFIG variable name Wadim Egorov
@ 2015-09-29 7:36 ` Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2015-09-29 7:36 UTC (permalink / raw)
To: Wadim Egorov; +Cc: barebox
On Mon, Sep 28, 2015 at 12:47:59PM +0200, Wadim Egorov wrote:
> Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
> ---
> arch/arm/dts/am335x-phytec-phycore-som-mlo.dts | 4 ++++
> 1 file changed, 4 insertions(+)
Applied 1/3 and 2/3 to next and 3/3 to master.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-29 7:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-28 10:47 [PATCH 1/3] ARM: dts: am335x-phytec-phycore-som: Disable mac node Wadim Egorov
2015-09-28 10:48 ` [PATCH 2/3] ARM: am33xx: Enable ethernet node on NET boot Wadim Egorov
2015-09-28 10:48 ` [PATCH 3/3] net: dhcp: Fix CONFIG variable name Wadim Egorov
2015-09-29 7:36 ` [PATCH 1/3] ARM: dts: am335x-phytec-phycore-som: Disable mac node Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox