mx23/mxs pending patches
Subsystems (4)
v2 cover mx23/mxs pending patches
This patchset includes the pending patches we have in our tree. It fixes issues for mx23evk and mx23_olinuxino boards.
The DRAM control register change has been kept specific to mx23evk as it breaks mx23_olinuxino (as it than reads only 16MB)
Changes in v2:
- Extend code comment to explicit say it needs to be there.
- Use MUX pin name - Requested by Marek
- Avoid wrong clock setting in MX23
- Add changes for allow use of the USB hub
- Remove extra newline
Otavio Salvador (10):
mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to
CONFIG_SPL_MXS_PSWITCH_WAIT
mx23: Document the tRAS lockout setting in memory initialization
mx23evk: Adjust DRAM control register to use full 128MB of RAM
led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set
mxs: Fix iomux.h to not break build during assembly stage
mx23_olinuxino: Add support for status LED
usb: mxs: Disable USB Port 1 for i.MX23
mx23evk: Enable USB support
mx23_olinuxino: Enable USB support
mx23_olinuxino: Add ethernet support
arch/arm/cpu/arm926ejs/mxs/mxs_init.h | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 + arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 2 +- arch/arm/include/asm/arch-mxs/iomux.h | 5 +++ board/freescale/mx23evk/spl_boot.c | 10 +++++ board/olimex/mx23_olinuxino/mx23_olinuxino.c | 13 ++++++ board/olimex/mx23_olinuxino/spl_boot.c | 8 ++++ common/cmd_led.c | 6 ++- drivers/usb/host/ehci-mxs.c | 12 ++++++ include/configs/mx23_olinuxino.h | 63 ++++++++++++++++++++++++++-- include/configs/mx23evk.h | 10 +++++ 11 files changed, 125 insertions(+), 7 deletions(-)
Signature · 1 line
1.8.1
PATCH v2 1/10 mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to CONFIG_SPL_MXS_PSWITCH_WAIT
The power switch option is compatible with i.MX23 and i.MX28 so the configration option needs to reflect it. We choose 'CONFIG_SPL_MXS_PSWITCH_WAIT' for the option name.
---
Changes in v2: None
arch/arm/cpu/arm926ejs/mxs/mxs_init.h | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/arm926ejs/mxs/mxs_init.h +1 -1
@@ -30,7 +30,7 @@ void early_delay(int delay);void mxs_power_init (void ); -#ifdef CONFIG_SPL_MX28_PSWITCH_WAIT +#ifdef CONFIG_SPL_MXS_PSWITCH_WAIT void mxs_power_wait_pswitch (void );#else static inline void mxs_power_wait_pswitch (void ) { }
arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +1 -1
@@ -921,7 +921,7 @@ void mxs_power_init(void)early_delay (1000 ); } -#ifdef CONFIG_SPL_MX28_PSWITCH_WAIT +#ifdef CONFIG_SPL_MXS_PSWITCH_WAIT void mxs_power_wait_pswitch (void ) { struct mxs_power_regs *power_regs =
Signature · 1 line
1.8.1
PATCH v2 2/10 mx23: Document the tRAS lockout setting in memory initialization
In reply to Otavio SalvadorAdd a comment about the tRAS lockout setting of HW_DRAM_CTL08 to enable the 'Fast Auto Pre-Charge' found in the memory chip. The setting is applied after memory initialization and it is worth document it.
---
Changes in v2:
- Extend code comment to explicit say it needs to be there.
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +1 -0
@@ -119,6 +119,7 @@ static void initialize_dram_values(void)writel (dram_vals[i],MXS_DRAM_BASE + (4 * i));#ifdef CONFIG_MX23 +/* Enable tRAS lockout in HW_DRAM_CTL08 ; it must be after all */ writel ((1 <<24 ),MXS_DRAM_BASE + (4 *8 ));#endif }
Signature · 1 line
1.8.1
PATCH v2 2/10 mx23: Document the tRAS lockout setting in memory initialization
Dear Otavio Salvador,
Quoted 18 lines
Add a comment about the tRAS lockout setting of
HW_DRAM_CTL08to enable the 'Fast Auto Pre-Charge' found in the memory chip. The setting is applied after memory initialization and it is worth document it.Signed-off-by Otavio Salvador <[email protected]>---
Changes in v2:
- Extend code comment to explicit say it needs to be there.arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 + 1 file changed, 1 insertion(+)(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.cindex f8392f6..1952eac 100644
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c static void initialize_dram_values(void) · line 122
Quoted 4 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +1
-0@@ -119,6 +119,7 @@ static void initialize_dram_values(void)writel (dram_vals[i],MXS_DRAM_BASE + (4 * i));#ifdef CONFIG_MX23 +/* Enable tRAS lockout in HW_DRAM_CTL08 ; it must be after all */
'After all'?
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c static void initialize_dram_values(void) · line 125
Quoted 3 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +0
-0writel ((1 <<24 ),MXS_DRAM_BASE + (4 *8 ));#endif }
Best regards,
Marek Vasut
PATCH v2 2/10 mx23: Document the tRAS lockout setting in memory initialization
Quoted 22 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 20 lines
Add a comment about the tRAS lockout setting of
HW_DRAM_CTL08to enable the 'Fast Auto Pre-Charge' found in the memory chip. The setting is applied after memory initialization and it is worth document it.Signed-off-by Otavio Salvador <[email protected]>---
Changes in v2:
- Extend code comment to explicit say it needs to be there.arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 + 1 file changed, 1 insertion(+)(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.cindex f8392f6..1952eac 100644arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +0
-0@@ -119,6 +119,7 @@ static void initialize_dram_values(void)writel (dram_vals[i],MXS_DRAM_BASE + (4 * i));
Quoted 4 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c static void initialize_dram_values(void) · line 122
Quoted 2 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +1
-0#ifdef CONFIG_MX23 +/* Enable tRAS lockout in HW_DRAM_CTL08 ; it must be after all */ 'After all'?
For me it is clear enough; I am not native so it'd be good if a native English speaker could comment on this.
Quoted 6 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c static void initialize_dram_values(void) · line 125
Quoted 3 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +0
-0writel ((1 <<24 ),MXS_DRAM_BASE + (4 *8 ));#endif }Best regards,
Marek Vasut
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Fabio Estevam
reviewerPATCH v2 2/10 mx23: Document the tRAS lockout setting in memory initialization
Quoted 7 lines · Otavio Salvador
Quoted 4 lines
Quoted 2 lines
#ifdef
CONFIG_MX23
+ /* Enable tRAS lockout inHW_DRAM_CTL08; it must be after all */'After all'?
For me it is clear enough; I am not native so it'd be good if a native English speaker could comment on this.
I think you meant to say "it must be the last element".
PATCH v2 2/10 mx23: Document the tRAS lockout setting in memory initialization
Quoted 6 lines · Fabio Estevam
Quoted 3 lines · Otavio Salvador
Quoted 3 lines
Quoted 2 lines
#ifdef
CONFIG_MX23
+ /* Enable tRAS lockout inHW_DRAM_CTL08; it must be after all */
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
'After all'?
For me it is clear enough; I am not native so it'd be good if a native English speaker could comment on this.
I think you meant to say "it must be the last element".
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +2 -0
@@ -119,6 +119,9 @@ static void initialize_dram_values(void)writel (dram_vals[i],MXS_DRAM_BASE + (4 * i));#ifdef CONFIG_MX23 +/* Enable tRAS lockout in HW_DRAM_CTL08 ; it must be the last +* element to be set */ writel ((1 <<24 ),MXS_DRAM_BASE + (4 *8 ));#endif }
What about this?
--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Fabio Estevam
reviewerPATCH v2 2/10 mx23: Document the tRAS lockout setting in memory initialization
Quoted 19 lines · Otavio Salvador
Quoted 12 lines · Fabio Estevam
Quoted 7 lines · Otavio Salvador
Quoted 4 lines
Quoted 2 lines
#ifdef
CONFIG_MX23
+ /* Enable tRAS lockout inHW_DRAM_CTL08; it must be after all */'After all'?
For me it is clear enough; I am not native so it'd be good if a native English speaker could comment on this.
I think you meant to say "it must be the last element".
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +0
-0
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c static void initialize_dram_values(void) · line 123
Quoted 5 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +2
-0@@ -119,6 +119,9 @@ static void initialize_dram_values(void)writel (dram_vals[i],MXS_DRAM_BASE + (4 * i));#ifdef CONFIG_MX23 +/* Enable tRAS lockout in HW_DRAM_CTL08 ; it must be the last +* element to be set */
I think the comment is clear, but multi-line comment should be like:
/*
* First line bla bla bla
* Second line bla bla bla
*/
PATCH v2 2/10 mx23: Document the tRAS lockout setting in memory initialization
Quoted 29 lines · Fabio Estevam
Quoted 19 lines · Otavio Salvador
Quoted 12 lines · Fabio Estevam
Quoted 7 lines · Otavio Salvador
Quoted 4 lines
Quoted 2 lines
#ifdef
CONFIG_MX23
+ /* Enable tRAS lockout inHW_DRAM_CTL08; it must be after all */'After all'?
For me it is clear enough; I am not native so it'd be good if a native English speaker could comment on this.
I think you meant to say "it must be the last element".
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +0
-0arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c static void initialize_dram_values(void) · line 123
Quoted 5 lines
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +2
-0@@ -119,6 +119,9 @@ static void initialize_dram_values(void)writel (dram_vals[i],MXS_DRAM_BASE + (4 * i));#ifdef CONFIG_MX23 +/* Enable tRAS lockout in HW_DRAM_CTL08 ; it must be the last +* element to be set */ I think the comment is clear, but multi-line comment should be like:
Quoted 4 lines
/*
* First line bla bla bla
* Second line bla bla bla
*/
Ok; fixed for v3.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH v2 3/10 mx23evk: Adjust DRAM control register to use full 128MB of RAM
In reply to Otavio SalvadorAdjust HW_DRAM_CTL14 to enable the chip selects to allow usage of full 128MB of RAM.
---
Changes in v2: None
board/freescale/mx23evk/spl_boot.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
board/freescale/mx23evk/spl_boot.c +10 -0
@@ -98,6 +98,16 @@ const iomux_cfg_t iomux_setup[] = { (MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL), }; +#define HW_DRAM_CTL14 (0x38 >> 2) +#define CS_MAP 0x3 +#define INTAREF 0x2 +#define HW_DRAM_CTL14_CONFIG (INTAREF << 8 | CS_MAP) + +void mxs_adjust_memory_params (uint32_t *dram_vals) +{ + dram_vals[HW_DRAM_CTL14 ] =HW_DRAM_CTL14_CONFIG ; +} +void board_init_ll (void ) {mxs_common_spl_init (iomux_setup,ARRAY_SIZE (iomux_setup));
Signature · 1 line
1.8.1
PATCH v2 3/10 mx23evk: Adjust DRAM control register to use full 128MB of RAM
Dear Otavio Salvador,
Quoted 2 lines
Adjust
HW_DRAM_CTL14to enable the chip selects to allow usage of full 128MB of RAM.
Why can this not be enabled globally?
Quoted 18 lines
Signed-off-by Otavio Salvador <[email protected]>---
Changes in v2: Noneboard/freescale/mx23evk/spl_boot.c | 10 ++++++++++ 1 file changed, 10 insertions(+)(quoted diff) +0
-0
b/board/freescale/mx23evk/spl_boot.cindex 6007433..b6f4e7e 100644board/freescale/mx23evk/spl_boot.c +3
-0@@ -98,6 +98,16 @@ const iomux_cfg_t iomux_setup[] = { (MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL), }; +#define HW_DRAM_CTL14 (0x38 >> 2) +#define CS_MAP 0x3 +#define INTAREF 0x2
board/freescale/mx23evk/spl_boot.c const iomux_cfg_t iomux_setup[] = { · line 113
Quoted 10 lines
board/freescale/mx23evk/spl_boot.c +7
-0+#define HW_DRAM_CTL14_CONFIG (INTAREF << 8 | CS_MAP) + +void mxs_adjust_memory_params (uint32_t *dram_vals) +{ + dram_vals[HW_DRAM_CTL14 ] =HW_DRAM_CTL14_CONFIG ; +} +void board_init_ll (void ) {mxs_common_spl_init (iomux_setup,ARRAY_SIZE (iomux_setup));
Best regards,
Marek Vasut
PATCH v2 3/10 mx23evk: Adjust DRAM control register to use full 128MB of RAM
Quoted 6 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 2 lines
Adjust
HW_DRAM_CTL14to enable the chip selects to allow usage of full 128MB of RAM.Why can this not be enabled globally?
Because it breaks mx23_olinuxino; it is a good reason for me.
Quoted 31 lines
Quoted 18 lines
Signed-off-by Otavio Salvador <[email protected]>---
Changes in v2: Noneboard/freescale/mx23evk/spl_boot.c | 10 ++++++++++ 1 file changed, 10 insertions(+)(quoted diff) +0
-0
b/board/freescale/mx23evk/spl_boot.cindex 6007433..b6f4e7e 100644board/freescale/mx23evk/spl_boot.c +3
-0@@ -98,6 +98,16 @@ const iomux_cfg_t iomux_setup[] = { (MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL), }; +#define HW_DRAM_CTL14 (0x38 >> 2) +#define CS_MAP 0x3 +#define INTAREF 0x2board/freescale/mx23evk/spl_boot.c const iomux_cfg_t iomux_setup[] = { · line 113
Quoted 10 lines
board/freescale/mx23evk/spl_boot.c +7
-0+#define HW_DRAM_CTL14_CONFIG (INTAREF << 8 | CS_MAP) + +void mxs_adjust_memory_params (uint32_t *dram_vals) +{ + dram_vals[HW_DRAM_CTL14 ] =HW_DRAM_CTL14_CONFIG ; +} +void board_init_ll (void ) {mxs_common_spl_init (iomux_setup,ARRAY_SIZE (iomux_setup));Best regards,
Marek Vasut
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH v2 3/10 mx23evk: Adjust DRAM control register to use full 128MB of RAM
Dear Otavio Salvador,
Quoted 9 lines · Marek Vasut
Quoted 6 lines
Dear Otavio Salvador,
Quoted 2 lines
Adjust
HW_DRAM_CTL14to enable the chip selects to allow usage of full 128MB of RAM.Why can this not be enabled globally?
Because it breaks
mx23_olinuxino; it is a good reason for me.
Can you elaborate please?
Best regards,
Marek Vasut
PATCH v2 3/10 mx23evk: Adjust DRAM control register to use full 128MB of RAM
Quoted 13 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 9 lines · Marek Vasut
Quoted 6 lines
Dear Otavio Salvador,
Quoted 2 lines
Adjust
HW_DRAM_CTL14to enable the chip selects to allow usage of full 128MB of RAM.Why can this not be enabled globally?
Because it breaks
mx23_olinuxino; it is a good reason for me.Can you elaborate please?
PATCH v2 3/10 mx23evk: Adjust DRAM control register to use full 128MB of RAM
Dear Otavio Salvador,
Quoted 11 lines · Marek Vasut
Quoted 10 lines
Dear Otavio Salvador,
Quoted 8 lines · Marek Vasut
Quoted 6 lines
Dear Otavio Salvador,
Quoted 2 lines
Adjust
HW_DRAM_CTL14to enable the chip selects to allow usage of full 128MB of RAM.Why can this not be enabled globally?
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Because it breaks
mx23_olinuxino; it is a good reason for me.Can you elaborate please?
From cover letter:
The DRAM control register change has been kept specific to mx23evk as
it breaksmx23_olinuxino(as it than reads only 16MB)
That's unfortunate.
Best regards,
Marek Vasut
PATCH v2 4/10 led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set
In reply to Otavio SalvadorThis fixes the gpio_led driver which needs to compare againt a STATUS_LED_ON to enable a led.
---
Changes in v2: None
common/cmd_led.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
common/cmd_led.c +4 -2
@@ -110,13 +110,15 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])if (led_commands[i].on) led_commands[i].on ();else -__led_set (led_commands[i].mask,1 ); +__led_set (led_commands[i].mask, +STATUS_LED_ON );break ;case LED_OFF :if (led_commands[i].off) led_commands[i].off ();else -__led_set (led_commands[i].mask,0 ); +__led_set (led_commands[i].mask, +STATUS_LED_OFF );break ;case LED_TOGGLE :if (led_commands[i].toggle)
Signature · 1 line
1.8.1
PATCH v2 5/10 mxs: Fix iomux.h to not break build during assembly stage
In reply to Otavio SalvadorThis fixes the build failure when included in mx23_olinuxino.h board config; the addition of "asm/types.h" is due "u32" being otherwise undefined.
---
Changes in v2: None
arch/arm/include/asm/arch-mxs/iomux.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/include/asm/arch-mxs/iomux.h +5 -0
@@ -21,6 +21,10 @@#ifndef __MACH_MXS_IOMUX_H__#define __MACH_MXS_IOMUX_H__ +#ifndef __ASSEMBLY__ + +#include <asm/types.h> +/* * IOMUX/PAD Bit field definitions *
@@ -165,4 +169,5 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad);*/ int mxs_iomux_setup_multiple_pads (const iomux_cfg_t *pad_list,unsigned count); +#endif /* __ASSEMBLY__ */ #endif /* __MACH_MXS_IOMUX_H__*/
Signature · 1 line
1.8.1
PATCH v2 5/10 mxs: Fix iomux.h to not break build during assembly stage
Dear Otavio Salvador,
Quoted 3 lines
This fixes the build failure when included in
mx23_olinuxino.hboard config; the addition of "asm/types.h" is due "u32" being otherwise undefined.
Regular <types.h> doesn't cut it?
Quoted 28 lines
Signed-off-by Otavio Salvador <[email protected]>---
Changes in v2: Nonearch/arm/include/asm/arch-mxs/iomux.h | 5 +++++ 1 file changed, 5 insertions(+)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mxs/iomux.hindex 7abdf58..4288715 100644arch/arm/include/asm/arch-mxs/iomux.h +5
-0@@ -21,6 +21,10 @@#ifndef __MACH_MXS_IOMUX_H__#define __MACH_MXS_IOMUX_H__ +#ifndef __ASSEMBLY__ + +#include <asm/types.h> +/* * IOMUX/PAD Bit field definitions * @@ -165,4 +169,5 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad);*/ int mxs_iomux_setup_multiple_pads (const iomux_cfg_t *pad_list,unsigned count); +#endif /* __ASSEMBLY__ */
Quoted 1 line
#endif /* __MACH_MXS_IOMUX_H__*/
Best regards,
Marek Vasut
PATCH v2 5/10 mxs: Fix iomux.h to not break build during assembly stage
Quoted 7 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 3 lines
This fixes the build failure when included in
mx23_olinuxino.hboard config; the addition of "asm/types.h" is due "u32" being otherwise undefined.Regular <
types.h> doesn't cut it?
I did not test; this seemed as the right one to take. Stefano?
Quoted 32 lines
Quoted 28 lines
Signed-off-by Otavio Salvador <[email protected]>---
Changes in v2: Nonearch/arm/include/asm/arch-mxs/iomux.h | 5 +++++ 1 file changed, 5 insertions(+)(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mxs/iomux.hindex 7abdf58..4288715 100644arch/arm/include/asm/arch-mxs/iomux.h +5
-0@@ -21,6 +21,10 @@#ifndef __MACH_MXS_IOMUX_H__#define __MACH_MXS_IOMUX_H__ +#ifndef __ASSEMBLY__ + +#include <asm/types.h> +/* * IOMUX/PAD Bit field definitions * @@ -165,4 +169,5 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad);*/ int mxs_iomux_setup_multiple_pads (const iomux_cfg_t *pad_list,unsigned count); +#endif /* __ASSEMBLY__ */ Quoted 1 line
#endif /* __MACH_MXS_IOMUX_H__*/
Best regards,
Marek Vasut
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH v2 5/10 mxs: Fix iomux.h to not break build during assembly stage
Dear Otavio Salvador,
Quoted 10 lines · Marek Vasut
Quoted 7 lines
Dear Otavio Salvador,
Quoted 3 lines
This fixes the build failure when included in
mx23_olinuxino.hboard config; the addition of "asm/types.h" is due "u32" being otherwise undefined.Regular <
types.h> doesn't cut it?I did not test; this seemed as the right one to take. Stefano?
ok, asm/types.h seems good
Best regards,
Marek Vasut
PATCH v2 6/10 mx23_olinuxino: Add support for status LED
In reply to Otavio SalvadorThis allow user to know if the bootloader is running, even without a serial console.
---
Changes in v2:
- Use MUX pin name - Requested by Marek
board/olimex/mx23_olinuxino/mx23_olinuxino.c | 7 +++++++ board/olimex/mx23_olinuxino/spl_boot.c | 4 ++++ include/configs/mx23_olinuxino.h | 14 ++++++++++++++ 3 files changed, 25 insertions(+)
board/olimex/mx23_olinuxino/mx23_olinuxino.c +7 -0
@@ -28,6 +28,9 @@#include <asm/arch/imx-regs.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> +#ifdef CONFIG_STATUS_LED +#include <status_led.h> +#endif DECLARE_GLOBAL_DATA_PTR ;
@@ -67,5 +70,9 @@ int board_init(void)/* Adress of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ; +#if defined(CONFIG_STATUS_LED ) && defined(STATUS_LED_BOOT ) +status_led_set (STATUS_LED_BOOT ,STATUS_LED_STATE ); +#endif +return 0 ; }
board/olimex/mx23_olinuxino/spl_boot.c +4 -0
@@ -84,6 +84,10 @@ const iomux_cfg_t iomux_setup[] = {MX23_PAD_EMI_RASN__EMI_RASN |MUX_CONFIG_EMI ,MX23_PAD_EMI_WEN__EMI_WEN |MUX_CONFIG_EMI , +/* Green LED */ +MX23_PAD_SSP1_DETECT__GPIO_2_1 | + (MXS_PAD_3V3 |MXS_PAD_4MA |MXS_PAD_NOPULL ), +/* MMC 0 */ MX23_PAD_SSP1_CMD__SSP1_CMD |MUX_CONFIG_SSP , MX23_PAD_SSP1_DATA0__SSP1_DATA0 | MUX_CONFIG_SSP,
include/configs/mx23_olinuxino.h +14 -0
@@ -19,6 +19,8 @@#ifndef __MX23_OLINUXINO_CONFIG_H__#define __MX23_OLINUXINO_CONFIG_H__ +#include <asm/arch/iomux-mx23.h> +/* * SoC configurations */
@@ -56,6 +58,7 @@#define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT #define CONFIG_CMD_GPIO +#define CONFIG_CMD_LED #define CONFIG_CMD_MMC /*
@@ -112,6 +115,17 @@#define CONFIG_BAUDRATE 115200/* Default baud rate */ /* +* Status LED +*/ +#define CONFIG_STATUS_LED +#define CONFIG_GPIO_LED +#define CONFIG_BOARD_SPECIFIC_LED +#define STATUS_LED_BOOT 0 +#define STATUS_LED_BIT MX23_PAD_SSP1_DETECT__GPIO_2_1 +#define STATUS_LED_STATE STATUS_LED_ON +#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) + +/* * MMC Driver */ #ifdef CONFIG_CMD_MMC
Signature · 1 line
1.8.1
PATCH v2 7/10 usb: mxs: Disable USB Port 1 for i.MX23
In reply to Otavio SalvadorThe i.MX23 just one USB port so disable the second controller probe when building for i.MX23.
---
Changes in v2:
- Avoid wrong clock setting in MX23
drivers/usb/host/ehci-mxs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/usb/host/ehci-mxs.c +12 -0
@@ -50,10 +50,12 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) usb_base =MXS_USBCTRL0_BASE ; phy_base =MXS_USBPHY0_BASE ;break ; +#ifdef CONFIG_MX28 case 1 : usb_base =MXS_USBCTRL1_BASE ; phy_base =MXS_USBPHY1_BASE ;break ; +#endif default :printf ("CONFIG_EHCI_MXS_PORT (port = %d)\n" , port);return -1 ;
@@ -67,7 +69,9 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port)/* This DIGCTL register ungates clock to USB */ #define HW_DIGCTL_CTRL 0x8001c000#define HW_DIGCTL_CTRL_USB0_CLKGATE (1 << 2) +#ifdef CONFIG_MX28 #define HW_DIGCTL_CTRL_USB1_CLKGATE (1 << 16) +#endif int ehci_hcd_init (int index,struct ehci_hccr **hccr,struct ehci_hcor **hcor) {
@@ -95,8 +99,12 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)writel (CLKCTRL_PLL1CTRL0_EN_USB_CLKS |CLKCTRL_PLL1CTRL0_POWER , &clkctrl_regs->hw_clkctrl_pll1ctrl0_set); +#if defined(CONFIG_MX23 ) +writel (HW_DIGCTL_CTRL_USB0_CLKGATE , &digctl_ctrl->reg_clr); +#elif defined(CONFIG_MX28 )writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , &digctl_ctrl->reg_clr); +#endif /* Start USB PHY */ writel (0 , &ehci_mxs.phy_regs->hw_usbphy_pwd);
@@ -153,8 +161,12 @@ int ehci_hcd_stop(int index) &clkctrl_regs->hw_clkctrl_pll1ctrl0_clr);/* Gate off the USB clock */ +#if defined(CONFIG_MX23 ) +writel (HW_DIGCTL_CTRL_USB0_CLKGATE , &digctl_ctrl->reg_set); +#elif defined(CONFIG_MX28 )writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , &digctl_ctrl->reg_set); +#endif return 0 ; }
Signature · 1 line
1.8.1
PATCH v2 7/10 usb: mxs: Disable USB Port 1 for i.MX23
Dear Otavio Salvador,
Quoted 41 lines
The i.MX23 just one USB port so disable the second controller probe when building for i.MX23.
Signed-off-by Otavio Salvador <[email protected]>---
Changes in v2:
- Avoid wrong clock setting in MX23drivers/usb/host/ehci-mxs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/usb/host/ehci-mxs.c +4
-0@@ -50,10 +50,12 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) usb_base = MXS_USBCTRL0_BASE; phy_base =MXS_USBPHY0_BASE ;break ; +#ifdef CONFIG_MX28 case 1 : usb_base =MXS_USBCTRL1_BASE ; phy_base =MXS_USBPHY1_BASE ;break ; +#endif default :printf ("CONFIG_EHCI_MXS_PORT (port = %d)\n" , port);return -1 ;@@ -67,7 +69,9 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port)/* This DIGCTL register ungates clock to USB */ #define HW_DIGCTL_CTRL 0x8001c000#define HW_DIGCTL_CTRL_USB0_CLKGATE (1 << 2) +#ifdef CONFIG_MX28 #define HW_DIGCTL_CTRL_USB1_CLKGATE (1 << 16) +#endif int ehci_hcd_init (int index,struct ehci_hccr **hccr,struct ehci_hcor **hcor) {@@ -95,8 +99,12 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr,struct
ehci_hcor**hcor) writel(CLKCTRL_PLL1CTRL0_EN_USB_CLKS |CLKCTRL_PLL1CTRL0_POWER,
drivers/usb/host/ehci-mxs.c int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) · line 103
Quoted 4 lines
drivers/usb/host/ehci-mxs.c +2
-0&clkctrl_regs->hw_clkctrl_pll1ctrl0_set); +#if defined(CONFIG_MX23 ) +writel (HW_DIGCTL_CTRL_USB0_CLKGATE , &digctl_ctrl->reg_clr);
What is that large space before '&digctl_regs->...' ?
drivers/usb/host/ehci-mxs.c int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) · line 107
Quoted 4 lines
drivers/usb/host/ehci-mxs.c +2
-0+#elif defined(CONFIG_MX28 )writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , &digctl_ctrl->reg_clr); +#endif
I'm sure these can be wrapped in much more elegant way, yes?
Quoted 6 lines
drivers/usb/host/ehci-mxs.c +0
-0/* Start USB PHY */ writel (0 , &ehci_mxs.phy_regs->hw_usbphy_pwd);@@ -153,8 +161,12 @@ int ehci_hcd_stop(int index) &clkctrl_regs->hw_clkctrl_pll1ctrl0_clr);
drivers/usb/host/ehci-mxs.c int ehci_hcd_stop(int index) · line 172
Quoted 10 lines
drivers/usb/host/ehci-mxs.c +4
-0/* Gate off the USB clock */ +#if defined(CONFIG_MX23 ) +writel (HW_DIGCTL_CTRL_USB0_CLKGATE , &digctl_ctrl->reg_set); +#elif defined(CONFIG_MX28 )writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , &digctl_ctrl->reg_set); +#endif return 0 ; }
Best regards,
Marek Vasut
PATCH v2 7/10 usb: mxs: Disable USB Port 1 for i.MX23
Quoted 45 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 43 lines
The i.MX23 just one USB port so disable the second controller probe when building for i.MX23.
Signed-off-by Otavio Salvador <[email protected]>---
Changes in v2:
- Avoid wrong clock setting in MX23drivers/usb/host/ehci-mxs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/usb/host/ehci-mxs.c +4
-0@@ -50,10 +50,12 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) usb_base = MXS_USBCTRL0_BASE; phy_base =MXS_USBPHY0_BASE ;break ; +#ifdef CONFIG_MX28 case 1 : usb_base =MXS_USBCTRL1_BASE ; phy_base =MXS_USBPHY1_BASE ;break ; +#endif default :printf ("CONFIG_EHCI_MXS_PORT (port = %d)\n" , port);return -1 ;@@ -67,7 +69,9 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port)/* This DIGCTL register ungates clock to USB */ #define HW_DIGCTL_CTRL 0x8001c000#define HW_DIGCTL_CTRL_USB0_CLKGATE (1 << 2) +#ifdef CONFIG_MX28 #define HW_DIGCTL_CTRL_USB1_CLKGATE (1 << 16) +#endif int ehci_hcd_init (int index,struct ehci_hccr **hccr,struct ehci_hcor **hcor) {@@ -95,8 +99,12 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr,struct
ehci_hcor**hcor) writel(CLKCTRL_PLL1CTRL0_EN_USB_CLKS |CLKCTRL_PLL1CTRL0_POWER,&clkctrl_regs->hw_clkctrl_pll1ctrl0_set);
Quoted 4 lines
drivers/usb/host/ehci-mxs.c int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) · line 103
Quoted 2 lines
drivers/usb/host/ehci-mxs.c +2
-0+#if defined(CONFIG_MX23 ) +writel (HW_DIGCTL_CTRL_USB0_CLKGATE , &digctl_ctrl->reg_clr);What is that large space before '&digctl_regs->...' ?
My fault. I can fix it.
Quoted 6 lines
drivers/usb/host/ehci-mxs.c int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) · line 107
Quoted 4 lines
drivers/usb/host/ehci-mxs.c +2
-0+#elif defined(CONFIG_MX28 )writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , &digctl_ctrl->reg_clr); +#endif I'm sure these can be wrapped in much more elegant way, yes?
I wanted to keep the changes at minimum; so seems the right route. What you'd like me to do? Use a temporary variable?
Quoted 18 lines
Quoted 5 lines
/* Start USB PHY */ writel(0, &ehci_mxs.phy_regs->hw_usbphy_pwd);drivers/usb/host/ehci-mxs.c +0
-0@@ -153,8 +161,12 @@ int ehci_hcd_stop(int index) &clkctrl_regs->hw_clkctrl_pll1ctrl0_clr);drivers/usb/host/ehci-mxs.c int ehci_hcd_stop(int index) · line 172
Quoted 10 lines
drivers/usb/host/ehci-mxs.c +4
-0/* Gate off the USB clock */ +#if defined(CONFIG_MX23 ) +writel (HW_DIGCTL_CTRL_USB0_CLKGATE , &digctl_ctrl->reg_set); +#elif defined(CONFIG_MX28 )writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , &digctl_ctrl->reg_set); +#endif return 0 ; }Best regards,
Marek Vasut
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH v2 7/10 usb: mxs: Disable USB Port 1 for i.MX23
Dear Otavio Salvador,
Quoted 70 lines · Marek Vasut
Quoted 56 lines
Dear Otavio Salvador,
Quoted 54 lines
The i.MX23 just one USB port so disable the second controller probe when building for i.MX23.
Signed-off-by Otavio Salvador <[email protected]>---
Changes in v2:
- Avoid wrong clock setting in MX23drivers/usb/host/ehci-mxs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/usb/host/ehci-mxs.c +4
-0@@ -50,10 +50,12 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) usb_base = MXS_USBCTRL0_BASE; phy_base =MXS_USBPHY0_BASE ;break ; +#ifdef CONFIG_MX28 case 1 : usb_base =MXS_USBCTRL1_BASE ; phy_base =MXS_USBPHY1_BASE ;break ; +#endif default :printf ("CONFIG_EHCI_MXS_PORT (port = %d)\n" , port);return -1 ;@@ -67,7 +69,9 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port)/* This DIGCTL register ungates clock to USB */ #define HW_DIGCTL_CTRL 0x8001c000#define HW_DIGCTL_CTRL_USB0_CLKGATE (1 << 2) +#ifdef CONFIG_MX28 #define HW_DIGCTL_CTRL_USB1_CLKGATE (1 << 16) +#endif int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor**hcor) {
drivers/usb/host/ehci-mxs.c +0
-0@@ -95,8 +99,12 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr,struct
ehci_hcor**hcor) writel(CLKCTRL_PLL1CTRL0_EN_USB_CLKS |CLKCTRL_PLL1CTRL0_POWER,Quoted 6 lines
drivers/usb/host/ehci-mxs.c int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) · line 103
Quoted 4 lines
&clkctrl_regs->hw_clkctrl_pll1ctrl0_set);drivers/usb/host/ehci-mxs.c +2
-0+#if defined(CONFIG_MX23 ) +writel (HW_DIGCTL_CTRL_USB0_CLKGATE , &digctl_ctrl->reg_clr);What is that large space before '&digctl_regs->...' ?
My fault. I can fix it.
Quoted 4 lines
Quoted 4 lines
+#elif
defined(CONFIG_MX28)writel(HW_DIGCTL_CTRL_USB0_CLKGATE |
HW_DIGCTL_CTRL_USB1_CLKGATE,
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
&digctl_ctrl->reg_clr);+#endif
I'm sure these can be wrapped in much more elegant way, yes?
I wanted to keep the changes at minimum; so seems the right route. What you'd like me to do? Use a temporary variable?
Either that or wrap it all in struct ehci_mxs and do these ungatings etc on a per-port basis.
PATCH v2 7/10 usb: mxs: Disable USB Port 1 for i.MX23
Quoted 78 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 76 lines · Marek Vasut
Quoted 56 lines
Dear Otavio Salvador,
Quoted 54 lines
The i.MX23 just one USB port so disable the second controller probe when building for i.MX23.
Signed-off-by Otavio Salvador <[email protected]>---
Changes in v2:
- Avoid wrong clock setting in MX23drivers/usb/host/ehci-mxs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/usb/host/ehci-mxs.c +4
-0@@ -50,10 +50,12 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) usb_base = MXS_USBCTRL0_BASE; phy_base =MXS_USBPHY0_BASE ;break ; +#ifdef CONFIG_MX28 case 1 : usb_base =MXS_USBCTRL1_BASE ; phy_base =MXS_USBPHY1_BASE ;break ; +#endif default :printf ("CONFIG_EHCI_MXS_PORT (port = %d)\n" , port);return -1 ;@@ -67,7 +69,9 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port)/* This DIGCTL register ungates clock to USB */ #define HW_DIGCTL_CTRL 0x8001c000#define HW_DIGCTL_CTRL_USB0_CLKGATE (1 << 2) +#ifdef CONFIG_MX28 #define HW_DIGCTL_CTRL_USB1_CLKGATE (1 << 16) +#endif int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor**hcor) {
drivers/usb/host/ehci-mxs.c +0
-0@@ -95,8 +99,12 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr,struct
ehci_hcor**hcor) writel(CLKCTRL_PLL1CTRL0_EN_USB_CLKS |CLKCTRL_PLL1CTRL0_POWER,Quoted 6 lines
drivers/usb/host/ehci-mxs.c int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) · line 103
Quoted 4 lines
&clkctrl_regs->hw_clkctrl_pll1ctrl0_set);drivers/usb/host/ehci-mxs.c +2
-0+#if defined(CONFIG_MX23 ) +writel (HW_DIGCTL_CTRL_USB0_CLKGATE , &digctl_ctrl->reg_clr);What is that large space before '&digctl_regs->...' ?
My fault. I can fix it.
Quoted 9 lines
drivers/usb/host/ehci-mxs.c
Quoted 7 lines
drivers/usb/host/ehci-mxs.c +2
-0+#elif defined(CONFIG_MX28 )writel (HW_DIGCTL_CTRL_USB0_CLKGATE |HW_DIGCTL_CTRL_USB1_CLKGATE , &digctl_ctrl->reg_clr); +#endif I'm sure these can be wrapped in much more elegant way, yes?
Quoted 5 lines
Quoted 2 lines
I wanted to keep the changes at minimum; so seems the right route. What you'd like me to do? Use a temporary variable?
Either that or wrap it all in struct
ehci_mxsand do these ungatings etc on a per-port basis.
I've prepared the v3 of the patch; I will give it a runtime test tomorrow and send.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH v2 8/10 mx23evk: Enable USB support
In reply to Otavio SalvadorThis enabled USB support for the mx23evk board.
---
Changes in v2: None
include/configs/mx23evk.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/configs/mx23evk.h +10 -0
@@ -60,6 +60,7 @@#define CONFIG_CMD_FAT #define CONFIG_CMD_GPIO #define CONFIG_CMD_MMC +#define CONFIG_CMD_USB #define CONFIG_CMD_BOOTZ /* Memory configurations */
@@ -125,6 +126,15 @@#define CONFIG_MXS_MMC #endif +/* USB */ +#ifdef CONFIG_CMD_USB +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_MXS +#define CONFIG_EHCI_MXS_PORT 0 +#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_STORAGE +#endif +/* Boot Linux */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS
Signature · 1 line
1.8.1
PATCH v2 9/10 mx23_olinuxino: Enable USB support
In reply to Otavio SalvadorThis enabled USB support for the mx23_olinuxino board.
---
Changes in v2:
- Add changes for allow use of the USB hub
board/olimex/mx23_olinuxino/mx23_olinuxino.c | 6 ++++++ board/olimex/mx23_olinuxino/spl_boot.c | 4 ++++ include/configs/mx23_olinuxino.h | 10 ++++++++++ 3 files changed, 20 insertions(+)
board/olimex/mx23_olinuxino/mx23_olinuxino.c +6 -0
@@ -23,6 +23,7 @@*/ #include <common.h> +#include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/iomux-mx23.h> #include <asm/arch/imx-regs.h>
@@ -45,6 +46,11 @@ int board_early_init_f(void)/* SSP0 clock at 96MHz */ mxs_set_sspclk (MXC_SSPCLK0 ,96000 ,0 ); +#ifdef CONFIG_CMD_USB +/* Enable LAN9512 */ +gpio_direction_output (MX23_PAD_GPMI_ALE__GPIO_0_17 ,1 ); +#endif +return 0 ; }
board/olimex/mx23_olinuxino/spl_boot.c +4 -0
@@ -95,6 +95,10 @@ const iomux_cfg_t iomux_setup[] = {MX23_PAD_SSP1_DATA2__SSP1_DATA2 |MUX_CONFIG_SSP ,MX23_PAD_SSP1_DATA3__SSP1_DATA3 |MUX_CONFIG_SSP ,MX23_PAD_SSP1_SCK__SSP1_SCK |MUX_CONFIG_SSP , + +/* Ethernet */ +MX23_PAD_GPMI_ALE__GPIO_0_17 | + (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL), };void board_init_ll (void )
include/configs/mx23_olinuxino.h +10 -0
@@ -60,6 +60,7 @@#define CONFIG_CMD_GPIO #define CONFIG_CMD_LED #define CONFIG_CMD_MMC +#define CONFIG_CMD_USB /* * Memory configurations
@@ -140,6 +141,15 @@*/ #define CONFIG_APBH_DMA +/* USB */ +#ifdef CONFIG_CMD_USB +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_MXS +#define CONFIG_EHCI_MXS_PORT 0 +#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_STORAGE +#endif +/* * Boot Linux */
Signature · 1 line
1.8.1
PATCH v2 10/10 mx23_olinuxino: Add ethernet support
In reply to Otavio SalvadorThis adds support to the LAN9512 chip included in the board and extend the environment to easy netboot use.
---
Changes in v2:
- Remove extra newline
include/configs/mx23_olinuxino.h | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-)
include/configs/mx23_olinuxino.h +36 -3
@@ -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__ */
Signature · 1 line
1.8.1
PATCH v2 10/10 mx23_olinuxino: Add ethernet support
Dear Otavio Salvador,
Quoted 4 lines
This adds support to the LAN9512 chip included in the board and extend the environment to easy netboot use.
Signed-off-by Otavio Salvador <[email protected]>
You completely ignored previous discussion to make this ethernet thingie part of the previous patch.
Best regards,
Marek Vasut
PATCH v2 10/10 mx23_olinuxino: Add ethernet support
Quoted 9 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 4 lines
This adds support to the LAN9512 chip included in the board and extend the environment to easy netboot use.
Signed-off-by Otavio Salvador <[email protected]>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.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH v2 10/10 mx23_olinuxino: Add ethernet support
Dear Otavio Salvador,
Quoted 6 lines · Marek Vasut
Quoted 5 lines
Dear Otavio Salvador,
Quoted 3 lines
This adds support to the LAN9512 chip included in the board and extend the environment to easy netboot use.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Otavio Salvador <[email protected]>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
PATCH v2 10/10 mx23_olinuxino: Add ethernet support
Quoted 10 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 8 lines · Marek Vasut
Quoted 7 lines
Dear Otavio Salvador,
Quoted 4 lines
This adds support to the LAN9512 chip included in the board and extend the environment to easy netboot use.
Signed-off-by Otavio Salvador <[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
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.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH v2 10/10 mx23_olinuxino: Add ethernet support
Dear Otavio Salvador,
Quoted 17 lines · Marek Vasut
Quoted 16 lines
Dear Otavio Salvador,
Quoted 13 lines · Marek Vasut
Quoted 9 lines
Dear Otavio Salvador,
Quoted 4 lines
This adds support to the LAN9512 chip included in the board and extend the environment to easy netboot use.
Signed-off-by Otavio Salvador <[email protected]>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.
Quoted 7 lines
Quoted 2 lines
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
PATCH v2 10/10 mx23_olinuxino: Add ethernet support
Quoted 22 lines · Marek Vasut
Dear Otavio Salvador,
Quoted 20 lines · Marek Vasut
Quoted 18 lines
Dear Otavio Salvador,
Quoted 6 lines · Marek Vasut
Quoted 5 lines
Dear Otavio Salvador,
Quoted 3 lines
This adds support to the LAN9512 chip included in the board and extend the environment to easy netboot use.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Otavio Salvador <[email protected]>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.
Quoted 7 lines
Quoted 4 lines
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.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: otavio at ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br