Patchwork [U-Boot,v2,10/10] mx23_olinuxino: Add ethernet support

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 11, 2013, 1:35 p.m.
Message ID <1360589756-26355-11-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/219608/
State Changes Requested
Delegated to: Stefano Babic
Headers show

Comments

Otavio Salvador - Feb. 11, 2013, 1:35 p.m.
This adds support to the LAN9512 chip included in the board and extend
the environment to easy netboot use.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v2:
- Remove extra newline

 include/configs/mx23_olinuxino.h | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)
Marek Vasut - Feb. 13, 2013, 9:19 p.m.
Dear Otavio Salvador,

> This adds support to the LAN9512 chip included in the board and extend
> the environment to easy netboot use.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

You completely ignored previous discussion to make this ethernet thingie part of 
the previous patch.

Best regards,
Marek Vasut
Otavio Salvador - Feb. 13, 2013, 9:25 p.m.
On Wed, Feb 13, 2013 at 7:19 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Otavio Salvador,
>
>> This adds support to the LAN9512 chip included in the board and extend
>> the environment to easy netboot use.
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> You completely ignored previous discussion to make this ethernet thingie part of
> the previous patch.

I made the HUB part of the previous patch; I don't agree in moving
ethernet to there.
Marek Vasut - Feb. 13, 2013, 9:36 p.m.
Dear Otavio Salvador,

> On Wed, Feb 13, 2013 at 7:19 PM, Marek Vasut <marex@denx.de> wrote:
> > Dear Otavio Salvador,
> > 
> >> This adds support to the LAN9512 chip included in the board and extend
> >> the environment to easy netboot use.
> >> 
> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > 
> > You completely ignored previous discussion to make this ethernet thingie
> > part of the previous patch.
> 
> I made the HUB part of the previous patch; I don't agree in moving
> ethernet to there.

The ethernet is integral part of the hub chip. This approach you take here 
breaks bisectability.

Best regards,
Marek Vasut
Otavio Salvador - Feb. 13, 2013, 9:40 p.m.
On Wed, Feb 13, 2013 at 7:36 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Otavio Salvador,
>
>> On Wed, Feb 13, 2013 at 7:19 PM, Marek Vasut <marex@denx.de> wrote:
>> > Dear Otavio Salvador,
>> >
>> >> This adds support to the LAN9512 chip included in the board and extend
>> >> the environment to easy netboot use.
>> >>
>> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> >
>> > You completely ignored previous discussion to make this ethernet thingie
>> > part of the previous patch.
>>
>> I made the HUB part of the previous patch; I don't agree in moving
>> ethernet to there.
>
> The ethernet is integral part of the hub chip. This approach you take here
> breaks bisectability.

It does not; in case you do bisect you'll be able to build and run
both revisions; it'll be a matter of one more 'bad' command call. I
prefer to keep it split as it is much easier for someone reading the
history to stop what has been done.
Marek Vasut - Feb. 14, 2013, 4:44 p.m.
Dear Otavio Salvador,

> On Wed, Feb 13, 2013 at 7:36 PM, Marek Vasut <marex@denx.de> wrote:
> > Dear Otavio Salvador,
> > 
> >> On Wed, Feb 13, 2013 at 7:19 PM, Marek Vasut <marex@denx.de> wrote:
> >> > Dear Otavio Salvador,
> >> > 
> >> >> This adds support to the LAN9512 chip included in the board and
> >> >> extend the environment to easy netboot use.
> >> >> 
> >> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> >> > 
> >> > You completely ignored previous discussion to make this ethernet
> >> > thingie part of the previous patch.
> >> 
> >> I made the HUB part of the previous patch; I don't agree in moving
> >> ethernet to there.
> > 
> > The ethernet is integral part of the hub chip. This approach you take
> > here breaks bisectability.
> 
> It does not; in case you do bisect you'll be able to build and run
> both revisions; it'll be a matter of one more 'bad' command call. I
> prefer to keep it split as it is much easier for someone reading the
> history to stop what has been done.

Yes, you're adding only part of the support in one patch and the other part in 
another patch. It makes no sense to me.

Best regards,
Marek Vasut
Otavio Salvador - Feb. 14, 2013, 6:24 p.m.
On Thu, Feb 14, 2013 at 2:44 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Otavio Salvador,
>
>> On Wed, Feb 13, 2013 at 7:36 PM, Marek Vasut <marex@denx.de> wrote:
>> > Dear Otavio Salvador,
>> >
>> >> On Wed, Feb 13, 2013 at 7:19 PM, Marek Vasut <marex@denx.de> wrote:
>> >> > Dear Otavio Salvador,
>> >> >
>> >> >> This adds support to the LAN9512 chip included in the board and
>> >> >> extend the environment to easy netboot use.
>> >> >>
>> >> >> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> >> >
>> >> > You completely ignored previous discussion to make this ethernet
>> >> > thingie part of the previous patch.
>> >>
>> >> I made the HUB part of the previous patch; I don't agree in moving
>> >> ethernet to there.
>> >
>> > The ethernet is integral part of the hub chip. This approach you take
>> > here breaks bisectability.
>>
>> It does not; in case you do bisect you'll be able to build and run
>> both revisions; it'll be a matter of one more 'bad' command call. I
>> prefer to keep it split as it is much easier for someone reading the
>> history to stop what has been done.
>
> Yes, you're adding only part of the support in one patch and the other part in
> another patch. It makes no sense to me.

I think the environment changes are part of the ethernet support; do
you wish me to merge it all together? I'd prefer to leave it as is.

Patch

diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index e081c49..dfba0fc 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -55,11 +55,13 @@ 
 #define	CONFIG_DOS_PARTITION
 
 #define	CONFIG_CMD_CACHE
+#define	CONFIG_CMD_DHCP
 #define	CONFIG_CMD_EXT2
 #define	CONFIG_CMD_FAT
 #define	CONFIG_CMD_GPIO
 #define	CONFIG_CMD_LED
 #define	CONFIG_CMD_MMC
+#define	CONFIG_CMD_NET
 #define	CONFIG_CMD_USB
 
 /*
@@ -150,6 +152,12 @@ 
 #define	CONFIG_USB_STORAGE
 #endif
 
+/* Ethernet */
+#ifdef	CONFIG_CMD_NET
+#define	CONFIG_USB_HOST_ETHER
+#define	CONFIG_USB_ETHER_SMSC95XX
+#endif
+
 /*
  * Boot Linux
  */
@@ -191,6 +199,7 @@ 
 	"fdt_file=imx23-olinuxino.dtb\0" \
 	"fdt_addr=0x41000000\0" \
 	"boot_fdt=try\0" \
+	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
 	"mmcpart=2\0" \
 	"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
@@ -216,6 +225,31 @@ 
 			"fi; " \
 		"else " \
 			"bootm; " \
+		"fi;\0" \
+	"netargs=setenv bootargs console=${console_mainline},${baudrate} " \
+		"root=/dev/nfs " \
+		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+	"netboot=echo Booting from net ...; " \
+		"usb start; " \
+		"run netargs; "	\
+		"if test ${ip_dyn} = yes; then " \
+			"setenv get_cmd dhcp; " \
+		"else " \
+			"setenv get_cmd tftp; " \
+		"fi; " \
+		"${get_cmd} ${uimage}; " \
+		"if test ${boot_fdt} = yes; then " \
+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+				"bootm ${loadaddr} - ${fdt_addr}; " \
+			"else " \
+				"if test ${boot_fdt} = try; then " \
+					"bootm; " \
+				"else " \
+					"echo WARN: Cannot load the DT; " \
+				"fi;" \
+			"fi; " \
+		"else " \
+			"bootm; " \
 		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
@@ -225,10 +259,9 @@ 
 		"else " \
 			"if run loaduimage; then " \
 				"run mmcboot; " \
-			"else " \
-				"echo ERR: Fail to boot from MMC; " \
+			"else run netboot; " \
 			"fi; " \
 		"fi; " \
-	"else exit; fi"
+	"else run netboot; fi"
 
 #endif /* __MX23_OLINUXINO_CONFIG_H__ */