mx35, flea3: updates for the imx35 based flea3 board
cover mx35, flea3: updates for the imx35 based flea3 board
post some small updates for the imx35 based flea3 board
- add DT support
- factorize SDRAM setup
- add GPIO setup
- adjust default environment
Heiko Schocher (2):
mx35: add DT support to flea3 board
mx35: adjust default environment for flea3 board
Stefano Babic (2):
mx35: factorize SDRAM setup in flea3
mx35: add GPIO setup on flea3 board
board/CarMediaLab/flea3/flea3.c | 124 +++++++++++----------------------------- configs/flea3_defconfig | 4 ++ include/configs/flea3.h | 9 ++- 3 files changed, 42 insertions(+), 95 deletions(-)
Signature · 1 line
2.5.5
PATCH 1/4 mx35: add DT support to flea3 board
---
board/CarMediaLab/flea3/flea3.c | 24 ++++++++++++++++++++++++ configs/flea3_defconfig | 4 ++++ 2 files changed, 28 insertions(+)
board/CarMediaLab/flea3/flea3.c +24 -0
@@ -19,6 +19,9 @@#include <asm/gpio.h> #include <asm/arch/sys_proto.h> #include <netdev.h> +#include <fdt_support.h> +#include <mtd_node.h> +#include <jffs2/load_kernel.h> #ifndef CONFIG_BOARD_EARLY_INIT_F #error "CONFIG_BOARD_EARLY_INIT_F must be set for this board"
@@ -276,3 +279,24 @@ u32 get_board_rev(void)return (get_cpu_rev () & ~(0xF <<8 )) | (rev &0xF ) <<8 ; } + +/* +* called prior to booting kernel or by 'fdt boardsetup' command +* +*/ +int ft_board_setup (void *blob,bd_t *bd) +{ +struct node_info nodes[] = { + {"physmap-flash.0" ,MTD_DEV_TYPE_NOR , },/* NOR flash */ + {"mxc_nand" ,MTD_DEV_TYPE_NAND , },/* NAND flash */ + }; + +if (getenv ("fdt_noauto" )) { +puts (" Skiping ft_board_setup (fdt_noauto defined)\n" ); +return 0 ; + } + +fdt_fixup_mtdparts (blob, nodes,ARRAY_SIZE (nodes)); + +return 0 ; +}
configs/flea3_defconfig +4 -0
@@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_TARGET_FLEA3=y CONFIG_FIT=y +CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y
@@ -12,3 +13,6 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y +CONFIG_OF_LIBFDT=y +CONFIG_FDT_FIXUP_PARTITIONS=y +# CONFIG_EFI_LOADER is not set
Signature · 1 line
2.5.5
PATCH 2/4 mx35: factorize SDRAM setup in flea3
In reply to Heiko SchocherFrom: Stefano Babic <[email protected]>
Drop local function to setup SDRAM controller
and use the common one for i.MX35.
---
board/CarMediaLab/flea3/flea3.c | 93 ++--------------------------------------- 1 file changed, 3 insertions(+), 90 deletions(-)
board/CarMediaLab/flea3/flea3.c +3 -90
@@ -30,18 +30,6 @@#define CCM_CCMR_CONFIG 0x003F4208#define ESDCTL_DDR2_CONFIG 0x007FFC3F -#define ESDCTL_0x92220000 0x92220000 -#define ESDCTL_0xA2220000 0xA2220000 -#define ESDCTL_0xB2220000 0xB2220000 -#define ESDCTL_0x82228080 0x82228080 -#define ESDCTL_DDR2_EMR2 0x04000000 -#define ESDCTL_DDR2_EMR3 0x06000000 -#define ESDCTL_PRECHARGE 0x00000400 -#define ESDCTL_DDR2_EN_DLL 0x02000400 -#define ESDCTL_DDR2_RESET_DLL 0x00000333 -#define ESDCTL_DDR2_MR 0x00000233 -#define ESDCTL_DDR2_OCD_DEFAULT 0x02000780 -#define ESDCTL_DELAY_LINE5 0x00F49F00static inline void dram_wait (unsigned int count) {
@@ -61,83 +49,6 @@ int dram_init(void)return 0 ; } -static void board_setup_sdram_bank (u32 start_address) - -{ -struct esdc_regs *esdc = (struct esdc_regs *)ESDCTL_BASE_ADDR ; -u32 *cfg_reg, *ctl_reg; -u32 val; - -switch (start_address) { -case CSD0_BASE_ADDR : - cfg_reg = &esdc->esdcfg0; - ctl_reg = &esdc->esdctl0; -break ; -case CSD1_BASE_ADDR : - cfg_reg = &esdc->esdcfg1; - ctl_reg = &esdc->esdctl1; -break ; -default : -return ; - } - -/* Initialize MISC register for DDR2 */ - val =ESDC_MISC_RST |ESDC_MISC_MDDR_EN |ESDC_MISC_MDDR_DL_RST | -ESDC_MISC_DDR_EN |ESDC_MISC_DDR2_EN ; -writel (val, &esdc->esdmisc); - val &= ~(ESDC_MISC_RST |ESDC_MISC_MDDR_DL_RST ); -writel (val, &esdc->esdmisc); - -/* -* according to DDR2 specs, wait a while before -* the PRECHARGE_ALL command -*/ -dram_wait (0x20000 ); - -/* Load DDR2 config and timing */ -writel (ESDCTL_DDR2_CONFIG , cfg_reg); - -/* Precharge ALL */ -writel (ESDCTL_0x92220000, - ctl_reg); -writel (0xda , start_address +ESDCTL_PRECHARGE ); - -/* Load mode */ -writel (ESDCTL_0xB2220000, - ctl_reg); -writeb (0xda , start_address +ESDCTL_DDR2_EMR2 );/* EMRS2 */ -writeb (0xda , start_address +ESDCTL_DDR2_EMR3 );/* EMRS3 */ -writeb (0xda , start_address +ESDCTL_DDR2_EN_DLL );/* Enable DLL */ -writeb (0xda , start_address +ESDCTL_DDR2_RESET_DLL );/* Reset DLL */ - -/* Precharge ALL */ -writel (ESDCTL_0x92220000, - ctl_reg); -writel (0xda , start_address +ESDCTL_PRECHARGE ); - -/* Set mode auto refresh : at least two refresh are required */ -writel (ESDCTL_0xA2220000, - ctl_reg); -writel (0xda , start_address); -writel (0xda , start_address); - -writel (ESDCTL_0xB2220000, - ctl_reg); -writeb (0xda , start_address +ESDCTL_DDR2_MR ); -writeb (0xda , start_address +ESDCTL_DDR2_OCD_DEFAULT ); - -/* OCD mode exit */ -writeb (0xda , start_address +ESDCTL_DDR2_EN_DLL );/* Enable DLL */ - -/* Set normal mode */ -writel (ESDCTL_0x82228080, - ctl_reg); - -dram_wait (0x20000 ); - -/* Do not set delay lines, only for MDDR */ -} -static void board_setup_sdram (void ) {struct esdc_regs *esdc = (struct esdc_regs *)ESDCTL_BASE_ADDR ;
@@ -146,7 +57,9 @@ static void board_setup_sdram(void)writel (0x2000 , &esdc->esdctl0);writel (0x2000 , &esdc->esdctl1); -board_setup_sdram_bank (CSD0_BASE_ADDR ); + +mx3_setup_sdram_bank (CSD0_BASE_ADDR ,ESDCTL_DDR2_CONFIG , +13 ,10 ,2 ,0x8080 ); }static void setup_iomux_uart3 (void )
Signature · 1 line
2.5.5
PATCH 3/4 mx35: add GPIO setup on flea3 board
In reply to Heiko SchocherFrom: Stefano Babic <[email protected]>
Hardware revision "e" of the board introduces a GPIO to reduce power consumption in stand-by mode. This must be enable (active low) at the startup for normal behaviour.
---
board/CarMediaLab/flea3/flea3.c | 7 +++++++ 1 file changed, 7 insertions(+)
board/CarMediaLab/flea3/flea3.c +7 -0
@@ -122,6 +122,8 @@ static void setup_iomux_fec(void)MX35_PAD_FEC_TDATA2__FEC_TDATA_2 ,MX35_PAD_FEC_RDATA3__FEC_RDATA_3 ,MX35_PAD_FEC_TDATA3__FEC_TDATA_3 , +/* GPIO used to power off ethernet */ + MX35_PAD_STXFS4__GPIO2_31, };/* setup pins for FEC */
@@ -183,6 +185,11 @@ int board_init(void)/* address of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ; +/* Enable power for ethernet */ +gpio_direction_output (63 ,0 ); + +udelay (2000 ); +return 0 ; }
Signature · 1 line
2.5.5
PATCH 4/4 mx35: adjust default environment for flea3 board
In reply to Heiko Schocher---
include/configs/flea3.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
include/configs/flea3.h +4 -5
@@ -101,10 +101,9 @@#define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE -#define CONFIG_SYS_CBSIZE 256/* Console I/O Buffer Size */ +#define CONFIG_SYS_CBSIZE 512/* Console I/O Buffer Size */ /* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_MAXARGS 16/* max number of command args */ +#define CONFIG_SYS_MAXARGS 32/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ #define CONFIG_SYS_MEMTEST_START 0/* memtest works on */
@@ -227,8 +226,8 @@ "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \"load=tftp ${loadaddr} ${u-boot}\0" \ "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \ -"update=protect off ${uboot_addr} +40000;" \ -"erase ${uboot_addr} +40000;" \ +"update=protect off ${uboot_addr} +80000;" \ +"erase ${uboot_addr} +80000;" \"cp.b ${loadaddr} ${uboot_addr} ${filesize}\0" \"upd=if run load;then echo Updating u-boot;if run update;" \"then echo U-Boot updated;" \
Signature · 1 line
2.5.5
cover mx35, flea3: updates for the imx35 based flea3 board
In reply to Heiko SchocherQuoted 11 lines · Heiko Schocher
post some small updates for the imx35 based flea3 board
- add DT support
- factorize SDRAM setup
- add GPIO setup
- adjust default environmentHeiko Schocher (2):
mx35: add DT support to flea3 board
mx35: adjust default environment for flea3 board
Quoted 9 lines
Stefano Babic (2):
mx35: factorize SDRAM setup in flea3
mx35: add GPIO setup on flea3 boardboard/CarMediaLab/flea3/flea3.c | 124 +++++++++++----------------------------- configs/flea3_defconfig | 4 ++ include/configs/flea3.h | 9 ++- 3 files changed, 42 insertions(+), 95 deletions(-)
Applied to u-boot-imx, -next branch, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================