March 2013 - U-Boot

[U-Boot] [PATCH] powerpc: fix 8xx and 82xx type-punning warnings with GCC 4.7
by Scott Wood 09 Mar '13

09 Mar '13

C99's strict aliasing rules are insane to use in low-level code such as a bootloader, but as Wolfgang has rejected -fno-strict-aliasing in the past, add a union so that 16-bit accesses can be performed. Compile-tested only. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- arch/powerpc/cpu/mpc8260/commproc.c | 2 +- arch/powerpc/cpu/mpc8260/cpu.c | 2 +- arch/powerpc/cpu/mpc8260/i2c.c | 8 ++++---- arch/powerpc/cpu/mpc8260/serial_smc.c | 4 ++-- arch/powerpc/cpu/mpc8260/spi.c | 2 +- arch/powerpc/cpu/mpc8xx/cpu.c | 6 +++--- arch/powerpc/include/asm/8xx_immap.h | 7 ++++++- arch/powerpc/include/asm/immap_8260.h | 19 ++++++++++++------- common/cmd_immap.c | 2 +- examples/standalone/mem_to_mem_idma2intr.c | 3 ++- 10 files changed, 33 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/cpu/mpc8260/commproc.c b/arch/powerpc/cpu/mpc8260/commproc.c index 082957e..70af613 100644 --- a/arch/powerpc/cpu/mpc8260/commproc.c +++ b/arch/powerpc/cpu/mpc8260/commproc.c @@ -43,7 +43,7 @@ m8260_cpm_reset(void) } while ((immr->im_cpm.cp_cpcr & CPM_CR_FLG) && ++count < 1000000); #ifdef CONFIG_HARD_I2C - *((unsigned short*)(&immr->im_dprambase[PROFF_I2C_BASE])) = 0; + immr->im_dprambase16[PROFF_I2C_BASE / 2] = 0; #endif } diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c index 220c1e2..85d209e 100644 --- a/arch/powerpc/cpu/mpc8260/cpu.c +++ b/arch/powerpc/cpu/mpc8260/cpu.c @@ -107,7 +107,7 @@ int checkcpu (void) * in the mask. */ m = immr & (IMMR_PARTNUM_MSK | IMMR_MASKNUM_MSK); - k = *((ushort *) & immap->im_dprambase[PROFF_REVNUM]); + k = immap->im_dprambase16[PROFF_REVNUM / 2]; switch (m) { case 0x0000: diff --git a/arch/powerpc/cpu/mpc8260/i2c.c b/arch/powerpc/cpu/mpc8260/i2c.c index 7382cba..70c1b6f 100644 --- a/arch/powerpc/cpu/mpc8260/i2c.c +++ b/arch/powerpc/cpu/mpc8260/i2c.c @@ -221,14 +221,14 @@ void i2c_init(int speed, int slaveadd) i2c_init_board(); #endif - dpaddr = *((unsigned short *) (&immap->im_dprambase[PROFF_I2C_BASE])); + dpaddr = immap->im_dprambase16[PROFF_I2C_BASE / 2]; if (dpaddr == 0) { /* need to allocate dual port ram */ dpaddr = m8260_cpm_dpalloc(64 + (NUM_RX_BDS * sizeof(I2C_BD)) + (NUM_TX_BDS * sizeof(I2C_BD)) + MAX_TX_SPACE, 64); - *((unsigned short *)(&immap->im_dprambase[PROFF_I2C_BASE])) = + immap->im_dprambase16[PROFF_I2C_BASE / 2] = dpaddr; } @@ -305,7 +305,7 @@ void i2c_newio(i2c_state_t *state) debug("[I2C] i2c_newio\n"); - dpaddr = *((unsigned short *)(&immap->im_dprambase[PROFF_I2C_BASE])); + dpaddr = immap->im_dprambase16[PROFF_I2C_BASE / 2]; iip = (iic_t *)&immap->im_dprambase[dpaddr]; state->rx_idx = 0; state->tx_idx = 0; @@ -480,7 +480,7 @@ int i2c_doio(i2c_state_t *state) return I2CERR_QUEUE_EMPTY; } - dpaddr = *((unsigned short *)(&immap->im_dprambase[PROFF_I2C_BASE])); + dpaddr = immap->im_dprambase16[PROFF_I2C_BASE / 2]; iip = (iic_t *)&immap->im_dprambase[dpaddr]; iip->iic_rbptr = iip->iic_rbase; iip->iic_tbptr = iip->iic_tbase; diff --git a/arch/powerpc/cpu/mpc8260/serial_smc.c b/arch/powerpc/cpu/mpc8260/serial_smc.c index feba1f6..50c81ed 100644 --- a/arch/powerpc/cpu/mpc8260/serial_smc.c +++ b/arch/powerpc/cpu/mpc8260/serial_smc.c @@ -105,7 +105,7 @@ static int mpc8260_smc_serial_init(void) /* initialize pointers to SMC */ sp = (smc_t *) &(im->im_smc[SMC_INDEX]); - *(ushort *)(&im->im_dprambase[PROFF_SMC_BASE]) = PROFF_SMC; + im->im_dprambase16[PROFF_SMC_BASE / 2] = PROFF_SMC; up = (smc_uart_t *)&im->im_dprambase[PROFF_SMC]; /* Disable transmitter/receiver. */ @@ -331,7 +331,7 @@ kgdb_serial_init (void) /* initialize pointers to SMC */ sp = (smc_t *) &(im->im_smc[KGDB_SMC_INDEX]); - *(ushort *)(&im->im_dprambase[KGDB_PROFF_SMC_BASE]) = KGDB_PROFF_SMC; + im->im_dprambase16[KGDB_PROFF_SMC_BASE / 2] = KGDB_PROFF_SMC; up = (smc_uart_t *)&im->im_dprambase[KGDB_PROFF_SMC]; /* Disable transmitter/receiver. */ diff --git a/arch/powerpc/cpu/mpc8260/spi.c b/arch/powerpc/cpu/mpc8260/spi.c index dc98ea7..24386a5 100644 --- a/arch/powerpc/cpu/mpc8260/spi.c +++ b/arch/powerpc/cpu/mpc8260/spi.c @@ -146,7 +146,7 @@ void spi_init_f (void) immr = (immap_t *) CONFIG_SYS_IMMR; cp = (cpm8260_t *) &immr->im_cpm; - *(ushort *)(&immr->im_dprambase[PROFF_SPI_BASE]) = PROFF_SPI; + immr->im_dprambase16[PROFF_SPI_BASE / 2] = PROFF_SPI; spi = (spi_t *)&immr->im_dprambase[PROFF_SPI]; /* 1 */ diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index b3fcfe5..4a11d10 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -79,7 +79,7 @@ static int check_CPU (long clock, uint pvr, uint immr) if ((pvr >> 16) != 0x0050) return -1; - k = (immr << 16) | *((ushort *) & immap->im_cpm.cp_dparam[0xB0]); + k = (immr << 16) | immap->im_cpm.cp_dparam16[0xB0 / 2]; m = 0; suf = ""; @@ -195,7 +195,7 @@ static int check_CPU (long clock, uint pvr, uint immr) if ((pvr >> 16) != 0x0050) return -1; - k = (immr << 16) | *((ushort *) & immap->im_cpm.cp_dparam[0xB0]); + k = (immr << 16) | in_be16((ushort *)&immap->im_cpm.cp_dparam[0xB0]); m = 0; switch (k) { @@ -313,7 +313,7 @@ static int check_CPU (long clock, uint pvr, uint immr) if ((pvr >> 16) != 0x0050) return -1; - k = (immr << 16) | *((ushort *) & immap->im_cpm.cp_dparam[0xB0]); + k = (immr << 16) | in_be16((ushort *)&immap->im_cpm.cp_dparam[0xB0]); m = 0; switch (k) { diff --git a/arch/powerpc/include/asm/8xx_immap.h b/arch/powerpc/include/asm/8xx_immap.h index 40679cb..01129ed 100644 --- a/arch/powerpc/include/asm/8xx_immap.h +++ b/arch/powerpc/include/asm/8xx_immap.h @@ -485,7 +485,12 @@ typedef struct comm_proc { * Some processors don't have all of it populated. */ u_char cp_dpmem[0x1C00]; /* BD / Data / ucode */ - u_char cp_dparam[0x400]; /* Parameter RAM */ + + /* Parameter RAM */ + union { + u_char cp_dparam[0x400]; + u16 cp_dparam16[0x200]; + }; } cpm8xx_t; /* Internal memory map. diff --git a/arch/powerpc/include/asm/immap_8260.h b/arch/powerpc/include/asm/immap_8260.h index 4974ae5..c7021a7 100644 --- a/arch/powerpc/include/asm/immap_8260.h +++ b/arch/powerpc/include/asm/immap_8260.h @@ -526,13 +526,18 @@ typedef struct immap { /* Some references are into the unique and known dpram spaces, * others are from the generic base. */ -#define im_dprambase im_dpram1 - u_char im_dpram1[16*1024]; - char res1[16*1024]; - u_char im_dpram2[4*1024]; - char res2[8*1024]; - u_char im_dpram3[4*1024]; - char res3[16*1024]; + union { + struct { + u_char im_dpram1[16 * 1024]; + char res1[16 * 1024]; + u_char im_dpram2[4 * 1024]; + char res2[8 * 1024]; + u_char im_dpram3[4 * 1024]; + char res3[16 * 1024]; + }; + u8 im_dprambase[64 * 1024]; + u16 im_dprambase16[32 * 1024]; + }; sysconf8260_t im_siu_conf; /* SIU Configuration */ memctl8260_t im_memctl; /* Memory Controller */ diff --git a/common/cmd_immap.c b/common/cmd_immap.c index 1f59c1e..1fcc13d 100644 --- a/common/cmd_immap.c +++ b/common/cmd_immap.c @@ -535,7 +535,7 @@ do_i2cinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) volatile iic_t *iip; uint dpaddr; - dpaddr = *((unsigned short *) (&immap->im_dprambase[PROFF_I2C_BASE])); + dpaddr = immap->im_dprambase16[PROFF_I2C_BASE / 2]; if (dpaddr == 0) iip = NULL; else diff --git a/examples/standalone/mem_to_mem_idma2intr.c b/examples/standalone/mem_to_mem_idma2intr.c index d0a75ea..1b83876 100644 --- a/examples/standalone/mem_to_mem_idma2intr.c +++ b/examples/standalone/mem_to_mem_idma2intr.c @@ -309,7 +309,8 @@ int idma_init (void) memaddr = dpalloc (sizeof (pram_idma_t), 64); - *(volatile ushort *) &immap->im_dprambase[PROFF_IDMA2_BASE] = memaddr; + *(volatile u16 *)&immap->im_dprambase16[PROFF_IDMA2_BASE / 2] = + memaddr; piptr = (volatile pram_idma_t *) ((uint) (immap) + memaddr); piptr->pi_resv1 = 0; /* manual says: clear it */ -- 1.7.9.5

2 2

[U-Boot] [PATCH 00/12] cmd_sf: Add support for read and write instructions
by Jagannadha Sutradharudu Teki 09 Mar '13

09 Mar '13

All these patches are added a support for read and write instruction for programming/reading SPI flash. Read and Write instruction are implemented as a command line arguments for 'sf write' , 'sf read' and 'sf update' commands. Currently I have added below instructions those are commonly available on all flash types. pp - Page Program (existing one) qpp - Quad-input Page Program afr - Array Fast Read (existing one) asr - Array Slow Read dofr - Dual Output Fast Read qofr - Quad Output Fast Read diofr - Dual IO Fast Read qiofr - Quad IO Fast Read I have tested mostly of the instruction on real h/w. This entire implementation will change the current sf framework little bit but I thought these changes are worth to add. Request for all your comment, so-that I can move forward. Please let me know for any issue regarding this new implementation. Thanks, Jagan. Jagannadha Sutradharudu Teki (12): cmd_sf: Add wr_inst argument to 'sf write' command cmd_sf: Add rd_inst argument to 'sf read' command cmd_sf: Add wr_inst argument to 'sf update' command cmd_sf: Add rd_inst argument to 'sf update' command cmd_sf: Define a functions for parsing read and write instructions cmd_sf: Add QPP(Quad-input Page Program) write instruction support cmd_sf: Add ASR(Array Slow Read) read instruction support cmd_sf: Add DOFR(Dual Output Fast Read) read instruction support cmd_sf: Add QOFR(Quad Output Fast Read) read instruction support cmd_sf: Add DIOFR(Dual IO Fast Read) read instruction support cmd_sf: Add QIOFR(Quad IO Fast Read) read instruction support sf: Pass rd_qeb_req variable as 0 for status and config reg reads common/cmd_sf.c | 198 +++++++++++++++++++++++++++++----- drivers/mtd/spi/spi_flash.c | 40 +++++-- drivers/mtd/spi/spi_flash_internal.h | 10 +- include/spi_flash.h | 22 ++-- include/spi_flash_inst.h | 39 +++++++ 5 files changed, 257 insertions(+), 52 deletions(-) create mode 100644 include/spi_flash_inst.h

5 24

[U-Boot] [PATCH v7 07/31] Define CONFIG_SYS_LEGACY_BOARD everywhere
by Simon Glass 09 Mar '13

09 Mar '13

We are introducing a new unified board setup and we want this to be the default. So we need to opt all architectures out first. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v7: - Add description of CONFIG_SYS_LEGACY_BOARD to README Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None README | 21 +++++++++++++++++++++ arch/arm/config.mk | 3 +++ arch/avr32/config.mk | 3 +++ arch/blackfin/config.mk | 3 +++ arch/m68k/config.mk | 3 +++ arch/microblaze/config.mk | 3 +++ arch/mips/config.mk | 3 +++ arch/nds32/config.mk | 3 +++ arch/nios2/config.mk | 3 +++ arch/powerpc/config.mk | 3 +++ arch/sandbox/config.mk | 3 +++ arch/sh/config.mk | 3 +++ arch/sparc/config.mk | 3 +++ arch/x86/config.mk | 3 +++ config.mk | 8 ++++++++ 15 files changed, 68 insertions(+) diff --git a/README b/README index 42544ce..47aa719 100644 --- a/README +++ b/README @@ -3211,6 +3211,27 @@ Configuration Settings: If defined, don't allow the -f switch to env set override variable access flags. +- CONFIG_SYS_GENERIC_BOARD + This selects the architecture-generic board system instead of the + architecture-specific board files. It is intended to move boards + to this new framework over time. Defining this will disable the + arch/foo/lib/board.c file and use common/board_f.c and + common/board_r.c instead. To use this option your architecture + must support it (i.e. must NOT define CONFIG_SYS_LEGACY_BOARD in + its config.mk file). If you find problems enabling this option on + your board please report the problem and send patches! + +- CONFIG_SYS_LEGACY_BOARD + This option should not be defined by board config files. + This is an internal CONFIG defined by architectures which do not + support CONFIG_SYS_GENERIC_BOARD. It is used as a check that boards + don't accidentally define CONFIG_SYS_GENERIC_BOARD when their + architecture cannot support it, and U-Boot would then either not + build or not work. When an architecture supports generic board, + then CONFIG_SYS_LEGACY_BOARD can be removed from the architecture's + config.mk file so that generic board becomes available. + + The following definitions that deal with the placement and management of environment data (variable area); in general, we support the following configurations: diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 24b9d7c..c159675 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -49,6 +49,9 @@ ifneq ($(CONFIG_SPL_BUILD),y) ALL-$(CONFIG_SYS_THUMB_BUILD) += checkthumb endif +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y + # Try if EABI is supported, else fall back to old API, # i. e. for example: # - with ELDK 4.2 (EABI supported), use: diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk index a751a3d..bd5703e 100644 --- a/arch/avr32/config.mk +++ b/arch/avr32/config.mk @@ -29,3 +29,6 @@ PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections LDFLAGS_u-boot = --gc-sections --relax + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index 3595aa2..972afb1 100644 --- a/arch/blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -37,6 +37,9 @@ CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE))) PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y + LDFLAGS_FINAL += --gc-sections LDFLAGS += -m elf32bfin PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk index 11ba334..11ad9a5 100644 --- a/arch/m68k/config.mk +++ b/arch/m68k/config.mk @@ -29,3 +29,6 @@ PLATFORM_CPPFLAGS += -DCONFIG_M68K -D__M68K__ PLATFORM_LDFLAGS += -n PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections LDFLAGS_FINAL += --gc-sections + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk index b4935f0..300e3c5 100644 --- a/arch/microblaze/config.mk +++ b/arch/microblaze/config.mk @@ -33,3 +33,6 @@ PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__ LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds CONFIG_ARCH_DEVICE_TREE := microblaze + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/mips/config.mk b/arch/mips/config.mk index aaa94e8..7a0275a 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -41,6 +41,9 @@ ENDIANNESS ?= -EB PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__ +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y + # # From Linux arch/mips/Makefile # diff --git a/arch/nds32/config.mk b/arch/nds32/config.mk index c589829..f989053 100644 --- a/arch/nds32/config.mk +++ b/arch/nds32/config.mk @@ -33,3 +33,6 @@ PLATFORM_RELFLAGS += -gdwarf-2 PLATFORM_CPPFLAGS += -DCONFIG_NDS32 -D__nds32__ -G0 -ffixed-10 -fpie LDFLAGS_u-boot = --gc-sections --relax + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk index 7b03ed8..0172f70 100644 --- a/arch/nios2/config.mk +++ b/arch/nios2/config.mk @@ -31,3 +31,6 @@ PLATFORM_CPPFLAGS += -G0 LDFLAGS_FINAL += --gc-sections PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index b706281..bf77090 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -29,6 +29,9 @@ PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ PLATFORM_LDFLAGS += -n +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y + # # When cross-compiling on NetBSD, we have to define __PPC__ or else we # will pick up a va_list declaration that is incompatible with the diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 4fd0d4e..049d5f7 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -20,3 +20,6 @@ PLATFORM_CPPFLAGS += -DCONFIG_SANDBOX -D__SANDBOX__ -U_FORTIFY_SOURCE PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM PLATFORM_LIBS += -lrt + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/sh/config.mk b/arch/sh/config.mk index 07ff8b9..0c21ef5 100644 --- a/arch/sh/config.mk +++ b/arch/sh/config.mk @@ -31,3 +31,6 @@ endif PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__ PLATFORM_LDFLAGS += -e $(CONFIG_SYS_TEXT_BASE) --defsym reloc_dst=$(CONFIG_SYS_TEXT_BASE) LDFLAGS_FINAL = --gc-sections + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/sparc/config.mk b/arch/sparc/config.mk index cae7478..b98a173 100644 --- a/arch/sparc/config.mk +++ b/arch/sparc/config.mk @@ -26,3 +26,6 @@ CROSS_COMPILE ?= sparc-elf- CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 -L $(gcclibdir) -T sparc.lds PLATFORM_CPPFLAGS += -DCONFIG_SPARC -D__sparc__ + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 23cacff..7be3036 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -48,3 +48,6 @@ NORMAL_LIBGCC = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) PREFIXED_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/$(shell basename $(NORMAL_LIBGCC)) export USE_PRIVATE_LIBGCC=$(shell dirname $(PREFIXED_LIBGCC)) + +# Move to unified board system later +CONFIG_SYS_LEGACY_BOARD := y diff --git a/config.mk b/config.mk index b7cd481..9d3b185 100644 --- a/config.mk +++ b/config.mk @@ -221,6 +221,14 @@ ifeq ($(CONFIG_SPL_BUILD),y) CPPFLAGS += -DCONFIG_SPL_BUILD endif +# Does this architecture support generic board init? +ifneq ($(CONFIG_SYS_LEGACY_BOARD),) +ifneq ($(CONFIG_SYS_GENERIC_BOARD),) +$(error Your architecture does not support generic board. Please undefined \ +CONFIG_SYS_GENERIC_BOARD in your board config file) +endif +endif + ifneq ($(RESET_VECTOR_ADDRESS),) CPPFLAGS += -DRESET_VECTOR_ADDRESS=$(RESET_VECTOR_ADDRESS) endif -- 1.8.1.3

2 2

[U-Boot] [RFC] Add Nitrogen6x support.
by Eric Nelson 09 Mar '13

09 Mar '13

I'd like to get some feedback on this patch set which adds support for our Nitrogen6X series of boards because this patch introduces some additional feature for i.MX6x processors specifically, but possibly other i.MX processors as well. To give a little background, we're supporting a variety of i.MX6 processors with out Nitrogen6X product, including the Dual-Lite and Solo processors. Some of this has been discussed on the mailing list, most recently here: http://lists.denx.de/pipermail/u-boot/2013-January/#144323 To give a little background, the i.MX6x architecture has three major variants: i.MX6 Quad and i.MX6 Dual i.MX6 Dual-Lite and i.MX6 Solo i.MX6 Solo Lite Because the first two are pin compatible, those variants are what we're supporting in this product line. Unfortunately, they have differing register locations, and also support different DDR clock rates (1066MHz on Quad/Dual and 800MHz on Dual-Lite/Solo). To simplify support for the two, we recently pushed patches adding support for the preprocessor to the 'imximage' utility and these have been merged. This allows us to define a single set of DCD data to configure portions of the device setup like this line from board/boundary/ddr-setup.cfg: DATA 4, IOM_DRAM_SDQS0, 0x00000030 The address of IOM_DRAM_SDQS0 depends on which processor variant is used. To resolve this, we've introduced header files arch/arm/include/asm/arch-mx6/mx6q-ddr.h and arch/arm/include/asm/arch-mx6/mx6dl-ddr.h The 'q' refers to Quad/Dual. The 'dl' refers to Dual-Lite/Solo. To make things simpler, we've added this header file, which includes one of the headers above based on whether we're compiling for MX6Q or MX6DL. arch/arm/include/asm/arch-mx6/mx6-ddr.h The net result seems to be fairly clean. We're able to express the various boards concisely in these files within board/boundary/nitrogen6x: board/boundary/nitrogen6x/nitrogen6dl2g.cfg board/boundary/nitrogen6x/nitrogen6dl.cfg board/boundary/nitrogen6x/nitrogen6q2g.cfg board/boundary/nitrogen6x/nitrogen6q.cfg board/boundary/nitrogen6x/nitrogen6s1g.cfg board/boundary/nitrogen6x/nitrogen6s.cfg By using the preprocessor, we were also able to separate common setup for clocks and DDR from the specific memory arrangements that differentiate some of our boards: clocks.cfg ddr-setup.cfg 1066mhz_4x128mx16.cfg 1066mhz_4x256mx16.cfg 800mhz_2x128mx16.cfg 800mhz_2x256mx16.cfg 800mhz_4x128mx16.cfg 800mhz_4x256mx16.cfg We're trying to keep the nomenclature consistent: 6x - refers to things that are independent of the variant used 6q - refers to the 6Quad/6Dual variant 6dl - refers to the 6Dual-Lite/6Solo Note that this differs from what's currently done in some other i.MX6 headers. For example, arch/arm/include/asm/arch-mx6/mx6x_pins.h defines the pad setting for UART2 using symbol MX6Q_PAD_EIM_D26__UART2_TXD while arch/arm/include/asm/arch-mx6/mx6dl_pins.h defines MX6DL_PAD_EIM_D26__UART2_TXD This necessitated a bit of preprocessor-fu in nitrogen6x.c where we create a common MX6PAD macro: #ifdef FOR_DL_SOLO #define MX6PAD(a) MX6DL_PAD_##a #else #define MX6PAD(a) MX6Q_PAD_##a #endif and use it later like this: MX6PAD(EIM_D26__UART2_TXD) It seems worthwhile to rename mx6x_pins.h to mx6q_pins.h and also change the pad declarations so that other boards can avoid the MX6PAD() macro. I also suggest that we add an intermediate mx6_pins.h or mx6x_pins.h file that includes the appropriate file based on the processor macro. There are a couple of other changes to common files that I'll break out before submitting this officially, but I'm hoping to get some feedback first. Eric Nelson (1): Add support for Boundary Devices Nitrogen6x boards MAINTAINERS | 8 + arch/arm/include/asm/arch-mx6/crm_regs.h | 12 + arch/arm/include/asm/arch-mx6/iomux.h | 5 + arch/arm/include/asm/arch-mx6/mx6-ddr.h | 73 ++ arch/arm/include/asm/arch-mx6/mx6dl-ddr.h | 59 ++ arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 3 + arch/arm/include/asm/arch-mx6/mx6q-ddr.h | 57 ++ board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg | 37 + board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg | 37 + board/boundary/nitrogen6x/6x_bootscript.txt | 58 ++ .../boundary/nitrogen6x/6x_bootscript_android.txt | 64 ++ .../nitrogen6x/6x_bootscript_android_recovery.txt | 64 ++ board/boundary/nitrogen6x/6x_upgrade.txt | 46 + board/boundary/nitrogen6x/800mhz_2x128mx16.cfg | 37 + board/boundary/nitrogen6x/800mhz_2x256mx16.cfg | 37 + board/boundary/nitrogen6x/800mhz_4x128mx16.cfg | 37 + board/boundary/nitrogen6x/800mhz_4x256mx16.cfg | 37 + board/boundary/nitrogen6x/Makefile | 41 + board/boundary/nitrogen6x/README | 93 ++ board/boundary/nitrogen6x/clocks.cfg | 31 + board/boundary/nitrogen6x/ddr-setup.cfg | 94 ++ board/boundary/nitrogen6x/nitrogen6dl.cfg | 46 + board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 46 + board/boundary/nitrogen6x/nitrogen6q.cfg | 46 + board/boundary/nitrogen6x/nitrogen6q2g.cfg | 46 + board/boundary/nitrogen6x/nitrogen6s.cfg | 46 + board/boundary/nitrogen6x/nitrogen6s1g.cfg | 46 + board/boundary/nitrogen6x/nitrogen6x.c | 901 ++++++++++++++++++++ boards.cfg | 6 + drivers/usb/host/ehci-mx6.c | 1 - include/configs/nitrogen6x.h | 284 ++++++ 31 files changed, 2397 insertions(+), 1 deletion(-) create mode 100644 arch/arm/include/asm/arch-mx6/mx6-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6q-ddr.h create mode 100644 board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/6x_bootscript.txt create mode 100644 board/boundary/nitrogen6x/6x_bootscript_android.txt create mode 100644 board/boundary/nitrogen6x/6x_bootscript_android_recovery.txt create mode 100644 board/boundary/nitrogen6x/6x_upgrade.txt create mode 100644 board/boundary/nitrogen6x/800mhz_2x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_2x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_4x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_4x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/Makefile create mode 100644 board/boundary/nitrogen6x/README create mode 100644 board/boundary/nitrogen6x/clocks.cfg create mode 100644 board/boundary/nitrogen6x/ddr-setup.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6dl.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6dl2g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6q.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6q2g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6s.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6s1g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6x.c create mode 100644 include/configs/nitrogen6x.h -- 1.7.9.5

4 6

Re: [U-Boot] [PATCH v5] Exynos5: Pinmux: Add fdt for pinmux
by Akshay Saraswat 08 Mar '13

08 Mar '13

Hi Simon, >Hi Akshay, > >On Thu, Mar 7, 2013 at 6:09 AM, Akshay Saraswat <akshay.s(a)samsung.com> wrote: >> This patch adds fdt nodes for peripherals which require >> pin muxing and configuration. Device tree bindings for pinctrl >> are kept same as required for Linux. Existing pinmux code >> modified to retrieve gpio range and function related info from fdt. >> >> Depends-on: [U-Boot] [PATCH 0/4 V3] EXYNOS5: Add GPIO numbering feature >> URL: http://lists.denx.de/pipermail/u-boot/2013-February/146151.html >> >> Signed-off-by: Akshay Saraswat <akshay.s(a)samsung.com> >> --- >> Changes since v1: >> - Device tree bindings changed to linux style. >> - Added documentation for samsung pinctrl. >> >> Changes since v2: >> - Rebased as per new version of GPIO numbering patch-set. >> >> Changes since v3: >> - Added comments to reduce ambiguity and increase readability. >> - Fixed few other nits. >> >> Changes since v4: >> - Added support for reading peripheral pinctrl subnode names from preipheral's node instead of hard coding. >> > >Well I have to say this is looking really nice. From what I can tell >you are using the Linux binding for samsung,pinctrl-names - please can >you add in that binding information to your binding file - I can't see >it there? > "samsung,pinctrl-names" is already mentioned in example 3 of doc/device-tree-bindings/samsung-pinctrl.txt. samsung-pinctrl.txt in u-boot and kernel are same except the name exynos5 replaced exynos4210. Please tell me, if I misunderstood the requirement. > >The interesting thing is that you should at some point (further patch) >be able to remove the alias stuff and have the driver's pass their >node offset into this function. Then we can drop the peripheral IDs >altogether perhaps? > I think for now we should keep PERIPH_ID's because same pinmux.c and functions are being used by exynos4 and exynos4x12. Since, I thought we should not break support for these SoC's, I kept node retrieval in Pinmux itself instead of drivers or smdk5250.c. Please suggest. > >> arch/arm/cpu/armv7/exynos/pinmux.c | 357 +++++++------- >> arch/arm/dts/exynos5250-pinctrl.dtsi | 675 +++++++++++++++++++++++++++ >> arch/arm/dts/exynos5250.dtsi | 92 ++++ >> board/samsung/dts/exynos5250-smdk5250.dts | 11 + >> doc/device-tree-bindings/samsung-pinctrl.txt | 253 ++++++++++ >> include/fdtdec.h | 4 + >> lib/fdtdec.c | 4 + >> 7 files changed, 1231 insertions(+), 165 deletions(-) >> create mode 100644 arch/arm/dts/exynos5250-pinctrl.dtsi >> create mode 100644 doc/device-tree-bindings/samsung-pinctrl.txt >> >[..] > >> diff --git a/include/fdtdec.h b/include/fdtdec.h >> index 77f244f..26692e5 100644 >> --- a/include/fdtdec.h >> +++ b/include/fdtdec.h >> @@ -81,6 +81,10 @@ enum fdt_compat_id { >> COMPAT_SAMSUNG_EXYNOS_EHCI, /* Exynos EHCI controller */ >> COMPAT_SAMSUNG_EXYNOS_USB_PHY, /* Exynos phy controller for usb2.0 */ >> COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */ >> + COMPAT_SAMSUNG_EXYNOS_UART, /* Exynos serial */ >> + COMPAT_SAMSUNG_EXYNOS_MSHC, /* Exynos MMC controller */ >> + COMPAT_SAMSUNG_EXYNOS_I2S, /* Exynos MMC controller */ >> + COMPAT_SAMSUNG_PINCTRL, /* PINCTRL */ >> >> COMPAT_COUNT, >> }; >> diff --git a/lib/fdtdec.c b/lib/fdtdec.c >> index 3ae348d..88dd669 100644 >> --- a/lib/fdtdec.c >> +++ b/lib/fdtdec.c >> @@ -56,6 +56,10 @@ static const char * const compat_names[COMPAT_COUNT] = { >> COMPAT(SAMSUNG_EXYNOS_EHCI, "samsung,exynos-ehci"), >> COMPAT(SAMSUNG_EXYNOS_USB_PHY, "samsung,exynos-usb-phy"), >> COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), >> + COMPAT(SAMSUNG_EXYNOS_UART, "samsung,exynos-uart"), >> + COMPAT(SAMSUNG_EXYNOS_MSHC, "samsung,exynos-mshc"), >> + COMPAT(SAMSUNG_EXYNOS_I2S, "samsung,exynos-i2s"), >> + COMPAT(SAMSUNG_PINCTRL, "samsung,pinctrl"), > >Do these match the kernel names? > In kernel these are mentioned as ""samsung,exynos5250-dw-mshc"" & "samsung,exynos4210-uart". I wanted to keep it consistent with others like "samsung,exynos-ehci", "samsung,exynos-spi" etc., hence, made "samsung,exynos-mshc" & "samsung,exynos-uart". Shall I change it ? > >> }; >> > Regards, Akshay Saraswat

2 1

[U-Boot] [PATCH] 8xx: Fix build warnings
by Wolfgang Denk 08 Mar '13

08 Mar '13

MPC8xx based systems throw this warning: cpu.c:81:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Fix it. Signed-off-by: Wolfgang Denk <wd(a)denx.de> Cc: Andy Fleming <afleming(a)gmail.com> --- arch/powerpc/cpu/mpc8xx/cpu.c | 4 +++- arch/powerpc/include/asm/8xx_immap.h | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index b6b733d..f48d602 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -78,7 +78,9 @@ static int check_CPU (long clock, uint pvr, uint immr) if ((pvr >> 16) != 0x0050) return -1; - k = (immr << 16) | *((ushort *) & immap->im_cpm.cp_dparam[0xB0]); + k = (immr << 16) | + immap->im_cpm.cp_dparam[PROFF_REVNUM] << 8 | + immap->im_cpm.cp_dparam[PROFF_REVNUM + 1] ; m = 0; suf = ""; diff --git a/arch/powerpc/include/asm/8xx_immap.h b/arch/powerpc/include/asm/8xx_immap.h index 40679cb..3b29b39 100644 --- a/arch/powerpc/include/asm/8xx_immap.h +++ b/arch/powerpc/include/asm/8xx_immap.h @@ -488,6 +488,11 @@ typedef struct comm_proc { u_char cp_dparam[0x400]; /* Parameter RAM */ } cpm8xx_t; +/* + * Parameter RAM offsets from the base. + */ +#define PROFF_REVNUM ((uint)0x00B0) + /* Internal memory map. */ typedef struct immap { -- 1.7.11.7

1 1

Re: [U-Boot] [PATCH v4] Introduced btrfs file-system with btrload command
by Simon Glass 08 Mar '13

08 Mar '13

Hi Adnan, On Fri, Mar 8, 2013 at 3:11 AM, Adnan Ali <adnan.ali(a)codethink.co.uk> wrote: > Hi > > On 08/03/13 05:03, Simon Glass wrote: > >> +U-Boot et al >> >> Hi, >> >> On Thu, Mar 7, 2013 at 2:35 AM, Adnan Ali <adnan.ali(a)codethink.co.uk> >> wrote: >> >>> Introduces btrfs file-system to read file >>> from volume/sub-volumes with btrload command. This >>> implementation has read-only support. >>> This btrfs implementation is based on syslinux btrfs >>> code, commit 269ebc845ebc8b46ef4b0be7fa0005**c7fdb95b8d. >>> >> Here are some comments, hope it helps. >> > Most of your comments in btrfs.c is about ported code. > which we have already discussed to leave it as it for easy > of future re sync. I will also wait for others to respond, > so that i know what to change before sending other > revision of patch. Please find my comments below > Yes, I'm sorry, now I remember that discussion. I think if you can fit it in to work with the new fs.c changes then all will be well. Please just take account of my comments that relate to fitting it into U-Boot, and ignore the ones that concern code style/readability. Regards, Simon

1 0

[U-Boot] Please pull u-boot-x86.git
by Simon Glass 08 Mar '13

08 Mar '13

Hi Tom, Great to see the previous lot made it in. Here is the next x86 series. The following changes since commit 2536850d7cd90bdb75bf3ff86838f913392b68db: Prepare v2013.04-rc1 (2013-03-04 16:29:17 -0500) are available in the git repository at: git://git.denx.de/u-boot-x86.git master for you to fetch changes up to fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800) ---------------------------------------------------------------- Simon Glass (9): x86: Add function to get top of usable ram x86: Add basic cache operations x86: Permit bootstage and timer data to be used prior to relocation x86: Add an __end symbol to signal the end of the U-Boot binary x86: Rearrange the output input to remove BSS x86: Support relocation of FDT on start-up x86: Add error checking to x86 relocation code x86: Adjust link device tree include file x86: Enable CONFIG_OF_CONTROL on coreboot arch/x86/cpu/coreboot/coreboot.c | 15 +++++------- arch/x86/cpu/coreboot/sdram.c | 18 +++----------- arch/x86/cpu/cpu.c | 23 +++++++++++++++++ arch/x86/cpu/interrupts.c | 7 +++--- arch/x86/cpu/u-boot.lds | 21 ++++++++++------ arch/x86/include/asm/global_data.h | 4 +++ arch/x86/include/asm/init_helpers.h | 2 ++ arch/x86/include/asm/relocate.h | 1 + arch/x86/include/asm/u-boot-x86.h | 1 + arch/x86/lib/board.c | 3 +++ arch/x86/lib/init_helpers.c | 49 ++++++++++++++++++++++++++++--------- arch/x86/lib/init_wrappers.c | 1 + arch/x86/lib/relocate.c | 37 ++++++++++++++++++++++++++-- arch/x86/lib/timer.c | 9 +++---- board/chromebook-x86/dts/link.dts | 2 +- include/configs/coreboot.h | 6 +++++ 16 files changed, 146 insertions(+), 53 deletions(-) Regards, Simon

2 1

[U-Boot] [PATCH 1/4] Tegra: All Tamonten-derived boards use onboard NAND
by Thierry Reding 08 Mar '13

08 Mar '13

Move the nand-controller node to the tegra20-tamonten.dtsi so that it can be shared between all derived boards. Signed-off-by: Thierry Reding <thierry.reding(a)avionic-design.de> --- This depends on Tom's "Tegra: MMC: Add DT support for MMC to T20 boards" patches. board/avionic-design/dts/tegra20-tamonten.dtsi | 11 +++++++++++ board/avionic-design/dts/tegra20-tec.dts | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/board/avionic-design/dts/tegra20-tamonten.dtsi b/board/avionic-design/dts/tegra20-tamonten.dtsi index 4766aba..0a95ac1 100644 --- a/board/avionic-design/dts/tegra20-tamonten.dtsi +++ b/board/avionic-design/dts/tegra20-tamonten.dtsi @@ -279,6 +279,17 @@ status = "okay"; }; + nand-controller@70008000 { + nvidia,wp-gpios = <&gpio 23 0>; /* PC7 */ + nvidia,width = <8>; + nvidia,timing = <26 100 20 80 20 10 12 10 70>; + + nand@0 { + reg = <0>; + compatible = "hynix,hy27uf4g2b", "nand-flash"; + }; + }; + i2c@7000c000 { clock-frequency = <400000>; status = "okay"; diff --git a/board/avionic-design/dts/tegra20-tec.dts b/board/avionic-design/dts/tegra20-tec.dts index 376d279..694682c 100644 --- a/board/avionic-design/dts/tegra20-tec.dts +++ b/board/avionic-design/dts/tegra20-tec.dts @@ -32,17 +32,6 @@ clock-frequency = <216000000>; }; - nand-controller@70008000 { - nvidia,wp-gpios = <&gpio 23 0>; /* PC7 */ - nvidia,width = <8>; - nvidia,timing = <26 100 20 80 20 10 12 10 70>; - - nand@0 { - reg = <0>; - compatible = "hynix,hy27uf4g2b", "nand-flash"; - }; - }; - i2c@7000c000 { status = "disabled"; }; -- 1.8.1.2

4 15

[U-Boot] [PATCH V2 1/4] ARM: tegra: make bounce buffer option common
by Stephen Warren 08 Mar '13

08 Mar '13

From: Stephen Warren <swarren(a)nvidia.com> All Tegra devices will need CONFIG_BOUNCE_BUFFER. Move it to tegra-common.h to ensure it's always set. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: Add missing word to commit subject. This is based on u-boot-tegra/next, plus my reset vector fix (which shouldn't conflict), plus Tom's Tegra30 MMC series. include/configs/tegra-common.h | 3 +++ include/configs/tegra20-common.h | 3 --- include/configs/tegra30-common.h | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 4a656bb..a3cb5b9 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -157,4 +157,7 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT +/* Misc utility code */ +#define CONFIG_BOUNCE_BUFFER + #endif /* _TEGRA_COMMON_H_ */ diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h index 33e5f52..dac8245 100644 --- a/include/configs/tegra20-common.h +++ b/include/configs/tegra20-common.h @@ -114,7 +114,4 @@ #define CONFIG_SYS_NAND_SELF_INIT #define CONFIG_SYS_NAND_ONFI_DETECTION -/* Misc utility code */ -#define CONFIG_BOUNCE_BUFFER - #endif /* _TEGRA20_COMMON_H_ */ diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index bd1dfe8..04517e1 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -86,7 +86,4 @@ /* Total I2C ports on Tegra30 */ #define TEGRA_I2C_NUM_CONTROLLERS 5 -/* Misc utility code */ -#define CONFIG_BOUNCE_BUFFER - #endif /* _TEGRA30_COMMON_H_ */ -- 1.7.10.4

3 9