mx28: Let imx_get_mac_from_fuse be common for mx28
PATCH v2 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
Let imx_get_mac_from_fuse function be a common function, so that other mx28 boards can reuse it.
--- arch/arm/cpu/arm926ejs/mx28/mx28.c | 35 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 2 + board/denx/m28evk/m28evk.c | 35 ---------------------------- 3 files changed, 37 insertions(+), 35 deletions(-)
arch/arm/cpu/arm926ejs/mx28/mx28.c +35 -0
@@ -214,6 +214,41 @@ int cpu_eth_init(bd_t *bis) }#endif +#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP + +#define MXS_OCOTP_MAX_TIMEOUT 1000000 +void imx_get_mac_from_fuse (char *mac) +{ +struct mx28_ocotp_regs *ocotp_regs = + (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; +uint32_t data; + +memset (mac,0 ,6 ); + +writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); + +if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , +MXS_OCOTP_MAX_TIMEOUT )) { +puts ("MXS FEC: Can't get MAC from OCOTP\n" ); +return ; + } + + data =readl (&ocotp_regs->hw_ocotp_cust0); + + mac[0 ] =0x00 ; + mac[1 ] =0x04 ; + mac[2 ] = (data >>24 ) &0xff ; + mac[3 ] = (data >>16 ) &0xff ; + mac[4 ] = (data >>8 ) &0xff ; + mac[5 ] = data &0xff ; +} +#else +void imx_get_mac_from_fuse (char *mac) +{ +memset (mac,0 ,6 ); +} +#endif + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",
arch/arm/include/asm/arch-mx28/sys_proto.h +2 -0
@@ -35,4 +35,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup, const unsigned int iomux_size);#endif +void imx_get_mac_from_fuse (char *mac); +#endif /* __MX28_H__ */
board/denx/m28evk/m28evk.c +0 -35
@@ -178,39 +178,4 @@ int board_eth_init(bd_t *bis) return ret; } -#ifdef CONFIG_M28_FEC_MAC_IN_OCOTP - -#define MXS_OCOTP_MAX_TIMEOUT 1000000 -void imx_get_mac_from_fuse (char *mac) -{ -struct mx28_ocotp_regs *ocotp_regs = - (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; -uint32_t data; - -memset (mac,0 ,6 ); - -writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); - -if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , -MXS_OCOTP_MAX_TIMEOUT )) { -printf ("MXS FEC: Can't get MAC from OCOTP\n" ); -return ; - } - - data =readl (&ocotp_regs->hw_ocotp_cust0); - - mac[0 ] =0x00 ; - mac[1 ] =0x04 ; - mac[2 ] = (data >>24 ) &0xff ; - mac[3 ] = (data >>16 ) &0xff ; - mac[4 ] = (data >>8 ) &0xff ; - mac[5 ] = data &0xff ; -} -#else -void imx_get_mac_from_fuse (char *mac) -{ -memset (mac,0 ,6 ); -} -#endif -#endif
Signature · 1 line
1.7.1
PATCH v2 2/3 mx28: Let dram_init be common for mx28
Let dram_init function be a common function, so that other mx28 boards can reuse it.
--- arch/arm/cpu/arm926ejs/mx28/mx28.c | 21 +++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 1 + board/denx/m28evk/m28evk.c | 21 --------------------- 3 files changed, 22 insertions(+), 21 deletions(-)
arch/arm/cpu/arm926ejs/mx28/mx28.c +21 -0
@@ -249,6 +249,27 @@ void imx_get_mac_from_fuse(char *mac) }#endif +#define HW_DIGCTRL_SCRATCH0 0x8001c280 +#define HW_DIGCTRL_SCRATCH1 0x8001c290 +int dram_init (void ) +{ +uint32_t sz[2 ]; + + sz[0 ] =readl (HW_DIGCTRL_SCRATCH0 ); + sz[1 ] =readl (HW_DIGCTRL_SCRATCH1 ); + +if (sz[0 ] != sz[1 ]) { +puts ("MX28:\n" +"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n" +"HW_DIGCTRL_SCRATCH1 is not the same. Please\n" +"verify these two registers contain valid RAM size!\n" ); +hang (); + } + + gd->ram_size = sz[0 ]; +return 0 ; +} + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",
arch/arm/include/asm/arch-mx28/sys_proto.h +1 -0
@@ -36,5 +36,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup,#endif void imx_get_mac_from_fuse (char *mac); +int dram_init (void );#endif /* __MX28_H__ */
board/denx/m28evk/m28evk.c +0 -21
@@ -70,27 +70,6 @@ int board_init(void)return 0 ; } -#define HW_DIGCTRL_SCRATCH0 0x8001c280 -#define HW_DIGCTRL_SCRATCH1 0x8001c290 -int dram_init (void ) -{ -uint32_t sz[2 ]; - - sz[0 ] =readl (HW_DIGCTRL_SCRATCH0 ); - sz[1 ] =readl (HW_DIGCTRL_SCRATCH1 ); - -if (sz[0 ] != sz[1 ]) { -printf ("MX28:\n" -"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n" -"HW_DIGCTRL_SCRATCH1 is not the same. Please\n" -"verify these two registers contain valid RAM size!\n" ); -hang (); - } - - gd->ram_size = sz[0 ]; -return 0 ; -} -#ifdef CONFIG_CMD_MMC static int m28_mmc_wp (int id) {
Signature · 1 line
1.7.1
PATCH v2 2/3 mx28: Let dram_init be common for mx28
Quoted 47 lines
Let
dram_initfunction be a common function, so that other mx28 boards can reuse it.Signed-off-by Fabio Estevam <[email protected]>--- arch/arm/cpu/arm926ejs/mx28/mx28.c | 21 +++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 1 + board/denx/m28evk/m28evk.c | 21 --------------------- 3 files changed, 22 insertions(+), 21 deletions(-)(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mx28/mx28.cindex 785978f..ec8eaf9 100644arch/arm/cpu/arm926ejs/mx28/mx28.c +21
-0@@ -249,6 +249,27 @@ void imx_get_mac_from_fuse(char *mac) }#endif +#define HW_DIGCTRL_SCRATCH0 0x8001c280 +#define HW_DIGCTRL_SCRATCH1 0x8001c290 +int dram_init (void ) +{ +uint32_t sz[2 ]; + + sz[0 ] =readl (HW_DIGCTRL_SCRATCH0 ); + sz[1 ] =readl (HW_DIGCTRL_SCRATCH1 ); + +if (sz[0 ] != sz[1 ]) { +puts ("MX28:\n" +"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n" +"HW_DIGCTRL_SCRATCH1 is not the same. Please\n" +"verify these two registers contain valid RAM size!\n" ); +hang (); + } + + gd->ram_size = sz[0 ]; +return 0 ; +} + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mx28/sys_proto.hindex cf5ab16..745b84d 100644
arch/arm/include/asm/arch-mx28/sys_proto.h void mx28_common_spl_init(const iomux_cfg_t *iomux_setup, · line 39
Quoted 4 lines
arch/arm/include/asm/arch-mx28/sys_proto.h +1
-0@@ -36,5 +36,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup,#endif void imx_get_mac_from_fuse (char *mac); +int dram_init (void );
Rename it to mx28_dram_init() or something please.
Quoted 24 lines
arch/arm/include/asm/arch-mx28/sys_proto.h +0
-0#endif /* __MX28_H__ */ board/denx/m28evk/m28evk.c +0
-14@@ -70,27 +70,6 @@ int board_init(void)return 0 ; } -#define HW_DIGCTRL_SCRATCH0 0x8001c280 -#define HW_DIGCTRL_SCRATCH1 0x8001c290 -int dram_init (void ) -{ -uint32_t sz[2 ]; - - sz[0 ] =readl (HW_DIGCTRL_SCRATCH0 ); - sz[1 ] =readl (HW_DIGCTRL_SCRATCH1 ); - -if (sz[0 ] != sz[1 ]) { -printf ("MX28:\n" -"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n" -"HW_DIGCTRL_SCRATCH1 is not the same. Please\n" -"verify these two registers contain valid RAM size!\n" );
board/denx/m28evk/m28evk.c int board_init(void) · line 75
Quoted 10 lines
board/denx/m28evk/m28evk.c +0
-7-hang (); - } - - gd->ram_size = sz[0 ]; -return 0 ; -} -#ifdef CONFIG_CMD_MMC static int m28_mmc_wp (int id) {
M
PATCH v2 3/3 mx28evk: Add initial support for MX28EVK board
In reply to Fabio EstevamAdd initial support for Freescale MX28EVK board.
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
---
- For correct operation of saving environment variables into the SD card, the following patch is needed:
http://lists.denx.de/pipermail/u-boot/2011-November/111448.html
Changes since v1:
- Read the MAC from fuses
- Use tabs instead of space in u-boot.bd
- Use puts instead of print
- Factor out mac reading function
- Factor out ddr size calculation function
- Use GENERATED_GBL_DATA_SIZE
- Protect CONFIG_ENV_IS_IN_MMC
MAINTAINERS | 1 + arch/arm/cpu/arm926ejs/mx28/mx28.c | 56 +++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 3 + board/denx/m28evk/m28evk.c | 56 --------- board/freescale/common/sdhc_boot.c | 2 + board/freescale/mx28evk/Makefile | 49 ++++++++ board/freescale/mx28evk/iomux.c | 138 ++++++++++++++++++++++ board/freescale/mx28evk/mx28evk.c | 164 ++++++++++++++++++++++++++ board/freescale/mx28evk/u-boot.bd | 14 +++ boards.cfg | 1 + include/configs/mx28evk.h | 172 ++++++++++++++++++++++++++++ 11 files changed, 600 insertions(+), 56 deletions(-) create mode 100644 board/freescale/mx28evk/Makefile create mode 100644 board/freescale/mx28evk/iomux.c create mode 100644 board/freescale/mx28evk/mx28evk.c create mode 100644 board/freescale/mx28evk/u-boot.bd create mode 100644 include/configs/mx28evk.h
MAINTAINERS +1 -0
@@ -639,6 +639,7 @@ Kristoffer Ericson <[email protected]> Fabio Estevam <[email protected]> mx25pdk i.MX25 + mx28evk i.MX28 mx31pdk i.MX31 mx53ard i.MX53 mx53smd i.MX53
arch/arm/cpu/arm926ejs/mx28/mx28.c +56 -0
62 lines not on this page · raw message
arch/arm/include/asm/arch-mx28/sys_proto.h +3 -0
@@ -35,4 +35,7 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup, const unsigned int iomux_size);#endif +void imx_get_mac_from_fuse (char *mac); +int dram_init (void ); +#endif /* __MX28_H__ */
board/denx/m28evk/m28evk.c +0 -56
66 lines not on this page · raw message
board/freescale/common/sdhc_boot.c +2 -0
@@ -32,6 +32,7 @@#define ESDHC_BOOT_IMAGE_SIZE 0x48#define ESDHC_BOOT_IMAGE_ADDR 0x50 +#if 0 int mmc_get_env_addr (struct mmc *mmc,u32 *env_addr) {u8 *tmp_buf;
@@ -61,3 +62,4 @@ int mmc_get_env_addr(struct mmc *mmc, u32 *env_addr) return 0; } +#endif
board/freescale/mx28evk/Makefile new file +49 -0
49 lines not on this page · raw message
board/freescale/mx28evk/iomux.c new file +138 -0
138 lines not on this page · raw message
board/freescale/mx28evk/mx28evk.c new file +164 -0
164 lines not on this page · raw message
board/freescale/mx28evk/u-boot.bd new file +14 -0
@@ -0,0 +1,14 @@ +sources { + u_boot_spl="spl/u-boot-spl.bin"; + u_boot="u-boot.bin"; +} + +section (0) { + load u_boot_spl > 0x0000; + load ivt (entry = 0x0014) > 0x8000; + hab call 0x8000; + + load u_boot > 0x40000100; + load ivt (entry = 0x40000100) > 0x8000; + hab call 0x8000; +}
boards.cfg +1 -0
@@ -160,6 +160,7 @@ zmx25 arm arm926ejs zmx25 syteco imx27lite arm arm926ejs imx27lite logicpd mx27 magnesium arm arm926ejs imx27lite logicpd mx27 m28evk arm arm926ejs - denx mx28 +mx28evk arm arm926ejs - freescale mx28 nhk8815 arm arm926ejs nhk8815 st nomadik nhk8815_onenand arm arm926ejs nhk8815 st nomadik nhk8815:BOOT_ONENAND omap1610h2 arm arm926ejs omap1610inn ti omap omap1610inn:CS3_BOOT
include/configs/mx28evk.h new file +172 -0
172 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v2 3/3 mx28evk: Add initial support for MX28EVK board
Quoted 56 lines · Fabio Estevam
Add initial support for Freescale MX28EVK board.
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
Signed-off-by Fabio Estevam <[email protected]>---
- For correct operation of saving environment variables into the SD card, the following patch is needed:
http://lists.denx.de/pipermail/u-boot/2011-November/111448.htmlChanges since v1:
- Read the MAC from fuses
- Use tabs instead of space in u-boot.bd
- Use puts instead of print
- Factor out mac reading function
- Factor out ddr size calculation function
- UseGENERATED_GBL_DATA_SIZE
- ProtectCONFIG_ENV_IS_IN_MMCMAINTAINERS | 1 + arch/arm/cpu/arm926ejs/mx28/mx28.c | 56 +++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 3 + board/denx/m28evk/m28evk.c | 56 --------- board/freescale/common/sdhc_boot.c | 2 + board/freescale/mx28evk/Makefile | 49 ++++++++ board/freescale/mx28evk/iomux.c | 138 ++++++++++++++++++++++ board/freescale/mx28evk/mx28evk.c | 164 ++++++++++++++++++++++++++ board/freescale/mx28evk/u-boot.bd | 14 +++ boards.cfg | 1 + include/configs/mx28evk.h | 172 ++++++++++++++++++++++++++++ 11 files changed, 600 insertions(+), 56 deletions(-) create mode 100644 board/freescale/mx28evk/Makefile create mode 100644 board/freescale/mx28evk/iomux.c create mode 100644 board/freescale/mx28evk/mx28evk.c create mode 100644 board/freescale/mx28evk/u-boot.bd create mode 100644 include/configs/mx28evk.hMAINTAINERS +1
-0@@ -639,6 +639,7 @@ Kristoffer Ericson <[email protected]> Fabio Estevam <[email protected]> mx25pdk i.MX25 + mx28evk i.MX28 mx31pdk i.MX31 mx53ard i.MX53 mx53smd i.MX53arch/arm/cpu/arm926ejs/mx28/mx28.c +0
-0@@ -214,6 +214,62 @@ int cpu_eth_init(bd_t *bis) }
arch/arm/cpu/arm926ejs/mx28/mx28.c int cpu_eth_init(bd_t *bis) · line 224
Quoted 10 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c +8
-0#endif +#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP + +#define MXS_OCOTP_MAX_TIMEOUT 1000000 +void imx_get_mac_from_fuse (char *mac) +{ +struct mx28_ocotp_regs *ocotp_regs = + (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; +uint32_t data;
Wait...this patch conflict with your first patch of your patchset, where you have already move this code in a common place. Anything wrong with your patchset ?
Regards,
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 3/3 mx28evk: Add initial support for MX28EVK board
Quoted 3 lines · Stefano Babic
Wait...this patch conflict with your first patch of your patchset, where you have already move this code in a common place. Anything wrong with your patchset ?
Sorry about that. I sent a fixed v3 version.
Thanks,
Fabio Estevam
PATCH v3 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
In reply to Fabio EstevamLet imx_get_mac_from_fuse function be a common function, so that other mx28 boards can reuse it.
--- arch/arm/cpu/arm926ejs/mx28/mx28.c | 35 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 2 + board/denx/m28evk/m28evk.c | 35 ---------------------------- 3 files changed, 37 insertions(+), 35 deletions(-)
arch/arm/cpu/arm926ejs/mx28/mx28.c +35 -0
@@ -214,6 +214,41 @@ int cpu_eth_init(bd_t *bis) }#endif +#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP + +#define MXS_OCOTP_MAX_TIMEOUT 1000000 +void imx_get_mac_from_fuse (char *mac) +{ +struct mx28_ocotp_regs *ocotp_regs = + (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; +uint32_t data; + +memset (mac,0 ,6 ); + +writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); + +if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , +MXS_OCOTP_MAX_TIMEOUT )) { +puts ("MXS FEC: Can't get MAC from OCOTP\n" ); +return ; + } + + data =readl (&ocotp_regs->hw_ocotp_cust0); + + mac[0 ] =0x00 ; + mac[1 ] =0x04 ; + mac[2 ] = (data >>24 ) &0xff ; + mac[3 ] = (data >>16 ) &0xff ; + mac[4 ] = (data >>8 ) &0xff ; + mac[5 ] = data &0xff ; +} +#else +void imx_get_mac_from_fuse (char *mac) +{ +memset (mac,0 ,6 ); +} +#endif + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",
arch/arm/include/asm/arch-mx28/sys_proto.h +2 -0
@@ -35,4 +35,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup, const unsigned int iomux_size);#endif +void imx_get_mac_from_fuse (char *mac); +#endif /* __MX28_H__ */
board/denx/m28evk/m28evk.c +0 -35
@@ -178,39 +178,4 @@ int board_eth_init(bd_t *bis) return ret; } -#ifdef CONFIG_M28_FEC_MAC_IN_OCOTP - -#define MXS_OCOTP_MAX_TIMEOUT 1000000 -void imx_get_mac_from_fuse (char *mac) -{ -struct mx28_ocotp_regs *ocotp_regs = - (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; -uint32_t data; - -memset (mac,0 ,6 ); - -writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); - -if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , -MXS_OCOTP_MAX_TIMEOUT )) { -printf ("MXS FEC: Can't get MAC from OCOTP\n" ); -return ; - } - - data =readl (&ocotp_regs->hw_ocotp_cust0); - - mac[0 ] =0x00 ; - mac[1 ] =0x04 ; - mac[2 ] = (data >>24 ) &0xff ; - mac[3 ] = (data >>16 ) &0xff ; - mac[4 ] = (data >>8 ) &0xff ; - mac[5 ] = data &0xff ; -} -#else -void imx_get_mac_from_fuse (char *mac) -{ -memset (mac,0 ,6 ); -} -#endif -#endif
Signature · 1 line
1.7.1
PATCH v3 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
Quoted 3 lines
Let
imx_get_mac_from_fusefunction be a common function, so that other mx28 boards can reuse it.
Please add summaries (what does "v2" "v3" etc. change ...) so we don't have to review this again and again.
M
PATCH v3 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
In reply to Fabio EstevamQuoted 5 lines · Fabio Estevam
Let
imx_get_mac_from_fusefunction be a common function, so that other mx28 boards can reuse it.Signed-off-by Fabio Estevam <[email protected]>---
Hi Fabio,
arch/arm/cpu/arm926ejs/mx28/mx28.c int cpu_eth_init(bd_t *bis) · line 239
Quoted 10 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c +10
-0+if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , +MXS_OCOTP_MAX_TIMEOUT )) { +puts ("MXS FEC: Can't get MAC from OCOTP\n" ); +return ; + } + + data =readl (&ocotp_regs->hw_ocotp_cust0); + + mac[0 ] =0x00 ; + mac[1 ] =0x04 ;
Maybe it is worth to add a comment to explain that the magic numbers 0x00 - 0x04 are the Freescale's vendor prefix.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v3 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
Dear Fabio,
Quoted 9 lines · In message <[email protected]> Stefano Babic wrote:
Quoted 5 lines · Fabio Estevam
Let
imx_get_mac_from_fusefunction be a common function, so that other mx28 boards can reuse it.Signed-off-by Fabio Estevam <[email protected]>---
Hi Fabio,
Quoted 13 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c int cpu_eth_init(bd_t *bis) · line 239
Quoted 10 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c +10
-0+if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , +MXS_OCOTP_MAX_TIMEOUT )) { +puts ("MXS FEC: Can't get MAC from OCOTP\n" ); +return ; + } + + data =readl (&ocotp_regs->hw_ocotp_cust0); + + mac[0 ] =0x00 ; + mac[1 ] =0x04 ;Maybe it is worth to add a comment to explain that the magic numbers
0x00-0x04are the Freescale's vendor prefix.
This is a common file, right? Then what about boards from other vendors?
I think this is not OK as is.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Dealing with failure is easy: work hard to improve. Success is also easy to handle: you've solved the wrong problem. Work hard to improve.
PATCH v3 2/3 mx28: Let dram_init be common for mx28
In reply to Fabio EstevamLet dram_init function be a common function, so that other mx28 boards can reuse it.
--- arch/arm/cpu/arm926ejs/mx28/mx28.c | 21 +++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 1 + board/denx/m28evk/m28evk.c | 21 --------------------- 3 files changed, 22 insertions(+), 21 deletions(-)
arch/arm/cpu/arm926ejs/mx28/mx28.c +21 -0
@@ -249,6 +249,27 @@ void imx_get_mac_from_fuse(char *mac) }#endif +#define HW_DIGCTRL_SCRATCH0 0x8001c280 +#define HW_DIGCTRL_SCRATCH1 0x8001c290 +int dram_init (void ) +{ +uint32_t sz[2 ]; + + sz[0 ] =readl (HW_DIGCTRL_SCRATCH0 ); + sz[1 ] =readl (HW_DIGCTRL_SCRATCH1 ); + +if (sz[0 ] != sz[1 ]) { +puts ("MX28:\n" +"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n" +"HW_DIGCTRL_SCRATCH1 is not the same. Please\n" +"verify these two registers contain valid RAM size!\n" ); +hang (); + } + + gd->ram_size = sz[0 ]; +return 0 ; +} + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",
arch/arm/include/asm/arch-mx28/sys_proto.h +1 -0
@@ -36,5 +36,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup,#endif void imx_get_mac_from_fuse (char *mac); +int dram_init (void );#endif /* __MX28_H__ */
board/denx/m28evk/m28evk.c +0 -21
@@ -70,27 +70,6 @@ int board_init(void)return 0 ; } -#define HW_DIGCTRL_SCRATCH0 0x8001c280 -#define HW_DIGCTRL_SCRATCH1 0x8001c290 -int dram_init (void ) -{ -uint32_t sz[2 ]; - - sz[0 ] =readl (HW_DIGCTRL_SCRATCH0 ); - sz[1 ] =readl (HW_DIGCTRL_SCRATCH1 ); - -if (sz[0 ] != sz[1 ]) { -printf ("MX28:\n" -"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n" -"HW_DIGCTRL_SCRATCH1 is not the same. Please\n" -"verify these two registers contain valid RAM size!\n" ); -hang (); - } - - gd->ram_size = sz[0 ]; -return 0 ; -} -#ifdef CONFIG_CMD_MMC static int m28_mmc_wp (int id) {
Signature · 1 line
1.7.1
PATCH v3 3/3 mx28evk: Add initial support for MX28EVK board
In reply to Fabio EstevamAdd initial support for Freescale MX28EVK board.
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
---
- For correct operation of saving environment variables into the SD card, the following patch is needed:
http://lists.denx.de/pipermail/u-boot/2011-November/111448.html
Changes since v2:
- Generate the patch again due to error in applying unrelated changes Changes since v1:
- Read the MAC from fuses
- Use tabs instead of space in u-boot.bd
- Use puts instead of print
- Factor out mac reading function
- Factor out ddr size calculation function
- Use GENERATED_GBL_DATA_SIZE
- Protect CONFIG_ENV_IS_IN_MMC
MAINTAINERS | 1 + board/freescale/mx28evk/Makefile | 49 +++++++++++ board/freescale/mx28evk/iomux.c | 138 +++++++++++++++++++++++++++++ board/freescale/mx28evk/mx28evk.c | 164 +++++++++++++++++++++++++++++++++++ board/freescale/mx28evk/u-boot.bd | 14 +++ boards.cfg | 1 + include/configs/mx28evk.h | 172 +++++++++++++++++++++++++++++++++++++ 7 files changed, 539 insertions(+), 0 deletions(-) create mode 100644 board/freescale/mx28evk/Makefile create mode 100644 board/freescale/mx28evk/iomux.c create mode 100644 board/freescale/mx28evk/mx28evk.c create mode 100644 board/freescale/mx28evk/u-boot.bd create mode 100644 include/configs/mx28evk.h
MAINTAINERS +1 -0
@@ -639,6 +639,7 @@ Kristoffer Ericson <[email protected]> Fabio Estevam <[email protected]> mx25pdk i.MX25 + mx28evk i.MX28 mx31pdk i.MX31 mx53ard i.MX53 mx53smd i.MX53
board/freescale/mx28evk/Makefile new file +49 -0
49 lines not on this page · raw message
board/freescale/mx28evk/iomux.c new file +138 -0
138 lines not on this page · raw message
board/freescale/mx28evk/mx28evk.c new file +164 -0
164 lines not on this page · raw message
board/freescale/mx28evk/u-boot.bd new file +14 -0
@@ -0,0 +1,14 @@ +sources { + u_boot_spl="spl/u-boot-spl.bin"; + u_boot="u-boot.bin"; +} + +section (0) { + load u_boot_spl > 0x0000; + load ivt (entry = 0x0014) > 0x8000; + hab call 0x8000; + + load u_boot > 0x40000100; + load ivt (entry = 0x40000100) > 0x8000; + hab call 0x8000; +}
boards.cfg +1 -0
@@ -160,6 +160,7 @@ zmx25 arm arm926ejs zmx25 syteco imx27lite arm arm926ejs imx27lite logicpd mx27 magnesium arm arm926ejs imx27lite logicpd mx27 m28evk arm arm926ejs - denx mx28 +mx28evk arm arm926ejs - freescale mx28 nhk8815 arm arm926ejs nhk8815 st nomadik nhk8815_onenand arm arm926ejs nhk8815 st nomadik nhk8815:BOOT_ONENAND omap1610h2 arm arm926ejs omap1610inn ti omap omap1610inn:CS3_BOOT
include/configs/mx28evk.h new file +172 -0
172 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v3 3/3 mx28evk: Add initial support for MX28EVK board
Quoted 7 lines
Add initial support for Freescale MX28EVK board.
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
Signed-off-by Fabio Estevam <[email protected]>---
1) Do you use the DRAM init data used by DENX boards ?
include/configs/mx28evk.h line 3
Quoted 10 lines
diff --git
a/include/configs/mx28evk.hb/include/configs/mx28evk.hnew file mode 100644
index 0000000..40b64bfinclude/configs/mx28evk.h new file +3
-0@@ -0,0 +1,172 @@ +/* +* Copyright (C) 2011 Marek Vasut <[email protected]> +* on behalf of DENX Software Engineering GmbH
Please recheck these ;-)
Quoted 53 lines
include/configs/mx28evk.h new file +53
-0+* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <asm/arch/regs-base.h> + +/* +* SoC configurations +*/ +#define CONFIG_MX28 /* i.MX28 SoC */ +#define CONFIG_MXS_GPIO /* GPIO control */ +#define CONFIG_SYS_HZ 1000/* Ticks per second */ + +#define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK + +#define CONFIG_SYS_NO_FLASH +#define CONFIG_SYS_ICACHE_OFF +#define CONFIG_SYS_DCACHE_OFF +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_ARCH_CPU_INIT +#define CONFIG_ARCH_MISC_INIT + +/* +* SPL +*/ +#define CONFIG_SPL +#define CONFIG_SPL_NO_CPU_SUPPORT_CODE +#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mx28" +#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds" +#define CONFIG_SPL_LIBCOMMON_SUPPORT +#define CONFIG_SPL_LIBGENERIC_SUPPORT + +/* +* U-Boot Commands +*/ +#include <config_cmd_default.h> +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_FAT + +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_GPIO
include/configs/mx28evk.h
Quoted 10 lines
include/configs/mx28evk.h new file +10
-0+#define CONFIG_CMD_MII +#define CONFIG_CMD_MMC +#define CONFIG_CMD_NET +#define CONFIG_CMD_NFS +#define CONFIG_CMD_PING + +/* +* Memory configurations +*/ +#define CONFIG_NR_DRAM_BANKS 1/* 1 bank of
DRAM */
include/configs/mx28evk.h line 67
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define PHYS_SDRAM_1 0x40000000/* Base address
*/
include/configs/mx28evk.h line 68
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define PHYS_SDRAM_1_SIZE 0x40000000/* Max 1 GB RAM
*/
include/configs/mx28evk.h line 69
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define CONFIG_STACKSIZE (128 * 1024)/* 128 KB stack
*/
include/configs/mx28evk.h line 70
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define CONFIG_SYS_MALLOC_LEN 0x00400000/* 4 MB for
malloc */
include/configs/mx28evk.h line 71
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define CONFIG_SYS_MEMTEST_START 0x40000000/* Memtest start
adr */
include/configs/mx28evk.h line 72
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define CONFIG_SYS_MEMTEST_END 0x40400000/* 4 MB RAM test
*/
Quoted 15 lines
include/configs/mx28evk.h new file +15
-0+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +/* Point initial SP in SRAM so SPL can use it too. */ + +#define CONFIG_SYS_INIT_RAM_ADDR 0x00002000 +#define CONFIG_SYS_INIT_RAM_SIZE (128 * 1024) + +#define CONFIG_SYS_INIT_SP_OFFSET \ + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + +/* +* We need to sacrifice first 4 bytes of RAM here to avoid triggering some +* strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot +* binary. In case there was more of this mess, 0x100 bytes are skipped.
include/configs/mx28evk.h
Quoted 10 lines
include/configs/mx28evk.h new file +10
-0+*/ +#define CONFIG_SYS_TEXT_BASE 0x40000100 + +#define CONFIG_ENV_OVERWRITE +/* +* U-Boot general configurations +*/ +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_PROMPT "MX28EVK U-Boot > " +#define CONFIG_SYS_CBSIZE 1024/* Console I/O buffer
size */
include/configs/mx28evk.h
Quoted 4 lines
include/configs/mx28evk.h new file +4
-0+#define CONFIG_SYS_PBSIZE \ + (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +/* Print buffer size */ +#define CONFIG_SYS_MAXARGS 32/* Max number of command
args */
include/configs/mx28evk.h
Quoted 4 lines
include/configs/mx28evk.h new file +4
-0+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +/* Boot argument buffer size */ +#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ +#define CONFIG_AUTO_COMPLETE /* Command auto complete
*/
include/configs/mx28evk.h line 106
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define CONFIG_CMDLINE_EDITING /* Command history etc
*/
include/configs/mx28evk.h
Quoted 12 lines
include/configs/mx28evk.h new file +12
-0+#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + +/* +* Serial Driver +*/ +#define CONFIG_PL011_SERIAL +#define CONFIG_PL011_CLOCK 24000000 +#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } +#define CONFIG_CONS_INDEX 0 +#define CONFIG_BAUDRATE 115200/* Default baud rate */ +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600,
115200 }
Quoted 44 lines
include/configs/mx28evk.h new file +44
-0+ +/* +* MMC Driver +*/ +#ifdef CONFIG_CMD_MMC +#define CONFIG_MMC +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_ENV_OFFSET (256 * 1024) +#define CONFIG_ENV_SIZE (16 * 1024) +#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_CMD_SAVEENV +#define CONFIG_GENERIC_MMC +#define CONFIG_MXS_MMC +#endif + +/* +* Ethernet on SOC (FEC) +*/ +#ifdef CONFIG_CMD_NET +#define CONFIG_NET_MULTI +#define CONFIG_ETHPRIME "FEC0" +#define CONFIG_FEC_MXC +#define CONFIG_FEC_MXC_MULTI +#define CONFIG_MII +#define CONFIG_DISCOVER_PHY +#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_MX28_FEC_MAC_IN_OCOTP +#endif + +/* +* Boot Linux +*/ +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTFILE "uImage" +#define CONFIG_BOOTCOMMAND "run bootcmd_net" +#define CONFIG_LOADADDR 0x42000000 +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + +/* +* Extra Environments +*/ +#define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/mx28evk.h line 172
Quoted 10 lines
include/configs/mx28evk.h new file +10
-0+"console_fsl=console=ttyAM0" \ +"console_mainline=console=ttyAMA0" \ +"netargs=setenv bootargs console=${console_mainline}" \ +"root=/dev/nfs " \ +"ip=dhcp nfsroot=${serverip}:${nfsroot}\0" \ +"bootcmd_net=echo Booting from net ...; " \ +"run netargs; " \ + "dhcp ${uimage}; bootm\0" \ + +#endif /* __CONFIG_H */
Otherwise it seems OK.
M
PATCH v3 3/3 mx28evk: Add initial support for MX28EVK board
Quoted 1 line · Marek Vasut
1) Do you use the DRAM init data used by DENX boards ?
Yes, same DDR settings.
PATCH v2 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
In reply to Fabio EstevamQuoted 33 lines
Let
imx_get_mac_from_fusefunction be a common function, so that other mx28 boards can reuse it.Signed-off-by Fabio Estevam <[email protected]>--- arch/arm/cpu/arm926ejs/mx28/mx28.c | 35 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 2 + board/denx/m28evk/m28evk.c | 35---------------------------- 3 files changed, 37 insertions(+), 35 deletions(-)
(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mx28/mx28.cindex 088c019..785978f 100644arch/arm/cpu/arm926ejs/mx28/mx28.c +13
-0@@ -214,6 +214,41 @@ int cpu_eth_init(bd_t *bis) }#endif +#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP + +#define MXS_OCOTP_MAX_TIMEOUT 1000000 +void imx_get_mac_from_fuse (char *mac) +{ +struct mx28_ocotp_regs *ocotp_regs = + (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; +uint32_t data; + +memset (mac,0 ,6 ); + +writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); +
arch/arm/cpu/arm926ejs/mx28/mx28.c int cpu_eth_init(bd_t *bis) · line 239
Quoted 10 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c +10
-0+if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , +MXS_OCOTP_MAX_TIMEOUT )) { +puts ("MXS FEC: Can't get MAC from OCOTP\n" ); +return ; + } + + data =readl (&ocotp_regs->hw_ocotp_cust0); + + mac[0 ] =0x00 ; + mac[1 ] =0x04 ;
Be careful here. 0x00 0x04 prefix might not be correct for all cases!
Quoted 60 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c +12
-0+ mac[2 ] = (data >>24 ) &0xff ; + mac[3 ] = (data >>16 ) &0xff ; + mac[4 ] = (data >>8 ) &0xff ; + mac[5 ] = data &0xff ; +} +#else +void imx_get_mac_from_fuse (char *mac) +{ +memset (mac,0 ,6 ); +} +#endif + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mx28/sys_proto.hindex be1f7db..cf5ab16 100644arch/arm/include/asm/arch-mx28/sys_proto.h +2
-0@@ -35,4 +35,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup, const unsigned int iomux_size);#endif +void imx_get_mac_from_fuse (char *mac); +#endif /* __MX28_H__ */ board/denx/m28evk/m28evk.c +0
-26@@ -178,39 +178,4 @@ int board_eth_init(bd_t *bis)return ret; } -#ifdef CONFIG_M28_FEC_MAC_IN_OCOTP - -#define MXS_OCOTP_MAX_TIMEOUT 1000000 -void imx_get_mac_from_fuse (char *mac) -{ -struct mx28_ocotp_regs *ocotp_regs = - (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; -uint32_t data; - -memset (mac,0 ,6 ); - -writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); - -if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , -MXS_OCOTP_MAX_TIMEOUT )) { -printf ("MXS FEC: Can't get MAC from OCOTP\n" ); -return ; - } - - data =readl (&ocotp_regs->hw_ocotp_cust0); - - mac[0 ] =0x00 ; - mac[1 ] =0x04 ; - mac[2 ] = (data >>24 ) &0xff ; - mac[3 ] = (data >>16 ) &0xff ; - mac[4 ] = (data >>8 ) &0xff ;
board/denx/m28evk/m28evk.c int board_eth_init(bd_t *bis) · line 181
Quoted 10 lines
board/denx/m28evk/m28evk.c +0
-9- mac[5 ] = data &0xff ; -} -#else -void imx_get_mac_from_fuse (char *mac) -{ -memset (mac,0 ,6 ); -} -#endif -#endif
Otherwise, sure, it seems OK.
M
PATCH v2 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
Quoted 4 lines · Marek Vasut
Quoted 4 lines
Let
imx_get_mac_from_fusefunction be a common function, so that other mx28 boards can reuse it.Signed-off-by Fabio Estevam <[email protected]>
Hi Marek,
Quoted 6 lines
Quoted 6 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c +6
-0+writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); + +if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , +MXS_OCOTP_MAX_TIMEOUT )) { +puts ("MXS FEC: Can't get MAC from OCOTP\n" ); +return ;
Quoted 8 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c int cpu_eth_init(bd_t *bis) · line 239
Quoted 6 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c +6
-0+ } + + data =readl (&ocotp_regs->hw_ocotp_cust0); + + mac[0 ] =0x00 ; + mac[1 ] =0x04 ;Be careful here.
0x000x04prefix might not be correct for all cases!
But to be honest, it seems they are correct for the MX28EVK and not for the M28EVK. The M28EVK and the M28 module are delivered with their own MAC address that does not belong to the Freescale's range.
As far as I can see, the M28EVK starts with a Freescale's MAC, and then the DENX MAC address (Vendor ID C0:E5:4E) is set later to the correct value when Linux boots.
I can understand this feature in the SOC as a way to set the LSBs of the MAC address, but leaving to the customer a way to set its own vendor id, if he bought it.
What about to add a weak function (board_set_mac_vendor, maybe ?) that can be called at this point to set the vendor id ? The default behavior should be to set the Freescale's vendor id.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
Quoted 7 lines · Marek Vasut
Quoted 4 lines
Quoted 4 lines
Let
imx_get_mac_from_fusefunction be a common function, so that other mx28 boards can reuse it.Signed-off-by Fabio Estevam <[email protected]>Hi Marek,
Hi Stefano,
Quoted 16 lines
Quoted 15 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c int cpu_eth_init(bd_t *bis) · line 239
Quoted 13 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c +3
-0+writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); + + if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg,
OCOTP_CTRL_BUSY, +MXS_OCOTP_MAX_TIMEOUT)) {arch/arm/cpu/arm926ejs/mx28/mx28.c +8
-0+puts ("MXS FEC: Can't get MAC from OCOTP\n" ); +return ; + } + + data =readl (&ocotp_regs->hw_ocotp_cust0); + + mac[0 ] =0x00 ; + mac[1 ] =0x04 ;Be careful here.
0x000x04prefix might not be correct for all cases!
Quoted 7 lines
But to be honest, it seems they are correct for the MX28EVK and not for the M28EVK. The M28EVK and the M28 module are delivered with their own MAC address that does not belong to the Freescale's range.
As far as I can see, the M28EVK starts with a Freescale's MAC, and then the DENX MAC address (Vendor ID C0:E5:4E) is set later to the correct value when Linux boots.
It's actually set even in uboot by ethaddr and eth1addr. This is the default behaviour.
Quoted 8 lines
I can understand this feature in the SOC as a way to set the LSBs of the MAC address, but leaving to the customer a way to set its own vendor id, if he bought it.
What about to add a weak function (
board_set_mac_vendor, maybe ?) that can be called at this point to set the vendor id ? The default behavior should be to set the Freescale's vendor id.
ethaddr and eth1addr is insufficient?
M
PATCH v2 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
Quoted 6 lines · Marek Vasut
Quoted 6 lines · Marek Vasut
Quoted 4 lines
Quoted 4 lines
Let
imx_get_mac_from_fusefunction be a common function, so that other mx28 boards can reuse it.Signed-off-by Fabio Estevam <[email protected]>
Hi Marek,
Quoted 6 lines
Quoted 6 lines
Quoted 1 line
Be careful here.
0x000x04prefix might not be correct for all cases!But to be honest, it seems they are correct for the MX28EVK and not for the M28EVK. The M28EVK and the M28 module are delivered with their own MAC address that does not belong to the Freescale's range.
Quoted 6 lines
Quoted 3 lines
As far as I can see, the M28EVK starts with a Freescale's MAC, and then the DENX MAC address (Vendor ID C0:E5:4E) is set later to the correct value when Linux boots.
It's actually set even in uboot by ethaddr and eth1addr. This is the default behaviour.
This means ethaddr overwrites the values read from fuses - why do we need the fuses ?
Quoted 11 lines
Quoted 9 lines
I can understand this feature in the SOC as a way to set the LSBs of the MAC address, but leaving to the customer a way to set its own vendor id, if he bought it.
What about to add a weak function (
board_set_mac_vendor, maybe ?) that can be called at this point to set the vendor id ? The default behavior should be to set the Freescale's vendor id.ethaddr and eth1addr is insufficient?
In a standard way, the environment must be adapted for each board to store the MAC address in the ethaddr variable. The reason to get the MAC directly from the hardware is that it is not required a specific initial setup for each board, and that simplifies the production and the delivery of the boards.
If you rely on ethaddr, than we do not need imx_get_mac_from_fuse() at all, and the MAC can be set to zero, because in this case the ethaddr value is used - but we lose the feature.
The reason why imx_get_mac_from_fuse was introduce is to have an automatic mechanism to set up the MAC without any customization.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
Quoted 8 lines · Marek Vasut
Quoted 5 lines
Quoted 5 lines · Marek Vasut
Quoted 4 lines
Quoted 4 lines
Let
imx_get_mac_from_fusefunction be a common function, so that other mx28 boards can reuse it.Signed-off-by Fabio Estevam <[email protected]>Hi Marek,
Hi Stefano,
DISCLAIMER: I'm terribly tired today, had early class.
Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 2 lines
Be careful here.
0x000x04prefix might not be correct for all cases!But to be honest, it seems they are correct for the MX28EVK and not for the M28EVK. The M28EVK and the M28 module are delivered with their own MAC address that does not belong to the Freescale's range.
As far as I can see, the M28EVK starts with a Freescale's MAC, and then the DENX MAC address (Vendor ID C0:E5:4E) is set later to the correct value when Linux boots.
Quoted 5 lines
Quoted 2 lines
It's actually set even in uboot by ethaddr and eth1addr. This is the default behaviour.
This means ethaddr overwrites the values read from fuses - why do we need the fuses ?
You disable fuses and use ethaddr. Why do we need them? We don't, but the hardware is in the CPU and someone might use it so let's support it.
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
I can understand this feature in the SOC as a way to set the LSBs of the MAC address, but leaving to the customer a way to set its own vendor id, if he bought it.
What about to add a weak function (
board_set_mac_vendor, maybe ?) that can be called at this point to set the vendor id ? The default behavior should be to set the Freescale's vendor id.
Quoted 7 lines
Quoted 1 line
ethaddr and eth1addr is insufficient?
In a standard way, the environment must be adapted for each board to store the MAC address in the ethaddr variable. The reason to get the MAC directly from the hardware is that it is not required a specific initial setup for each board, and that simplifies the production and the delivery of the boards.
Sure, but the OCOTP capacity here is limited. But there was approach from Fabio/me how to make the OCOTP good enough for two NICs even.
* The idea is to let user configure the top 2 bytes per-device (which is the most likely case).
* Introduce mac_modify(int fec, char *mac) function, which will be called from imx_get_mac_from_fuse()
* The function will adjust the MAC, for example by setting top two bytes to preconfigured data, bottom four bytes from OCOTP and the last bit of the MAC from "int fec", which is 0 for FEC0 and 1 for FEC1. This should be sufficient for most people.
* The function will be weak so it can be overridden to your hearts content.
Quoted 10 lines
If you rely on ethaddr, than we do not need
imx_get_mac_from_fuse()at all, and the MAC can be set to zero, because in this case the ethaddr value is used - but we lose the feature.The reason why
imx_get_mac_from_fusewas introduce is to have an automatic mechanism to set up the MAC without any customization.Best regards,
Stefano Babic
Cheers!
M
PATCH v2 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
Quoted 6 lines · Marek Vasut
Quoted 2 lines
Hi Marek,
Hi Stefano,
DISCLAIMER: I'm terribly tired today, had early class.
ok, I understand..;-)
Quoted 3 lines
You disable fuses and use ethaddr. Why do we need them? We don't, but the hardware is in the CPU and someone might use it so let's support it.
Exactly - see also othe IMX SOCs.
Quoted 8 lines
Quoted 5 lines
In a standard way, the environment must be adapted for each board to store the MAC address in the ethaddr variable. The reason to get the MAC directly from the hardware is that it is not required a specific initial setup for each board, and that simplifies the production and the delivery of the boards.
Sure, but the OCOTP capacity here is limited. But there was approach from Fabio/me how to make the OCOTP good enough for two NICs even.
And this is nice.
Quoted 2 lines
* The idea is to let user configure the top 2 bytes per-device (which is the most likely case).
This is exactly what I meant.
Quoted 6 lines
* Introduce
mac_modify(int fec, char *mac)function, which will be called fromimx_get_mac_from_fuse()
* The function will adjust the MAC, for example by setting top two bytes to preconfigured data, bottom four bytes from OCOTP and the last bit of the MAC from "int fec", which is 0 for FEC0 and 1 for FEC1. This should be sufficient for most people.
Exactly !
Quoted 1 line
* The function will be weak so it can be overridden to your hearts content.
Right !
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
Quoted 37 lines · Marek Vasut
Quoted 5 lines
Quoted 1 line
Hi Marek,
Hi Stefano,
DISCLAIMER: I'm terribly tired today, had early class.
ok, I understand..;-)
Quoted 2 lines
You disable fuses and use ethaddr. Why do we need them? We don't, but the hardware is in the CPU and someone might use it so let's support it.
Exactly - see also othe IMX SOCs.
Quoted 8 lines
Quoted 5 lines
In a standard way, the environment must be adapted for each board to store the MAC address in the ethaddr variable. The reason to get the MAC directly from the hardware is that it is not required a specific initial setup for each board, and that simplifies the production and the delivery of the boards.
Sure, but the OCOTP capacity here is limited. But there was approach from Fabio/me how to make the OCOTP good enough for two NICs even.
And this is nice.
Quoted 2 lines
* The idea is to let user configure the top 2 bytes per-device (which is the most likely case).
This is exactly what I meant.
Quoted 6 lines
* Introduce
mac_modify(int fec, char *mac)function, which will be called fromimx_get_mac_from_fuse()
* The function will adjust the MAC, for example by setting top two bytes to preconfigured data, bottom four bytes from OCOTP and the last bit of the MAC from "int fec", which is 0 for FEC0 and 1 for FEC1. This should be sufficient for most people.
Quoted 8 lines
Exactly !
Quoted 2 lines
* The function will be weak so it can be overridden to your hearts content.
Right !
Stefano
And it was mostly Fabio's idea I'd say ;-)
M
PATCH v4 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
In reply to Fabio EstevamLet imx_get_mac_from_fuse function be a common function, so that other mx28 boards can reuse it.
---
Change since v3:
- Add a note about the first two MAC addresses being from Freescale vendor.
arch/arm/cpu/arm926ejs/mx28/mx28.c | 41 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 2 + board/denx/m28evk/m28evk.c | 35 ----------------------- 3 files changed, 43 insertions(+), 35 deletions(-)
arch/arm/cpu/arm926ejs/mx28/mx28.c +41 -0
@@ -214,6 +214,47 @@ int cpu_eth_init(bd_t *bis) }#endif +#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP + +#define MXS_OCOTP_MAX_TIMEOUT 1000000 +void imx_get_mac_from_fuse (char *mac) +{ +struct mx28_ocotp_regs *ocotp_regs = + (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; +uint32_t data; + +memset (mac,0 ,6 ); + +writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); + +if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , +MXS_OCOTP_MAX_TIMEOUT )) { +puts ("MXS FEC: Can't get MAC from OCOTP\n" ); +return ; + } + + data =readl (&ocotp_regs->hw_ocotp_cust0); + + mac[0 ] =0x00 ; + mac[1 ] =0x04 ; +/* +* Note: +* +* These first two bytes are Freescale's vendor MAC prefix. +* +*/ + mac[2 ] = (data >>24 ) &0xff ; + mac[3 ] = (data >>16 ) &0xff ; + mac[4 ] = (data >>8 ) &0xff ; + mac[5 ] = data &0xff ; +} +#else +void imx_get_mac_from_fuse (char *mac) +{ +memset (mac,0 ,6 ); +} +#endif + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",
arch/arm/include/asm/arch-mx28/sys_proto.h +2 -0
@@ -35,4 +35,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup, const unsigned int iomux_size);#endif +void imx_get_mac_from_fuse (char *mac); +#endif /* __MX28_H__ */
board/denx/m28evk/m28evk.c +0 -35
@@ -178,39 +178,4 @@ int board_eth_init(bd_t *bis) return ret; } -#ifdef CONFIG_M28_FEC_MAC_IN_OCOTP - -#define MXS_OCOTP_MAX_TIMEOUT 1000000 -void imx_get_mac_from_fuse (char *mac) -{ -struct mx28_ocotp_regs *ocotp_regs = - (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; -uint32_t data; - -memset (mac,0 ,6 ); - -writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); - -if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , -MXS_OCOTP_MAX_TIMEOUT )) { -printf ("MXS FEC: Can't get MAC from OCOTP\n" ); -return ; - } - - data =readl (&ocotp_regs->hw_ocotp_cust0); - - mac[0 ] =0x00 ; - mac[1 ] =0x04 ; - mac[2 ] = (data >>24 ) &0xff ; - mac[3 ] = (data >>16 ) &0xff ; - mac[4 ] = (data >>8 ) &0xff ; - mac[5 ] = data &0xff ; -} -#else -void imx_get_mac_from_fuse (char *mac) -{ -memset (mac,0 ,6 ); -} -#endif -#endif
Signature · 1 line
1.7.1
PATCH v4 2/3 mx28: Let dram_init be common for mx28
In reply to Fabio EstevamLet dram_init function be a common function, so that other mx28 boards can reuse it.
---
Changes since v3:
- Rename dram_init to mx28_dram_init
arch/arm/cpu/arm926ejs/mx28/mx28.c | 21 +++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 1 + board/denx/m28evk/m28evk.c | 21 --------------------- 3 files changed, 22 insertions(+), 21 deletions(-)
arch/arm/cpu/arm926ejs/mx28/mx28.c +21 -0
@@ -255,6 +255,27 @@ void imx_get_mac_from_fuse(char *mac) }#endif +#define HW_DIGCTRL_SCRATCH0 0x8001c280 +#define HW_DIGCTRL_SCRATCH1 0x8001c290 +int mx28_dram_init (void ) +{ +uint32_t sz[2 ]; + + sz[0 ] =readl (HW_DIGCTRL_SCRATCH0 ); + sz[1 ] =readl (HW_DIGCTRL_SCRATCH1 ); + +if (sz[0 ] != sz[1 ]) { +puts ("MX28:\n" +"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n" +"HW_DIGCTRL_SCRATCH1 is not the same. Please\n" +"verify these two registers contain valid RAM size\n" ); +hang (); + } + + gd->ram_size = sz[0 ]; +return 0 ; +} + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",
arch/arm/include/asm/arch-mx28/sys_proto.h +1 -0
@@ -36,5 +36,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup,#endif void imx_get_mac_from_fuse (char *mac); +int mx28_dram_init (void );#endif /* __MX28_H__ */
board/denx/m28evk/m28evk.c +0 -21
@@ -70,27 +70,6 @@ int board_init(void)return 0 ; } -#define HW_DIGCTRL_SCRATCH0 0x8001c280 -#define HW_DIGCTRL_SCRATCH1 0x8001c290 -int dram_init (void ) -{ -uint32_t sz[2 ]; - - sz[0 ] =readl (HW_DIGCTRL_SCRATCH0 ); - sz[1 ] =readl (HW_DIGCTRL_SCRATCH1 ); - -if (sz[0 ] != sz[1 ]) { -printf ("MX28:\n" -"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n" -"HW_DIGCTRL_SCRATCH1 is not the same. Please\n" -"verify these two registers contain valid RAM size!\n" ); -hang (); - } - - gd->ram_size = sz[0 ]; -return 0 ; -} -#ifdef CONFIG_CMD_MMC static int m28_mmc_wp (int id) {
Signature · 1 line
1.7.1
PATCH v4 3/3 mx28evk: Add initial support for MX28EVK board
In reply to Fabio EstevamAdd initial support for Freescale MX28EVK board.
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
---
- For correct operation of saving environment variables into the SD card, the following patch is needed:
http://lists.denx.de/pipermail/u-boot/2011-November/111448.html
Changes since v3:
- Fix Copyright in mx28evk.h
- Call mx28_dram_init from dram_init
Changes since v2:
- Generate the patch again due to error in applying unrelated changes Changes since v1:
- Read the MAC from fuses
- Use tabs instead of space in u-boot.bd
- Use puts instead of print
- Factor out mac reading function
- Factor out ddr size calculation function
- Use GENERATED_GBL_DATA_SIZE
- Protect CONFIG_ENV_IS_IN_MMC
MAINTAINERS | 1 + board/freescale/mx28evk/Makefile | 49 ++++++++++ board/freescale/mx28evk/iomux.c | 138 +++++++++++++++++++++++++++++ board/freescale/mx28evk/mx28evk.c | 170 +++++++++++++++++++++++++++++++++++ board/freescale/mx28evk/u-boot.bd | 14 +++ boards.cfg | 1 + include/configs/mx28evk.h | 176 +++++++++++++++++++++++++++++++++++++ 7 files changed, 549 insertions(+), 0 deletions(-) create mode 100644 board/freescale/mx28evk/Makefile create mode 100644 board/freescale/mx28evk/iomux.c create mode 100644 board/freescale/mx28evk/mx28evk.c create mode 100644 board/freescale/mx28evk/u-boot.bd create mode 100644 include/configs/mx28evk.h
MAINTAINERS +1 -0
@@ -639,6 +639,7 @@ Kristoffer Ericson <[email protected]> Fabio Estevam <[email protected]> mx25pdk i.MX25 + mx28evk i.MX28 mx31pdk i.MX31 mx53ard i.MX53 mx53smd i.MX53
board/freescale/mx28evk/Makefile new file +49 -0
49 lines not on this page · raw message
board/freescale/mx28evk/iomux.c new file +138 -0
138 lines not on this page · raw message
board/freescale/mx28evk/mx28evk.c new file +170 -0
170 lines not on this page · raw message
board/freescale/mx28evk/u-boot.bd new file +14 -0
@@ -0,0 +1,14 @@ +sources { + u_boot_spl="spl/u-boot-spl.bin"; + u_boot="u-boot.bin"; +} + +section (0) { + load u_boot_spl > 0x0000; + load ivt (entry = 0x0014) > 0x8000; + hab call 0x8000; + + load u_boot > 0x40000100; + load ivt (entry = 0x40000100) > 0x8000; + hab call 0x8000; +}
boards.cfg +1 -0
@@ -160,6 +160,7 @@ zmx25 arm arm926ejs zmx25 syteco imx27lite arm arm926ejs imx27lite logicpd mx27 magnesium arm arm926ejs imx27lite logicpd mx27 m28evk arm arm926ejs - denx mx28 +mx28evk arm arm926ejs - freescale mx28 nhk8815 arm arm926ejs nhk8815 st nomadik nhk8815_onenand arm arm926ejs nhk8815 st nomadik nhk8815:BOOT_ONENAND omap1610h2 arm arm926ejs omap1610inn ti omap omap1610inn:CS3_BOOT
include/configs/mx28evk.h new file +176 -0
176 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v5 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
In reply to Fabio EstevamLet imx_get_mac_from_fuse function be a common function, so that other mx28 boards can reuse it.
---
Changes since v4:
- No changes
Change since v3:
- Add a note about the first two MAC addresses being from Freescale vendor.
arch/arm/cpu/arm926ejs/mx28/mx28.c | 41 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 2 + board/denx/m28evk/m28evk.c | 35 ----------------------- 3 files changed, 43 insertions(+), 35 deletions(-)
arch/arm/cpu/arm926ejs/mx28/mx28.c +41 -0
@@ -214,6 +214,47 @@ int cpu_eth_init(bd_t *bis) }#endif +#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP + +#define MXS_OCOTP_MAX_TIMEOUT 1000000 +void imx_get_mac_from_fuse (char *mac) +{ +struct mx28_ocotp_regs *ocotp_regs = + (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; +uint32_t data; + +memset (mac,0 ,6 ); + +writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); + +if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , +MXS_OCOTP_MAX_TIMEOUT )) { +puts ("MXS FEC: Can't get MAC from OCOTP\n" ); +return ; + } + + data =readl (&ocotp_regs->hw_ocotp_cust0); + + mac[0 ] =0x00 ; + mac[1 ] =0x04 ; +/* +* Note: +* +* These first two bytes are Freescale's vendor MAC prefix. +* +*/ + mac[2 ] = (data >>24 ) &0xff ; + mac[3 ] = (data >>16 ) &0xff ; + mac[4 ] = (data >>8 ) &0xff ; + mac[5 ] = data &0xff ; +} +#else +void imx_get_mac_from_fuse (char *mac) +{ +memset (mac,0 ,6 ); +} +#endif + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",
arch/arm/include/asm/arch-mx28/sys_proto.h +2 -0
@@ -35,4 +35,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup, const unsigned int iomux_size);#endif +void imx_get_mac_from_fuse (char *mac); +#endif /* __MX28_H__ */
board/denx/m28evk/m28evk.c +0 -35
@@ -178,39 +178,4 @@ int board_eth_init(bd_t *bis) return ret; } -#ifdef CONFIG_M28_FEC_MAC_IN_OCOTP - -#define MXS_OCOTP_MAX_TIMEOUT 1000000 -void imx_get_mac_from_fuse (char *mac) -{ -struct mx28_ocotp_regs *ocotp_regs = - (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; -uint32_t data; - -memset (mac,0 ,6 ); - -writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); - -if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , -MXS_OCOTP_MAX_TIMEOUT )) { -printf ("MXS FEC: Can't get MAC from OCOTP\n" ); -return ; - } - - data =readl (&ocotp_regs->hw_ocotp_cust0); - - mac[0 ] =0x00 ; - mac[1 ] =0x04 ; - mac[2 ] = (data >>24 ) &0xff ; - mac[3 ] = (data >>16 ) &0xff ; - mac[4 ] = (data >>8 ) &0xff ; - mac[5 ] = data &0xff ; -} -#else -void imx_get_mac_from_fuse (char *mac) -{ -memset (mac,0 ,6 ); -} -#endif -#endif
Signature · 1 line
1.7.1
PATCH v5 1/3 mx28: Let imx_get_mac_from_fuse be common for mx28
Quoted 9 lines
Let
imx_get_mac_from_fusefunction be a common function, so that other mx28 boards can reuse it.Signed-off-by Fabio Estevam <[email protected]>---
Changes since v4:
- No changes
Change since v3:
- Add a note about the first two MAC addresses being from Freescale vendor.
What changes are in V5? Also, mark resubmissions with "RESEND" or "V3 RESEND" or something ... like "[PATCH V3 RESEND]" ... though you don't need to resend stuff here.
Quoted 26 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c | 41 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 2 + board/denx/m28evk/m28evk.c | 35 ----------------------- 3 files changed, 43 insertions(+), 35 deletions(-)(quoted diff) +0
-0
b/arch/arm/cpu/arm926ejs/mx28/mx28.cindex 088c019..d82bb01 100644arch/arm/cpu/arm926ejs/mx28/mx28.c +11
-0@@ -214,6 +214,47 @@ int cpu_eth_init(bd_t *bis) }#endif +#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP + +#define MXS_OCOTP_MAX_TIMEOUT 1000000 +void imx_get_mac_from_fuse (char *mac) +{ +struct mx28_ocotp_regs *ocotp_regs = + (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; +uint32_t data; + +memset (mac,0 ,6 ); +
arch/arm/cpu/arm926ejs/mx28/mx28.c int cpu_eth_init(bd_t *bis) · line 237
Quoted 10 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c +10
-0+writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); + +if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , +MXS_OCOTP_MAX_TIMEOUT )) { +puts ("MXS FEC: Can't get MAC from OCOTP\n" ); +return ; + } + + data =readl (&ocotp_regs->hw_ocotp_cust0); +
/* Freescale MAC vendor prefix: 00:04:xx:xx:xx:xx */ ... or something
It's shorter and it should be above the code.
Quoted 68 lines
arch/arm/cpu/arm926ejs/mx28/mx28.c +20
-0+ mac[0 ] =0x00 ; + mac[1 ] =0x04 ; +/* +* Note: +* +* These first two bytes are Freescale's vendor MAC prefix. +* +*/ + mac[2 ] = (data >>24 ) &0xff ; + mac[3 ] = (data >>16 ) &0xff ; + mac[4 ] = (data >>8 ) &0xff ; + mac[5 ] = data &0xff ; +} +#else +void imx_get_mac_from_fuse (char *mac) +{ +memset (mac,0 ,6 ); +} +#endif + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",(quoted diff) +0
-0
b/arch/arm/include/asm/arch-mx28/sys_proto.hindex be1f7db..cf5ab16 100644arch/arm/include/asm/arch-mx28/sys_proto.h +2
-0@@ -35,4 +35,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup, const unsigned int iomux_size);#endif +void imx_get_mac_from_fuse (char *mac); +#endif /* __MX28_H__ */ board/denx/m28evk/m28evk.c +0
-26@@ -178,39 +178,4 @@ int board_eth_init(bd_t *bis)return ret; } -#ifdef CONFIG_M28_FEC_MAC_IN_OCOTP - -#define MXS_OCOTP_MAX_TIMEOUT 1000000 -void imx_get_mac_from_fuse (char *mac) -{ -struct mx28_ocotp_regs *ocotp_regs = - (struct mx28_ocotp_regs *)MXS_OCOTP_BASE ; -uint32_t data; - -memset (mac,0 ,6 ); - -writel (OCOTP_CTRL_RD_BANK_OPEN , &ocotp_regs->hw_ocotp_ctrl_set); - -if (mx28_wait_mask_clr (&ocotp_regs->hw_ocotp_ctrl_reg,OCOTP_CTRL_BUSY , -MXS_OCOTP_MAX_TIMEOUT )) { -printf ("MXS FEC: Can't get MAC from OCOTP\n" ); -return ; - } - - data =readl (&ocotp_regs->hw_ocotp_cust0); - - mac[0 ] =0x00 ; - mac[1 ] =0x04 ; - mac[2 ] = (data >>24 ) &0xff ; - mac[3 ] = (data >>16 ) &0xff ; - mac[4 ] = (data >>8 ) &0xff ;
board/denx/m28evk/m28evk.c int board_eth_init(bd_t *bis) · line 181
Quoted 10 lines
board/denx/m28evk/m28evk.c +0
-9- mac[5 ] = data &0xff ; -} -#else -void imx_get_mac_from_fuse (char *mac) -{ -memset (mac,0 ,6 ); -} -#endif -#endif
M
PATCH v5 2/3 mx28: Let dram_init be common for mx28
In reply to Fabio EstevamLet dram_init function be a common function, so that other mx28 boards can reuse it.
---
Changes since v4:
- Call mx28_dram_init from m28evk.c
Changes since v3:
- Rename dram_init to mx28_dram_init
arch/arm/cpu/arm926ejs/mx28/mx28.c | 21 +++++++++++++++++++++ arch/arm/include/asm/arch-mx28/sys_proto.h | 1 + board/denx/m28evk/m28evk.c | 25 +++++-------------------- 3 files changed, 27 insertions(+), 20 deletions(-)
arch/arm/cpu/arm926ejs/mx28/mx28.c +21 -0
@@ -255,6 +255,27 @@ void imx_get_mac_from_fuse(char *mac) }#endif +#define HW_DIGCTRL_SCRATCH0 0x8001c280 +#define HW_DIGCTRL_SCRATCH1 0x8001c290 +int mx28_dram_init (void ) +{ +uint32_t sz[2 ]; + + sz[0 ] =readl (HW_DIGCTRL_SCRATCH0 ); + sz[1 ] =readl (HW_DIGCTRL_SCRATCH1 ); + +if (sz[0 ] != sz[1 ]) { +puts ("MX28:\n" +"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n" +"HW_DIGCTRL_SCRATCH1 is not the same. Please\n" +"verify these two registers contain valid RAM size\n" ); +hang (); + } + + gd->ram_size = sz[0 ]; +return 0 ; +} + U_BOOT_CMD( clocks, CONFIG_SYS_MAXARGS, 1, do_mx28_showclocks, "display clocks",
arch/arm/include/asm/arch-mx28/sys_proto.h +1 -0
@@ -36,5 +36,6 @@ void mx28_common_spl_init(const iomux_cfg_t *iomux_setup,#endif void imx_get_mac_from_fuse (char *mac); +int mx28_dram_init (void );#endif /* __MX28_H__ */
board/denx/m28evk/m28evk.c +5 -20
@@ -62,32 +62,17 @@ int board_early_init_f(void)return 0 ; } -int board_init (void ) +int dram_init (void ) { -/* Adress of boot parameters */ - gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ; - +mx28_dram_init ();return 0 ; } -#define HW_DIGCTRL_SCRATCH0 0x8001c280 -#define HW_DIGCTRL_SCRATCH1 0x8001c290 -int dram_init (void ) +int board_init (void ) { -uint32_t sz[2 ]; - - sz[0 ] =readl (HW_DIGCTRL_SCRATCH0 ); - sz[1 ] =readl (HW_DIGCTRL_SCRATCH1 ); - -if (sz[0 ] != sz[1 ]) { -printf ("MX28:\n" -"Error, the RAM size in HW_DIGCTRL_SCRATCH0 and\n" -"HW_DIGCTRL_SCRATCH1 is not the same. Please\n" -"verify these two registers contain valid RAM size!\n" ); -hang (); - } +/* Adress of boot parameters */ + gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ; - gd->ram_size = sz[0 ];return 0 ; }
Signature · 1 line
1.7.1
PATCH v5 2/3 mx28: Let dram_init be common for mx28
Quoted 6 lines · Fabio Estevam
Let
dram_initfunction be a common function, so that other mx28 boards can reuse it.Signed-off-by Fabio Estevam <[email protected]>---
board/denx/m28evk/m28evk.c int board_early_init_f(void) · line 68
Quoted 8 lines
board/denx/m28evk/m28evk.c +2
-4-int board_init (void ) +int dram_init (void ) { -/* Adress of boot parameters */ - gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ; - +mx28_dram_init ();return 0 ;
Why not simply return mx28_dram_init() ?
We do not drop the return code if mx28_dram_init will be changed.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v5 3/3 mx28evk: Add initial support for MX28EVK board
In reply to Fabio EstevamAdd initial support for Freescale MX28EVK board.
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
---
- For correct operation of saving environment variables into the SD card, the following patch is needed:
http://lists.denx.de/pipermail/u-boot/2011-November/111448.html
Changes since v4:
- No changes
Changes since v3:
- Fix Copyright in mx28evk.h
- Call mx28_dram_init from dram_init
Changes since v2:
- Generate the patch again due to error in applying unrelated changes Changes since v1:
- Read the MAC from fuses
- Use tabs instead of space in u-boot.bd
- Use puts instead of print
- Factor out mac reading function
- Factor out ddr size calculation function
- Use GENERATED_GBL_DATA_SIZE
- Protect CONFIG_ENV_IS_IN_MMC
MAINTAINERS | 1 + board/freescale/mx28evk/Makefile | 49 ++++++++++ board/freescale/mx28evk/iomux.c | 138 +++++++++++++++++++++++++++++ board/freescale/mx28evk/mx28evk.c | 170 +++++++++++++++++++++++++++++++++++ board/freescale/mx28evk/u-boot.bd | 14 +++ boards.cfg | 1 + include/configs/mx28evk.h | 176 +++++++++++++++++++++++++++++++++++++ 7 files changed, 549 insertions(+), 0 deletions(-) create mode 100644 board/freescale/mx28evk/Makefile create mode 100644 board/freescale/mx28evk/iomux.c create mode 100644 board/freescale/mx28evk/mx28evk.c create mode 100644 board/freescale/mx28evk/u-boot.bd create mode 100644 include/configs/mx28evk.h
MAINTAINERS +1 -0
@@ -639,6 +639,7 @@ Kristoffer Ericson <[email protected]> Fabio Estevam <[email protected]> mx25pdk i.MX25 + mx28evk i.MX28 mx31pdk i.MX31 mx53ard i.MX53 mx53smd i.MX53
board/freescale/mx28evk/Makefile new file +49 -0
49 lines not on this page · raw message
board/freescale/mx28evk/iomux.c new file +138 -0
138 lines not on this page · raw message
board/freescale/mx28evk/mx28evk.c new file +170 -0
170 lines not on this page · raw message
board/freescale/mx28evk/u-boot.bd new file +14 -0
@@ -0,0 +1,14 @@ +sources { + u_boot_spl="spl/u-boot-spl.bin"; + u_boot="u-boot.bin"; +} + +section (0) { + load u_boot_spl > 0x0000; + load ivt (entry = 0x0014) > 0x8000; + hab call 0x8000; + + load u_boot > 0x40000100; + load ivt (entry = 0x40000100) > 0x8000; + hab call 0x8000; +}
boards.cfg +1 -0
@@ -160,6 +160,7 @@ zmx25 arm arm926ejs zmx25 syteco imx27lite arm arm926ejs imx27lite logicpd mx27 magnesium arm arm926ejs imx27lite logicpd mx27 m28evk arm arm926ejs - denx mx28 +mx28evk arm arm926ejs - freescale mx28 nhk8815 arm arm926ejs nhk8815 st nomadik nhk8815_onenand arm arm926ejs nhk8815 st nomadik nhk8815:BOOT_ONENAND omap1610h2 arm arm926ejs omap1610inn ti omap omap1610inn:CS3_BOOT
include/configs/mx28evk.h new file +176 -0
176 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v5 3/3 mx28evk: Add initial support for MX28EVK board
Quoted 7 lines · Fabio Estevam
Add initial support for Freescale MX28EVK board.
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
Signed-off-by Fabio Estevam <[email protected]>---
Hi Fabio,
board/freescale/mx28evk/mx28evk.c line 61
Quoted 4 lines
board/freescale/mx28evk/mx28evk.c new file +4
-0+int dram_init (void ) +{ +mx28_dram_init (); +return 0 ;
return mx28_dram_init();
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v5 3/3 mx28evk: Add initial support for MX28EVK board
In reply to Fabio EstevamQuoted 456 lines
Add initial support for Freescale MX28EVK board.
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
Signed-off-by Fabio Estevam <[email protected]>---
- For correct operation of saving environment variables into the SD card, the following patch is needed:
http://lists.denx.de/pipermail/u-boot/2011-November/111448.htmlChanges since v4:
- No changes
Changes since v3:
- Fix Copyright inmx28evk.h
- Callmx28_dram_initfromdram_init
Changes since v2:
- Generate the patch again due to error in applying unrelated changes Changes since v1:
- Read the MAC from fuses
- Use tabs instead of space in u-boot.bd
- Use puts instead of print
- Factor out mac reading function
- Factor out ddr size calculation function
- UseGENERATED_GBL_DATA_SIZE
- ProtectCONFIG_ENV_IS_IN_MMCMAINTAINERS | 1 + board/freescale/mx28evk/Makefile | 49 ++++++++++ board/freescale/mx28evk/iomux.c | 138 +++++++++++++++++++++++++++++ board/freescale/mx28evk/mx28evk.c | 170 +++++++++++++++++++++++++++++++++++ board/freescale/mx28evk/u-boot.bd | 14 +++ boards.cfg | 1 + include/configs/mx28evk.h | 176 +++++++++++++++++++++++++++++++++++++ 7 files changed, 549 insertions(+), 0 deletions(-) create mode 100644 board/freescale/mx28evk/Makefile create mode 100644 board/freescale/mx28evk/iomux.c create mode 100644 board/freescale/mx28evk/mx28evk.c create mode 100644 board/freescale/mx28evk/u-boot.bd create mode 100644 include/configs/mx28evk.hMAINTAINERS +1
-0@@ -639,6 +639,7 @@ Kristoffer Ericson <[email protected]> Fabio Estevam <[email protected]> mx25pdk i.MX25 + mx28evk i.MX28 mx31pdk i.MX31 mx53ard i.MX53 mx53smd i.MX53(quoted diff) +0
-0b/board/freescale/mx28evk/Makefile new file mode 100644 index 0000000..7459107
board/freescale/mx28evk/Makefile new file +49
-0@@ -0,0 +1,49 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +ifndef CONFIG_SPL_BUILD +COBJS := mx28evk.o +else +COBJS := iomux.o +endif + +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +all: $(ALL) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################(quoted diff) +0
-0
b/board/freescale/mx28evk/iomux.cnew file mode 100644 index 0000000..904e3f3board/freescale/mx28evk/iomux.c new file +138
-0@@ -0,0 +1,138 @@ +/* +* Freescale MX28EVK IOMUX setup +* +* Copyright (C) 2011 Marek Vasut <[email protected]> +* on behalf of DENX Software Engineering GmbH +* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <common.h> +#include <config.h> +#include <asm/io.h> +#include <asm/arch/iomux-mx28.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/sys_proto.h> + +#define MUX_CONFIG_SSP0 (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP) +#define MUX_CONFIG_ENET (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP) +#define MUX_CONFIG_EMI (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL) + +const iomux_cfg_t iomux_setup[] = { +/* DUART */ +MX28_PAD_PWM0__DUART_RX , +MX28_PAD_PWM1__DUART_TX , + +/* MMC0 */ +MX28_PAD_SSP0_DATA0__SSP0_D0 |MUX_CONFIG_SSP0 , +MX28_PAD_SSP0_DATA1__SSP0_D1 |MUX_CONFIG_SSP0 , +MX28_PAD_SSP0_DATA2__SSP0_D2 |MUX_CONFIG_SSP0 , +MX28_PAD_SSP0_DATA3__SSP0_D3 |MUX_CONFIG_SSP0 , +MX28_PAD_SSP0_DATA4__SSP0_D4 |MUX_CONFIG_SSP0 , +MX28_PAD_SSP0_DATA5__SSP0_D5 |MUX_CONFIG_SSP0 , +MX28_PAD_SSP0_DATA6__SSP0_D6 |MUX_CONFIG_SSP0 , +MX28_PAD_SSP0_DATA7__SSP0_D7 |MUX_CONFIG_SSP0 , +MX28_PAD_SSP0_CMD__SSP0_CMD |MUX_CONFIG_SSP0 , +MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT | + (MXS_PAD_8MA |MXS_PAD_3V3 |MXS_PAD_NOPULL ), +MX28_PAD_SSP0_SCK__SSP0_SCK | + (MXS_PAD_12MA |MXS_PAD_3V3 |MXS_PAD_NOPULL ), +/* write protect */ +MX28_PAD_SSP1_SCK__GPIO_2_12 , +/* MMC0 slot power enable */ +MX28_PAD_PWM3__GPIO_3_28 | + (MXS_PAD_12MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), + +/* FEC0 */ +MX28_PAD_ENET0_MDC__ENET0_MDC |MUX_CONFIG_ENET , +MX28_PAD_ENET0_MDIO__ENET0_MDIO |MUX_CONFIG_ENET , +MX28_PAD_ENET0_RX_EN__ENET0_RX_EN |MUX_CONFIG_ENET , +MX28_PAD_ENET0_TX_EN__ENET0_TX_EN |MUX_CONFIG_ENET , +MX28_PAD_ENET0_RXD0__ENET0_RXD0 |MUX_CONFIG_ENET , +MX28_PAD_ENET0_RXD1__ENET0_RXD1 |MUX_CONFIG_ENET , +MX28_PAD_ENET0_TXD0__ENET0_TXD0 |MUX_CONFIG_ENET , +MX28_PAD_ENET0_TXD1__ENET0_TXD1 |MUX_CONFIG_ENET , +MX28_PAD_ENET_CLK__CLKCTRL_ENET |MUX_CONFIG_ENET , +/* FEC0 Enable */ +MX28_PAD_SSP1_DATA3__GPIO_2_15 | + (MXS_PAD_12MA |MXS_PAD_3V3 ), +/* FEC0 Reset */ +MX28_PAD_ENET0_RX_CLK__GPIO_4_13 | + (MXS_PAD_12MA |MXS_PAD_3V3 |MXS_PAD_PULLUP ), + +/* FEC1 */ +MX28_PAD_ENET0_COL__ENET1_TX_EN |MUX_CONFIG_ENET , +MX28_PAD_ENET0_CRS__ENET1_RX_EN |MUX_CONFIG_ENET , +MX28_PAD_ENET0_RXD2__ENET1_RXD0 |MUX_CONFIG_ENET , +MX28_PAD_ENET0_RXD3__ENET1_RXD1 |MUX_CONFIG_ENET , +MX28_PAD_ENET0_TXD2__ENET1_TXD0 |MUX_CONFIG_ENET , +MX28_PAD_ENET0_TXD3__ENET1_TXD1 |MUX_CONFIG_ENET , + +/* EMI */ +MX28_PAD_EMI_D00__EMI_DATA0 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D01__EMI_DATA1 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D02__EMI_DATA2 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D03__EMI_DATA3 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D04__EMI_DATA4 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D05__EMI_DATA5 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D06__EMI_DATA6 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D07__EMI_DATA7 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D08__EMI_DATA8 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D09__EMI_DATA9 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D10__EMI_DATA10 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D11__EMI_DATA11 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D12__EMI_DATA12 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D13__EMI_DATA13 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D14__EMI_DATA14 |MUX_CONFIG_EMI , +MX28_PAD_EMI_D15__EMI_DATA15 |MUX_CONFIG_EMI , +MX28_PAD_EMI_ODT0__EMI_ODT0 |MUX_CONFIG_EMI , +MX28_PAD_EMI_DQM0__EMI_DQM0 |MUX_CONFIG_EMI , +MX28_PAD_EMI_ODT1__EMI_ODT1 |MUX_CONFIG_EMI , +MX28_PAD_EMI_DQM1__EMI_DQM1 |MUX_CONFIG_EMI , +MX28_PAD_EMI_DDR_OPEN_FB__EMI_DDR_OPEN_FEEDBACK |MUX_CONFIG_EMI , +MX28_PAD_EMI_CLK__EMI_CLK |MUX_CONFIG_EMI , +MX28_PAD_EMI_DQS0__EMI_DQS0 |MUX_CONFIG_EMI , +MX28_PAD_EMI_DQS1__EMI_DQS1 |MUX_CONFIG_EMI , +MX28_PAD_EMI_DDR_OPEN__EMI_DDR_OPEN |MUX_CONFIG_EMI , + +MX28_PAD_EMI_A00__EMI_ADDR0 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A01__EMI_ADDR1 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A02__EMI_ADDR2 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A03__EMI_ADDR3 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A04__EMI_ADDR4 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A05__EMI_ADDR5 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A06__EMI_ADDR6 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A07__EMI_ADDR7 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A08__EMI_ADDR8 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A09__EMI_ADDR9 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A10__EMI_ADDR10 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A11__EMI_ADDR11 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A12__EMI_ADDR12 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A13__EMI_ADDR13 |MUX_CONFIG_EMI , +MX28_PAD_EMI_A14__EMI_ADDR14 |MUX_CONFIG_EMI , +MX28_PAD_EMI_BA0__EMI_BA0 |MUX_CONFIG_EMI , +MX28_PAD_EMI_BA1__EMI_BA1 |MUX_CONFIG_EMI , +MX28_PAD_EMI_BA2__EMI_BA2 |MUX_CONFIG_EMI , +MX28_PAD_EMI_CASN__EMI_CASN |MUX_CONFIG_EMI , +MX28_PAD_EMI_RASN__EMI_RASN |MUX_CONFIG_EMI , +MX28_PAD_EMI_WEN__EMI_WEN |MUX_CONFIG_EMI , +MX28_PAD_EMI_CE0N__EMI_CE0N |MUX_CONFIG_EMI , +MX28_PAD_EMI_CE1N__EMI_CE1N |MUX_CONFIG_EMI , +MX28_PAD_EMI_CKE__EMI_CKE |MUX_CONFIG_EMI , +}; + +void board_init_ll (void ) +{ +mx28_common_spl_init (iomux_setup,ARRAY_SIZE (iomux_setup)); +}(quoted diff) +0
-0
b/board/freescale/mx28evk/mx28evk.cnew file mode 100644 index 0000000..542e806board/freescale/mx28evk/mx28evk.c new file +170
-0@@ -0,0 +1,170 @@ +/* +* Freescale MX28EVK board +* +* (C) Copyright 2011 Freescale Semiconductor, Inc. +* +* Author: Fabio Estevam <[email protected]> +* +* Based on m28evk.c: +* Copyright (C) 2011 Marek Vasut <[email protected]> +* on behalf of DENX Software Engineering GmbH +* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <common.h> +#include <asm/gpio.h> +#include <asm/io.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/iomux-mx28.h> +#include <asm/arch/clock.h> +#include <asm/arch/sys_proto.h> +#include <linux/mii.h> +#include <miiphy.h> +#include <netdev.h> +#include <errno.h> + +DECLARE_GLOBAL_DATA_PTR ; + +/* +* Functions +*/ +int board_early_init_f (void ) +{ +/* IO0 clock at 480MHz */ +mx28_set_ioclk (MXC_IOCLK0 ,480000 ); +/* IO1 clock at 480MHz */ +mx28_set_ioclk (MXC_IOCLK1 ,480000 ); + +/* SSP0 clock at 96MHz */ +mx28_set_sspclk (MXC_SSPCLK0 ,96000 ,0 ); +/* SSP2 clock at 96MHz */ +mx28_set_sspclk (MXC_SSPCLK2 ,96000 ,0 ); + +return 0 ; +} + +int dram_init (void ) +{ +mx28_dram_init (); +return 0 ; +} + +int board_init (void ) +{ +/* Adress of boot parameters */ + gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ; + +return 0 ; +} + +#ifdef CONFIG_CMD_MMC +static int mx28evk_mmc_wp (int id) +{ +if (id !=0 ) { +printf ("MXS MMC: Invalid card selected (card id = %d)\n" , id); +return 1 ; + } + +return gpio_get_value (MX28_PAD_SSP1_SCK__GPIO_2_12 ); +} + +int board_mmc_init (bd_t *bis) +{ +/* Configure WP as input */ +gpio_direction_input (MX28_PAD_SSP1_SCK__GPIO_2_12 ); + +/* Configure MMC0 Power Enable */ +gpio_direction_output (MX28_PAD_PWM3__GPIO_3_28 ,0 ); + +return mxsmmc_initialize (bis,0 , mx28evk_mmc_wp); +} +#endif + +#ifdef CONFIG_CMD_NET + +#define MII_OPMODE_STRAP_OVERRIDE 0x16 +#define MII_PHY_CTRL1 0x1e +#define MII_PHY_CTRL2 0x1f + +int fecmxc_mii_postcall (int phy) +{ +miiphy_write ("FEC1" , phy,MII_BMCR ,0x9000 ); +miiphy_write ("FEC1" , phy,MII_OPMODE_STRAP_OVERRIDE ,0x0202 ); +if (phy ==3 ) +miiphy_write ("FEC1" ,3 ,MII_PHY_CTRL2 ,0x8180 ); +return 0 ; +} + +int board_eth_init (bd_t *bis) +{ +struct mx28_clkctrl_regs *clkctrl_regs = + (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE ; +struct eth_device *dev; +int ret; + + ret =cpu_eth_init (bis); + +/* MX28EVK uses ENET_CLK PAD to drive FEC clock */ +writel (CLKCTRL_ENET_TIME_SEL_RMII_CLK |CLKCTRL_ENET_CLK_OUT_EN , + &clkctrl_regs->hw_clkctrl_enet); + +/* Power-on FECs */ +gpio_direction_output (MX28_PAD_SSP1_DATA3__GPIO_2_15 ,0 ); + +/* Reset FEC PHYs */ +gpio_direction_output (MX28_PAD_ENET0_RX_CLK__GPIO_4_13 ,0 ); +udelay (200 ); +gpio_set_value (MX28_PAD_ENET0_RX_CLK__GPIO_4_13 ,1 ); + + ret =fecmxc_initialize_multi (bis,0 ,0 ,MXS_ENET0_BASE ); +if (ret) { +puts ("FEC MXS: Unable to init FEC0\n" ); +return ret; + } + + ret =fecmxc_initialize_multi (bis,1 ,3 ,MXS_ENET1_BASE ); +if (ret) { +puts ("FEC MXS: Unable to init FEC1\n" ); +return ret; + } + + dev =eth_get_dev_by_name ("FEC0" ); +if (!dev) { +puts ("FEC MXS: Unable to get FEC0 device entry\n" ); +return -EINVAL ; + } + + ret =fecmxc_register_mii_postcall (dev, fecmxc_mii_postcall); +if (ret) { +puts ("FEC MXS: Unable to register FEC0 mii postcall\n" ); +return ret; + } + + dev =eth_get_dev_by_name ("FEC1" ); +if (!dev) { +puts ("FEC MXS: Unable to get FEC1 device entry\n" ); +return -EINVAL ; + } + + ret =fecmxc_register_mii_postcall (dev, fecmxc_mii_postcall); +if (ret) { +puts ("FEC MXS: Unable to register FEC1 mii postcall\n" ); +return ret; + } + +return ret; +} + +#endif (quoted diff) +0
-0b/board/freescale/mx28evk/u-boot.bd new file mode 100644 index 0000000..c60615a
board/freescale/mx28evk/u-boot.bd new file +14
-0@@ -0,0 +1,14 @@ +sources { + u_boot_spl="spl/u-boot-spl.bin"; + u_boot="u-boot.bin"; +} + +section (0) { + load u_boot_spl > 0x0000; + load ivt (entry = 0x0014) > 0x8000; + hab call 0x8000; + + load u_boot > 0x40000100; + load ivt (entry = 0x40000100) > 0x8000; + hab call 0x8000; +}boards.cfg +0
-0@@ -160,6 +160,7 @@ zmx25 arm arm926ejszmx25 syteco imx27lite arm
arm926ejs imx27lite logicpd mx27 magnesium
Quoted 8 lines
arm arm926ejs imx27lite logicpd mx27
m28evk arm arm926ejs -
denx mx28 +mx28evk arm arm926ejs
- freescale mx28 nhk8815 arm
arm926ejs nhk8815 st nomadiknhk8815_onenandarm arm926ejs nhk8815
st nomadik nhk8815:BOOT_ONENAND omap1610h2 arm
arm926ejs omap1610inn ti omap omap1610inn:CS3_BOOT
diff --git
Quoted 66 lines
a/include/configs/mx28evk.hb/include/configs/mx28evk.hnew file mode 100644
index 0000000..5b8a1bfinclude/configs/mx28evk.h new file +60
-0@@ -0,0 +1,176 @@ +/* +* (C) Copyright 2011 Freescale Semiconductor, Inc. +* Author: Fabio Estevam <[email protected]> +* +* Based on m28evk.h: +* Copyright (C) 2011 Marek Vasut <[email protected]> +* on behalf of DENX Software Engineering GmbH +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <asm/arch/regs-base.h> + +/* +* SoC configurations +*/ +#define CONFIG_MX28 /* i.MX28 SoC */ +#define CONFIG_MXS_GPIO /* GPIO control */ +#define CONFIG_SYS_HZ 1000/* Ticks per second */ + +#define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK + +#define CONFIG_SYS_NO_FLASH +#define CONFIG_SYS_ICACHE_OFF +#define CONFIG_SYS_DCACHE_OFF +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_ARCH_CPU_INIT +#define CONFIG_ARCH_MISC_INIT + +/* +* SPL +*/ +#define CONFIG_SPL +#define CONFIG_SPL_NO_CPU_SUPPORT_CODE +#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mx28" +#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds" +#define CONFIG_SPL_LIBCOMMON_SUPPORT +#define CONFIG_SPL_LIBGENERIC_SUPPORT + +/* +* U-Boot Commands +*/ +#include <config_cmd_default.h> +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DOS_PARTITION +#define CONFIG_CMD_FAT + +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_GPIO
include/configs/mx28evk.h line 70
Quoted 10 lines
include/configs/mx28evk.h new file +10
-0+#define CONFIG_CMD_MII +#define CONFIG_CMD_MMC +#define CONFIG_CMD_NET +#define CONFIG_CMD_NFS +#define CONFIG_CMD_PING + +/* +* Memory configurations +*/ +#define CONFIG_NR_DRAM_BANKS 1/* 1 bank of
DRAM */
include/configs/mx28evk.h line 71
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define PHYS_SDRAM_1 0x40000000/* Base address
*/
include/configs/mx28evk.h line 72
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define PHYS_SDRAM_1_SIZE 0x40000000/* Max 1 GB RAM
*/
include/configs/mx28evk.h line 73
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define CONFIG_STACKSIZE (128 * 1024)/* 128 KB stack
*/
include/configs/mx28evk.h line 74
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define CONFIG_SYS_MALLOC_LEN 0x00400000/* 4 MB for
malloc */
include/configs/mx28evk.h line 75
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define CONFIG_SYS_MEMTEST_START 0x40000000/* Memtest start
adr */
include/configs/mx28evk.h line 76
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define CONFIG_SYS_MEMTEST_END 0x40400000/* 4 MB RAM test
*/
Quoted 15 lines
include/configs/mx28evk.h new file +15
-0+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +/* Point initial SP in SRAM so SPL can use it too. */ + +#define CONFIG_SYS_INIT_RAM_ADDR 0x00002000 +#define CONFIG_SYS_INIT_RAM_SIZE (128 * 1024) + +#define CONFIG_SYS_INIT_SP_OFFSET \ + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + +/* +* We need to sacrifice first 4 bytes of RAM here to avoid triggering some +* strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot +* binary. In case there was more of this mess, 0x100 bytes are skipped.
include/configs/mx28evk.h
Quoted 10 lines
include/configs/mx28evk.h new file +10
-0+*/ +#define CONFIG_SYS_TEXT_BASE 0x40000100 + +#define CONFIG_ENV_OVERWRITE +/* +* U-Boot general configurations +*/ +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_PROMPT "MX28EVK U-Boot > " +#define CONFIG_SYS_CBSIZE 1024/* Console I/O buffer
size */
include/configs/mx28evk.h
Quoted 4 lines
include/configs/mx28evk.h new file +4
-0+#define CONFIG_SYS_PBSIZE \ + (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +/* Print buffer size */ +#define CONFIG_SYS_MAXARGS 32/* Max number of command
args */
include/configs/mx28evk.h
Quoted 4 lines
include/configs/mx28evk.h new file +4
-0+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +/* Boot argument buffer size */ +#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ +#define CONFIG_AUTO_COMPLETE /* Command auto complete
*/
include/configs/mx28evk.h line 110
Quoted 1 line
include/configs/mx28evk.h new file +1
-0+#define CONFIG_CMDLINE_EDITING /* Command history etc
*/
include/configs/mx28evk.h
Quoted 12 lines
include/configs/mx28evk.h new file +12
-0+#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + +/* +* Serial Driver +*/ +#define CONFIG_PL011_SERIAL +#define CONFIG_PL011_CLOCK 24000000 +#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } +#define CONFIG_CONS_INDEX 0 +#define CONFIG_BAUDRATE 115200/* Default baud rate */ +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600,
115200 }
Quoted 4 lines
include/configs/mx28evk.h new file +4
-0+ +/* +* MMC Driver +*/
include/configs/mx28evk.h line 136
Quoted 10 lines
include/configs/mx28evk.h new file +10
-0+#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_ENV_OFFSET (256 * 1024) +#define CONFIG_ENV_SIZE (16 * 1024) +#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_CMD_SAVEENV +#ifdef CONFIG_CMD_MMC +#define CONFIG_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_MXS_MMC +#endif
Tabs vs. spaces, please fix globally.
M
PATCH v5 3/3 mx28evk: Add initial support for MX28EVK board
In reply to Fabio EstevamHi Fabio,
Quoted 2 lines · Fabio Estevam
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
Have you any idea why this works from SD card but not by USB recovery using exactly same sb file?
By quick look it seems that control is not passed back to the ROM properly after SPL or ROM is unable to load/run U-Boot after SPL.
--
Veli-Pekka Peltola
PATCH v5 3/3 mx28evk: Add initial support for MX28EVK board
Quoted 2 lines · Veli-Pekka Peltola
Have you any idea why this works from SD card but not by USB recovery using exactly same sb file?
Sorry, never tested this 'USB recovery' mode.
I can look at it after I finish the mx28evk patches.
Reagards,
Fabio Estevam
PATCH v5 3/3 mx28evk: Add initial support for MX28EVK board
In reply to Veli-Pekka PeltolaQuoted 11 lines
Hi Fabio,
Quoted 2 lines · Fabio Estevam
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
Have you any idea why this works from SD card but not by USB recovery using exactly same sb file?
By quick look it seems that control is not passed back to the ROM properly after SPL or ROM is unable to load/run U-Boot after SPL.
What do you mean? The SPL only inits the hardware and then lets the bootrom do whatever it wants again with the next file in u-boot.bd.
PATCH v5 3/3 mx28evk: Add initial support for MX28EVK board
Dear Marek Vasut,
Quoted 6 lines · Marek Vasut
Quoted 6 lines
Hi Fabio,
Quoted 2 lines · Fabio Estevam
Tested boot via SD card and by loading a kernel via TFTP through the FEC interface.
Quoted 8 lines
Quoted 5 lines
Have you any idea why this works from SD card but not by USB recovery using exactly same sb file?
By quick look it seems that control is not passed back to the ROM properly after SPL or ROM is unable to load/run U-Boot after SPL.
What do you mean? The SPL only inits the hardware and then lets the bootrom do whatever it wants again with the next file in u-boot.bd.
U-Boot doesn't start up after SPL, that is what I see.
I don't have tools or knowledge to investigate this further but here are steps to replicate the issue:
1) make mx28evk_config
2) make u-boot.sb
3) set dip switches to usb0 bootmode
4) connect micro-USB cable
5) try to load u-boot.sb using mfgtool (Windows) or imx_hid_recovery (Linux) [1]
I tested USB powered mode and 5V wall adapter without difference.
--
Veli-Pekka Peltola
[1]
http://git.pengutronix.de/?p=mxs-utils.git;a=commit;h=87692449099ae85922842f7f01acc0ab71e382d7