Re: [U-Boot] [PATCH] cosmetic: boards.cfg: fix some maintainers fields
Hi Masahiro, Thanks. On 07/22/2014 11:58 AM, Masahiro Yamada wrote: Add a whitespace between the name and the email address. When switching to Kconfig, the first version of MAINTAINERS files will be generated based on the boards.cfg file. So, the maintainers field should be corrected even if it is a really minor fix. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Bo Shen voice.s...@atmel.com --- boards.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards.cfg b/boards.cfg index 3be1e0d..1808131 100644 --- a/boards.cfg +++ b/boards.cfg @@ -106,8 +106,8 @@ Active arm arm926ejs at91atmel at91sam9263ek Active arm arm926ejs at91atmel at91sam9263ek at91sam9263ek_nandflash at91sam9263ek:AT91SAM9263,SYS_USE_NANDFLASH Stelian Pop stel...@popies.net Active arm arm926ejs at91atmel at91sam9263ek at91sam9263ek_norflashat91sam9263ek:AT91SAM9263,SYS_USE_NORFLASH Stelian Pop stel...@popies.net Active arm arm926ejs at91atmel at91sam9263ek at91sam9263ek_norflash_boot at91sam9263ek:AT91SAM9263,SYS_USE_BOOT_NORFLASH Stelian Pop stel...@popies.net -Active arm arm926ejs at91atmel at91sam9m10g45ek at91sam9m10g45ek_mmc at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_MMC Bo Shenvoice.s...@atmel.com -Active arm arm926ejs at91atmel at91sam9m10g45ek at91sam9m10g45ek_nandflash at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH Bo Shenvoice.s...@atmel.com +Active arm arm926ejs at91atmel at91sam9m10g45ek at91sam9m10g45ek_mmc at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_MMC Bo Shen voice.s...@atmel.com +Active arm arm926ejs at91atmel at91sam9m10g45ek at91sam9m10g45ek_nandflash at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH Bo Shen voice.s...@atmel.com Active arm arm926ejs at91atmel at91sam9n12ek at91sam9n12ek_mmc at91sam9n12ek:AT91SAM9N12,SYS_USE_MMC Josh Wu josh...@atmel.com Active arm arm926ejs at91atmel at91sam9n12ek at91sam9n12ek_nandflash at91sam9n12ek:AT91SAM9N12,SYS_USE_NANDFLASH Josh Wu josh...@atmel.com Active arm arm926ejs at91atmel at91sam9n12ek at91sam9n12ek_spiflashat91sam9n12ek:AT91SAM9N12,SYS_USE_SPIFLASH Josh Wu josh...@atmel.com Best Regards, Bo Shen ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 08/10] powerpc: mpc8xx: remove FLAGADM board support
This board has been orphaned for a while and old enough. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- board/flagadm/Makefile | 8 - board/flagadm/flagadm.c| 134 board/flagadm/flash.c | 687 - board/flagadm/u-boot.lds | 82 - board/flagadm/u-boot.lds.debug | 121 boards.cfg | 1 - doc/README.scrapyard | 1 + include/commproc.h | 21 -- include/configs/FLAGADM.h | 296 -- 9 files changed, 1 insertion(+), 1350 deletions(-) delete mode 100644 board/flagadm/Makefile delete mode 100644 board/flagadm/flagadm.c delete mode 100644 board/flagadm/flash.c delete mode 100644 board/flagadm/u-boot.lds delete mode 100644 board/flagadm/u-boot.lds.debug delete mode 100644 include/configs/FLAGADM.h diff --git a/board/flagadm/Makefile b/board/flagadm/Makefile deleted file mode 100644 index f2377c8..000 --- a/board/flagadm/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2001-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y = flagadm.o flash.o diff --git a/board/flagadm/flagadm.c b/board/flagadm/flagadm.c deleted file mode 100644 index 343cb77..000 --- a/board/flagadm/flagadm.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * (C) Copyright 2001 - * Wolfgang Denk, DENX Software Engineering, w...@denx.de. - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include common.h -#include mpc8xx.h - -#define_NOT_USED_ 0x - -/*Orginal table, GPL4 disabled*/ -const uint sdram_table[] = -{ - /* single read (offset 0x00 in upm ram) */ - 0x1f07cc04, 0xeeaeec04, 0x11adcc04, 0xefbbac00, - 0x1ff74c47, - /* Precharge */ - 0x1FF74C05, - _NOT_USED_, - _NOT_USED_, - /* burst read(offset 0x08 in upm ram) */ - 0x1f07cc04, 0xeeaeec04, 0x00adcc04, 0x00afcc00, - 0x00afcc00, 0x01afcc00, 0x0fbb8c00, 0x1ff74c47, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - /* single write (offset 0x18 in upm ram) */ - 0x1f27cc04, 0xeeaeac00, 0x01b90c04, 0x1ff74c47, - /* Load moderegister */ - 0x1FF74C34, /*Precharge*/ - 0xEFEA8C34, /*NOP*/ - 0x1FB54C35, /*Load moderegister*/ - _NOT_USED_, - - /* burst write (offset 0x20 in upm ram) */ - 0x1f07cc04, 0xeeaeac00, 0x00ad4c00, 0x00afcc00, - 0x00afcc00, 0x01bb8c04, 0x1ff74c47, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - /* refresh (offset 0x30 in upm ram) */ - 0x1ff5cc84, 0xec04, 0xec04, 0xec04, - 0xec84, 0xec07, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - /* exception (offset 0x3C in upm ram) */ - 0x7fffec07, _NOT_USED_, _NOT_USED_, _NOT_USED_, -}; - -/* GPL5 driven every cycle */ -/* the display and the DSP */ -const uint dsp_disp_table[] = -{ - /* single read (offset 0x00 in upm ram) */ - 0xc80c, 0xc004, 0x0fffc004, 0x0fffd004, - 0x0fffc000, 0x0fffc004, 0x3fffc004, 0xcc05, - /* burst read(offset 0x08 in upm ram) */ - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - /* single write (offset 0x18 in upm ram) */ - 0xcc0c, 0xc004, 0x0fffc004, 0x0fffd004, - 0x0fffc000, 0x0fffc004, 0x7fffc004, 0xfc05, - /* burst write (offset 0x20 in upm ram) */ - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - /* refresh (offset 0x30 in upm ram) */ - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, - /* exception (offset 0x3C in upm ram) */ - _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, -}; - -int checkboard (void) -{ - puts (Board: FlagaDM V3.0\n); - return 0; -} - -phys_size_t initdram (int board_type) -{ - volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR; - volatile memctl8xx_t *memctl = immap-im_memctl; - long int size_b0; - - memctl-memc_or2 = CONFIG_SYS_OR2; - memctl-memc_br2 = CONFIG_SYS_BR2; - - udelay(100); - upmconfig(UPMA, (uint *)sdram_table, sizeof(sdram_table)/sizeof(uint)); - - memctl-memc_mptpr = MPTPR_PTP_DIV16; - memctl-memc_mamr = CONFIG_SYS_MAMR_48_SDR | MAMR_TLFA_1X; - - /*Do the initialization of the SDRAM*/ -
[U-Boot] [PATCH 0/10] Drop mpc8xx, mpc82xx boards which are orphaned or have no maintainers
I built all the other boards and compared MD5SUM. I confirmed this series has no impact against them. I'd like to drop as many unmaintained (or old enough) boards as possible before switching to Kconfig. I believe this would make our migration and test easier. Masahiro Yamada (10): powerpc: mpc8xx: remove some of tqm8xx board family without maintainers powerpc: mpc8260: remove ppmc8260 board support powerpc: mpc824x: remove MUSENKI and Sandpoint8245 board support powerpc: mpc8xx: remove stxxtc board support powerpc: mpc8xx: remove svm_sc8xx board powerpc: mpc8xx: remove SXNI855T board support powerpc: mpc8xx: remove GEN860T, GEN806T_SC board support powerpc: mpc8xx: remove FLAGADM board support powerpc: mpc8260: remove sacsng board support powerpc: mpc8260: remove ep8260 board support CREDITS |2 +- arch/powerpc/cpu/mpc824x/cpu_init.c | 21 - arch/powerpc/cpu/mpc8260/ether_fcc.c | 17 - arch/powerpc/cpu/mpc8xx/cpu_init.c |4 - arch/powerpc/cpu/mpc8xx/fec.c| 79 +- arch/powerpc/cpu/mpc8xx/speed.c |3 +- arch/powerpc/lib/board.c |3 +- board/ep8260/Makefile|8 - board/ep8260/ep8260.c| 304 -- board/ep8260/ep8260.h| 24 - board/ep8260/flash.c | 395 board/ep8260/mii_phy.c | 107 --- board/flagadm/Makefile |8 - board/flagadm/flagadm.c | 134 --- board/flagadm/flash.c| 687 -- board/flagadm/u-boot.lds | 82 -- board/flagadm/u-boot.lds.debug | 121 --- board/gen860t/Makefile |8 - board/gen860t/README | 131 --- board/gen860t/beeper.c | 183 board/gen860t/beeper.h | 13 - board/gen860t/flash.c| 628 - board/gen860t/fpga.c | 362 --- board/gen860t/fpga.h | 26 - board/gen860t/gen860t.c | 278 -- board/gen860t/ioport.c | 331 --- board/gen860t/ioport.h | 26 - board/gen860t/u-boot-flashenv.lds| 92 -- board/gen860t/u-boot.lds | 87 -- board/musenki/Makefile |8 - board/musenki/README | 298 -- board/musenki/flash.c| 496 -- board/musenki/musenki.c | 94 -- board/ppmc8260/Makefile |8 - board/ppmc8260/ppmc8260.c| 291 -- board/sacsng/Makefile|8 - board/sacsng/clkinit.c | 1009 board/sacsng/clkinit.h | 103 -- board/sacsng/flash.c | 507 -- board/sacsng/ioconfig.h | 217 - board/sacsng/sacsng.c| 848 - board/sixnet/Makefile|8 - board/sixnet/flash.c | 774 --- board/sixnet/fpgadata.c | 1719 -- board/sixnet/sixnet.c| 578 board/sixnet/sixnet.h| 20 - board/sixnet/u-boot.lds | 82 -- board/stx/stxxtc/Makefile|8 - board/stx/stxxtc/README.stxxtc | 59 -- board/stx/stxxtc/stxxtc.c| 592 board/stx/stxxtc/u-boot.lds | 82 -- board/stx/stxxtc/u-boot.lds.debug| 121 --- board/svm_sc8xx/Makefile |8 - board/svm_sc8xx/flash.c | 666 - board/svm_sc8xx/svm_sc8xx.c | 144 --- board/svm_sc8xx/u-boot.lds | 99 -- board/svm_sc8xx/u-boot.lds.debug | 114 --- board/tqc/tqm8xx/tqm8xx.c| 57 -- boards.cfg | 22 - common/board_f.c |3 +- doc/README.scrapyard | 31 +- drivers/i2c/soft_i2c.c |3 - drivers/pcmcia/mpc8xx_pcmcia.c |2 +- drivers/pcmcia/tqm8xx_pcmcia.c | 54 +- drivers/rtc/Makefile |1 - drivers/rtc/ds1306.c | 443 - drivers/serial/usbtty.h |4 +- drivers/usb/gadget/Makefile |1 - drivers/usb/gadget/mpc8xx_udc.c | 1386 --- include/common.h | 28 +- include/commproc.h | 117 +-- include/configs/FLAGADM.h| 296 -- include/configs/GEN860T.h| 712 -- include/configs/MUSENKI.h| 275 -- include/configs/NSCU.h | 463 - include/configs/SXNI855T.h | 378 include/configs/Sandpoint8245.h | 376 include/configs/TK885D.h | 490 -- include/configs/TQM823M.h| 464 - include/configs/TQM850M.h| 454 - include/configs/TQM855M.h| 491 --
[U-Boot] [PATCH 03/10] powerpc: mpc824x: remove MUSENKI and Sandpoint8245 board support
These boards have been orphaned for a while and old enough. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- arch/powerpc/cpu/mpc824x/cpu_init.c | 21 -- board/musenki/Makefile | 8 - board/musenki/README| 298 -- board/musenki/flash.c | 496 board/musenki/musenki.c | 94 --- boards.cfg | 2 - doc/README.scrapyard| 1 + include/configs/MUSENKI.h | 275 include/configs/Sandpoint8245.h | 376 --- 9 files changed, 1 insertion(+), 1570 deletions(-) delete mode 100644 board/musenki/Makefile delete mode 100644 board/musenki/README delete mode 100644 board/musenki/flash.c delete mode 100644 board/musenki/musenki.c delete mode 100644 include/configs/MUSENKI.h delete mode 100644 include/configs/Sandpoint8245.h diff --git a/arch/powerpc/cpu/mpc824x/cpu_init.c b/arch/powerpc/cpu/mpc824x/cpu_init.c index 68d88e9..36dad17 100644 --- a/arch/powerpc/cpu/mpc824x/cpu_init.c +++ b/arch/powerpc/cpu/mpc824x/cpu_init.c @@ -50,27 +50,6 @@ cpu_init_f (void) CONFIG_WRITE_HALFWORD(PCICR, 0x06); /* Bus Master, respond to PCI memory space acesses*/ /*CONFIG_WRITE_HALFWORD(PCISR, 0x); */ /*reset PCISR*/ -#if defined(CONFIG_MUSENKI) -/* Why is this here, you ask? Try, just try setting 0x8000 - * in PCIACR with CONFIG_WRITE_HALFWORD() - * this one was a stumper, and we are annoyed - */ - -#define M_CONFIG_WRITE_HALFWORD( addr, data ) \ - __asm__ __volatile__( \ - stw %2,0(%0)\n \ - sync\n \ - sth %3,2(%1)\n \ - sync\n \ - \ - : /* no output */ \ - : r (CONFIG_ADDR), r (CONFIG_DATA), \ - r (PCISWAP(addr ~3)), r (PCISWAP(data 16)) \ - ); - - M_CONFIG_WRITE_HALFWORD(PCIACR, 0x8000); -#endif - CONFIG_WRITE_BYTE(PCLSR, 0x8); /* set PCI cache line size */ CONFIG_WRITE_BYTE (PLTR, 0x40); /* set PCI latency timer */ /* diff --git a/board/musenki/Makefile b/board/musenki/Makefile deleted file mode 100644 index d2b79ff..000 --- a/board/musenki/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2001-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y = musenki.o flash.o diff --git a/board/musenki/README b/board/musenki/README deleted file mode 100644 index 084ab54..000 --- a/board/musenki/README +++ /dev/null @@ -1,298 +0,0 @@ -U-Boot for a Musenki M-3/M-1 board - -Musenki M-1 and M-3 have two banks of flash of 4MB or 8MB each. - -In board's notation, bank 0 is the one at the address of 0xFF80 -and bank 1 is the one at the address of 0xFF00. - -On power-up the processor jumps to the address of 0xFFF00100, the last -megabyte of the bank 0 of flash. - -Thus, U-Boot is configured to reside in flash starting at the address of -0xFFF0. The environment space is located in flash separately from -U-Boot, at the address of 0xFF80. - -There is a Davicom 9102A on-board, but I don't have it working yet. - -U-Boot test results - - -x.x Operation on all available serial consoles - -x.x.x CONFIG_CONS_INDEX 1 - - -U-Boot 1.1.1 (Nov 20 2001 - 15:55:32) - -CPU: MPC8245 Revision 16.20 at 250 MHz: 16 kB I-Cache 16 kB D-Cache -Board: MUSENKI Local Bus at 100 MHz -DRAM: 32 MB -FLASH: 4 MB -In:serial -Out: serial -Err: serial -Hit any key to stop autoboot: 0 -= help -base- print or set address offset -bdinfo - print Board Info structure -bootm - boot application image from memory -bootp - boot image via network using BootP/TFTP protocol -bootd - boot default, i.e., run 'bootcmd' -cmp - memory compare -coninfo - print console devices and informations -cp - memory copy -crc32 - checksum calculation -dcache - enable or disable data cache -echo- echo args to console -erase - erase FLASH memory -flinfo - print FLASH memory information -go - start application at address 'addr' -help- print online help -icache - enable or disable instruction cache -iminfo - print header information for application image -loadb - load binary file over serial line (kermit mode) -loads - load S-Record file over serial line -loop- infinite loop on address range -md - memory display -mm - memory modify (auto-incrementing) -mtest - simple RAM test -mw - memory write (fill) -nm - memory modify (constant address) -printenv- print environment variables -protect - enable or disable FLASH write protection -rarpboot- boot image via network using RARP/TFTP protocol -reset - Perform RESET of the CPU -run - run commands in an environment variable
[U-Boot] [PATCH 02/10] powerpc: mpc8260: remove ppmc8260 board support
This board has been orphaned for a while and old enough. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- board/ppmc8260/Makefile| 8 - board/ppmc8260/ppmc8260.c | 291 - boards.cfg | 1 - doc/README.scrapyard | 23 +- include/configs/ppmc8260.h | 986 - 5 files changed, 12 insertions(+), 1297 deletions(-) delete mode 100644 board/ppmc8260/Makefile delete mode 100644 board/ppmc8260/ppmc8260.c delete mode 100644 include/configs/ppmc8260.h diff --git a/board/ppmc8260/Makefile b/board/ppmc8260/Makefile deleted file mode 100644 index 3072fb4..000 --- a/board/ppmc8260/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y := ppmc8260.o diff --git a/board/ppmc8260/ppmc8260.c b/board/ppmc8260/ppmc8260.c deleted file mode 100644 index f0f29b2..000 --- a/board/ppmc8260/ppmc8260.c +++ /dev/null @@ -1,291 +0,0 @@ -/* - * (C) Copyright 2000 - * Sysgo Real-Time Solutions, GmbH www.elinos.com - * Marius Groeger mgroe...@sysgo.de - * - * (C) Copyright 2001 - * Advent Networks, Inc. http://www.adventnetworks.com - * Jay Monkman j...@smoothsmoothie.com - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include common.h -#include ioports.h -#include mpc8260.h - -/* - * I/O Port configuration table - * - * if conf is 1, then that port pin will be configured at boot time - * according to the five values podr/pdir/ppar/psor/pdat for that entry - */ - -const iop_conf_t iop_conf_tab[4][32] = { - - -/* Port A configuration */ -{ /*conf ppar psor pdir podr pdat */ - /* PA31 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 *ATMTXEN */ - /* PA30 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMTCA */ - /* PA29 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMTSOC */ - /* PA28 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 *ATMRXEN */ - /* PA27 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMRSOC */ - /* PA26 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMRCA */ - /* PA25 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMTXD[0] */ - /* PA24 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMTXD[1] */ - /* PA23 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMTXD[2] */ - /* PA22 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMTXD[3] */ - /* PA21 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMTXD[4] */ - /* PA20 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMTXD[5] */ - /* PA19 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMTXD[6] */ - /* PA18 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMTXD[7] */ - /* PA17 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMRXD[7] */ - /* PA16 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMRXD[6] */ - /* PA15 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMRXD[5] */ - /* PA14 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMRXD[4] */ - /* PA13 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMRXD[3] */ - /* PA12 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMRXD[2] */ - /* PA11 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMRXD[1] */ - /* PA10 */ { 0, 0, 0, 0, 0, 0 }, /* FCC1 ATMRXD[0] */ - /* PA9 */ { 1, 1, 0, 1, 0, 0 }, /* SMC2 TXD */ - /* PA8 */ { 1, 1, 0, 0, 0, 0 }, /* SMC2 RXD */ - /* PA7 */ { 1, 0, 0, 1, 0, 0 }, /* TDM_A1:L1TSYNC */ - /* PA6 */ { 1, 0, 0, 1, 0, 0 }, /* TDN_A1:L1RSYNC */ - /* PA5 */ { 0, 0, 0, 0, 0, 0 }, /* PA5 */ - /* PA4 */ { 0, 0, 0, 0, 0, 0 }, /* PA4 */ - /* PA3 */ { 0, 0, 0, 0, 0, 0 }, /* PA3 */ - /* PA2 */ { 0, 0, 0, 0, 0, 0 }, /* PA2 */ - /* PA1 */ { 0, 0, 0, 0, 0, 0 }, /* PA1 */ - /* PA0 */ { 0, 0, 0, 0, 0, 0 } /* PA0 */ -}, - -/* Port B configuration */ -{ /* conf ppar psor pdir podr pdat */ - /* PB31 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 MII TX_ER */ - /* PB30 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RX_DV */ - /* PB29 */ { 1, 1, 1, 1, 0, 0 }, /* FCC2 MII TX_EN */ - /* PB28 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RX_ER */ - /* PB27 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII COL */ - /* PB26 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII CRS */ - /* PB25 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[3] */ - /* PB24 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[2] */ - /* PB23 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[1] */ - /* PB22 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[0] */ - /* PB21 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2
[U-Boot] [PATCH 05/10] powerpc: mpc8xx: remove svm_sc8xx board
This board has been orphaned for a while and old enough. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- arch/powerpc/cpu/mpc8xx/cpu_init.c | 4 - board/svm_sc8xx/Makefile | 8 - board/svm_sc8xx/flash.c| 666 - board/svm_sc8xx/svm_sc8xx.c| 144 board/svm_sc8xx/u-boot.lds | 99 -- board/svm_sc8xx/u-boot.lds.debug | 114 --- boards.cfg | 1 - doc/README.scrapyard | 1 + drivers/pcmcia/tqm8xx_pcmcia.c | 6 +- include/commproc.h | 51 --- include/configs/svm_sc8xx.h| 450 - include/pcmcia.h | 2 +- include/status_led.h | 14 - 13 files changed, 4 insertions(+), 1556 deletions(-) delete mode 100644 board/svm_sc8xx/Makefile delete mode 100644 board/svm_sc8xx/flash.c delete mode 100644 board/svm_sc8xx/svm_sc8xx.c delete mode 100644 board/svm_sc8xx/u-boot.lds delete mode 100644 board/svm_sc8xx/u-boot.lds.debug delete mode 100644 include/configs/svm_sc8xx.h diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c index e51fec7..90c7e61 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c @@ -44,11 +44,7 @@ void cpu_init_f (volatile immap_t * immr) #endif /* CONFIG_WATCHDOG */ /* SIUMCR - contains debug pin configuration (11-6) */ -#ifndef CONFIG_SVM_SC8xx immr-im_siu_conf.sc_siumcr |= CONFIG_SYS_SIUMCR; -#else - immr-im_siu_conf.sc_siumcr = CONFIG_SYS_SIUMCR; -#endif /* initialize timebase status and control register (11-26) */ /* unlock TBSCRK */ diff --git a/board/svm_sc8xx/Makefile b/board/svm_sc8xx/Makefile deleted file mode 100644 index 4c0b4a3..000 --- a/board/svm_sc8xx/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y = svm_sc8xx.o flash.o diff --git a/board/svm_sc8xx/flash.c b/board/svm_sc8xx/flash.c deleted file mode 100644 index 8a04de8..000 --- a/board/svm_sc8xx/flash.c +++ /dev/null @@ -1,666 +0,0 @@ -/* - * Wolfgang Denk, DENX Software Engineering, w...@denx.de. - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -#include common.h -#include mpc8xx.h - -#ifndefCONFIG_ENV_ADDR -#define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) -#endif - -flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; - -/*--- - * Functions - */ -static int write_word(flash_info_t *info, ulong dest, ulong data); - -#ifdef CONFIG_BOOT_8B -static int my_in_8(unsigned char *addr); -static void my_out_8(unsigned char *addr, int val); -#endif -#ifdef CONFIG_BOOT_16B -static int my_in_be16(unsigned short *addr); -static void my_out_be16(unsigned short *addr, int val); -#endif -#ifdef CONFIG_BOOT_32B -static unsigned my_in_be32(unsigned *addr); -static void my_out_be32(unsigned *addr, int val); -#endif -/*--- - */ - -unsigned long flash_init(void) -{ - volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; - volatile memctl8xx_t *memctl = immap-im_memctl; - unsigned long size_b0, size_b1; - int i; - - size_b0 = 0; - size_b1 = 0; - /* Init: no FLASHes known */ - for (i = 0; i CONFIG_SYS_MAX_FLASH_BANKS; ++i) - flash_info[i].flash_id = FLASH_UNKNOWN; - -#ifdef CONFIG_SYS_DOC_BASE -#ifndef CONFIG_FEL8xx_AT - /* 32k bytes */ - memctl-memc_or5 = (0x8000 | CONFIG_SYS_OR_TIMING_DOC); - memctl-memc_br5 = CONFIG_SYS_DOC_BASE | 0x401; -#else - /* 32k bytes */ - memctl-memc_or3 = (0x8000 | CONFIG_SYS_OR_TIMING_DOC); - memctl-memc_br3 = CONFIG_SYS_DOC_BASE | 0x401; -#endif -#endif -#if defined(CONFIG_BOOT_8B) - size_b0 = 0x8; /* 512 K */ - - flash_info[0].flash_id = FLASH_MAN_AMD | FLASH_AM040; - flash_info[0].sector_count = 8; - flash_info[0].size = 0x0008; - - /* set up sector start address table */ - for (i = 0; i flash_info[0].sector_count; i++) - flash_info[0].start[i] = 0x4000 + (i * 0x1); - - /* protect all sectors */ - for (i = 0; i flash_info[0].sector_count; i++) - flash_info[0].protect[i] = 0x1; - -#elif defined(CONFIG_BOOT_16B) - size_b0 = 0x40; /* 4MB , assume AMD29LV320B */ - - flash_info[0].flash_id = FLASH_MAN_AMD | FLASH_AM320B; - flash_info[0].sector_count = 67; - flash_info[0].size = 0x0040; - - /* set up sector start address table */ - flash_info[0].start[0] = 0x4000; - flash_info[0].start[1] = 0x4000 + 0x4000; - flash_info[0].start[2] = 0x4000 + 0x6000; - flash_info[0].start[3] = 0x4000
Re: [U-Boot] [PATCH] dfu: fix: Add the absolute path to the file name for ext4 write operation
Hi Stephen, On 07/16/2014 03:38 AM, Lukasz Majewski wrote: Commit 1151b7ac10b81ecbb has cleaned up read and write operations. Unfortunately, for correct operation the write for ext4 fs requires absolute patch. This patch fixes this case. Shouldn't the user simply supply the absolute patch name as the entity name? That's what I've been doing. This way, it makes files in sub-directories look more natural; you'd pass in e.g. /boot/zImage rather than boot/zImage, which looks like a relative path. Hmm.. this is the angle from which I didn't look. Thanks for the tip. I will adjust envs accordingly. Please discard this patch. -- Best regards, Lukasz Majewski Samsung RD Institute Poland (SRPOL) | Linux Platform Group ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ext4: trats: trats2: Modify dfu_alt_info's file names to have absolute path
After the clean up performed in the commit 1151b7ac10b81ecbb the DFU subsystem requires absolute patch for correct operation. Signed-off-by: Lukasz Majewski l.majew...@samsung.com --- include/configs/trats.h | 6 +++--- include/configs/trats2.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/trats.h b/include/configs/trats.h index 90f1962..7db1db6 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -102,9 +102,9 @@ #define CONFIG_DFU_ALT \ u-boot raw 0x80 0x400; \ - uImage ext4 0 2; \ - modem.bin ext4 0 2; \ - exynos4210-trats.dtb ext4 0 2; \ + /uImage ext4 0 2; \ + /modem.bin ext4 0 2; \ + /exynos4210-trats.dtb ext4 0 2; \ PARTS_CSA part 0 1; \ PARTS_BOOT part 0 2; \ PARTS_QBOOT part 0 3; \ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 206975b..f537e4f 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -92,9 +92,9 @@ #define CONFIG_DFU_ALT \ u-boot raw 0x80 0x800; \ - uImage ext4 0 2; \ - modem.bin ext4 0 2; \ - exynos4412-trats2.dtb ext4 0 2; \ + /uImage ext4 0 2; \ + /modem.bin ext4 0 2; \ + /exynos4412-trats2.dtb ext4 0 2; \ PARTS_CSA part 0 1; \ PARTS_BOOT part 0 2; \ PARTS_QBOOT part 0 3; \ -- 2.0.0.rc2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] socfpga: initialize MMC
Hi! I don't know what differ with socfpga_dw_mmc.c. I think you can use it. Yes, I think I can. I missed it because it has different name than in altera sources, and because it was not hooked up with rest of system. Thanks, Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 01/12] video: Add S3C24xx framebuffer support
Dear Marek, In message 1405989293-6629-1-git-send-email-ma...@denx.de you wrote: Add basic framebuffer driver for the S3C24xx family of CPUs. Signed-off-by: Marek Vasut ma...@denx.de Cc: Anatolij Gustschin ag...@denx.de Cc: Kyungmin Park kyungmin.p...@samsung.com Cc: Lukasz Majewski l.majew...@samsung.com Cc: Minkyu Kang mk7.k...@samsung.com Cc: Vladimir Zapolskiy v...@mleia.com --- drivers/video/Makefile | 1 + drivers/video/cfb_console.c | 2 +- drivers/video/s3c-fb.c | 172 3 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 drivers/video/s3c-fb.c diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 945f35d..7441783 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o videomodes.o obj-$(CONFIG_VIDEO_MX3) += mx3fb.o videomodes.o obj-$(CONFIG_VIDEO_IPUV3) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o obj-$(CONFIG_VIDEO_MXS) += mxsfb.o videomodes.o +obj-$(CONFIG_VIDEO_S3C) += s3c-fb.o videomodes.o obj-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o obj-$(CONFIG_VIDEO_SED13806) += sed13806.o can you please fix the sort oder of this ist? Thanks. ... + /* Suck display configuration from videomode variable */ + penv = getenv(videomode); + if (!penv) { + puts(S3CFB: 'videomode' variable not set!\n); + return NULL; + } + + bpp = video_get_params(mode, penv); Should there not be some error handling in case we pass invalid data? + /* Allocate framebuffer */ + fb = memalign(S3CFB_ALIGN, roundup(panel.memSize, S3CFB_ALIGN)); + if (!fb) { + printf(S3CFB: Error allocating framebuffer!\n); + return NULL; + } Should we not use the gd-fb_base frame buffer allocation as provided in lib/board.c ? Best regards, Wolfgang Denk -- 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: w...@denx.de Bus error -- please leave by the rear door. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 01/10] powerpc: mpc8xx: remove some of tqm8xx board family without maintainers
Dear Masahiro Yamada, In message 1406014114-8016-2-git-send-email-yamad...@jp.panasonic.com you wrote: Remove NSCU, TK885D, TQM823M, TQM850M, TQM855M, TQM860M, TQM862L, TQM826M, TQM866M, TQM885D boards support. These boards are old enough and have no maintainers. NAK for all the TQM boards. What makes you think these have no maintainer? They are on my list. Best regards, Wolfgang Denk -- 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: w...@denx.de Everything should be made as simple as possible, but not simpler. - Albert Einstein ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] socfpga: Fix SOCFPGA build error for Altera dev kit
To fix the build error when build for Altera dev kit, not virtual target. At same time, set the build for Altera dev kit as default instead virtual target. With that, U-Boot is booting well and SPL still lack of few drivers. Signed-off-by: Chin Liang See cl...@altera.com Cc: Pavel Machek pa...@denx.de Cc: Marek Vasut ma...@denx.de Cc: Tom Rini tr...@ti.com Cc: Albert Aribaud albert.u.b...@aribaud.net --- arch/arm/cpu/armv7/socfpga/clock_manager.c |1 - arch/arm/cpu/armv7/socfpga/config.mk |3 +++ arch/arm/cpu/armv7/socfpga/spl.c |2 ++ arch/arm/include/asm/arch-socfpga/scan_manager.h |2 ++ board/altera/socfpga/Makefile|2 +- include/configs/socfpga_cyclone5.h |2 +- 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/socfpga/clock_manager.c b/arch/arm/cpu/armv7/socfpga/clock_manager.c index 23d697d..85a1a70 100644 --- a/arch/arm/cpu/armv7/socfpga/clock_manager.c +++ b/arch/arm/cpu/armv7/socfpga/clock_manager.c @@ -188,7 +188,6 @@ void cm_basic_init(const cm_config_t *cfg) * Time starts here * must wait 7 us from BGPWRDN_SET(0) to VCO_ENABLE_SET(1) */ - reset_timer(); start = get_timer(0); /* timeout in unit of us as CONFIG_SYS_HZ = 1000*1000 */ timeout = 7; diff --git a/arch/arm/cpu/armv7/socfpga/config.mk b/arch/arm/cpu/armv7/socfpga/config.mk index 3d18491..2a99c72 100644 --- a/arch/arm/cpu/armv7/socfpga/config.mk +++ b/arch/arm/cpu/armv7/socfpga/config.mk @@ -6,3 +6,6 @@ ifndef CONFIG_SPL_BUILD ALL-y += u-boot.img endif + +# Added for handoff support +PLATFORM_RELFLAGS += -Iboard/$(VENDOR)/$(BOARD) diff --git a/arch/arm/cpu/armv7/socfpga/spl.c b/arch/arm/cpu/armv7/socfpga/spl.c index 4bed19d..27efde6 100644 --- a/arch/arm/cpu/armv7/socfpga/spl.c +++ b/arch/arm/cpu/armv7/socfpga/spl.c @@ -14,6 +14,8 @@ #include spl.h #include asm/arch/system_manager.h #include asm/arch/freeze_controller.h +#include asm/arch/clock_manager.h +#include asm/arch/scan_manager.h DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/include/asm/arch-socfpga/scan_manager.h b/arch/arm/include/asm/arch-socfpga/scan_manager.h index f9be621..b2686d3 100644 --- a/arch/arm/include/asm/arch-socfpga/scan_manager.h +++ b/arch/arm/include/asm/arch-socfpga/scan_manager.h @@ -87,4 +87,6 @@ extern const uint32_t iocsr_scan_chain2_table[ extern const uint32_t iocsr_scan_chain3_table[ ((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH / 32) + 1)]; +int scan_mgr_configure_iocsr(void); + #endif /* _SCAN_MANAGER_H_ */ diff --git a/board/altera/socfpga/Makefile b/board/altera/socfpga/Makefile index de339ec..44baa00 100644 --- a/board/altera/socfpga/Makefile +++ b/board/altera/socfpga/Makefile @@ -7,4 +7,4 @@ # obj-y := socfpga_cyclone5.o -obj-$(CONFIG_SPL_BUILD) += pinmux_config.o +obj-$(CONFIG_SPL_BUILD) += pinmux_config.o iocsr_config.o diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h index 262e744..589f2e3 100644 --- a/include/configs/socfpga_cyclone5.h +++ b/include/configs/socfpga_cyclone5.h @@ -15,7 +15,7 @@ * High level configuration */ /* Virtual target or real hardware */ -#define CONFIG_SOCFPGA_VIRTUAL_TARGET +#undef CONFIG_SOCFPGA_VIRTUAL_TARGET #define CONFIG_ARMV7 #define CONFIG_SYS_DCACHE_OFF -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] socfpga: initialize MMC
Hi Pavel, On Mon, 2014-07-21 at 14:05 +0200, ZY - pavel wrote: Is there a free(host) anywhere? Dynamic allocation does not make much sense here, agreed. But as it is existing code, and there are bigger issues around, I'd prefer to leave it to someone else to clean it up... I tend to disagree. If we do not fix the problems as we see them, and when we are working on the code anyway, they will never get fixed. I'm working on the code, anyway, yes. Currently, u-boot is completely unusable on socfpga. I'd rather fix big problems first, so that code could be actually tested, and does not bitrot further as happened in clock and time areas. There are just too many small problems around. I believe some of them break due to recent upstream. The bug escaped as we still build socfpga for Virtual Target instead dev kit. I already fix this at another patch and I can boot up the U-Boot successfully again. While SDMMC, I can try it tomorrow. Thanks Chin Liang Could we talk on jabber or phone? Best regards, Pavel ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 01/10] powerpc: mpc8xx: remove some of tqm8xx board family without maintainers
Hi Wolfgang, On Tue, 22 Jul 2014 11:27:16 +0200 Wolfgang Denk w...@denx.de wrote: Dear Masahiro Yamada, In message 1406014114-8016-2-git-send-email-yamad...@jp.panasonic.com you wrote: Remove NSCU, TK885D, TQM823M, TQM850M, TQM855M, TQM860M, TQM862L, TQM826M, TQM866M, TQM885D boards support. These boards are old enough and have no maintainers. NAK for all the TQM boards. What makes you think these have no maintainer? They are on my list. Because the maintainers fields (the rightest fields) of boards.cfg for these boards are blank. I do not mind retracting this patch, but let me ask you a question. It is true, for example, your name is on the maintainers field of TQM823L, but is isn't for TQM823M. If the maintainers fields are blank and you still claim you are their maintainer, what does the maintainers field stand for ? Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 0/6] board/ti/xxx: Add NAND and NOR support for new TI boards
*changes v1-v2* - Moved ti_armv7_common.h clean-up patch into independet series [1] - Dropped changes in board profile (boards.cfg) - Dropped changes in ENV configs - Updated NOR pin-muxing in [PATCH] board/ti/am335x: add support for beaglebone NOR Cape - Added new [PATCH] board/ti/dra7xx: add support for parallel NOR - Updated commit logs with board settings required for NAND boot This series is tested above separate independent series [1] [PATCH v1 0/3] ARM: omap: clean GPMC macros http://lists.denx.de/pipermail/u-boot/2014-July/183942.html *Original v1* [PATCH v1 0/7] TI: armv7: add parallel NAND support http://lists.denx.de/pipermail/u-boot/2014-July/183126.html This patch series adds support for parallel NAND devices support connected via GPMC chip-select on various boards belonging to AM33xx and OMAPx platforms. This series also moves some board specific CONFIG_NAND_xx from generic files to individual files. Pekon Gupta (6): board/ti/am335x: update configs for parallel NAND board/ti/am335x: add support for beaglebone NAND cape board/ti/am335x: add support for beaglebone NOR Cape board/ti/am43xx: add support for parallel NAND board/ti/dra7xx: add support for parallel NAND board/ti/dra7xx: add support for parallel NOR arch/arm/include/asm/arch-omap5/mem.h | 12 +-- board/ti/am335x/mux.c | 149 -- board/ti/am43xx/board.c | 1 + board/ti/am43xx/mux.c | 43 +- board/ti/dra7xx/mux_data.h| 60 ++ doc/README.cfi| 13 +++ include/configs/am335x_evm.h | 55 +++-- include/configs/am43xx_evm.h | 64 +++ include/configs/dra7xx_evm.h | 88 9 files changed, 376 insertions(+), 109 deletions(-) -- 1.8.5.1.163.gd7aced9 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 2/6] board/ti/am335x: add support for beaglebone NAND cape
Beaglebone Board can be connected to expansion boards to add devices to them. These expansion boards are called 'capes'. This patch adds support for following versions of Beaglebone(AM335x) NAND capes (a) NAND Device with bus-width=16, block-size=128k, page-size=2k, oob-size=64 (b) NAND Device with bus-width=16, block-size=256k, page-size=4k, oob-size=224 Further information and datasheets can be found at [1] and [2] * How to boot from NAND using Memory Expander + NAND Cape ? * - Important: As BOOTSEL values are sampled only at POR, so after changing any setting on SW2 (DIP switch), disconnect and reconnect all board power supply (including mini-USB console port) to POR the beaglebone. - Selection of ECC scheme for NAND cape(a), ROM code expects BCH8_HW ecc-scheme for NAND cape(b), ROM code expects BCH16_HW ecc-scheme - Selction of boot modes can be controlled via DIP switch(SW2) present on Memory Expander cape. SW2[SWITCH_BOOT] == OFF follow default boot order MMC- SPI - UART - USB SW2[SWITCH_BOOT] == ON boot mode selected via DIP switch(SW2) So to flash NAND, first boot via MMC or other sources and then switch to SW2[SWITCH_BOOT]=ON to boot from NAND Cape. - For NAND boot following switch settings need to be followed SW2[ 1] = OFF (SYSBOOT[ 0]==1: NAND boot mode selected ) SW2[ 2] = OFF (SYSBOOT[ 1]==1: -- do -- ) SW2[ 3] = ON (SYSBOOT[ 2]==0: -- do -- ) SW2[ 4] = ON (SYSBOOT[ 3]==0: -- do -- ) SW2[ 5] = OFF (SYSBOOT[ 4]==1: -- do -- ) SW2[ 6] = OFF (SYSBOOT[ 8]==1: 0:x8 device, 1:x16 device ) SW2[ 7] = ON (SYSBOOT[ 9]==0: ECC done by ROM ) SW2[ 8] = ON (SYSBOOT[10]==0: Non Muxed device ) SW2[ 9] = ON (SYSBOOT[11]==0:-- do -- ) [1] http://beagleboardtoys.info/index.php?title=BeagleBone_Memory_Expansion [2] http://beagleboardtoys.info/index.php?title=BeagleBone_4Gb_16-Bit_NAND_Module *IMPORTANT NOTE* As Beaglebone board shares the same config as AM335x EVM, so following changes are required in addition to this patch for Beaglebone NAND cape. (1) Enable NAND in am335x_beaglebone board profile (2) Add CONFIG_SYS_NAND_BUSWIDTH_16BIT to board config because: - AM335x EVM has NAND device with datawidth=8, whereas - Beaglebone NAND cape has NAND device with data-width=16 diff --git a/boards.cfg b/boards.cfg -Active arm armv7 am33xx ti am335x am335x_boneblack am335x_evm:SERIAL1,CONS_INDEX=1,EMMC_BOOT Tom Rini tr...@ti.com +Active arm armv7 am33xx ti am335x am335x_boneblack am335x_evm:SERIAL1,CONS_INDEX=1,NAND Tom Rini tr...@ti.com diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT Signed-off-by: Pekon Gupta pe...@ti.com --- board/ti/am335x/mux.c | 58 +-- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index b2bfda5..439da4b 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -171,25 +171,36 @@ static struct module_pin_mux mii1_pin_mux[] = { {-1}, }; +#ifdef CONFIG_NAND static struct module_pin_mux nand_pin_mux[] = { - {OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD0 */ - {OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD1 */ - {OFFSET(gpmc_ad2), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD2 */ - {OFFSET(gpmc_ad3), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD3 */ - {OFFSET(gpmc_ad4), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD4 */ - {OFFSET(gpmc_ad5), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD5 */ - {OFFSET(gpmc_ad6), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD6 */ - {OFFSET(gpmc_ad7), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD7 */ - {OFFSET(gpmc_wait0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* NAND WAIT */ - {OFFSET(gpmc_wpn), (MODE(7) | PULLUP_EN | RXACTIVE)}, /* NAND_WPN */ - {OFFSET(gpmc_csn0), (MODE(0) | PULLUDEN)}, /* NAND_CS0 */ - {OFFSET(gpmc_advn_ale), (MODE(0) | PULLUDEN)}, /* NAND_ADV_ALE */ - {OFFSET(gpmc_oen_ren), (MODE(0) | PULLUDEN)}, /* NAND_OE */ - {OFFSET(gpmc_wen), (MODE(0) | PULLUDEN)}, /* NAND_WEN */ - {OFFSET(gpmc_be0n_cle), (MODE(0) | PULLUDEN)}, /* NAND_BE_CLE */ + {OFFSET(gpmc_ad0), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD0 */ + {OFFSET(gpmc_ad1), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD1 */ + {OFFSET(gpmc_ad2), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD2 */ + {OFFSET(gpmc_ad3), (MODE(0) | PULLUDDIS |
[U-Boot] [PATCH v2 1/6] board/ti/am335x: update configs for parallel NAND
This patch - consolidate CONFIG_SYS_NAND_xx and CONFIG_SPL_NAND_xx from various configuration files into single file. - update MTD Partition table to match AM335x_EVM DT in linux-kernel - segregate CONFIGs based on different boot modes (like SPL and U-Boot) Signed-off-by: Pekon Gupta pe...@ti.com --- include/configs/am335x_evm.h | 53 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index f5bfd5d..790f1f9 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -61,7 +61,7 @@ ${optargs} \ root=${nandroot} \ rootfstype=${nandrootfstype}\0 \ - nandroot=ubi0:rootfs rw ubi.mtd=7,2048\0 \ + nandroot=ubi0:rootfs rw ubi.mtd=9,2048\0 \ nandrootfstype=ubifs rootwait=1\0 \ nandboot=echo Booting from nand ...; \ run nandargs; \ @@ -229,16 +229,19 @@ #define CONFIG_SPL_NET_VCI_STRING AM335x U-Boot SPL #define CONFIG_SPL_LDSCRIPT$(CPUDIR)/am33xx/u-boot-spl.lds +#endif #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM +/* NAND: device related configs */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) +/* NAND: driver related configs */ +#define CONFIG_NAND_OMAP_GPMC +#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ 10, 11, 12, 13, 14, 15, 16, 17, \ @@ -252,15 +255,34 @@ #define CONFIG_SYS_NAND_ECCBYTES 14 #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_OFFS0x8 +#define MTDIDS_DEFAULT nand0=nand.0 +#define MTDPARTS_DEFAULT mtdparts=nand.0: \ + 128k(NAND.SPL), \ + 128k(NAND.SPL.backup1), \ + 128k(NAND.SPL.backup2), \ + 128k(NAND.SPL.backup3), \ + 256k(NAND.u-boot-spl-os), \ + 1m(NAND.u-boot), \ + 128k(NAND.u-boot-env), \ + 128k(NAND.u-boot-env.backup1), \ + 8m(NAND.kernel), \ + -(NAND.rootfs) +#define CONFIG_SYS_NAND_U_BOOT_OFFS0x000c +#undef CONFIG_ENV_IS_NOWHERE +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x001c +#define CONFIG_ENV_OFFSET_REDUND 0x001e +#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE +/* NAND: SPL related configs */ +#ifdef CONFIG_SPL_NAND_SUPPORT +#define CONFIG_SPL_NAND_AM33XX_BCH +#endif #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_CMD_SPL_NAND_OFS0x0008 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS0x0020 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif -#endif -#endif +#endif /* !CONFIG_NAND */ /* * For NOR boot, we must set this to the start of where NOR is mapped @@ -417,23 +439,6 @@ #define CONFIG_PHYLIB #define CONFIG_PHY_SMSC -/* NAND support */ -#ifdef CONFIG_NAND -#define CONFIG_CMD_NAND -#if !defined(CONFIG_SPI_BOOT) !defined(CONFIG_NOR_BOOT) -#define MTDIDS_DEFAULT nand0=omap2-nand.0 -#define MTDPARTS_DEFAULT mtdparts=omap2-nand.0:128k(SPL), \ - 128k(SPL.backup1), \ - 128k(SPL.backup2), \ - 128k(SPL.backup3),1792k(u-boot), \ - 128k(u-boot-spl-os), \ - 128k(u-boot-env),5m(kernel),-(rootfs) -#define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET 0x26 /* environment starts here */ -#define CONFIG_SYS_ENV_SECT_SIZE (128 10) /* 128 KiB */ -#endif -#endif - /* * NOR Size = 16 MiB * Number of Sectors/Blocks = 128 -- 1.8.5.1.163.gd7aced9 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 4/6] board/ti/am43xx: add support for parallel NAND
This patch adds support for NAND device connected to GPMC chip-select on following AM43xx EVM boards. am437x-gp-evm: On this board, NAND Flash signals are muxed with eMMC, thus at a time either eMMC or NAND can be enabled. Selection between eMMC and NAND is controlled by: (a) Statically using Jumper on connecter (J89) present on board. (a) If Jumper on J89 is NOT used, then selection can be dynamically controlled by driving SPI2_CS0[MUX_MODE=GPIO] pin via software: SPI2_CS0 == 0: NAND (default) SPI2_CS0 == 1: eMMC am43x-epos-evm: On this board, NAND Flash control lines are muxed with QSPI, Thus only one of the two can be used at a time. Selection is controlled by: (a) Dynamically driving following GPIO pin from software GPMC_A0(GPIO) == 0 NAND is selected (default) NAND device (MT29F4G08AB) on these boards has: - data-width=8bits - blocksize=256KB - pagesize=4KB - oobsize=224 bytes For above NAND device, ROM code expects the boot-loader to be flashed in BCH16 ECC scheme for NAND boot, So by default BCH16 ECC is enabled for AM43xx EVMs. Signed-off-by: Pekon Gupta pe...@ti.com --- board/ti/am43xx/board.c | 1 + board/ti/am43xx/mux.c| 43 - include/configs/am43xx_evm.h | 64 3 files changed, 107 insertions(+), 1 deletion(-) diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 7e239f1..d9f401c 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -612,6 +612,7 @@ int board_init(void) modena_init0_bw_integer, modena_init0_watermark_0; gd-bd-bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + gpmc_init(); /* Clear all important bits for DSS errata that may need to be tweaked*/ mreqprio_0 = readl(cdev-mreqprio_0) MREQPRIO_0_SAB_INIT1_MASK diff --git a/board/ti/am43xx/mux.c b/board/ti/am43xx/mux.c index 50967e1..a670b0b 100644 --- a/board/ti/am43xx/mux.c +++ b/board/ti/am43xx/mux.c @@ -73,7 +73,38 @@ static struct module_pin_mux gpio5_7_pin_mux[] = { {-1}, }; -static struct module_pin_mux qspi_pin_mux[] = { +#ifdef CONFIG_NAND +static struct module_pin_mux nand_pin_mux[] = { + {OFFSET(gpmc_ad0), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD0 */ + {OFFSET(gpmc_ad1), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD1 */ + {OFFSET(gpmc_ad2), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD2 */ + {OFFSET(gpmc_ad3), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD3 */ + {OFFSET(gpmc_ad4), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD4 */ + {OFFSET(gpmc_ad5), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD5 */ + {OFFSET(gpmc_ad6), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD6 */ + {OFFSET(gpmc_ad7), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD7 */ +#ifdef CONFIG_SYS_NAND_BUSWIDTH_16BIT + {OFFSET(gpmc_ad8), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD8 */ + {OFFSET(gpmc_ad9), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD9 */ + {OFFSET(gpmc_ad10), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD10 */ + {OFFSET(gpmc_ad11), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD11 */ + {OFFSET(gpmc_ad12), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD12 */ + {OFFSET(gpmc_ad13), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD13 */ + {OFFSET(gpmc_ad14), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD14 */ + {OFFSET(gpmc_ad15), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD15 */ +#endif + {OFFSET(gpmc_wait0),(MODE(0) | RXACTIVE | PULLUP_EN)}, /* Wait */ + {OFFSET(gpmc_wpn), (MODE(7) | PULLUP_EN)}, /* Write Protect */ + {OFFSET(gpmc_csn0), (MODE(0) | PULLUP_EN)}, /* Chip-Select */ + {OFFSET(gpmc_wen), (MODE(0) | PULLDOWN_EN)}, /* Write Enable */ + {OFFSET(gpmc_oen_ren), (MODE(0) | PULLDOWN_EN)}, /* Read Enable */ + {OFFSET(gpmc_advn_ale), (MODE(0) | PULLDOWN_EN)}, /* Addr Latch Enable*/ + {OFFSET(gpmc_be0n_cle), (MODE(0) | PULLDOWN_EN)}, /* Byte Enable */ + {-1}, +}; +#endif + +static __maybe_unused struct module_pin_mux qspi_pin_mux[] = { {OFFSET(gpmc_csn0), (MODE(3) | PULLUP_EN | RXACTIVE)}, /* QSPI_CS0 */ {OFFSET(gpmc_csn3), (MODE(2) | PULLUP_EN | RXACTIVE)}, /* QSPI_CLK */ {OFFSET(gpmc_advn_ale), (MODE(3) | PULLUP_EN | RXACTIVE)}, /* QSPI_D0 */ @@ -97,12 +128,22 @@ void enable_board_pin_mux(void) if (board_is_gpevm()) { configure_module_pin_mux(gpio5_7_pin_mux); configure_module_pin_mux(rgmii1_pin_mux); +#if defined(CONFIG_NAND) + configure_module_pin_mux(nand_pin_mux); +#endif } else if (board_is_sk()) { configure_module_pin_mux(rgmii1_pin_mux); +#if defined(CONFIG_NAND) + printf(Error: NAND flash not present on this board\n); +#endif configure_module_pin_mux(qspi_pin_mux); } else if (board_is_eposevm()) {
[U-Boot] [PATCH v2 3/6] board/ti/am335x: add support for beaglebone NOR Cape
This patch adds support of NOR cape[1] for both Beaglebone (white) and Beaglebone(Black) boards. NOR Flash on this cape is connected to GPMC chip-select[0] and accesses as external memory-mapped device. This cape has 128Mbits(16MBytes), x16, CFI compatible NOR Flash device. As GPMC chip-select[0] can be shared by multiple capes so NOR profile is not enabled by default in boards.cfg. Following changes are required to enable NOR cape detection when building am335x_boneblack board profile. diff --git a/boards.cfg b/boards.cfg -Active arm armv7 am33xx ti am335x am335x_boneblack am335x_evm:SERIAL1,CO +Active arm armv7 am33xx ti am335x am335x_boneblack am335x_evm:SERIAL1,CO [1] http://elinux.org/Beagleboardtoys:BeagleBone_128Mb_16-Bit_NOR_Module http://elinux.org/CircuitCo:BeagleBone_Memory_Expansion Signed-off-by: Pekon Gupta pe...@ti.com --- board/ti/am335x/mux.c| 95 doc/README.cfi | 13 ++ include/configs/am335x_evm.h | 2 + 3 files changed, 50 insertions(+), 60 deletions(-) diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 439da4b..2a18ccb 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -200,73 +200,46 @@ static struct module_pin_mux nand_pin_mux[] = { {OFFSET(gpmc_be0n_cle), (MODE(0) | PULLDOWN_EN)}, /* BE_CLE */ {-1}, }; -#endif -#if defined(CONFIG_NOR) !defined(CONFIG_NOR_BOOT) +#elif defined(CONFIG_NOR) static struct module_pin_mux bone_norcape_pin_mux[] = { - {OFFSET(lcd_data0), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A0 */ - {OFFSET(lcd_data1), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A1 */ - {OFFSET(lcd_data2), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A2 */ - {OFFSET(lcd_data3), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A3 */ - {OFFSET(lcd_data4), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A4 */ - {OFFSET(lcd_data5), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A5 */ - {OFFSET(lcd_data6), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A6 */ - {OFFSET(lcd_data7), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A7 */ - {OFFSET(lcd_vsync), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A8 */ - {OFFSET(lcd_hsync), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A9 */ - {OFFSET(lcd_pclk), MODE(1)| PULLUDEN | RXACTIVE}, /* NOR_A10 */ - {OFFSET(lcd_ac_bias_en), MODE(1)| PULLUDEN | RXACTIVE}, /* NOR_A11 */ - {OFFSET(lcd_data8), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A12 */ - {OFFSET(lcd_data9), MODE(1) | PULLUDEN | RXACTIVE}, /* NOR_A13 */ - {OFFSET(lcd_data10), MODE(1) | PULLUDEN | RXACTIVE},/* NOR_A14 */ - {OFFSET(lcd_data11), MODE(1) | PULLUDEN | RXACTIVE},/* NOR_A15 */ - {OFFSET(lcd_data12), MODE(1) | PULLUDEN | RXACTIVE},/* NOR_A16 */ - {OFFSET(lcd_data13), MODE(1) | PULLUDEN | RXACTIVE},/* NOR_A17 */ - {OFFSET(lcd_data14), MODE(1) | PULLUDEN | RXACTIVE},/* NOR_A18 */ - {OFFSET(lcd_data15), MODE(1) | PULLUDEN | RXACTIVE},/* NOR_A19 */ - {OFFSET(gpmc_ad0), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD0 */ - {OFFSET(gpmc_ad1), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD1 */ - {OFFSET(gpmc_ad2), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD2 */ - {OFFSET(gpmc_ad3), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD3 */ - {OFFSET(gpmc_ad4), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD4 */ - {OFFSET(gpmc_ad5), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD5 */ - {OFFSET(gpmc_ad6), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD6 */ - {OFFSET(gpmc_ad7), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD7 */ - {OFFSET(gpmc_ad8), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD8 */ - {OFFSET(gpmc_ad9), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD9 */ - {OFFSET(gpmc_ad10), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD10 */ - {OFFSET(gpmc_ad11), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD11 */ - {OFFSET(gpmc_ad12), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD12 */ - {OFFSET(gpmc_ad13), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD13 */ - {OFFSET(gpmc_ad14), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD14 */ - {OFFSET(gpmc_ad15), MODE(0) | PULLUDEN | RXACTIVE}, /* NOR_AD15 */ - - {OFFSET(gpmc_csn0), (MODE(0) | PULLUDEN) | RXACTIVE}, /* NOR_CE */ - {OFFSET(gpmc_advn_ale), (MODE(0) | PULLUDEN) | RXACTIVE}, /* NOR_ADVN_ALE */ - {OFFSET(gpmc_oen_ren), (MODE(0) | PULLUDEN | RXACTIVE)},/* NOR_OE */ - {OFFSET(gpmc_be0n_cle), (MODE(0) | PULLUDEN | RXACTIVE)},/* NOR_BE0N_CLE */ - {OFFSET(gpmc_wen), (MODE(0) | PULLUDEN | RXACTIVE)},/* NOR_WEN */ - {OFFSET(gpmc_wait0), (MODE(0) | RXACTIVE | PULLUDEN)}, /* NOR WAIT */ + {OFFSET(gpmc_a0), MODE(0) |
[U-Boot] [PATCH v2 6/6] board/ti/dra7xx: add support for parallel NOR
This patch adds support for parallel NOR device (S29GL512S10) present on J6-EVM. The Flash device is connected to GPMC controller on chip-select[0] and accessed as memory-mapped device. It has data-witdh=x16, capacity-64MBytes(512Mbits) and is CFI compatible. As multiple devices are share GPMC pins on this board, so following board settings are required to detect NOR device: SW5.1 (NAND_BOOTn) = OFF (logic-1) SW5.2 (NOR_BOOTn) = ON (logic-0) /* Active-low */ SW5.3 (eMMC_BOOTn) = OFF (logic-1) SW5.4 (QSPI_BOOTn) = OFF (logic-1) And also set appropriate SYSBOOT configurations: SW3.1 (SYSBOOT[ 8])= ON (logic-1) /* selects SYS_CLK1 speed */ SW3.2 (SYSBOOT[ 9])= OFF (logic-0) /* selects SYS_CLK1 speed */ SW3.3 (SYSBOOT[10])= ON (logic-1) /* wait-pin monitoring = enabled */ SW3.4 (SYSBOOT[11])= OFF (logic-0) /* device type: Non Muxed */ SW3.5 (SYSBOOT[12])= OFF (logic-0) /* device type: Non Muxed */ SW3.6 (SYSBOOT[13])= ON (logic-1) /* device bus-width: 1(x16) */ SW3.7 (SYSBOOT[14])= OFF (logic-0) /* reserved */ SW3.8 (SYSBOOT[15])= ON (logic-1) /* reserved */ Also, following changes are required to enable NOR Flash support in dra7xx_evm board profile: diff --git a/boards.cfg b/boards.cfg -Active arm armv7 omap5 ti dra7xx dra7xx_evmdra7xx_evm:CONS_INDEX=1 Lokesh Vutla lokeshvu...@ti.com +Active arm armv7 omap5 ti dra7xx dra7xx_evmdra7xx_evm:CONS_INDEX=1,NOR Lokesh Vutla lokeshvu...@ti.com Signed-off-by: Pekon Gupta pe...@ti.com --- arch/arm/include/asm/arch-omap5/mem.h | 12 +-- board/ti/dra7xx/mux_data.h| 36 +++-- include/configs/dra7xx_evm.h | 38 +++ 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/arch-omap5/mem.h b/arch/arm/include/asm/arch-omap5/mem.h index d2e708b..3e5d655 100644 --- a/arch/arm/include/asm/arch-omap5/mem.h +++ b/arch/arm/include/asm/arch-omap5/mem.h @@ -46,13 +46,13 @@ #define M_NAND_GPMC_CONFIG60x16000f80 #define M_NAND_GPMC_CONFIG70x0008 -#define STNOR_GPMC_CONFIG1 0x1200 -#define STNOR_GPMC_CONFIG2 0x00101000 -#define STNOR_GPMC_CONFIG3 0x00030301 -#define STNOR_GPMC_CONFIG4 0x10041004 -#define STNOR_GPMC_CONFIG5 0x000C1010 +#define STNOR_GPMC_CONFIG1 0x1000 +#define STNOR_GPMC_CONFIG2 0x001f1f00 +#define STNOR_GPMC_CONFIG3 0x001f1f01 +#define STNOR_GPMC_CONFIG4 0x1f011f01 +#define STNOR_GPMC_CONFIG5 0x001d1f1f #define STNOR_GPMC_CONFIG6 0x08070280 -#define STNOR_GPMC_CONFIG7 0x0F48 +#define STNOR_GPMC_CONFIG7 0x0048 /* max number of GPMC Chip Selects */ #define GPMC_MAX_CS8 diff --git a/board/ti/dra7xx/mux_data.h b/board/ti/dra7xx/mux_data.h index 035e862..d04b225 100644 --- a/board/ti/dra7xx/mux_data.h +++ b/board/ti/dra7xx/mux_data.h @@ -21,6 +21,37 @@ const struct pad_conf_entry core_padconf_array_essential[] = { {MMC1_DAT3, (IEN | PTU | PDIS | M0)}, /* MMC1_DAT3 */ {MMC1_SDCD, (FSC | IEN | PTU | PDIS | M0)}, /* MMC1_SDCD */ {MMC1_SDWP, (FSC | IEN | PTD | PEN | M14)}, /* MMC1_SDWP */ +#if defined(CONFIG_NOR) + /* NOR only pin-mux */ + {GPMC_A0 , M0 | IDIS | PDIS}, /* nor.GPMC_A[0 ] */ + {GPMC_A1 , M0 | IDIS | PDIS}, /* nor.GPMC_A[1 ] */ + {GPMC_A2 , M0 | IDIS | PDIS}, /* nor.GPMC_A[2 ] */ + {GPMC_A3 , M0 | IDIS | PDIS}, /* nor.GPMC_A[3 ] */ + {GPMC_A4 , M0 | IDIS | PDIS}, /* nor.GPMC_A[4 ] */ + {GPMC_A5 , M0 | IDIS | PDIS}, /* nor.GPMC_A[5 ] */ + {GPMC_A6 , M0 | IDIS | PDIS}, /* nor.GPMC_A[6 ] */ + {GPMC_A7 , M0 | IDIS | PDIS}, /* nor.GPMC_A[7 ] */ + {GPMC_A8 , M0 | IDIS | PDIS}, /* nor.GPMC_A[8 ] */ + {GPMC_A9 , M0 | IDIS | PDIS}, /* nor.GPMC_A[9 ] */ + {GPMC_A10 , M0 | IDIS | PDIS}, /* nor.GPMC_A[10] */ + {GPMC_A11 , M0 | IDIS | PDIS}, /* nor.GPMC_A[11] */ + {GPMC_A12 , M0 | IDIS | PDIS}, /* nor.GPMC_A[12] */ + {GPMC_A13 , M0 | IDIS | PDIS}, /* nor.GPMC_A[13] */ + {GPMC_A14 , M0 | IDIS | PDIS}, /* nor.GPMC_A[14] */ + {GPMC_A15 , M0 | IDIS | PDIS}, /* nor.GPMC_A[15] */ + {GPMC_A16 , M0 | IDIS | PDIS}, /* nor.GPMC_A[16] */ + {GPMC_A17 , M0 | IDIS | PDIS}, /* nor.GPMC_A[17] */ + {GPMC_A18 , M0 | IDIS | PDIS}, /* nor.GPMC_A[18] */ + {GPMC_A19 , M0 | IDIS | PDIS}, /* nor.GPMC_A[19] */ + {GPMC_A20 , M0 | IDIS | PDIS}, /* nor.GPMC_A[20] */ + {GPMC_A21 , M0 | IDIS | PDIS}, /* nor.GPMC_A[21] */ + {GPMC_A22 , M0 | IDIS | PDIS}, /* nor.GPMC_A[22] */ +
[U-Boot] [PATCH v2 5/6] board/ti/dra7xx: add support for parallel NAND
This patch adds support for x16 NAND device (MT29F2G16AAD) connected to GPMC chip-select[0] on DRA7xx EVM. As GPMC pins are shared by multiple devices, so in addition to this patch following board settings are required for NAND device detection [1]: SW5.9 (GPMC_WPN) = OFF (logic-1) SW5.1 (NAND_BOOTn) = ON (logic-0) /* Active-low */ SW5.2 (NOR_BOOTn) = OFF (logic-1) SW5.3 (eMMC_BOOTn) = OFF (logic-1) SW5.4 (QSPI_BOOTn) = OFF (logic-1) And also set appropriate SYSBOOT configurations SW2.1 (SYSBOOT[0]) = ON (logic-1) /* selects NAND Boot */ SW2.2 (SYSBOOT[1]) = OFF (logic-0) /* selects NAND Boot */ SW2.3 (SYSBOOT[2]) = OFF (logic-0) /* selects NAND Boot */ SW2.4 (SYSBOOT[3]) = OFF (logic-0) /* selects NAND Boot */ SW2.5 (SYSBOOT[4]) = ON (logic-1) /* selects NAND Boot */ SW2.6 (SYSBOOT[5]) = ON (logic-1) /* selects NAND Boot */ SW2.7 (SYSBOOT[6]) = OFF (logic-0) /* reserved */ SW2.8 (SYSBOOT[7]) = OFF (logic-0) /* reserved */ SW3.1 (SYSBOOT[ 8])= ON (logic-1) /* selects SYS_CLK1 speed */ SW3.2 (SYSBOOT[ 9])= OFF (logic-0) /* selects SYS_CLK1 speed */ SW3.3 (SYSBOOT[10])= ON (logic-1) /* wait-pin monitoring = enabled */ SW3.4 (SYSBOOT[11])= OFF (logic-0) /* device type: Addr/Data Muxed */ SW3.5 (SYSBOOT[12])= ON (logic-1) /* device type: Addr/Data Muxed */ SW3.6 (SYSBOOT[13])= ON (logic-1) /* device bus-width: 1(x16) */ SW3.7 (SYSBOOT[14])= OFF (logic-0) /* reserved */ SW3.8 (SYSBOOT[15])= ON (logic-1) /* reserved */ Following changes are required in board.cfg to enable NAND on J6-EVM: diff --git a/boards.cfg b/boards.cfg -Active arm armv7 omap5 ti dra7xx dra7xx_evmdra7xx_evm:CONS_INDEX=1 Lokesh Vutla lokeshvu...@ti.com +Active arm armv7 omap5 ti dra7xx dra7xx_evmdra7xx_evm:CONS_INDEX=1,NAND Lokesh Vutla lokeshvu...@ti.com [1] http://processors.wiki.ti.com/index.php/Linux_Core_NAND_User%27s_Guide#Board_specific_configurations Signed-off-by: Pekon Gupta pe...@ti.com --- board/ti/dra7xx/mux_data.h | 28 + include/configs/dra7xx_evm.h | 50 2 files changed, 78 insertions(+) diff --git a/board/ti/dra7xx/mux_data.h b/board/ti/dra7xx/mux_data.h index c9e202a..035e862 100644 --- a/board/ti/dra7xx/mux_data.h +++ b/board/ti/dra7xx/mux_data.h @@ -56,6 +56,33 @@ const struct pad_conf_entry core_padconf_array_essential[] = { {RGMII0_RXD2, (IEN | M0) }, {RGMII0_RXD1, (IEN | M0) }, {RGMII0_RXD0, (IEN | M0) }, +#ifdef CONFIG_NAND + /* NAND / NOR pin-mux */ + {GPMC_AD0 , M0 | IEN | PDIS}, /* GPMC_AD0 */ + {GPMC_AD1 , M0 | IEN | PDIS}, /* GPMC_AD1 */ + {GPMC_AD2 , M0 | IEN | PDIS}, /* GPMC_AD2 */ + {GPMC_AD3 , M0 | IEN | PDIS}, /* GPMC_AD3 */ + {GPMC_AD4 , M0 | IEN | PDIS}, /* GPMC_AD4 */ + {GPMC_AD5 , M0 | IEN | PDIS}, /* GPMC_AD5 */ + {GPMC_AD6 , M0 | IEN | PDIS}, /* GPMC_AD6 */ + {GPMC_AD7 , M0 | IEN | PDIS}, /* GPMC_AD7 */ + {GPMC_AD8 , M0 | IEN | PDIS}, /* GPMC_AD8 */ + {GPMC_AD9 , M0 | IEN | PDIS}, /* GPMC_AD9 */ + {GPMC_AD10, M0 | IEN | PDIS}, /* GPMC_AD10 */ + {GPMC_AD11, M0 | IEN | PDIS}, /* GPMC_AD11 */ + {GPMC_AD12, M0 | IEN | PDIS}, /* GPMC_AD12 */ + {GPMC_AD13, M0 | IEN | PDIS}, /* GPMC_AD13 */ + {GPMC_AD14, M0 | IEN | PDIS}, /* GPMC_AD14 */ + {GPMC_AD15, M0 | IEN | PDIS}, /* GPMC_AD15 */ + {GPMC_CS0, M0 | IDIS | PEN | PTU}, /* GPMC chip-select */ + {GPMC_ADVN_ALE, M0 | IDIS | PEN | PTD}, /* GPMC Addr latch */ + {GPMC_OEN_REN, M0 | IDIS | PEN | PTU}, /* GPMC Read enable */ + {GPMC_WEN, M0 | IDIS | PEN | PTU}, /* GPMC Write enable_n */ + {GPMC_BEN0, M0 | IDIS | PEN | PTD}, /* GPMC Byte/Column En */ + {GPMC_WAIT0,M0 | IEN | PEN | PTU}, /* GPMC Wait/Ready */ + /* GPMC_WPN (Write Protect) is controlled by DIP Switch SW10(12) */ +#else + /* QSPI pin-mux */ {GPMC_A13, (IEN | PDIS | M1)}, /* QSPI1_RTCLK */ {GPMC_A14, (IEN | PDIS | M1)}, /* QSPI1_D[3] */ {GPMC_A15, (IEN | PDIS | M1)}, /* QSPI1_D[2] */ @@ -66,6 +93,7 @@ const struct pad_conf_entry core_padconf_array_essential[] = { {GPMC_A4, (IEN | PDIS | M1)}, /* QSPI1_CS3 */ {GPMC_CS2, (IEN | PTU | PDIS | M1)},/* QSPI1_CS0 */ {GPMC_CS3, (IEN | PTU | PDIS | M1)},/* QSPI1_CS1*/ +#endif /* CONFIG_NAND */ {USB2_DRVVBUS, (M0 | IEN | FSC) }, }; #endif /* _MUX_DATA_DRA7XX_H_ */ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 8d0a0eb..10c88dc 100644 --- a/include/configs/dra7xx_evm.h
[U-Boot] [PATCH] usb: musb-new: core: set MUSB_POWER_HSENAB in MUSB_POWER for host mode
This bit allows the MUSB controller to negotiate for high-speed mode when the device is reset by the hub. If unset, Babble errors occur with high-speed mass storage devices right after the first packet. This condition is not caught by the interrupt handles in U-Boot, so no recovery is done, and the USB communication is stuck. To fix this, set the bit unconditionally, not only for CONFIG_USB_GADGET_DUALSPEED but also for host-only modes. Signed-off-by: Daniel Mack zon...@gmail.com --- drivers/usb/musb-new/musb_core.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index 36681b6..eeaacdf 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -943,9 +943,7 @@ void musb_start(struct musb *musb) /* put into basic highspeed mode and start session */ musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE -#ifdef CONFIG_USB_GADGET_DUALSPEED | MUSB_POWER_HSENAB -#endif /* ENSUSPEND wedges tusb */ /* | MUSB_POWER_ENSUSPEND */ ); -- 1.9.3 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] h2200: Disable SHA256 on FIT images
This board is close in binary size to one of its hard limits, so disable SHA256 FIT image support to gain some breathing room. Signed-off-by: Tom Rini tr...@ti.com --- include/configs/h2200.h |1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 5d0b85e..9470ad6 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -123,6 +123,7 @@ #define CONFIG_CMD_IMI #define CONFIG_FIT +#define CONFIG_FIT_DISABLE_SHA256 #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG #define CONFIG_INITRD_TAG -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 01/10] powerpc: mpc8xx: remove some of tqm8xx board family without maintainers
Dear Masahiro, In message 20140722184445.ef22.aa925...@jp.panasonic.com you wrote: Because the maintainers fields (the rightest fields) of boards.cfg for these boards are blank. I don't know why this is the case; it is wrong. If the maintainers fields are blank and you still claim you are their maintainer, what does the maintainers field stand for ? You ask the wrong question :-) The question is why I'm not listed as maintainer of these boards. Best regards, Wolfgang Denk -- 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: w...@denx.de Just about every computer on the market today runs Unix, except the Mac (and nobody cares about it). - Bill Joy 6/21/85 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] boards.cfg: re-claim ownership for TQM8xx boards
Signed-off-by: Wolfgang Denk w...@denx.de --- boards.cfg | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/boards.cfg b/boards.cfg index 1ba2081..4b2bc19 100644 --- a/boards.cfg +++ b/boards.cfg @@ -1007,19 +1007,19 @@ Active powerpc mpc8xx - tqc tqm8xx Active powerpc mpc8xx - tqc tqm8xx TK885D- - Active powerpc mpc8xx - tqc tqm8xx TQM823L - Wolfgang Denk w...@denx.de Active powerpc mpc8xx - tqc tqm8xx TQM823L_LCD TQM823L:LCD,NEC_NL6448BC20 Wolfgang Denk w...@denx.de -Active powerpc mpc8xx - tqc tqm8xx TQM823M - - +Active powerpc mpc8xx - tqc tqm8xx TQM823M - Wolfgang Denk w...@denx.de Active powerpc mpc8xx - tqc tqm8xx TQM850L - Wolfgang Denk w...@denx.de -Active powerpc mpc8xx - tqc tqm8xx TQM850M - - +Active powerpc mpc8xx - tqc tqm8xx TQM850M - Wolfgang Denk w...@denx.de Active powerpc mpc8xx - tqc tqm8xx TQM855L - Wolfgang Denk w...@denx.de -Active powerpc mpc8xx - tqc tqm8xx TQM855M - - +Active powerpc mpc8xx - tqc tqm8xx TQM855M - Wolfgang Denk w...@denx.de Active powerpc mpc8xx - tqc tqm8xx TQM860L - Wolfgang Denk w...@denx.de -Active powerpc mpc8xx - tqc tqm8xx TQM860M - - -Active powerpc mpc8xx - tqc tqm8xx TQM862L - - -Active powerpc mpc8xx - tqc tqm8xx TQM862M - - -Active powerpc mpc8xx - tqc tqm8xx TQM866M - - -Active powerpc mpc8xx - tqc tqm8xx TQM885D - - +Active powerpc mpc8xx - tqc tqm8xx TQM860M
Re: [U-Boot] [PATCH 01/10] powerpc: mpc8xx: remove some of tqm8xx board family without maintainers
On Tue, 22 Jul 2014 14:16:43 +0200 Wolfgang Denk w...@denx.de wrote: Dear Masahiro, In message 20140722184445.ef22.aa925...@jp.panasonic.com you wrote: Because the maintainers fields (the rightest fields) of boards.cfg for these boards are blank. I don't know why this is the case; it is wrong. If the maintainers fields are blank and you still claim you are their maintainer, what does the maintainers field stand for ? You ask the wrong question :-) The question is why I'm not listed as maintainer of these boards. OK. Thanks for your patch: http://patchwork.ozlabs.org/patch/372452/ Anyway I decided to postpone this series. Changed 1/10 to Rejected, 2/10 thru 10/10 to RFC. Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] ODROID dynamic memory initialization
Hi Przemyslaw, While looking at the old uboot from hardkernel, I'm curious about CONFIG_CLK_BUS_DMC_220_440, which is set by default. This appears to run the memory at a high speed, by writing certain registers in the Dynamic Memory Controller (e.g. TIMINGROW), and clocking MPLL to 880MHz. Your uboot patches don't seem to touch DMC regs like TIMINGROW, and also clock the MPLL at 800MHz. I'm wondering if there is any reason for this? Wouldn't it be better to run at the faster speed like the vendor code does? Thanks Daniel ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] A way to change the status of the whole series on Patchwork ?
On Wed, Jul 16, 2014 at 07:49:09PM -0700, Brian Norris wrote: On Thu, Jul 17, 2014 at 11:19:42AM +0900, Masahiro Yamada wrote: When I change the status of patches, I always do it one by one. But it is painful if the series consists of a bunch of patches. Does Patchwork have any good way to change the status of the whole series? You can use pwclient via scripts. (I wrote my own hooks for mutt so I can do quicker management straight from my mailbox.) Oooh, can you share? Thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/1] ARM: kirkwood: add mvsdio driver
Hi Prafulla, On 20/07/2014 14:54, Prafulla Wadaskar wrote: This patch add Marvell kirkwood MVSDIO/MMC driver and enable it for Sheevaplugs and OpenRD boards. - Fix some typo and missing lines from patch import If above line is your change log info then it should put is below --- Also you should maintain all history like... Change log V1:... Change log V2:... Is there any chance to get this patch be reviewed in time for been included in the near stable release ? Regards, G signature.asc Description: OpenPGP digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/1] ARM: kirkwood: add mvsdio driver
Hi Prafulla, On 20/07/2014 14:54, Prafulla Wadaskar wrote: This patch add Marvell kirkwood MVSDIO/MMC driver and enable it for Sheevaplugs and OpenRD boards. - Fix some typo and missing lines from patch import If above line is your change log info then it should put is below --- Also you should maintain all history like... Change log V1:... Change log V2:... Is there any chance to get this patch be reviewe in time for been included in the near stable release ? Regards, G signature.asc Description: OpenPGP digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 12/15] buildman: adjust for Kconfig
Use make board_defconfig instead of make board_config. Invoke tools/genboardscfg to generate boards.cfg when it is missing. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- Changes in v4: - Generate boards.cfg automatically if it is missing Changes in v3: None Changes in v2: None tools/buildman/board.py | 2 +- tools/buildman/builder.py | 6 +++--- tools/buildman/control.py | 10 ++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tools/buildman/board.py b/tools/buildman/board.py index 5172a47..7bcc932 100644 --- a/tools/buildman/board.py +++ b/tools/buildman/board.py @@ -17,7 +17,7 @@ class Board: soc: Name of SOC, or '' if none (e.g. mx31) vendor: Name of vendor (e.g. armltd) board_name: Name of board (e.g. integrator) -target: Target name (use make target_config to configure) +target: Target name (use make target_defconfig to configure) options: board-specific options (e.g. integratorcp:CM1136) self.target = target diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 4987fc9..502a35a 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -198,7 +198,7 @@ class BuilderThread(threading.Thread): commit_upto: Commit number to build (0...n-1) brd: Board object to build work_dir: Directory to which the source will be checked out -do_config: True to run a make board_config on the source +do_config: True to run a make board_defconfig on the source force_build: Force a build even if one was previously done Returns: @@ -251,7 +251,7 @@ class BuilderThread(threading.Thread): args = ['O=build', '-s'] if self.builder.num_jobs is not None: args.extend(['-j', str(self.builder.num_jobs)]) -config_args = ['%s_config' % brd.target] +config_args = ['%s_defconfig' % brd.target] config_out = '' args.extend(self.builder.toolchains.GetMakeArguments(brd)) @@ -404,7 +404,7 @@ class BuilderThread(threading.Thread): work_dir = self.builder.GetThreadDir(self.thread_num) self.toolchain = None if job.commits: -# Run 'make board_config' on the first commit +# Run 'make board_defconfig' on the first commit do_config = True commit_upto = 0 force_build = False diff --git a/tools/buildman/control.py b/tools/buildman/control.py index fd6f197..b35da20 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -15,6 +15,7 @@ import patchstream import terminal import toolchain import command +import subprocess def GetPlural(count): Returns a plural 's' if count is not 1 @@ -109,6 +110,15 @@ def DoBuildman(options, args): sys.exit(1) # Work out what subset of the boards we are building +board_file = os.path.join(options.git, 'boards.cfg') +if not os.path.exists(board_file): +print 'Could not find %s' % board_file +status = subprocess.call([os.path.join(options.git, + 'tools/genboardscfg')]) +if status != 0: +print sys.stderr, Failed to generate boards.cfg +sys.exit(1) + boards = board.Boards() boards.ReadBoards(os.path.join(options.git, 'boards.cfg')) why_selected = boards.SelectBoards(args) -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 09/15] tools: add genboardscfg
Now the primary data for each board is in Kconfig, defconfig and MAINTAINERS. It is true boards.cfg is needed for MAKEALL and buildman and might be useful to brouse boards in a single database. But it would be painful to maintain the boards.cfg in sync. So, this is the solution. Add a tool to generate the equivalent boards.cfg file from the Kconfig, defconfig and MAINTAINERS files. We can keep all the functions of MAKEALL and buildman with it. The best thing would be to change MAKEALL and buildman for not depending on boards.cfg in future, but it would take some time. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- Changes in v4: - Newly added Changes in v3: None Changes in v2: None tools/genboardscfg | 433 + 1 file changed, 433 insertions(+) create mode 100755 tools/genboardscfg diff --git a/tools/genboardscfg b/tools/genboardscfg new file mode 100755 index 000..ebd3507 --- /dev/null +++ b/tools/genboardscfg @@ -0,0 +1,433 @@ +#!/usr/bin/env python +# +# Author: Masahiro Yamada yamad...@jp.panasonic.com +# +# SPDX-License-Identifier: GPL-2.0+ +# + +''' +Converter from Kconfig and MAINTAINERS to boards.cfg + +Run 'genboardscfg' to create boards.cfg file. + +Run 'genboardscfg -h' for available options. +''' + +import sys +import os +import errno +import shutil +import time +import subprocess +import fnmatch +import re +import optparse + +BUILD_DIR = '.genboardscfg/' +BOARD_FILE = 'boards.cfg' +CONFIG_DIR = 'configs' +REFORMAT_CMD = ['tools/reformat.py', '-i', '-d', '-', '-s', '8'] +SLEEP_TIME=0.03 + +COMMENT_BLOCK = ''' +# +# List of boards +# Automatically generated by tools/genboardscfg: don't edit +# +# Status, Arch, CPU:SPLCPU, SoC, Vendor, Board name, Target, Options, Maintainers + +''' + +class MaintainersDatabase: +'''The database of board status and maintainers''' +def __init__(self): +'''Create an empty database''' +self.database = {} +def get_status(self, target): +''' +Return the status of the given board + +The status is either 'Active' or 'Orphan'. +''' +tmp = self.database[target][0] +if tmp.startswith('Maintained'): +return 'Active' +elif tmp.startswith('Orphan'): +return 'Orphan' +else: +print sys.stderr, 'Error: %s: unknown status' % tmp +def get_maintainers(self, target): +''' +Return the maintainers of the given board + +If the board has two or more maintainers, they are separated with +colons. +''' +return ':'.join(self.database[target][1]) +def parse_file(self, file): +''' +Parse the given MAINTAINERS file and add board status and +maintainers information to the database + +Arguments: + file - MAINTAINERS file to be parsed +''' +targets = [] +maintainers = [] +status = '-' +for line in open(file): +if line[:2] == 'M:': +maintainers.append(line[2:].strip()) +elif line[:2] == 'F:': +front, match, rear = line[2:].strip().partition('configs/') +if not front and match: +front, match, rear = rear.rpartition('_defconfig') +if match and not rear: +targets.append(front) +elif line[:2] == 'S:': +status = line[2:].strip() +elif line == '\n' and targets: +for target in targets: +self.database[target] = (status, maintainers) +targets = [] +maintainers = [] +status = '-' +if targets: +for target in targets: +self.database[target] = (status, maintainers) + +class DotConfigParser: +''' +A parser of .config file + +Each line of the boards.cfg has the form of: +Status, Arch, CPU, SoC, Vendor, Board, Target, Options, Maintainers +Most of the fields are extracted from .config file. +MAINTAINERS files are also consulted for Status and Maintainers fields. +''' +re_arch = re.compile(r'CONFIG_SYS_ARCH=(.*)') +re_cpu = re.compile(r'CONFIG_SYS_CPU=(.*)') +re_soc = re.compile(r'CONFIG_SYS_SOC=(.*)') +re_vendor = re.compile(r'CONFIG_SYS_VENDOR=(.*)') +re_board = re.compile(r'CONFIG_SYS_BOARD=(.*)') +re_config = re.compile(r'CONFIG_SYS_CONFIG_NAME=(.*)') +re_options = re.compile(r'CONFIG_SYS_EXTRA_OPTIONS=(.*)') +re_list = (('arch', re_arch), ('cpu', re_cpu), ('soc', re_soc), + ('vendor', re_vendor), ('board', re_board), + ('config', re_config), ('options', re_options)) +must_fields = ('arch', 'config') +def __init__(self, build_dir, output, maintainers_database): +''' +Create a new .config perser + +Arguments: + build_dir - Build directory where
[U-Boot] [PATCH v4 11/15] MAKEALL: adjust for Kconfig
Use make board_defconfig instead of make board_config. Invoke tools/genboardscfg to generate boards.cfg when it is missing. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- Changes in v4: - Generate boards.cfg automatically if it is missing Changes in v3: None Changes in v2: None MAKEALL | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/MAKEALL b/MAKEALL index 9510982..3eb54d1 100755 --- a/MAKEALL +++ b/MAKEALL @@ -171,6 +171,14 @@ GNU_MAKE=$(scripts/show-gnu-make) || { # echo Remaining arguments: # for arg do echo '-- '\`$arg' ; done +if [ ! -r boards.cfg ]; then + echo Could not find boards.cfg + tools/genboardscfg || { + echo Failed to generate boards.cfg 2 + exit 1 + } +fi + FILTER=\$1 !~ /^#/ [ $opt_a ] FILTER=${FILTER} $opt_a [ $opt_c ] FILTER=${FILTER} $opt_c @@ -512,9 +520,9 @@ get_target_location() { set ${line} - CONFIG_NAME=${7%_config} + CONFIG_NAME=${7%_defconfig} - [ ${BOARD_NAME} ] || BOARD_NAME=${7%_config} + [ ${BOARD_NAME} ] || BOARD_NAME=${7%_defconfig} if [ $# -gt 5 ]; then if [ $6 = - ] ; then @@ -651,7 +659,7 @@ build_target() { fi ${MAKE} distclean /dev/null - ${MAKE} -s ${target}_config + ${MAKE} -s ${target}_defconfig ${MAKE} ${JOBS} ${CHECK} all \ ${LOG_DIR}/$target.MAKELOG 2 ${LOG_DIR}/$target.ERR -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 05/15] include: define CONFIG_SPL and CONFIG_TPL as 1
We are about to switch to Kconfig in the next commit. But there are something to get done beforehand. In Kconfig, include/generated/autoconf.h defines boolean CONFIG macros as 1. CONFIG_SPL and CONFIG_TPL, if defined, must be set to 1. Otherwise, when switching to Kconfig, the build log would be sprinkled with warning messages like this: warning: CONFIG_SPL redefined [enabled by default] Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Reviewed-by: Simon Glass s...@chromium.org --- Changes in v4: None Changes in v3: - Rebase on the current u-boot/master Changes in v2: - Rebase on the current u-boot/master doc/README.SPL | 2 +- include/configs/B4860QDS.h | 2 +- include/configs/BSC9131RDB.h | 2 +- include/configs/BSC9132QDS.h | 2 +- include/configs/C29XPCIE.h | 4 ++-- include/configs/MPC8313ERDB.h | 2 +- include/configs/P1010RDB.h | 8 include/configs/P1022DS.h | 8 include/configs/P1_P2_RDB.h| 8 include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240QDS.h | 2 +- include/configs/a3m071.h | 2 +- include/configs/am335x_igep0033.h | 2 +- include/configs/am3517_crane.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/apf27.h| 2 +- include/configs/arndale.h | 2 +- include/configs/bur_am335x_common.h| 2 +- include/configs/cam_enc_4xx.h | 2 +- include/configs/cm_t35.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/devkit8000.h | 2 +- include/configs/exynos5-dt.h | 2 +- include/configs/hawkboard.h| 2 +- include/configs/ipam390.h | 2 +- include/configs/lwmon5.h | 2 +- include/configs/m53evk.h | 2 +- include/configs/mcx.h | 2 +- include/configs/microblaze-generic.h | 2 +- include/configs/mx31pdk.h | 2 +- include/configs/mxs.h | 2 +- include/configs/omap3_evm_common.h | 2 +- include/configs/origen.h | 2 +- include/configs/p1_p2_rdb_pc.h | 8 include/configs/palmtreo680.h | 2 +- include/configs/pcm051.h | 2 +- include/configs/sama5d3_xplained.h | 2 +- include/configs/sama5d3xek.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/smdkv310.h | 2 +- include/configs/socfpga_cyclone5.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/tam3517-common.h | 2 +- include/configs/tao3530.h | 2 +- include/configs/tegra-common.h | 2 +- include/configs/ti814x_evm.h | 2 +- include/configs/ti816x_evm.h | 2 +- include/configs/ti_armv7_common.h | 2 +- include/configs/tricorder.h| 2 +- include/configs/tx25.h | 2 +- include/configs/vpac270.h | 2 +- include/configs/woodburn_sd.h | 2 +- include/configs/x600.h | 2 +- include/configs/zynq-common.h | 2 +- 56 files changed, 69 insertions(+), 69 deletions(-) diff --git a/doc/README.SPL b/doc/README.SPL index 57a39a4..2b4b0b8 100644 --- a/doc/README.SPL +++ b/doc/README.SPL @@ -40,7 +40,7 @@ COBJS-$(CONFIG_SPL_BUILD) += foo.o The building of SPL images can be with: -#define CONFIG_SPL +#define CONFIG_SPL 1 Because SPL images normally have a different text base, one has to be configured by defining CONFIG_SPL_TEXT_BASE. The linker script has to be diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 1af9ba6..cb35116 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -23,7 +23,7 @@ #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS0xfffc #else -#define CONFIG_SPL +#define CONFIG_SPL 1 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 5a316c8..e6b46e4 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -25,7 +25,7 @@ #endif #ifdef CONFIG_NAND -#define CONFIG_SPL +#define CONFIG_SPL 1 #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 7bb5d33..fc45e45 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -41,7 +41,7 @@ #endif #ifdef CONFIG_NAND -#define CONFIG_SPL +#define CONFIG_SPL 1 #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/C29XPCIE.h
[U-Boot] [PATCH v4 15/15] kbuild: remove CONFIG_SPL/CONFIG_TPL definition in config headers
Now CONFIG_SPL and CONFIG_TPL are defined in Kconfig. Remove the redundant definition in config headers. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Reviewed-by: Simon Glass s...@chromium.org --- Changes in v4: - Rebase on the current u-boot/master Changes in v3: - Rebase on the current u-boot/master Changes in v2: - Rebase on the current u-boot/master include/configs/B4860QDS.h | 1 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 2 -- include/configs/MPC8313ERDB.h | 1 - include/configs/P1010RDB.h | 4 include/configs/P1022DS.h | 4 include/configs/P1_P2_RDB.h| 4 include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 1 - include/configs/a3m071.h | 1 - include/configs/am335x_igep0033.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/apf27.h| 1 - include/configs/arndale.h | 1 - include/configs/bur_am335x_common.h| 1 - include/configs/cam_enc_4xx.h | 1 - include/configs/cm_t35.h | 1 - include/configs/da850evm.h | 1 - include/configs/devkit8000.h | 1 - include/configs/exynos5-dt.h | 1 - include/configs/hawkboard.h| 1 - include/configs/ipam390.h | 1 - include/configs/lwmon5.h | 1 - include/configs/m53evk.h | 1 - include/configs/mcx.h | 1 - include/configs/microblaze-generic.h | 1 - include/configs/mx31pdk.h | 1 - include/configs/mxs.h | 1 - include/configs/omap3_evm_common.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/origen.h | 1 - include/configs/p1_p2_rdb_pc.h | 4 include/configs/palmtreo680.h | 1 - include/configs/pcm051.h | 1 - include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/smdkv310.h | 1 - include/configs/socfpga_cyclone5.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/tegra-common.h | 1 - include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 1 - include/configs/ti_armv7_common.h | 1 - include/configs/tricorder.h| 1 - include/configs/tx25.h | 1 - include/configs/vpac270.h | 1 - include/configs/woodburn_sd.h | 1 - include/configs/x600.h | 1 - include/configs/zynq-common.h | 1 - 56 files changed, 69 deletions(-) diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index cb35116..c4eb50d 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -23,7 +23,6 @@ #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS0xfffc #else -#define CONFIG_SPL 1 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index e6b46e4..56a3e94 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -25,7 +25,6 @@ #endif #ifdef CONFIG_NAND -#define CONFIG_SPL 1 #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index fc45e45..4089b33 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -41,7 +41,6 @@ #endif #ifdef CONFIG_NAND -#define CONFIG_SPL 1 #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index f382b48..8ae33a5 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -24,8 +24,6 @@ #endif #ifdef CONFIG_NAND -#define CONFIG_SPL 1 -#define CONFIG_TPL 1 #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_NAND_BOOT #define CONFIG_SPL_FLUSH_IMAGE diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 7f5aa59..dd81229 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -19,7 +19,6 @@ #define CONFIG_MPC8313ERDB 1 #ifdef CONFIG_NAND -#define CONFIG_SPL 1 #define CONFIG_SPL_INIT_MINIMAL #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_NAND_SUPPORT diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 86d62e1..c491b50 100644 --- a/include/configs/P1010RDB.h +++
[U-Boot] [PATCH v4 04/15] kconfig: add basic Kconfig files
This commit adds more Kconfig files, which were written by hand. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- Changes in v4: - Abolish CONFIG_SUBIMAGES - Add CONFIG_DEFCONFIG_LIST Changes in v3: - Add CONFIG_SUBIMAGES for generic sub-image framework. - Move CONFIG_SYS_EXTRA_OPTIONS to the top Kconfig. - Add more help messages to each config. Changes in v2: - Do not include board/Kconfig - Drop CONFIG_BUILD_MODE Kconfig | 65 +++ arch/Kconfig | 66 2 files changed, 131 insertions(+) create mode 100644 Kconfig create mode 100644 arch/Kconfig diff --git a/Kconfig b/Kconfig new file mode 100644 index 000..9e77a6e --- /dev/null +++ b/Kconfig @@ -0,0 +1,65 @@ +# +# For a description of the syntax of this configuration file, +# see Documentation/kbuild/kconfig-language.txt. +# +mainmenu U-Boot $UBOOTVERSION Configuration + +config UBOOTVERSION + string + option env=UBOOTVERSION + +config KCONFIG_OBJDIR + string + option env=KCONFIG_OBJDIR + +config DEFCONFIG_LIST + string + depends on !SPL_BUILD + option defconfig_list + default configs/sandbox_defconfig + +menu General setup + +config SPL_BUILD + bool + depends on $KCONFIG_OBJDIR=spl || $KCONFIG_OBJDIR=tpl + default y + +config TPL_BUILD + bool + depends on $KCONFIG_OBJDIR=tpl + default y + +config SPL + bool + prompt Enable SPL if !SPL_BUILD + default y if SPL_BUILD + help + If you want to build SPL as well as the normal image, say Y. + +config TPL + bool + depends on SPL + prompt Enable TPL if !SPL_BUILD + default y if TPL_BUILD + default n + help + If you want to build TPL as well as the normal image and SPL, say Y. + +config SYS_EXTRA_OPTIONS + string Extra Options (DEPRECATED) + depends on !SPL_BUILD + help + The old configuration infrastructure (= mkconfig + boards.cfg) + provided the extra options field. It you have something like + HAS_BAR,BAZ=64, the optional options + #define CONFIG_HAS + #define CONFIG_BAZ 64 + will be defined in include/config.h. + This option was prepared for the smooth migration from the old + configuration to Kconfig. Since this option will be removed sometime, + new boards should not use this option. + +endmenu# General setup + +source arch/Kconfig diff --git a/arch/Kconfig b/arch/Kconfig new file mode 100644 index 000..8620a4f --- /dev/null +++ b/arch/Kconfig @@ -0,0 +1,66 @@ +choice + prompt Architecture select + default SANDBOX + +config ARC + bool ARC architecture + +config ARM + bool ARM architecture + +config AVR32 + bool AVR32 architecture + +config BLACKFIN + bool Blackfin architecture + +config M68K + bool M68000 architecture + +config MICROBLAZE + bool MicroBlaze architecture + +config MIPS + bool MIPS architecture + +config NDS32 + bool NDS32 architecture + +config NIOS2 + bool Nios II architecture + +config OPENRISC + bool OpenRISC architecture + +config PPC + bool PowerPC architecture + +config SANDBOX + bool Sandbox + +config SH + bool SuperH architecture + +config SPARC + bool SPARC architecture + +config X86 + bool x86 architecture + +endchoice + +source arch/arc/Kconfig +source arch/arm/Kconfig +source arch/avr32/Kconfig +source arch/blackfin/Kconfig +source arch/m68k/Kconfig +source arch/microblaze/Kconfig +source arch/mips/Kconfig +source arch/nds32/Kconfig +source arch/nios2/Kconfig +source arch/openrisc/Kconfig +source arch/powerpc/Kconfig +source arch/sandbox/Kconfig +source arch/sh/Kconfig +source arch/sparc/Kconfig +source arch/x86/Kconfig -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 07/15] Do not apply: tools: add gen_maintainers.py
Do not apply this patch to the main line This tool generates MAINTAINERS files based on boards.cfg file. Because it is used only once, it should not be applied. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- Changes in v4: - Newly added Changes in v3: None Changes in v2: None tools/gen_maintainers.py | 117 +++ 1 file changed, 117 insertions(+) create mode 100755 tools/gen_maintainers.py diff --git a/tools/gen_maintainers.py b/tools/gen_maintainers.py new file mode 100755 index 000..c448402 --- /dev/null +++ b/tools/gen_maintainers.py @@ -0,0 +1,117 @@ +#!/usr/bin/env python + +import os +import sys +import subprocess + +INPUT_FILE = 'boards.cfg' + +def get_board_name(board, target): +board = board.upper() +target = target.upper() +if board == 'none': +return target +elif board == target[:len(board)]: +return board +else: +print other cases:, board, ':', target +return target + +def get_status(status): +if status == 'Active': +return 'Maintained' +elif status == 'Orphan': +return 'Orphan (since %s)' % orphaned_date +else: +print 'Error: %s: unknown status' % status +sys.exit(1) + +class Board: +def __init__(self, name, status, files, maintainers): +self.name = name +self.status = status +self.files = files +self.maintainers = maintainers +def append(self, files): +self.files += files + +# remove old MAINTAINERS files +subprocess.call(find board -name MAINTAINERS | xargs -r rm, shell=True) + +# store all the boards in this dictionary +all_boards = {} + +for line in open(INPUT_FILE): +if line[0] == '#' or line == '\n': +if line == '# The following were moved to Orphan in June, 2014\n': +orphaned_date = '2014-06' +elif line == '# The following were moved to Orphan in April, 2014\n': +orphaned_date = '2014-04' +elif line == '# The following were moved to Orphan in March, 2014\n': +orphaned_date = '2014-03' +elif line == '# The following were move to Orphan in September, 2013\n': +orphaned_date = '2013-09' +continue +(status, arch, cpu, soc, vendor, board, target, options, maintainers) = \ + line.rstrip().split(None, 8) +status = get_status(status) +if options == '-': +config = target +else: +config = options.split(':')[0] +# path of MAINTAINERS file: board/path/MAINTAINERS +if board == '-': +path = vendor +elif vendor == '-': +path = board +else: +path = os.path.join(vendor, board) +#name = get_board_name(board, target) +if board == '-': +files = [] +elif vendor == '-': +files = [ 'board/' + board + '/' ] +else: +files = [ 'board/' + vendor + '/' + board + '/' ] +files.append('include/configs/' + config + '.h') +files.append('configs/' + target + '_defconfig') +# On the first occurance of this MAINTAINERS path, add an empty list +if not path in all_boards: +all_boards[path] = [] +# boards_list is the list of boards that share the same MAINTAINERS file +boards_list = all_boards[path] +for b in boards_list: +remove_list = [] +for f in files: +if f in b.files: +remove_list.append(f) +for f in remove_list: +files.remove(f) +i = 0 +for b in boards_list: +if status == b.status and maintainers == b.maintainers: +b.append(files) +break +i += 1 +else: +if i == 0: +name = board.upper() +else: +name = target.upper() +boards_list.append(Board(name, status, files, maintainers)) + +for path, boards_list in all_boards.items(): +path = os.path.join('board', path, 'MAINTAINERS') +wfile = open(path, 'w') +first_loop = True +for b in boards_list: +if first_loop: +first_loop = False +else: +wfile.write('\n') +wfile.write(b.name.upper() + ' BOARD\n') +for maintainer in b.maintainers.split(':'): +wfile.write('M:\t%s\n' % maintainer) +wfile.write('S:\t%s\n' % b.status) +for file in b.files: +wfile.write('F:\t%s\n' % file) -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 06/15] kconfig: switch to Kconfig
This commit enables Kconfig. Going forward, we use Kconfig for the board configuration. mkconfig will never be used. Nor will include/config.mk be generated. Kconfig must be adjusted for U-Boot because our situation is a little more complicated than Linux Kernel. We have to generate multiple boot images (Normal, SPL, TPL) from one source tree. Each image needs its own configuration input. Usage: Run make board_defconfig to do the board configuration. It will create .config file and additionally spl/.config, tpl/.config if SPL, TPL is enabled respectively. You can use make config, make menuconfig etc. to create a new .config or modify the existing one. Use make spl:config, make spl:menuconfig etc. for spl/.config and do likewise for tpl/.config file. The generic syntax of configuration targets for SPL, TPL is: target_image:config_command When the configuration is done, run make. (Or make board_defconfig all will do the configuration and build in one time.) For futher information of how Kconfig in U-Boot works, please read the comment block of scripts/multiconfig.py. By the way, there is another item worth remarking here: coexistence of Kconfig and board herder files. Prior to Kconfig, we used C headers to define a set of configs. We expect a very long term to migrate from C headers to Kconfig. Two different infractructure must coexist in the interim. In our former configuration scheme, include/autoconf.mk was generated for use in makefiles. It is still generated under include/, spl/include/, tpl/include/ directory for the Normal, SPL, TPL image, respectively. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- Changes in v4: - Have one defconfig file for each board by supporting conditional definition in defconfig - Put adjustment code into scripts/multiconfig.py Changes in v3: - Invoke SPL/TPL configuration only for defconfig and silentoldconfig Changes in v2: - Put dirty build rule into scripts/multiple_config.sh and scripts/Makefile.autoconf - Fix dependency tracking. In v1, any change to Kconfig triggered re-complile of all objects. In this version, re-compile is kept at a minimum. - Fix a clean-source check In v1, clean source tree check did not work correctly for out-of-tree build. .gitignore| 2 - Makefile | 116 +-- arch/m68k/cpu/mcf52x2/config.mk | 16 +- arch/m68k/cpu/mcf532x/config.mk | 6 +- arch/m68k/cpu/mcf5445x/config.mk | 4 +- arch/powerpc/cpu/ppc4xx/config.mk | 4 +- config.mk | 10 + include/.gitignore| 1 - scripts/Makefile | 2 +- scripts/Makefile.autoconf | 100 ++ scripts/Makefile.build| 31 ++- scripts/Makefile.spl | 31 +-- scripts/basic/fixdep.c| 6 +- scripts/kconfig/confdata.c| 8 + scripts/multiconfig.py| 406 ++ tools/Makefile| 2 +- tools/env/Makefile| 2 +- 17 files changed, 615 insertions(+), 132 deletions(-) create mode 100644 scripts/Makefile.autoconf create mode 100755 scripts/multiconfig.py diff --git a/.gitignore b/.gitignore index 2ddf57f..3b32485 100644 --- a/.gitignore +++ b/.gitignore @@ -57,8 +57,6 @@ # /include/config/ /include/generated/ -/include/spl-autoconf.mk -/include/tpl-autoconf.mk # stgit generated dirs patches-* diff --git a/Makefile b/Makefile index 5277781..c7bca84 100644 --- a/Makefile +++ b/Makefile @@ -166,9 +166,6 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) export srctree objtree VPATH -MKCONFIG := $(srctree)/mkconfig -export MKCONFIG - # Make sure CDPATH settings don't interfere unexport CDPATH @@ -189,9 +186,6 @@ HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \ export HOSTARCH HOSTOS -# Deal with colliding definitions from tcsh etc. -VENDOR= - # # set default to nothing for native builds @@ -199,6 +193,9 @@ ifeq ($(HOSTARCH),$(ARCH)) CROSS_COMPILE ?= endif +KCONFIG_CONFIG ?= .config +export KCONFIG_CONFIG + # SHELL used by kbuild CONFIG_SHELL := $(shell if [ -x $$BASH ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ @@ -341,6 +338,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP= $(CROSS_COMPILE)objdump AWK= awk PERL = perl +PYTHON = python DTC= dtc CHECK = sparse @@ -362,7 +360,7 @@ export VERSION PATCHLEVEL SUBLEVEL UBOOTRELEASE UBOOTVERSION export ARCH CPU BOARD VENDOR SOC CPUDIR BOARDDIR export CONFIG_SHELL HOSTCC HOSTCFLAGS HOSTLDFLAGS CROSS_COMPILE AS LD CC export CPP AR NM LDR STRIP OBJCOPY OBJDUMP -export MAKE AWK PERL +export MAKE AWK PERL PYTHON export HOSTCXX HOSTCXXFLAGS DTC CHECK CHECKFLAGS export
[U-Boot] [PATCH v4 14/15] powerpc: remove redundant CPU definition
CONFIG_${CPU} is defined by Kconfig. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- Changes in v4: - Newly added Changes in v3: None Changes in v2: None arch/powerpc/cpu/74xx_7xx/config.mk | 2 +- arch/powerpc/cpu/mpc512x/config.mk | 2 +- arch/powerpc/cpu/mpc5xx/config.mk | 2 +- arch/powerpc/cpu/mpc5xxx/config.mk | 3 +-- arch/powerpc/cpu/mpc824x/config.mk | 2 +- arch/powerpc/cpu/mpc8260/config.mk | 2 +- arch/powerpc/cpu/mpc83xx/config.mk | 2 +- arch/powerpc/cpu/mpc85xx/config.mk | 2 +- arch/powerpc/cpu/mpc86xx/config.mk | 2 +- arch/powerpc/cpu/mpc8xx/config.mk | 2 +- arch/powerpc/cpu/ppc4xx/config.mk | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/cpu/74xx_7xx/config.mk b/arch/powerpc/cpu/74xx_7xx/config.mk index 96812a0..4cd1a26 100644 --- a/arch/powerpc/cpu/74xx_7xx/config.mk +++ b/arch/powerpc/cpu/74xx_7xx/config.mk @@ -5,4 +5,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_74xx_7xx -mstring +PLATFORM_CPPFLAGS += -mstring diff --git a/arch/powerpc/cpu/mpc512x/config.mk b/arch/powerpc/cpu/mpc512x/config.mk index 03759e6..5bf1b2a 100644 --- a/arch/powerpc/cpu/mpc512x/config.mk +++ b/arch/powerpc/cpu/mpc512x/config.mk @@ -4,4 +4,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 -msoft-float -mcpu=603e +PLATFORM_CPPFLAGS += -DCONFIG_E300 -msoft-float -mcpu=603e diff --git a/arch/powerpc/cpu/mpc5xx/config.mk b/arch/powerpc/cpu/mpc5xx/config.mk index 31e2dc9..dd2ec37 100644 --- a/arch/powerpc/cpu/mpc5xx/config.mk +++ b/arch/powerpc/cpu/mpc5xx/config.mk @@ -5,4 +5,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_5xx -mpowerpc -msoft-float +PLATFORM_CPPFLAGS += -mpowerpc -msoft-float diff --git a/arch/powerpc/cpu/mpc5xxx/config.mk b/arch/powerpc/cpu/mpc5xxx/config.mk index 3384f6f..bcff214 100644 --- a/arch/powerpc/cpu/mpc5xxx/config.mk +++ b/arch/powerpc/cpu/mpc5xxx/config.mk @@ -5,5 +5,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx \ --mstring -mcpu=603e -mmultiple +PLATFORM_CPPFLAGS += -mstring -mcpu=603e -mmultiple diff --git a/arch/powerpc/cpu/mpc824x/config.mk b/arch/powerpc/cpu/mpc824x/config.mk index a224bc8..ecfb07e 100644 --- a/arch/powerpc/cpu/mpc824x/config.mk +++ b/arch/powerpc/cpu/mpc824x/config.mk @@ -5,4 +5,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -mstring -mcpu=603e -msoft-float +PLATFORM_CPPFLAGS += -mstring -mcpu=603e -msoft-float diff --git a/arch/powerpc/cpu/mpc8260/config.mk b/arch/powerpc/cpu/mpc8260/config.mk index 59f152d..6a1b6e3 100644 --- a/arch/powerpc/cpu/mpc8260/config.mk +++ b/arch/powerpc/cpu/mpc8260/config.mk @@ -5,5 +5,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_MPC8260 -DCONFIG_CPM2 \ +PLATFORM_CPPFLAGS += -DCONFIG_CPM2 \ -mstring -mcpu=603e -mmultiple diff --git a/arch/powerpc/cpu/mpc83xx/config.mk b/arch/powerpc/cpu/mpc83xx/config.mk index dfce4d5..0c08350 100644 --- a/arch/powerpc/cpu/mpc83xx/config.mk +++ b/arch/powerpc/cpu/mpc83xx/config.mk @@ -4,4 +4,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_MPC83xx -DCONFIG_E300 -msoft-float +PLATFORM_CPPFLAGS += -DCONFIG_E300 -msoft-float diff --git a/arch/powerpc/cpu/mpc85xx/config.mk b/arch/powerpc/cpu/mpc85xx/config.mk index 1470f95..72c964c 100644 --- a/arch/powerpc/cpu/mpc85xx/config.mk +++ b/arch/powerpc/cpu/mpc85xx/config.mk @@ -5,7 +5,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx -Wa,-me500 -msoft-float -mno-string +PLATFORM_CPPFLAGS += -Wa,-me500 -msoft-float -mno-string # -mspe=yes is needed to have -mno-spe accepted by a buggy GCC; # see [PATCH,rs6000] make -mno-spe work as expected on diff --git a/arch/powerpc/cpu/mpc86xx/config.mk b/arch/powerpc/cpu/mpc86xx/config.mk index 4c7235f..69a0b96 100644 --- a/arch/powerpc/cpu/mpc86xx/config.mk +++ b/arch/powerpc/cpu/mpc86xx/config.mk @@ -5,4 +5,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_MPC86xx -mstring -maltivec -mabi=altivec -msoft-float +PLATFORM_CPPFLAGS += -mstring -maltivec -mabi=altivec -msoft-float diff --git a/arch/powerpc/cpu/mpc8xx/config.mk b/arch/powerpc/cpu/mpc8xx/config.mk index ee2c883..485e43d 100644 --- a/arch/powerpc/cpu/mpc8xx/config.mk +++ b/arch/powerpc/cpu/mpc8xx/config.mk @@ -5,4 +5,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_8xx -mstring -mcpu=860 -msoft-float +PLATFORM_CPPFLAGS += -mstring -mcpu=860 -msoft-float diff --git a/arch/powerpc/cpu/ppc4xx/config.mk b/arch/powerpc/cpu/ppc4xx/config.mk index a7253b2..f87c9dc 100644 --- a/arch/powerpc/cpu/ppc4xx/config.mk +++ b/arch/powerpc/cpu/ppc4xx/config.mk @@ -5,7 +5,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -PLATFORM_CPPFLAGS += -DCONFIG_4xx -mstring
[U-Boot] [PATCH v4 02/15] Do not apply: tools: add genkconfig
Do not apply this patch to the main line What is this tool? -- This tool converts boards.cfg to defconfig and Kconfig files. It automatically generates - arch/${ARCH}/Kconfig - board/${VENDOR}/${BOARD}/Kconfig - board/${BOARD}/Kconfig - configs/${TARGET_BOARD}_defconfig How to use? --- Open tools/print_allconfigs with an editor. Adjust cross compilers part for your environment. # Specify your favoriate cross tools CROSS_COMPILE_ARC=arc-linux- CROSS_COMPILE_AARCH64=aarch64-linux-gnu- CROSS_COMPILE_ARM=arm-unknown-linux-gnueabi- [snip] CROSS_COMPILE_X86=i386-linux- And then, run tools/genkconfig. Why is this patch here? --- The file boards.cfg is touched very frequently. All the time, new/old boards are being added/removed. The next commit was generated based on the u-boot/master at the time I posted it. It will become out-dated soon. You can update it with this tool. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- Changes in v4: - Remove debug code - Do not specify CONFIG_SYS_CPU if the cpu field of boards.cfg is '-' - Adjust to the current boards.cfg fields spec. - Add select CPU to PowerPC Kconfig - Generate only one defconfig per board Changes in v3: - Create SPL defconfig into configs/board_spl_defconfig instead of conigs/spl/board_defconfig. Like the same for TPL. Because I want to handle Falcon boot more genericlly. If you build only configs/board_spl_defconfig, it is Falcon boot. - Create board select menu based on the 8th field of boards.cfg. It is common that many entries (= 7th field) share the same config header. So this change help to reduce the code redandancy. Changes in v2: - Do not output CONFIG_BOARD_MAINTAINERS and CONFIG_BOARD_STATUS - Delete board/Kconfig and move source board/*/*/Kconfig statements to arch/*/Kconfig. tools/genkconfig | 333 + tools/print_allconfigs | 77 2 files changed, 410 insertions(+) create mode 100755 tools/genkconfig create mode 100755 tools/print_allconfigs diff --git a/tools/genkconfig b/tools/genkconfig new file mode 100755 index 000..281e3e2 --- /dev/null +++ b/tools/genkconfig @@ -0,0 +1,333 @@ +#!/bin/bash + +set -e + +rm -rf configs +mkdir configs +find board -name Kconfig | xargs rm -f + +get_arch() +{ + case $arch in + powerpc) echo PPC;; + *) echo ${1^^};; + esac +} + +arch_list=arc arm avr32 blackfin m68k microblaze mips nds32 nios2 openrisc powerpc sandbox sh sparc x86 + +for arch in $arch_list +do + ARCH=$(get_arch $arch) + + case $arch in + blackfin) menu=Blackfin;; + m68k) menu=M68000;; + microblaze) menu=MicroBlaze;; + nios2) menu=Nios II;; + openrisc) menu=OpenRISC;; + powerpc) menu=PowerPC;; + sandbox) menu=Sandbox;; + sh) menu=SuperH;; + x86) menu=x86;; + *) menu=${arch^^};; + esac + +cat EOF arch/$arch/Kconfig +menu $menu architecture + depends on $ARCH + +config SYS_ARCH + string + default $arch + +EOF + +if [ $arch = powerpc ]; then +cat EOF arch/$arch/Kconfig +config SYS_CPU + string + default 74xx_7xx if 74xx_7xx + default mpc512x if MPC512X + default mpc5xx if 5xx + default mpc5xxx if MPC5xxx + default mpc824x if MPC824X + default mpc8260 if MPC8260 + default mpc83xx if MPC83xx + default mpc85xx if MPC85xx + default mpc86xx if MPC86xx + default mpc8xx if 8xx + default ppc4xx if 4xx + +config 74xx_7xx + bool + +config MPC512X + bool + +config 5xx + bool + +config MPC5xxx + bool + +config MPC824X + bool + +config MPC8260 + bool + +config MPC83xx + bool + +config MPC85xx + bool + +config MPC86xx + bool + +config 8xx + bool + +config 4xx + bool + +EOF +fi + +if [ $arch = sandbox ]; then +cat EOF arch/$arch/Kconfig +config SYS_BOARD + string + default $arch + +config SYS_CONFIG_NAME + string + default $arch +EOF +else +cat EOF arch/$arch/Kconfig +choice + prompt Target select + +EOF +fi + +done + +get_ppc_cpu () +{ + case $1 in + 74xx_7xx) echo 74xx_7xx;; + mpc512x) echo MPC512X;; + mpc5xx) echo 5xx;; + mpc5xxx) echo MPC5xxx;; + mpc824x) echo MPC824X;; + mpc8260) echo MPC8260;; + mpc83xx) echo MPC83xx;; + mpc85xx) echo MPC85xx;; + mpc86xx) echo MPC86xx;; + mpc8xx) echo 8xx;; + ppc4xx) echo 4xx;; + *) echo 2 Unkown PPC CPU $1; exit 1;; + esac +} + +write_defconfig() { + + if [
[U-Boot] [PATCH v4 13/15] kconfig: delete redundant CONFIG_${ARCH} definition
CONFIG_${ARCH} is defined by Kconfig. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Reviewed-by: Simon Glass s...@chromium.org --- Changes in v4: - Rebase on the current u-boot/master Changes in v3: None Changes in v2: None arch/arc/config.mk | 2 +- arch/arm/config.mk | 2 +- arch/avr32/config.mk | 1 - arch/blackfin/config.mk | 1 - arch/m68k/config.mk | 2 +- arch/mips/config.mk | 2 +- arch/nds32/config.mk | 2 +- arch/nios2/config.mk | 2 +- arch/openrisc/config.mk | 2 +- arch/powerpc/config.mk | 2 +- arch/sandbox/config.mk | 2 +- arch/sparc/config.mk | 2 +- arch/x86/cpu/config.mk | 2 +- include/configs/microblaze-generic.h | 1 - 14 files changed, 11 insertions(+), 14 deletions(-) diff --git a/arch/arc/config.mk b/arch/arc/config.mk index a3b8df7..e408800 100644 --- a/arch/arc/config.mk +++ b/arch/arc/config.mk @@ -21,7 +21,7 @@ ifeq ($(CROSS_COMPILE),) CROSS_COMPILE := $(ARC_CROSS_COMPILE) endif -PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -DCONFIG_ARC -gdwarf-2 +PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -gdwarf-2 # Needed for relocation LDFLAGS_FINAL += -pie diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 5fa1825..9b414c2 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -22,7 +22,7 @@ PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \ # Support generic board on ARM __HAVE_ARCH_GENERIC_BOARD := y -PLATFORM_CPPFLAGS += -DCONFIG_ARM -D__ARM__ +PLATFORM_CPPFLAGS += -D__ARM__ # Choose between ARM/Thumb instruction sets ifeq ($(CONFIG_SYS_THUMB_BUILD),y) diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk index 28a371c..469185e 100644 --- a/arch/avr32/config.mk +++ b/arch/avr32/config.mk @@ -9,7 +9,6 @@ ifeq ($(CROSS_COMPILE),) CROSS_COMPILE := avr32-linux- endif -PLATFORM_CPPFLAGS += -DCONFIG_AVR32 CONFIG_STANDALONE_LOAD_ADDR ?= 0x PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index fcaa44f..7b17b75 100644 --- a/arch/blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -21,7 +21,6 @@ endif CONFIG_BFIN_BOOT_MODE := $(strip $(CONFIG_BFIN_BOOT_MODE:%=%)) PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic -PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN LDFLAGS_FINAL += --gc-sections LDFLAGS += -m elf32bfin diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk index 33b3d51..3b3a7e8 100644 --- a/arch/m68k/config.mk +++ b/arch/m68k/config.mk @@ -11,7 +11,7 @@ endif CONFIG_STANDALONE_LOAD_ADDR ?= 0x2 -PLATFORM_CPPFLAGS += -DCONFIG_M68K -D__M68K__ +PLATFORM_CPPFLAGS += -D__M68K__ PLATFORM_LDFLAGS += -n PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_RELFLAGS += -ffixed-d7 -msep-data diff --git a/arch/mips/config.mk b/arch/mips/config.mk index f4a234a..a2d07af 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -25,7 +25,7 @@ endif # Default to EB if no endianess is configured ENDIANNESS ?= -EB -PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__ +PLATFORM_CPPFLAGS += -D__MIPS__ __HAVE_ARCH_GENERIC_BOARD := y diff --git a/arch/nds32/config.mk b/arch/nds32/config.mk index 1024852..5ac9f90 100644 --- a/arch/nds32/config.mk +++ b/arch/nds32/config.mk @@ -17,6 +17,6 @@ CONFIG_STANDALONE_LOAD_ADDR = 0x30 \ PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -mrelax PLATFORM_RELFLAGS += -gdwarf-2 -PLATFORM_CPPFLAGS += -DCONFIG_NDS32 -D__nds32__ -G0 -ffixed-10 -fpie +PLATFORM_CPPFLAGS += -D__nds32__ -G0 -ffixed-10 -fpie LDFLAGS_u-boot = --gc-sections --relax diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk index 65a5a40..82bd887 100644 --- a/arch/nios2/config.mk +++ b/arch/nios2/config.mk @@ -12,7 +12,7 @@ endif CONFIG_STANDALONE_LOAD_ADDR ?= 0x0200 -PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__ +PLATFORM_CPPFLAGS += -D__NIOS2__ PLATFORM_CPPFLAGS += -G0 LDFLAGS_FINAL += --gc-sections diff --git a/arch/openrisc/config.mk b/arch/openrisc/config.mk index 9902b9a..cd95f24 100644 --- a/arch/openrisc/config.mk +++ b/arch/openrisc/config.mk @@ -11,6 +11,6 @@ endif # r10 used for global object pointer, already set in OR32 GCC but just to be # clear -PLATFORM_CPPFLAGS += -DCONFIG_OPENRISC -D__OR1K__ -ffixed-r10 +PLATFORM_CPPFLAGS += -D__OR1K__ -ffixed-r10 CONFIG_STANDALONE_LOAD_ADDR ?= 0x4 diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index fb7096e..6329b6c 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -13,7 +13,7 @@ CONFIG_STANDALONE_LOAD_ADDR ?= 0x4 LDFLAGS_FINAL += --gc-sections PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections \ -meabi -PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ -ffixed-r2
Re: [U-Boot] [PATCH v2 1/1] ARM: kirkwood: add mvsdio driver
Hi Gerald, On Jul 20, 2014, at 9:28 AM, Gerald Kerma wrote: This patch add Marvell kirkwood MVSDIO/MMC driver and enable it for Sheevaplugs and OpenRD boards. - Fix some typo and missing lines from patch import Signed-off-by: Gerald Kerma drea...@doukki.net --- arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 58 arch/arm/include/asm/arch-kirkwood/config.h| 2 + arch/arm/include/asm/arch-kirkwood/cpu.h | 2 + arch/arm/include/asm/arch-kirkwood/kirkwood.h | 24 ++ arch/arm/include/asm/arch-kirkwood/kw88f6282.h | 33 ++ board/Marvell/openrd/openrd.c | 11 + board/Marvell/sheevaplug/sheevaplug.c | 11 + drivers/mmc/Makefile | 1 + drivers/mmc/mrvl_mmc.c | 463 + include/configs/openrd.h | 8 + include/configs/sheevaplug.h | 19 +- include/mrvl_mmc.h | 290 12 files changed, 920 insertions(+), 2 deletions(-) create mode 100644 arch/arm/include/asm/arch-kirkwood/kw88f6282.h create mode 100644 drivers/mmc/mrvl_mmc.c create mode 100644 include/mrvl_mmc.h diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index da80240..472aa8a 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -333,6 +333,64 @@ int arch_cpu_init(void) } #endif /* CONFIG_ARCH_CPU_INIT */ +/* + * General + / +#if defined(CONFIG_ARCH_DEV_ID) + +void kirkwood_pcie_id(u32 *dev, u32 *rev) +{ + *dev = (readl(KW_REG_PCIE_DEVID) 16) 0x; + *rev = readl(KW_REG_PCIE_REVID) 0xff; +} + +/* + * Identify device ID and revision. + */ +char *kirkwood_id(void) +{ + u32 dev, rev; + + kirkwood_pcie_id(dev, rev); + + if (dev == MV88F6281_DEV_ID) { + if (rev == MV88F6281_REV_Z0) + return MV88F6281-Z0; + else if (rev == MV88F6281_REV_A0) + return MV88F6281-A0; + else if (rev == MV88F6281_REV_A1) + return MV88F6281-A1; + else + return MV88F6281-Rev-Unsupported; + } else if (dev == MV88F6192_DEV_ID) { + if (rev == MV88F6192_REV_Z0) + return MV88F6192-Z0; + else if (rev == MV88F6192_REV_A0) + return MV88F6192-A0; + else if (rev == MV88F6192_REV_A1) + return MV88F6192-A1; + else + return MV88F6192-Rev-Unsupported; + } else if (dev == MV88F6180_DEV_ID) { + if (rev == MV88F6180_REV_A0) + return MV88F6180-Rev-A0; + else if (rev == MV88F6180_REV_A1) + return MV88F6180-Rev-A1; + else + return MV88F6180-Rev-Unsupported; + } else if (dev == MV88F6282_DEV_ID) { + if (rev == MV88F6282_REV_A0) + return MV88F6282-Rev-A0; + else if (rev == MV88F6282_REV_A1) + return MV88F6282-Rev-A1; + else + return MV88F6282-Rev-Unsupported; + } else { + return Device-Unknown; + } +} +#endif /* CONFIG_ARCH_DEV_ID */ + /* * SOC specific misc init */ diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h index 7a688e4..a0563a3 100644 --- a/arch/arm/include/asm/arch-kirkwood/config.h +++ b/arch/arm/include/asm/arch-kirkwood/config.h @@ -19,6 +19,8 @@ #include asm/arch/kw88f6281.h #elif defined (CONFIG_KW88F6192) #include asm/arch/kw88f6192.h +#elif defined(CONFIG_KW88F6182) +#include asm/arch/kw88f6182.h #else #error SOC Name not defined #endif /* CONFIG_KW88F6281 */ diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h index 97daa40..e7b6448 100644 --- a/arch/arm/include/asm/arch-kirkwood/cpu.h +++ b/arch/arm/include/asm/arch-kirkwood/cpu.h @@ -151,5 +151,7 @@ int kw_config_mpp(unsigned int mpp0_7, unsigned int mpp8_15, unsigned int mpp32_39, unsigned int mpp40_47, unsigned int mpp48_55); unsigned int kw_winctrl_calcsize(unsigned int sizeval); +void kirkwood_pcie_id(u32 *dev, u32 *rev); +char *kirkwood_id(void); #endif /* __ASSEMBLY__ */ #endif /* _KWCPU_H */ diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h index bc207f5..489517f 100644 --- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h +++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h @@ -39,6 +39,7 @@ #define KW_EGIGA0_BASE(KW_REGISTER(0x72000)) #define KW_EGIGA1_BASE
Re: [U-Boot] [PATCH] doc: README.android-fastboot: Add note about vendor ID
On Tue, Jul 22, 2014 at 10:23 AM, Clifton Barnes cabar...@indesign-llc.com wrote: The Android fastboot client only communicates with specific vendor IDs. This addition to the documentation points out that fact so everyone is aware that not just any vendor ID will work and where to find the IDs that will. Signed-off-by: Clifton Barnes cabar...@indesign-llc.com Cc: Rob Herring r...@kernel.org Acked-by: Rob Herring r...@kernel.org Rob --- doc/README.android-fastboot |4 1 file changed, 4 insertions(+) diff --git a/doc/README.android-fastboot b/doc/README.android-fastboot index f1d128c..4045727 100644 --- a/doc/README.android-fastboot +++ b/doc/README.android-fastboot @@ -38,6 +38,10 @@ CONFIG_G_DNL_VENDOR_NUM CONFIG_G_DNL_PRODUCT_NUM CONFIG_G_DNL_MANUFACTURER +NOTE: The CONFIG_G_DNL_VENDOR_NUM must be one of the numbers supported by +the fastboot client. The list of vendor IDs supported can be found in the +fastboot client source code (fastboot.c) mentioned above. + The fastboot function is enabled by defining CONFIG_CMD_FASTBOOT and CONFIG_ANDROID_BOOT_IMAGE. -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] doc: README.android-fastboot: Add note about vendor ID
The Android fastboot client only communicates with specific vendor IDs. This addition to the documentation points out that fact so everyone is aware that not just any vendor ID will work and where to find the IDs that will. Signed-off-by: Clifton Barnes cabar...@indesign-llc.com Cc: Rob Herring r...@kernel.org --- doc/README.android-fastboot |4 1 file changed, 4 insertions(+) diff --git a/doc/README.android-fastboot b/doc/README.android-fastboot index f1d128c..4045727 100644 --- a/doc/README.android-fastboot +++ b/doc/README.android-fastboot @@ -38,6 +38,10 @@ CONFIG_G_DNL_VENDOR_NUM CONFIG_G_DNL_PRODUCT_NUM CONFIG_G_DNL_MANUFACTURER +NOTE: The CONFIG_G_DNL_VENDOR_NUM must be one of the numbers supported by +the fastboot client. The list of vendor IDs supported can be found in the +fastboot client source code (fastboot.c) mentioned above. + The fastboot function is enabled by defining CONFIG_CMD_FASTBOOT and CONFIG_ANDROID_BOOT_IMAGE. -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 1/1] ARM: kirkwood: add mvsdio driver
This patch add Marvell kirkwood MVSDIO/MMC driver and enable it for Sheevaplugs and OpenRD boards. Signed-off-by: Gerald Kerma drea...@doukki.net --- Changes in v3: - Add MVSDIO_TWEAK_NOSDHS quirk - Minor clean Changes in v2: - Fix some typo and missing lines from patch import arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 58 arch/arm/include/asm/arch-kirkwood/config.h| 2 + arch/arm/include/asm/arch-kirkwood/cpu.h | 2 + arch/arm/include/asm/arch-kirkwood/kirkwood.h | 24 ++ arch/arm/include/asm/arch-kirkwood/kw88f6282.h | 33 ++ board/Marvell/openrd/openrd.c | 11 + board/Marvell/sheevaplug/sheevaplug.c | 11 + drivers/mmc/Makefile | 1 + drivers/mmc/mrvl_mmc.c | 461 + include/configs/openrd.h | 8 + include/configs/sheevaplug.h | 19 +- include/mrvl_mmc.h | 290 12 files changed, 918 insertions(+), 2 deletions(-) create mode 100644 arch/arm/include/asm/arch-kirkwood/kw88f6282.h create mode 100644 drivers/mmc/mrvl_mmc.c create mode 100644 include/mrvl_mmc.h diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index d4711c0..a6e18ff 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -334,6 +334,64 @@ int arch_cpu_init(void) } #endif /* CONFIG_ARCH_CPU_INIT */ +/* + * General + / +#if defined(CONFIG_ARCH_DEV_ID) + +void kirkwood_pcie_id(u32 *dev, u32 *rev) +{ + *dev = (readl(KW_REG_PCIE_DEVID) 16) 0x; + *rev = readl(KW_REG_PCIE_REVID) 0xff; +} + +/* + * Identify device ID and revision. + */ +char *kirkwood_id(void) +{ + u32 dev, rev; + + kirkwood_pcie_id(dev, rev); + + if (dev == MV88F6281_DEV_ID) { + if (rev == MV88F6281_REV_Z0) + return MV88F6281-Z0; + else if (rev == MV88F6281_REV_A0) + return MV88F6281-A0; + else if (rev == MV88F6281_REV_A1) + return MV88F6281-A1; + else + return MV88F6281-Rev-Unsupported; + } else if (dev == MV88F6192_DEV_ID) { + if (rev == MV88F6192_REV_Z0) + return MV88F6192-Z0; + else if (rev == MV88F6192_REV_A0) + return MV88F6192-A0; + else if (rev == MV88F6192_REV_A1) + return MV88F6192-A1; + else + return MV88F6192-Rev-Unsupported; + } else if (dev == MV88F6180_DEV_ID) { + if (rev == MV88F6180_REV_A0) + return MV88F6180-Rev-A0; + else if (rev == MV88F6180_REV_A1) + return MV88F6180-Rev-A1; + else + return MV88F6180-Rev-Unsupported; + } else if (dev == MV88F6282_DEV_ID) { + if (rev == MV88F6282_REV_A0) + return MV88F6282-Rev-A0; + else if (rev == MV88F6282_REV_A1) + return MV88F6282-Rev-A1; + else + return MV88F6282-Rev-Unsupported; + } else { + return Device-Unknown; + } +} +#endif /* CONFIG_ARCH_DEV_ID */ + /* * SOC specific misc init */ diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h index 7a688e4..a0563a3 100644 --- a/arch/arm/include/asm/arch-kirkwood/config.h +++ b/arch/arm/include/asm/arch-kirkwood/config.h @@ -19,6 +19,8 @@ #include asm/arch/kw88f6281.h #elif defined (CONFIG_KW88F6192) #include asm/arch/kw88f6192.h +#elif defined(CONFIG_KW88F6182) +#include asm/arch/kw88f6182.h #else #error SOC Name not defined #endif /* CONFIG_KW88F6281 */ diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h index 97daa40..e7b6448 100644 --- a/arch/arm/include/asm/arch-kirkwood/cpu.h +++ b/arch/arm/include/asm/arch-kirkwood/cpu.h @@ -151,5 +151,7 @@ int kw_config_mpp(unsigned int mpp0_7, unsigned int mpp8_15, unsigned int mpp32_39, unsigned int mpp40_47, unsigned int mpp48_55); unsigned int kw_winctrl_calcsize(unsigned int sizeval); +void kirkwood_pcie_id(u32 *dev, u32 *rev); +char *kirkwood_id(void); #endif /* __ASSEMBLY__ */ #endif /* _KWCPU_H */ diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h index bc207f5..489517f 100644 --- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h +++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h @@ -39,6 +39,7 @@ #define KW_EGIGA0_BASE (KW_REGISTER(0x72000)) #define KW_EGIGA1_BASE
Re: [U-Boot] [PATCH] dfu: fix: Add the absolute path to the file name for ext4 write operation
On Tuesday, July 22, 2014 at 10:00:05 AM, Lukasz Majewski wrote: Hi Stephen, On 07/16/2014 03:38 AM, Lukasz Majewski wrote: Commit 1151b7ac10b81ecbb has cleaned up read and write operations. Unfortunately, for correct operation the write for ext4 fs requires absolute patch. This patch fixes this case. Shouldn't the user simply supply the absolute patch name as the entity name? That's what I've been doing. This way, it makes files in sub-directories look more natural; you'd pass in e.g. /boot/zImage rather than boot/zImage, which looks like a relative path. Hmm.. this is the angle from which I didn't look. Thanks for the tip. I will adjust envs accordingly. Please discard this patch. Done. Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] h2200: Disable SHA256 on FIT images
On Tue, Jul 22, 2014 at 08:12:50AM -0400, Tom Rini wrote: This board is close in binary size to one of its hard limits, so disable SHA256 FIT image support to gain some breathing room. Signed-off-by: Tom Rini tr...@ti.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,1/2] sparc: merge LEON3 linker scripts
On Fri, Jun 20, 2014 at 02:58:21PM +0900, Masahiro Yamada wrote: The linker scripts of LEON3 - board/gaisler/grsim/u-boot.lds - board/gaisler/gr_cpci_ax2000/u-boot.lds - board/gaisler/gr_ep2s60/u-boot.lds - board/gaisler/gr_xc3s_1500/u-boot.lds are the same (except cosmetic differences such as indentation). This commit merges them into arch/sparc/cpu/leon3/u-boot.lds. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Daniel Hellstrom dan...@gaisler.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] boards.cfg: re-claim ownership for TQM8xx boards
On Tue, Jul 22, 2014 at 02:20:43PM +0200, Wolfgang Denk wrote: Signed-off-by: Wolfgang Denk w...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 2/2] sparc: merge LEON2 and LEON3 linker scripts
On Fri, Jun 20, 2014 at 02:58:22PM +0900, Masahiro Yamada wrote: There is only one line diff between LEON2 and LEON3 linker scripts: - arch/sparc/cpu/leon2/start.o (.text) + arch/sparc/cpu/leon3/start.o (.text) They can be written in the same way: */start.o (.text) So, board/gaisler/grsim_leon2/u-boot.lds and arch/sparc/cpu/leon3/u-boot.lds can be merged into arch/sparc/cpu/u-boot.lds. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Daniel Hellstrom dan...@gaisler.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] tools: compiler.h: add missing time.h
On Wed, Jun 25, 2014 at 11:02:21PM +0200, Jeroen Hofstee wrote: genimg_print_time uses time_t, but time.h is never included. Linux gets away with this since types.h includes time.h. Explicitly include the header file so building on e.g. FreeBSD also works. cc: Tom Rini tr...@ti.com Signed-off-by: Jeroen Hofstee jer...@myspectrum.nl Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v4, 2/2] driver/usb: include upper/lower_32_bits() from linux/compat.h
On Fri, Jun 20, 2014 at 12:18:39PM -0500, Lijun Pan wrote: upper_32_bits() and lower_32_bits() have been ported into linux/compat.h. Start use them now in drivers/usb/host/xhci.h. Signed-off-by: Lijun Pan lijun@freescale.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Fix help text of ext2load and fatload.
On Wed, Jul 09, 2014 at 10:40:07PM +0200, Pavel Machek wrote: Fix help text of ext2load and fatload to match code in fs/fs.c Signed-off-by: Pavel Machek pa...@denx.de Reviewed-by: Marek Vasut ma...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v4, 1/2] linux/compat.h: port lower_32_bits and upper_32_bits from Linux
On Fri, Jun 20, 2014 at 12:17:29PM -0500, Lijun Pan wrote: [backport from linux commit 204b885e and 218e180e7] 64 bit processors are becomming more and more popular. lower_32_bits and upper_32_bits save our labor doing shifts/manipulations like (u32)(n) and (u32)((n) 32). They are good helpers in both little and big endian cases. Port these two functions here from Linux:include/linux/kernel.h, cater the comment message to little/big endian cases. Later on, developers could include linux/compat.h if they want to use these two functions. Signed-off-by: Lijun Pan lijun@freescale.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] catch wrong load address passed to fatload / ext2load
On Wed, Jul 09, 2014 at 10:42:57PM +0200, Pavel Machek wrote: If filename is passed instead of address to ext2load or fatload, u-boot silently accepts that, and uses 0 for load address and default filename from environment. That is confusing, display help instead. Signed-off-by: Pavel Machek pa...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] spl: nand: read only in the size of image_header on the first access
On Thu, Jul 10, 2014 at 08:43:16PM +0900, Masahiro Yamada wrote: For the same reason as in commit 50c8d66d, all the remaining CONFIG_SYS_NAND_PAGE_SIZE in common/spl/spl_nand.c can be replaced with sizeof(*header). Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Tim Harvey thar...@gateworks.com Cc: Scott Wood scottw...@freescale.com Cc: Stefano Babic sba...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] bootp can use mdelay
On Fri, Jul 11, 2014 at 11:39:37AM +0200, Pavel Machek wrote: Cleanup bootp code by using mdelay. Signed-off-by: Pavel Machek pa...@denx.de Acked-by: Marek Vasut ma...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/3] serial: ns16550: drop CONFIG_OMAP1610 from the special case
On Fri, Jul 11, 2014 at 08:29:02PM +0900, Masahiro Yamada wrote: If CONFIG_OMAP1610 is defined, the code returning the fixed value (26) is enabled. But this case is covered by the following code. (CONFIG_SYS_NS16550_CLK + (gd-baudrate * (MODE_X_DIV / 2))) / (MODE_X_DIV * gd-baudrate) = (4800 + (115200 * (16 / 2))) / (16 * 115200) = 48921600 / 1843200 = 26 The #ifdef CONFIG_OMAP1610 was added by commit 6f21347d more than ten years ago. In those days, the divide-and-round was not used. I guess that is why this weird code was added here. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Tom Rini tr...@ti.com Cc: Rishi Bhattacharya ri...@ti.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 2/3] serial: ns16550: use DIV_ROUND_CLOSEST macro to compute the divisor
On Fri, Jul 11, 2014 at 08:29:03PM +0900, Masahiro Yamada wrote: The function still returns the same value. The comment block is no longer necessary because our intention is clear enough by using DIV_ROUND_CLOSEST() macro. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 3/3] serial: ns16550: use a const variable instead of macro
On Fri, Jul 11, 2014 at 08:29:04PM +0900, Masahiro Yamada wrote: Just for type checking. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Marek Vasut ma...@denx.de Acked-by: Marek Vasut ma...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 2/2] common: cmd_ide: use __weak and add prototypes
On Sat, Jul 12, 2014 at 03:07:19PM +0200, Jeroen Hofstee wrote: clang chokes about the concept of having an alias to an always_inlined function. gcc likely just ignores the always inlined since binary sizes are equal before and after this patch. Convert the aliases to weak functions and provide missing prototypes. cc: Pavel Herrmann morpheus.i...@gmail.com Signed-off-by: Jeroen Hofstee jer...@myspectrum.nl Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,1/2] common: cmd_ide: remove PIO mode
On Sat, Jul 12, 2014 at 03:07:18PM +0200, Jeroen Hofstee wrote: Since no board defines CONFIG_TUNE_PIO this is just dead code, so remove it. cc: Pavel Herrmann morpheus.i...@gmail.com Signed-off-by: Jeroen Hofstee jer...@myspectrum.nl Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] lib/time.c cleanups
On Sun, Jul 13, 2014 at 01:14:27PM +0200, Pavel Machek wrote: As I initially suspected overflow in time handling, I took a detailed look at lib/time.c. This adds comments about units being used, reduces amount of type casting being done, and makes __udelay() always wait at least one tick. (Current code could do no delaying at all for short delays). Signed-off-by: Pavel Machek pa...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/4] Add option -r to env import to allow import of text files with CRLF as line endings
On Mon, Jul 14, 2014 at 05:49:55PM +0200, Alexander Holler wrote: When this option is enabled, CRLF is treated like LF when importing environments from text files, which means CRs ('\r') in front of LFs ('\n') are just ignored. Drawback of enabling this option is that (maybe exported) variables which have a trailing CR in their content will get imported without that CR. But this drawback is very unlikely and the big advantage of letting Windows user create a *working* uEnv.txt too is likely more welcome. Signed-off-by: Alexander Holler hol...@ahsoftware.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 2/4] omap3_beagle: handle import of environments in files with CRLF as line endings
On Mon, Jul 14, 2014 at 05:49:56PM +0200, Alexander Holler wrote: Use the new option -r for env import. Signed-off-by: Alexander Holler hol...@ahsoftware.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 4/4] rpi_b: handle import of environments in files with CRLF as line endings
On Mon, Jul 14, 2014 at 05:49:58PM +0200, Alexander Holler wrote: Use the new option -r for env import. Signed-off-by: Alexander Holler hol...@ahsoftware.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 3/4] am335x_evm: handle import of environments in files with CRLF as line endings
On Mon, Jul 14, 2014 at 05:49:57PM +0200, Alexander Holler wrote: Use the new option -r for env import. Signed-off-by: Alexander Holler hol...@ahsoftware.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/3] Makefile: fix the {c, e}tags/cscope build targets
On Tue, Jul 15, 2014 at 03:52:00PM +0300, Igor Grinberg wrote: Commit 9e41403 (kbuild: change out-of-tree build) changed the U-Boot build working directory to the output tree for the out-of-tree builds. This broke the {c,e}tags/cscope build targets as TAG_SUBDIRS variable collected directories based on assumption that the build working directory is the U-Boot source tree directory. Fix the {c,e}tags/cscope build targets by adding the $(srctree) prefix. Also, remove the $(obj) prefix from the etags build target to finish the $(obj) prefix removal started by the same commit. Cc: Masahiro Yamada yamad...@jp.panasonic.com Signed-off-by: Igor Grinberg grinb...@compulab.co.il Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,3/3] Makefile: fix tags target documentation
On Tue, Jul 15, 2014 at 03:52:02PM +0300, Igor Grinberg wrote: Replace the TAGS target name by the actual ctags target name. Also, add etags target documentation. Cc: Masahiro Yamada yamad...@jp.panasonic.com Signed-off-by: Igor Grinberg grinb...@compulab.co.il Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 2/3] scripts: add mailmapper, a tool to create/update mailmap file
On Wed, Jul 16, 2014 at 05:49:45PM +0900, Masahiro Yamada wrote: This tool helps to create/update the mailmap file. It runs 'git shortlog' internally and searches differently spelled author names which share the same email address. The author name with the most commits is asuumed to be a canonical real name. If the number of commits from the cananonical name is equal to or greater than 'MIN_COMMITS' (=50), the entry for the cananical name will be output. ('MIN_COMMITS' is used here because we do not want to create a fat mailmap by adding every author with only a few commits.) If there exists a mailmap file specified by the mailmap.file configuration options or '.mailmap' at the toplevel of the repository, it is used as a base file. The base file and the newly added entries are merged together and sorted alphabetically (but the comment block is kept untouched), and then printed to standard output. Usage - scripts/mailmapper prints the mailmapping to standard output. scripts/mailmapper tmp; mv tmp .mailmap will be useful for updating '.mailmap' file. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,2/3] Makefile: fix ctags/etags clean targets
On Tue, Jul 15, 2014 at 03:52:01PM +0300, Igor Grinberg wrote: Commit efcf861 (kbuild: use scripts/Makefile.clean) refactored the cleaning targets and accidentially replaced the actually generated ctags and etags files in the file list by tags and TAGS. tags and TAGS are not part of the Makefile build targets and therefore should not be a part of the list for clean targets. Substitute the actually generated files instead, to fix the clean targets behavior. Cc: Masahiro Yamada yamad...@jp.panasonic.com Signed-off-by: Igor Grinberg grinb...@compulab.co.il Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 3/3] Update .mailmap using scripts/mailmapper
On Wed, Jul 16, 2014 at 05:49:46PM +0900, Masahiro Yamada wrote: Add more entries to .mailmap for the canonical names with 50 commits or more. This commit was generated by the following command: scripts/mailmapper tmp; mv tmp .mailmap Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 1/3] add .mailmap for proper git-shortlog output
On Wed, Jul 16, 2014 at 05:49:44PM +0900, Masahiro Yamada wrote: This is the first version of .mailmap created by hand. Please see man git-shortlog for what this commit is trying to do. Without this file, for example, git shortlog -n -s shows as follows: 2693 Wolfgang Denk -- 1002 Stefan Roese -- 811 wdenk -- 808 Mike Frysinger 806 Simon Glass [snip] 177 Matthias Fuchs 154 stroese -- 153 Timur Tabi And then, with this file, it shows as follows: 3504 Wolfgang Denk -- 1156 Stefan Roese -- 808 Mike Frysinger 806 Simon Glass Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Stefan Roese s...@denx.de Cc: Wolfgang Denk w...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,1/3] AHCI: Increase link timeout to 200ms
On Fri, Jul 18, 2014 at 08:38:39PM +0100, Ian Campbell wrote: In 73545f75b66d ahci: wait longer for link I increased the timeout to 40ms based on the observed behaviour of a WD disk on a Cubietruck. Since then Karsten Merker and myself have both observed timeouts with HGST disks (Karsten on Cubietruck, me on Cubieboard2). Increasing the timeout to ~175ms fixes this, so go to 200ms for a bit of headroom. Signed-off-by: Ian Campbell i...@hellion.org.uk Cc: Karsten Merker mer...@debian.org Acked-by: Hans de Goede hdego...@redhat.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] .gitignore: clean-up unnecessary entries
On Thu, Jul 17, 2014 at 12:16:43PM +0900, Masahiro Yamada wrote: There have been /errlog and /reloc_off in the top level .gitignore since commit 1b4aaffe added it about 7 years ago. But they are no longer generated. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] whitespace cleanups
On Sat, Jul 19, 2014 at 11:50:44PM +0200, Pavel Machek wrote: Whitespace cleanups. Signed-off-by: Pavel Machek pa...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,2/3] board_r: run scsi init() on ARM too
On Mon, Jul 21, 2014 at 07:23:18PM +0100, Ian Campbell wrote: Subject: [PATCH v3] board_r: run scsi init() on ARM too This has been disabled for ARM in initr_scsi since that function was introduced. However it works fine for me on Cubieboard and Cubietruck (with the upcoming AHCI glue patch). I also tested on two random ARM platforms which seem to define CONFIG_CMD_SCSI: - highbank worked fine (on midway hardware) - omap5_uevm built OK and I confirmed using objdump that things were as expected (i.e. the default weak scsi_init nop was used). While there remove the mismatched comment from the #endif (omitting the comment seems to be the prevailing style in this file). Signed-off-by: Ian Campbell i...@hellion.org.uk Acked-by: Simon Glass s...@chromium.org Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] m68k: fix an undefined behavior warning of M5253DEMO board
On Tue, Jul 22, 2014 at 10:57:18AM +0900, Masahiro Yamada wrote: The latest GCC is so clever that it reports more warnings than old ones did: --8-- board/freescale/m5253demo/flash.c: In function 'flash_get_offsets': board/freescale/m5253demo/flash.c:65:23: warning: iteration 2047u invokes undefined behavior [-Waggressive-loop-optimizations] info-start[k + 1] = info-start[k] + CONFIG_SYS_SST_SECTSZ; ^ board/freescale/m5253demo/flash.c:64:3: note: containing loop for (k = 0, j = 0; j CONFIG_SYS_SST_SECT; j++, k++) { ^ --8-- The cause of the warning is like this: The for statement iterates 2048 times in flash_get_offsets() func. (Notice CONFIG_SYS_SST_SECT is defined as 2048) The last iteration does info-start[2048] = info-start[2047] + CONFIG_SYS_SST_SECTSZ; causing an undefined behavior. (Please note the array size of info-start is 2048. CONFIG_SYS_MAX_FLASH_SECT is defined as 2048 for this board.) This commit fixes that so as not to overrun the info-start array. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Jason Jin jason@freescale.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] m68k: define __kernel_size_t as unsinged int again
On Tue, Jul 22, 2014 at 10:57:19AM +0900, Masahiro Yamada wrote: Commit ddc94378d changed the definition of __kernel_size_t from unsigned int to unsigned long. It is true that it fixed warnings on some crosstools but it increased warnings on the others. The problem is that we cannot see consistency in terms of the typedef of __kernel_size_t on M68K architecture. However, I'd like to suggest to have __kernel_size_t to be unsigned int again. Rationale: [1] Linux Kernel defines __kernel_size_t on M68K as unsigned int. Let's stick to the Linux's way. [2] We want to build boards with popular pre-built toolchains, not the one locally-built by indivisuals. I think m68-linux-gcc which can be downloaded from www.kernel.org is the candidate for our _recommended_ toolchains. With this patch, all the m68k boards can be built without any warnings. Give it a try with the following crosstools: https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.6.3/ x86_64-gcc-4.6.3-nolibc_m68k-linux.tar.xz or https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.9.0/ x86_64-gcc-4.9.0-nolibc_m68k-linux.tar.xz (The latter is newer.) Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Simon Glass s...@chromium.org Cc: Jason Jin jason@freescale.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/2] Now all the M68K boards can be cleanly built
On Tue, Jul 22, 2014 at 10:57:17AM +0900, Masahiro Yamada wrote: This series consists of two fixes. With this series and the crosstools distributed on www.kernel.org, M68K boards can be built without any warnings. You can download it from: https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.9.0/ x86_64-gcc-4.9.0-nolibc_m68k-linux.tar.xz My build log is as follows: $ m68k-linux-gcc --version m68k-linux-gcc (GCC) 4.9.0 Copyright (C) 2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ CROSS_COMPILE=m68k-linux- ./MAKEALL -a m68k Configuring for M52277EVB - Board: M52277EVB, Options: SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x text data bss dec hex filename 115847 115424096 131485 2019d ./u-boot Configuring for M52277EVB_stmicro - Board: M52277EVB, Options: CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E0 text data bss dec hex filename 115474 115424100 131116 2002c ./u-boot Configuring for M5235EVB - Board: M5235EVB, Options: SYS_TEXT_BASE=0xFFE0 text data bss dec hex filename 132258 12240 21132 165630 286fe ./u-boot Configuring for M5235EVB_Flash32 - Board: M5235EVB, Options: NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC0 text data bss dec hex filename 132258 12240 21132 165630 286fe ./u-boot Configuring for cobra5272 board... text data bss dec hex filename 112166 9360 19880 141406 2285e ./u-boot Configuring for eb_cpu5282 - Board: eb_cpu5282, Options: SYS_TEXT_BASE=0xFF00,SYS_MONITOR_BASE=0xFF000400 text data bss dec hex filename 117802 12608 59632 190042 2e65a ./u-boot Configuring for eb_cpu5282_internal - Board: eb_cpu5282, Options: SYS_TEXT_BASE=0xF000,SYS_MONITOR_BASE=0xF418 text data bss dec hex filename 117871 12612 59632 190115 2e6a3 ./u-boot Configuring for TASREG board... text data bss dec hex filename 173998 102904784 189072 2e290 ./u-boot Configuring for M5208EVBE board... text data bss dec hex filename 125563 11252 22852 159667 26fb3 ./u-boot Configuring for M5249EVB board... text data bss dec hex filename 107905 86544224 120783 1d7cf ./u-boot Configuring for M5253DEMO board... text data bss dec hex filename 153476 11348 222476 387300 5e8e4 ./u-boot Configuring for M5272C3 board... text data bss dec hex filename 126385 10676 20588 157649 267d1 ./u-boot Configuring for M5275EVB board... text data bss dec hex filename 134047 12284 21016 167347 28db3 ./u-boot Configuring for M5282EVB board... text data bss dec hex filename 124852 10544 21100 156496 26350 ./u-boot Configuring for astro_mcf5373l board... text data bss dec hex filename 130047 12516 10304 152867 25523 ./u-boot Configuring for M53017EVB board... text data bss dec hex filename 151345 11564 22268 185177 2d359 ./u-boot Configuring for M5329AFEE - Board: M5329EVB, Options: NANDFLASH_SIZE=0 text data bss dec hex filename 176789 28016 22896 227701 37975 ./u-boot Configuring for M5329BFEE - Board: M5329EVB, Options: NANDFLASH_SIZE=16 text data bss dec hex filename 176793 28016 22896 227705 37979 ./u-boot Configuring for M5373EVB - Board: M5373EVB, Options: NANDFLASH_SIZE=16 text data bss dec hex filename 176811 28016 22896 227723 3798b ./u-boot Configuring for M54418TWR - Board: M54418TWR, Options: CF_SBF,SYS_SERIAL_BOOT,SYS_TEXT_BASE=0x47E0,SYS_INPUT_CLKSRC=5000 text data bss dec hex filename 110939 10362 11620 132921 20739 ./u-boot Configuring for M54418TWR_nand_mii - Board: M54418TWR, Options: SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E0,SYS_INPUT_CLKSRC=2500 text data bss dec hex filename 109786 10226 11620 131632 20230 ./u-boot Configuring for M54418TWR_nand_rmii - Board: M54418TWR, Options: SYS_NAND_BOOT,SYS_TEXT_BASE=0x47E0,SYS_INPUT_CLKSRC=5000 text data bss dec hex filename 109786 10226 11620 131632 20230 ./u-boot Configuring for M54418TWR_nand_rmii_lowfreq - Board: M54418TWR, Options: SYS_NAND_BOOT,LOW_MCFCLK,SYS_TEXT_BASE=0x47E0,SYS_INPUT_CLKSRC=5000 text data bss dec hex filename 109830
Re: [U-Boot] A way to change the status of the whole series on Patchwork ?
On Tue, Jul 22, 2014 at 09:50:51AM -0400, Tom Rini wrote: On Wed, Jul 16, 2014 at 07:49:09PM -0700, Brian Norris wrote: On Thu, Jul 17, 2014 at 11:19:42AM +0900, Masahiro Yamada wrote: Does Patchwork have any good way to change the status of the whole series? You can use pwclient via scripts. (I wrote my own hooks for mutt so I can do quicker management straight from my mailbox.) Oooh, can you share? Thanks! It's kind of an ugly patchwork (pun!) of Python, shell, etc., so it's not beautiful to share. But the core of it is that I pipe an email to a Python script to extract the Message-ID, then pipe that to pwclient for tasks. Note that the patch hash [1] is severely unreliable [2], since it's easy to have collisions; this left me with using e-mail Message-ID, which is much more likely to be unique. The Python tidbit simplifies to this: import sys from email import message_from_file print message_from_file(sys.stdin)['Message-Id'] Then some sort of grepping/regex/etc. can get you the patchwork ID from the Message-ID. e.g.: pwclient list -m $MESSAGEID | awk '{print $1;}' | grep '[0-9][0-9]*' After which you can do your magic with: pwclient action patchwork ID Unfortunately, this is two round trips to the patchwork server, but that's the best I have for now. My .muttrc has bindings like this: set pipe_split=yes macro index,pager A pipe-message~/scripts/mutt-patchwork-applyenter macro index,pager S pipe-message~/scripts/mutt-patchwork-statusenter macro index,pager I pipe-message~/scripts/mutt-patchwork-infoenter HTH. Brian [1] patchwork.git has a parser script (apps/patchwork/parser.py), which can give you the patchwork patch hash: parser.py --hash [2] I note the problem with hash collisions here, but I didn't get any response: https://lists.ozlabs.org/pipermail/patchwork/2014-May/001019.html ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 12/12] net: smc911x: Keep MAC programmed
On Mon, Jul 21, 2014 at 7:34 PM, Marek Vasut ma...@denx.de wrote: Make sure to keep the MAC address programmed in the SMC911x ADDRH and ADDRL registers. Linux can read those registers to determine the MAC address on EEPROM-less configurations. Signed-off-by: Marek Vasut ma...@denx.de Cc: Joe Hershberger joe.hershber...@ni.com Cc: Tom Rini tr...@ti.com Acked-by: Joe Hershberger joe.hershber...@ni.com ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH] Fix bug in T4240QDS code. Don't access nonexistent registers
This patch points out a bug in T4240QDS code. But the fix is not correct. Shaohui, please take a closer look and submit a patch to fix it. I believe the code should check each Bank of each SerDes (totally 8 clocks). Thanks Vasili for pointing out. York On 06/16/2014 07:41 AM, Vasili Galka wrote: The code in misc_init_r() verifies actual SERDES clocks versus expected. It supposes that the number of clocks is MAX_SERDES. However, the number of pllcr0 registers is only SRDS_MAX_BANK. This clearly results in access to wrong memory. I don't have the datasheet to design a correct solution, but at least let's change it to access only the existing registers. Signed-off-by: Vasili Galka vvv...@gmail.com Cc: York Sun york...@freescale.com --- board/freescale/t4qds/t4240qds.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index fe1bc7f..6646042 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -662,7 +662,7 @@ int misc_init_r(void) } } - for (i = 0; i MAX_SERDES; i++) { + for (i = 0; i SRDS_MAX_BANK; i++) { u32 pllcr0 = srds_regs-bank[i].pllcr0; u32 expected = pllcr0 SRDS_PLLCR0_RFCK_SEL_MASK; if (expected != actual[i]) { ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH] Fix bug in T4240QDS code. Don't access nonexistent registers
Shaohui, Never mind. You sent the patch already http://patchwork.ozlabs.org/patch/364807/. York On 07/22/2014 02:16 PM, York Sun wrote: This patch points out a bug in T4240QDS code. But the fix is not correct. Shaohui, please take a closer look and submit a patch to fix it. I believe the code should check each Bank of each SerDes (totally 8 clocks). Thanks Vasili for pointing out. York On 06/16/2014 07:41 AM, Vasili Galka wrote: The code in misc_init_r() verifies actual SERDES clocks versus expected. It supposes that the number of clocks is MAX_SERDES. However, the number of pllcr0 registers is only SRDS_MAX_BANK. This clearly results in access to wrong memory. I don't have the datasheet to design a correct solution, but at least let's change it to access only the existing registers. Signed-off-by: Vasili Galka vvv...@gmail.com Cc: York Sun york...@freescale.com --- board/freescale/t4qds/t4240qds.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index fe1bc7f..6646042 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -662,7 +662,7 @@ int misc_init_r(void) } } -for (i = 0; i MAX_SERDES; i++) { +for (i = 0; i SRDS_MAX_BANK; i++) { u32 pllcr0 = srds_regs-bank[i].pllcr0; u32 expected = pllcr0 SRDS_PLLCR0_RFCK_SEL_MASK; if (expected != actual[i]) { ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/b4860: Updated default hwconfig so as to enable only CPC2
On 07/01/2014 11:13 PM, Shaveta Leekha wrote: CPC1 is not being enabled by default as powerpc is supposed to use only CPC2. Signed-off-by: Shaveta Leekha shav...@freescale.com Signed-off-by: Sandeep Singh sand...@freescale.com --- include/configs/B4860QDS.h |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 1af9ba6..53fdac7 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -820,8 +820,14 @@ unsigned long get_board_ddr_clk(void); #define __USB_PHY_TYPE ulpi +#ifdef CONFIG_PPC_B4860 +#define HWCONFIG hwconfig=fsl_ddr:ctlr_intlv=null,en_cpc:cpc2, +#else +#define HWCONFIGhwconfig=fsl_ddr:ctlr_intlv=null, +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ - hwconfig=fsl_ddr:ctlr_intlv=null, \ + HWCONFIG\ bank_intlv=cs0_cs1; \ usb1:dr_mode=host,phy_type= __stringify(__USB_PHY_TYPE) \0\ netdev=eth0\0 \ Did you try this patch on a board? You inserted en_cpc:cpc2 at a wrong place. You actually broke into the setting for DDR. When you move out hwconfig string, you only removed partially. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] ahci: provide sunxi SATA driver using AHCI platform framework
On Fri, Jul 18, 2014 at 08:38:41PM +0100, Ian Campbell wrote: This enables the necessary clocks, in AHB0 and in PLL6_CFG. This is done for sun7i only since I don't have access to any other sunxi platforms with sata included. The PHY setup is derived from the Alwinner releases and Linux, but is mostly undocumented. The Allwinner AHCI controller also requires some magic (and, again, undocumented) DMA initialisation when starting a port. This is added under a suitable ifdef. This option is enabled for Cubieboard, Cubieboard2 and Cubietruck based on contents of Linux DTS files, including SATA power pin config taken from the DTS. All build tested, but runtime tested on Cubieboard2 and Cubietruck only. Signed-off-by: Ian Campbell i...@hellion.org.uk Note that this may need rebasing as I was just going to grab it as part of the rest of the series but it did not apply cleanly. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 0/4] Introducing the Broadcom Cygnus and NSP boards.
This series adds the bcm958300k and the bcm958622hr boards which share the iproc architecture code. Changes in v2: - remove unused include file - reformat multi-line comment(s) - remove deprecated SZ_ definitions - remove misc_init_r() - update CONFIG_ENV_SIZE Scott Branden (4): arm: iproc: Initial commit of iproc architecture code arm: bcmcygnus: Add bcmcygnus u-architecture arm: bcmnsp: Add bcmnsp u-architecture arm: add Cygnus and NSP boards arch/arm/cpu/armv7/Makefile | 1 + arch/arm/cpu/armv7/bcmcygnus/Makefile | 7 + arch/arm/cpu/armv7/bcmcygnus/reset.c| 20 +++ arch/arm/cpu/armv7/bcmnsp/Makefile | 7 + arch/arm/cpu/armv7/bcmnsp/reset.c | 19 +++ arch/arm/cpu/armv7/iproc-common/Makefile| 9 ++ arch/arm/cpu/armv7/iproc-common/armpll.c| 170 arch/arm/cpu/armv7/iproc-common/hwinit-common.c | 15 +++ arch/arm/cpu/armv7/iproc-common/timer.c | 130 ++ arch/arm/include/asm/arch-bcmcygnus/configs.h | 25 arch/arm/include/asm/arch-bcmnsp/configs.h | 22 +++ arch/arm/include/asm/iproc-common/armpll.h | 14 ++ arch/arm/include/asm/iproc-common/configs.h | 20 +++ arch/arm/include/asm/iproc-common/sysmap.h | 47 +++ arch/arm/include/asm/iproc-common/timer.h | 37 ++ board/broadcom/bcm_ep/Makefile | 7 + board/broadcom/bcm_ep/board.c | 55 boards.cfg | 2 + include/configs/bcm_ep_board.h | 107 +++ 19 files changed, 714 insertions(+) create mode 100644 arch/arm/cpu/armv7/bcmcygnus/Makefile create mode 100644 arch/arm/cpu/armv7/bcmcygnus/reset.c create mode 100644 arch/arm/cpu/armv7/bcmnsp/Makefile create mode 100644 arch/arm/cpu/armv7/bcmnsp/reset.c create mode 100644 arch/arm/cpu/armv7/iproc-common/Makefile create mode 100644 arch/arm/cpu/armv7/iproc-common/armpll.c create mode 100644 arch/arm/cpu/armv7/iproc-common/hwinit-common.c create mode 100644 arch/arm/cpu/armv7/iproc-common/timer.c create mode 100644 arch/arm/include/asm/arch-bcmcygnus/configs.h create mode 100644 arch/arm/include/asm/arch-bcmnsp/configs.h create mode 100644 arch/arm/include/asm/iproc-common/armpll.h create mode 100644 arch/arm/include/asm/iproc-common/configs.h create mode 100644 arch/arm/include/asm/iproc-common/sysmap.h create mode 100644 arch/arm/include/asm/iproc-common/timer.h create mode 100644 board/broadcom/bcm_ep/Makefile create mode 100644 board/broadcom/bcm_ep/board.c create mode 100644 include/configs/bcm_ep_board.h -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 1/4] arm: iproc: Initial commit of iproc architecture code
From: Scott Branden sbran...@broadcom.com The iproc architecture code is present in several Broadcom chip architectures, including Cygnus and NSP. Signed-off-by: Scott Branden sbran...@broadcom.com Signed-off-by: Steve Rae s...@broadcom.com --- Changes in v2: - remove unused include file arch/arm/cpu/armv7/Makefile | 1 + arch/arm/cpu/armv7/iproc-common/Makefile| 9 ++ arch/arm/cpu/armv7/iproc-common/armpll.c| 170 arch/arm/cpu/armv7/iproc-common/hwinit-common.c | 15 +++ arch/arm/cpu/armv7/iproc-common/timer.c | 130 ++ arch/arm/include/asm/iproc-common/armpll.h | 14 ++ arch/arm/include/asm/iproc-common/sysmap.h | 47 +++ arch/arm/include/asm/iproc-common/timer.h | 37 ++ 8 files changed, 423 insertions(+) create mode 100644 arch/arm/cpu/armv7/iproc-common/Makefile create mode 100644 arch/arm/cpu/armv7/iproc-common/armpll.c create mode 100644 arch/arm/cpu/armv7/iproc-common/hwinit-common.c create mode 100644 arch/arm/cpu/armv7/iproc-common/timer.c create mode 100644 arch/arm/include/asm/iproc-common/armpll.h create mode 100644 arch/arm/include/asm/iproc-common/sysmap.h create mode 100644 arch/arm/include/asm/iproc-common/timer.h diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 232118d..d0cab8d 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -23,6 +23,7 @@ obj-y += nonsec_virt.o obj-y += virt-v7.o endif +obj-$(CONFIG_IPROC) += iproc-common/ obj-$(CONFIG_KONA) += kona-common/ obj-$(CONFIG_OMAP_COMMON) += omap-common/ obj-$(CONFIG_SYS_ARCH_TIMER) += arch_timer.o diff --git a/arch/arm/cpu/armv7/iproc-common/Makefile b/arch/arm/cpu/armv7/iproc-common/Makefile new file mode 100644 index 000..c071a17 --- /dev/null +++ b/arch/arm/cpu/armv7/iproc-common/Makefile @@ -0,0 +1,9 @@ +# +# Copyright 2014 Broadcom Corporation. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += armpll.o +obj-y += hwinit-common.o +obj-y += timer.o diff --git a/arch/arm/cpu/armv7/iproc-common/armpll.c b/arch/arm/cpu/armv7/iproc-common/armpll.c new file mode 100644 index 000..49b61bf --- /dev/null +++ b/arch/arm/cpu/armv7/iproc-common/armpll.c @@ -0,0 +1,170 @@ +/* + * Copyright 2014 Broadcom Corporation. + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#include common.h +#include asm/io.h +#include asm/iproc-common/armpll.h +#include asm/iproc-common/sysmap.h + +#define NELEMS(x) (sizeof(x) / sizeof(x[0])) + +struct armpll_parameters { + unsigned int mode; + unsigned int ndiv_int; + unsigned int ndiv_frac; + unsigned int pdiv; + unsigned int freqid; +}; + +struct armpll_parameters armpll_clk_tab[] = { + { 25, 64, 1, 1, 0}, + { 100, 64, 1, 1, 2}, + { 400, 64, 1, 1, 6}, + { 448, 71, 713050, 1, 6}, + { 500, 80, 1, 1, 6}, + { 560, 89, 629145, 1, 6}, + { 600, 96, 1, 1, 6}, + { 800, 64, 1, 1, 7}, + { 896, 71, 713050, 1, 7}, + { 1000, 80, 1, 1, 7}, + { 1100, 88, 1, 1, 7}, + { 1120, 89, 629145, 1, 7}, + { 1200, 96, 1, 1, 7}, +}; + +uint32_t armpll_config(uint32_t clkmhz) +{ + uint32_t freqid; + uint32_t ndiv_frac; + uint32_t pll; + uint32_t status = 1; + uint32_t timeout_countdown; + int i; + + for (i = 0; i NELEMS(armpll_clk_tab); i++) { + if (armpll_clk_tab[i].mode == clkmhz) { + status = 0; + break; + } + } + + if (status) { + printf(Error: Clock configuration not supported\n); + goto armpll_config_done; + } + + /* Enable write access */ + writel(IPROC_REG_WRITE_ACCESS, IHOST_PROC_CLK_WR_ACCESS); + + if (clkmhz == 25) + freqid = 0; + else + freqid = 2; + + /* Bypass ARM clock and run on sysclk */ + writel(1 IHOST_PROC_CLK_POLICY_FREQ__PRIV_ACCESS_MODE | + freqid IHOST_PROC_CLK_POLICY_FREQ__POLICY3_FREQ_R | + freqid IHOST_PROC_CLK_POLICY_FREQ__POLICY2_FREQ_R | + freqid IHOST_PROC_CLK_POLICY_FREQ__POLICY1_FREQ_R | + freqid IHOST_PROC_CLK_POLICY_FREQ__POLICY0_FREQ_R, + IHOST_PROC_CLK_POLICY_FREQ); + + writel(1 IHOST_PROC_CLK_POLICY_CTL__GO | + 1 IHOST_PROC_CLK_POLICY_CTL__GO_AC, + IHOST_PROC_CLK_POLICY_CTL); + + /* Poll CCU until operation complete */ + timeout_countdown = 0x10; + while (readl(IHOST_PROC_CLK_POLICY_CTL) + (1 IHOST_PROC_CLK_POLICY_CTL__GO)) { + timeout_countdown--; + if (timeout_countdown == 0) { + printf(CCU polling timedout\n); + status = 1; + goto armpll_config_done; + } + }
[U-Boot] [PATCH v2 2/4] arm: bcmcygnus: Add bcmcygnus u-architecture
From: Scott Branden sbran...@broadcom.com Base support for the Broadcom Cygnus SoC. Based on iproc-common and the SoC specific reset function. Signed-off-by: Scott Branden sbran...@broadcom.com Signed-off-by: Steve Rae s...@broadcom.com --- Changes in v2: None arch/arm/cpu/armv7/bcmcygnus/Makefile | 7 +++ arch/arm/cpu/armv7/bcmcygnus/reset.c | 20 2 files changed, 27 insertions(+) create mode 100644 arch/arm/cpu/armv7/bcmcygnus/Makefile create mode 100644 arch/arm/cpu/armv7/bcmcygnus/reset.c diff --git a/arch/arm/cpu/armv7/bcmcygnus/Makefile b/arch/arm/cpu/armv7/bcmcygnus/Makefile new file mode 100644 index 000..04afcf9 --- /dev/null +++ b/arch/arm/cpu/armv7/bcmcygnus/Makefile @@ -0,0 +1,7 @@ +# +# Copyright 2014 Broadcom Corporation. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += reset.o diff --git a/arch/arm/cpu/armv7/bcmcygnus/reset.c b/arch/arm/cpu/armv7/bcmcygnus/reset.c new file mode 100644 index 000..53ecc0c --- /dev/null +++ b/arch/arm/cpu/armv7/bcmcygnus/reset.c @@ -0,0 +1,20 @@ +/* + * Copyright 2014 Broadcom Corporation. + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#include common.h +#include asm/io.h + +#define CRMU_MAIL_BOX1 0x03024028 +#define CRMU_SOFT_RESET_CMD0x + +void reset_cpu(ulong ignored) +{ + /* Send soft reset command via Mailbox. */ + writel(CRMU_SOFT_RESET_CMD, CRMU_MAIL_BOX1); + + while (1) + ; /* loop forever till reset */ +} -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 3/4] arm: bcmnsp: Add bcmnsp u-architecture
From: Scott Branden sbran...@broadcom.com Base support for the Broadcom NSP SoC. Based on iproc-common and the SoC specific reset function. Signed-off-by: Scott Branden sbran...@broadcom.com Signed-off-by: Steve Rae s...@broadcom.com --- Changes in v2: None arch/arm/cpu/armv7/bcmnsp/Makefile | 7 +++ arch/arm/cpu/armv7/bcmnsp/reset.c | 19 +++ 2 files changed, 26 insertions(+) create mode 100644 arch/arm/cpu/armv7/bcmnsp/Makefile create mode 100644 arch/arm/cpu/armv7/bcmnsp/reset.c diff --git a/arch/arm/cpu/armv7/bcmnsp/Makefile b/arch/arm/cpu/armv7/bcmnsp/Makefile new file mode 100644 index 000..04afcf9 --- /dev/null +++ b/arch/arm/cpu/armv7/bcmnsp/Makefile @@ -0,0 +1,7 @@ +# +# Copyright 2014 Broadcom Corporation. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += reset.o diff --git a/arch/arm/cpu/armv7/bcmnsp/reset.c b/arch/arm/cpu/armv7/bcmnsp/reset.c new file mode 100644 index 000..d79d9aa --- /dev/null +++ b/arch/arm/cpu/armv7/bcmnsp/reset.c @@ -0,0 +1,19 @@ +/* + * Copyright 2014 Broadcom Corporation. + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#include common.h +#include asm/io.h + +#define CRU_RESET_OFFSET 0x1803F184 + +void reset_cpu(ulong ignored) +{ + /* Reset the cpu by setting software reset request bit */ + writel(0x1, CRU_RESET_OFFSET); + + while (1) + ; /* loop forever till reset */ +} -- 1.8.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 4/4] arm: add Cygnus and NSP boards
From: Scott Branden sbran...@broadcom.com The bcm_ep board configuration is used by a number of boards including Cygnus and NSP. Add builds for the bcm958300k and the bcm958622hr boards. Signed-off-by: Scott Branden sbran...@broadcom.com Signed-off-by: Steve Rae s...@broadcom.com --- Changes in v2: - reformat multi-line comment(s) - remove deprecated SZ_ definitions - remove misc_init_r() - update CONFIG_ENV_SIZE arch/arm/include/asm/arch-bcmcygnus/configs.h | 25 ++ arch/arm/include/asm/arch-bcmnsp/configs.h| 22 ++ arch/arm/include/asm/iproc-common/configs.h | 20 + board/broadcom/bcm_ep/Makefile| 7 ++ board/broadcom/bcm_ep/board.c | 55 + boards.cfg| 2 + include/configs/bcm_ep_board.h| 107 ++ 7 files changed, 238 insertions(+) create mode 100644 arch/arm/include/asm/arch-bcmcygnus/configs.h create mode 100644 arch/arm/include/asm/arch-bcmnsp/configs.h create mode 100644 arch/arm/include/asm/iproc-common/configs.h create mode 100644 board/broadcom/bcm_ep/Makefile create mode 100644 board/broadcom/bcm_ep/board.c create mode 100644 include/configs/bcm_ep_board.h diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h new file mode 100644 index 000..5354637 --- /dev/null +++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h @@ -0,0 +1,25 @@ +/* + * Copyright 2014 Broadcom Corporation. + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#ifndef __ARCH_CONFIGS_H +#define __ARCH_CONFIGS_H + +#include asm/iproc-common/configs.h + +/* uArchitecture specifics */ + +/* Serial Info */ +/* Post pad 3 bytes after each reg addr */ +#define CONFIG_SYS_NS16550_REG_SIZE(-4) +#define CONFIG_SYS_NS16550_MEM32 + +#define CONFIG_SYS_NS16550_CLK 1 +#define CONFIG_SYS_NS16550_CLK_DIV 54 +#define CONFIG_SERIAL_MULTI +#define CONFIG_CONS_INDEX 3 +#define CONFIG_SYS_NS16550_COM30x18023000 + +#endif /* __ARCH_CONFIGS_H */ diff --git a/arch/arm/include/asm/arch-bcmnsp/configs.h b/arch/arm/include/asm/arch-bcmnsp/configs.h new file mode 100644 index 000..786deae --- /dev/null +++ b/arch/arm/include/asm/arch-bcmnsp/configs.h @@ -0,0 +1,22 @@ +/* + * Copyright 2014 Broadcom Corporation. + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#ifndef __ARCH_CONFIGS_H +#define __ARCH_CONFIGS_H + +#include asm/iproc-common/configs.h + +/* uArchitecture specifics */ + +/* Serial Info */ +/* no padding */ +#define CONFIG_SYS_NS16550_REG_SIZE1 + +#define CONFIG_SYS_NS16550_CLK 0x03b9aca0 +#define CONFIG_CONS_INDEX 1 +#define CONFIG_SYS_NS16550_COM10x18000300 + +#endif /* __ARCH_CONFIGS_H */ diff --git a/arch/arm/include/asm/iproc-common/configs.h b/arch/arm/include/asm/iproc-common/configs.h new file mode 100644 index 000..c24de1f --- /dev/null +++ b/arch/arm/include/asm/iproc-common/configs.h @@ -0,0 +1,20 @@ +/* + * Copyright 2014 Broadcom Corporation. + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#ifndef __IPROC_COMMON_CONFIGS_H +#define __IPROC_COMMON_CONFIGS_H + +#include linux/stringify.h + +/* Architecture, CPU, chip, etc */ +#define CONFIG_IPROC +#define CONFIG_SYS_ARM_CACHE_WRITETHROUGH + +/* Memory Info */ +#define CONFIG_SYS_TEXT_BASE 0x6100 +#define CONFIG_SYS_SDRAM_BASE 0x6100 + +#endif /* __IPROC_COMMON_CONFIGS_H */ diff --git a/board/broadcom/bcm_ep/Makefile b/board/broadcom/bcm_ep/Makefile new file mode 100644 index 000..8914e54 --- /dev/null +++ b/board/broadcom/bcm_ep/Makefile @@ -0,0 +1,7 @@ +# +# Copyright 2014 Broadcom Corporation. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += board.o diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c new file mode 100644 index 000..e48cd3f --- /dev/null +++ b/board/broadcom/bcm_ep/board.c @@ -0,0 +1,55 @@ +/* + * Copyright 2014 Broadcom Corporation. + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#include common.h +#include asm/io.h +#include config.h +#include asm/system.h +#include asm/iproc-common/armpll.h + +DECLARE_GLOBAL_DATA_PTR; + +/* + * board_init - early hardware init + */ +int board_init(void) +{ + /* +* Address of boot parameters passed to kernel +* Use default offset 0x100 +*/ + gd-bd-bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + + return 0; +} + +/* + * dram_init - sets u-boot's idea of sdram size + */ +int dram_init(void) +{ + gd-ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, + CONFIG_SYS_SDRAM_SIZE); + return 0; +} + +void dram_init_banksize(void) +{ + gd-bd-bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; + gd-bd-bi_dram[0].size = gd-ram_size; +} + +int board_early_init_f(void) +{ + uint32_t status = 0; + + /* Setup PLL if required */ +#if
Re: [U-Boot] [PATCH] powerpc/t104xrdb: Add T1042RDB board support
On 07/10/2014 03:09 AM, Vijay Rai wrote: T1042RDB is Freescale Reference Design Board supporting the T1042 QorIQ Power Architecture processor. T1042 is a reduced personality of T1040 SoC without Integrated 8-port Gigabit. The board is designed with low power features targeted for Printing Image Market. T1042RDB board Overview --- - Four e5500 cores, each with a private 256 KB L2 cache - 256 KB shared L3 CoreNet platform cache (CPC) - Interconnect CoreNet platform - 32-/64-bit DDR3L/DDR4 SDRAM memory controller with ECC and interleaving support - Data Path Acceleration Architecture (DPAA) incorporating acceleration for the following functions: - Packet parsing, classification, and distribution - Queue management for scheduling, packet sequencing, and congestion management - Cryptography Acceleration - RegEx Pattern Matching Acceleration - IEEE Std 1588 support - Hardware buffer management for buffer allocation and deallocation - Ethernet interfaces - Two on-board RGMII 10/100/1G ethernet ports. - SERDES Connections, 8 lanes supporting: - PCI - SGMII - SATA 2.0 - DDR Controller 32-/64-bit DDR3L/DDR4 SDRAM memory controller with ECC and Interleaving - IFC/Local Bus - NAND flash: 1GB 8-bit NAND flash - NOR: 128MB 16-bit NOR Flash - Ethernet - Two on-board RGMII 10/100/1G ethernet ports. - PHY #0 remains powered up during deep-sleep - CPLD - Clocks - System and DDR clock (SYSCLK, ?DDRCLK?) - SERDES clocks - Video - DIU supports video at up to 1280x1024x32bpp - HDMI connector - Power Supplies - USB - Supports two USB 2.0 ports with integrated PHYs - Two type A ports with 5V@1.5A per port. - SDHC - SDHC/SDXC connector - SPI - On-board 64MB SPI flash - I2C - Device connected: EEPROM, thermal monitor, VID controller, RTC - Other IO - Two Serial ports - ProfiBus port T1042RDB is configured as serdes protocol 0x86 which can support following interfaces 2 RGMIIS on DTSEC4, DTSEC5 1 SGMII on DTSEC3 I prefer you move this to board README file. Can you explain the difference among T1040RDB, T1042RDB_PI, T1042RDB? It would be nice to put them in a table in README. Comments updated for 0x06 protocol in place of 0x66 protocol for T1042RDB_PI Just say fix the comment to match serdes protocol. This patch also does minor clean ups for fdt defines for T1042RDB_PI board Signed-off-by: Vijay Rai vijay@freescale.com Signed-off-by: Priyanka Jain priyanka.j...@freescale.com --- board/freescale/t104xrdb/t1042_rcw.cfg |2 +- boards.cfg |1 + include/configs/T104xRDB.h | 15 +-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/board/freescale/t104xrdb/t1042_rcw.cfg b/board/freescale/t104xrdb/t1042_rcw.cfg index a3ea8ad..57de89a 100644 --- a/board/freescale/t104xrdb/t1042_rcw.cfg +++ b/board/freescale/t104xrdb/t1042_rcw.cfg @@ -1,6 +1,6 @@ #PBL preamble and RCW header aa55aa55 010e0100 -# serdes protocol 0x66 +# serdes protocol 0x06 This is for both T1042RDB and T1042RDB_PI, right? 0c18000e 0e00 0602 0042 e8106000 0100 00030810 diff --git a/boards.cfg b/boards.cfg index b8cfead..a989ea2 100644 --- a/boards.cfg +++ b/boards.cfg @@ -961,6 +961,7 @@ Active powerpc mpc85xx- freescale t104xrdb Active powerpc mpc85xx- freescale t104xrdb T1040RDB_SDCARD T104xRDB:PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD - Active powerpc mpc85xx- freescale t104xrdb T1040RDB_SECURE_BOOT T104xRDB:PPC_T1040,SECURE_BOOT,T1040RDB Aneesh Bansal aneesh.ban...@freescale.com Active powerpc mpc85xx- freescale t104xrdb T1040RDB_SPIFLASH T104xRDB:PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH Priyanka Jain priyanka.j...@freescale.com +Active powerpc mpc85xx- freescale t104xrdb T1042RDB T104xRDB:PPC_T1042,T1042RDB Priyanka Jain priyanka.j...@freescale.com Active powerpc mpc85xx- freescale t104xrdb T1042RDB_PI T104xRDB:PPC_T1042,T1042RDB_PI
Re: [U-Boot] enabling ecc on P2041 and QoreIQ familly not valid for memory = 4GB
On 07/18/2014 06:11 AM, Benoit Sansoni wrote: Hi , I found out an issue when enabling ECC for P2041 platform with an amount of memory of 8GB. The routine void dma_meminit(uint val, uint size) is not adapted to manage memory size greater or equal to 4GB due to the 'uint' type. With this typing the dma_meminit sees 0 as size when memory is for example at 8GB. So the ECC part of the memory is not initialized and when going in memory the code crash. To correct it you need to use phys_size_t type instead of uint. It is the same thing for all routines that are called by dma_meminit. I attached a patch that able to correct it easily. This patch should be integrated in the main branch I think so. Regards, Benoit This is a valid concern. Some code started when we had far less memory. We need to comb through the code to fix more of them. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] pxe: clear Bootfile before returning
From: Stephen Warren swar...@nvidia.com When pxe boot downloads the initrd/kernel/DTB, netboot_common() saves the downloaded filename to global variable BootFile. If the boot operation is aborted, this global state is not cleared. If dhcp is executed later without any arguments, BootFile is not cleared, and when the DHCP response is received, BootpCopyNetParams() writes the value into environment variable bootfile. This causes the following scenario: * Boot script executes dhcp; pxe get; pxe boot * User CTRL-C's the PXE menu, which causes the first menu item to be booted, which causes some file to be downloaded. (This boot-on-CTRL-C behaviour is arguably a bug too, but it's a separate bug and the bug this patch fixes would still exist if the user simply waited to press CTRL-C until pxe boot started downloading files) * User CTRL-C's the file downloads, but the filename is still written to the bootfile environment variable. * User re-runs the boot command, which in my case executes dhcp; pxe get; pxe boot again, and dhcp picks up the saved bootfile environment variable and proceeds to download a file that it shouldn't. To solve this, modify the implementation of pxe get to clear BootFile if the whole boot operation fails, which avoids this whole mess. An alternative would be to modify netboot_common() such that the no- arguments case explicitly clears the global variable BootFile. However, that would prevent the following command sequences from working: $ dhcp filename # downloads filename $ dhcp # downloads $bootfile, i.e. filename or: $ setenv bootfile filename $ dhcp # downloads $bootfile, i.e. filename ... and I assume someone relies on U-Boot working that way. Signed-off-by: Stephen Warren swar...@nvidia.com --- common/cmd_pxe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index ba48692e8641..28999f573496 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -1554,6 +1554,8 @@ do_pxe_boot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) destroy_pxe_menu(cfg); + copy_filename(BootFile, , sizeof(BootFile)); + return 0; } -- 1.8.1.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Makefile: use $(shell ...) for determining file_size
file_size was being calculated using back-ticks but map_size uses $(shell ...). Update the file_size calculation to use $(shell ...). Signed-off-by: Chris Packham judge.pack...@gmail.com --- The back ticks didn't work in my environment (GNU Make 3.81). Updating to use $(shell ...) makes sense from a consistency view even if the problem is my environment. Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ca212b5..f6a0f68 100644 --- a/Makefile +++ b/Makefile @@ -786,7 +786,7 @@ u-boot.hex u-boot.srec: u-boot FORCE OBJCOPYFLAGS_u-boot.bin := -O binary binary_size_check: u-boot.bin System.map FORCE - @file_size=`stat -c %s u-boot.bin` ; \ + file_size=$(shell stat -c %s u-boot.bin) ; \ map_size=$(shell cat System.map | \ awk '/_image_copy_start/ {start = $$1} /_image_binary_end/ {end = $$1} END {if (start != end != ) print ibase=16; toupper(end) - toupper(start)}' \ | bc); \ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please update doc/git-mailrc
Hello Andy Freming, All the emails sent to your email address aflem...@freescale.com have been bouncing. If Andy Fleming aflem...@freescale.com is no longer valid address, could you update the following line in doc/git-mailrc, please? alias afleming Andy Fleming aflem...@freescale.com Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH] Fix bug in T4240QDS code. Don't access nonexistent registers
Hi, York, There is already a patch sent upstream to fix this bug, the state is under review. http://patchwork.ozlabs.org/patch/364807/ Best Regards, Shaohui Xie -Original Message- From: Sun York-R58495 Sent: Wednesday, July 23, 2014 5:16 AM To: Xie Shaohui-B21989 Cc: Vasili Galka; u-boot@lists.denx.de; Zang Roy-R61911 Subject: Re: [RFC PATCH] Fix bug in T4240QDS code. Don't access nonexistent registers This patch points out a bug in T4240QDS code. But the fix is not correct. Shaohui, please take a closer look and submit a patch to fix it. I believe the code should check each Bank of each SerDes (totally 8 clocks). Thanks Vasili for pointing out. York On 06/16/2014 07:41 AM, Vasili Galka wrote: The code in misc_init_r() verifies actual SERDES clocks versus expected. It supposes that the number of clocks is MAX_SERDES. However, the number of pllcr0 registers is only SRDS_MAX_BANK. This clearly results in access to wrong memory. I don't have the datasheet to design a correct solution, but at least let's change it to access only the existing registers. Signed-off-by: Vasili Galka vvv...@gmail.com Cc: York Sun york...@freescale.com --- board/freescale/t4qds/t4240qds.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index fe1bc7f..6646042 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -662,7 +662,7 @@ int misc_init_r(void) } } - for (i = 0; i MAX_SERDES; i++) { + for (i = 0; i SRDS_MAX_BANK; i++) { u32 pllcr0 = srds_regs-bank[i].pllcr0; u32 expected = pllcr0 SRDS_PLLCR0_RFCK_SEL_MASK; if (expected != actual[i]) { ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] A way to change the status of the whole series on Patchwork ?
Hi Brian, On Mon, 21 Jul 2014 19:52:22 -0700 Brian Norris computersforpe...@gmail.com wrote: On Tue, Jul 22, 2014 at 11:37:26AM +0900, Masahiro Yamada wrote: On Wed, 16 Jul 2014 19:49:09 -0700 Brian Norris computersforpe...@gmail.com wrote: On Thu, Jul 17, 2014 at 11:19:42AM +0900, Masahiro Yamada wrote: Does Patchwork have any good way to change the status of the whole series? You can use pwclient via scripts. (I wrote my own hooks for mutt so I can do quicker management straight from my mailbox.) From the web interface, you can also select multiple patch checkboxes, then use the Change state drop down at the bottom of the page. Thanks for your advice. I am trying the web interface and I see multiple checkboxes at the left-hand side of the page. But I don't see any Change state drop down at the bottom. (Instead, I see Bundling stuff such as Create bundle and Add to bundle boxes at the bottom of the page.) I see Bundling too, but I also have a similar box labeled Properties on my view. Notably, I only see the Properties (with Change State, Delegate to and Archive drop-downs) on linux-mtd [1] for which I'm a maintainer. But I don't see it on uboot [2], for which I'm not a maintainer. I am not a maintainer of any projects. That's why I cannot see Change State drop down. I will try another choice, pwclient. Thanks, Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 01/12] video: Add S3C24xx framebuffer support
On Tuesday, July 22, 2014 at 11:25:09 AM, Wolfgang Denk wrote: [...] diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 945f35d..7441783 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o videomodes.o obj-$(CONFIG_VIDEO_MX3) += mx3fb.o videomodes.o obj-$(CONFIG_VIDEO_IPUV3) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o obj-$(CONFIG_VIDEO_MXS) += mxsfb.o videomodes.o +obj-$(CONFIG_VIDEO_S3C) += s3c-fb.o videomodes.o obj-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o obj-$(CONFIG_VIDEO_SANDBOX_SDL) += sandbox_sdl.o obj-$(CONFIG_VIDEO_SED13806) += sed13806.o can you please fix the sort oder of this ist? Thanks. Will do in V2, thanks. ... + /* Suck display configuration from videomode variable */ + penv = getenv(videomode); + if (!penv) { + puts(S3CFB: 'videomode' variable not set!\n); + return NULL; + } + + bpp = video_get_params(mode, penv); Should there not be some error handling in case we pass invalid data? There is one, about 10 lines further there is a 'switch (bpp) {}' statement. The default branch will trigger a fail. + /* Allocate framebuffer */ + fb = memalign(S3CFB_ALIGN, roundup(panel.memSize, S3CFB_ALIGN)); + if (!fb) { + printf(S3CFB: Error allocating framebuffer!\n); + return NULL; + } Should we not use the gd-fb_base frame buffer allocation as provided in lib/board.c ? I use CONFIG_VIDEO , not CONFIG_LCD here. My understanding is that CONFIG_VIDEO is what should be used and CONFIG_LCD is legacy. Please correct me if I'm wrong. Only the CONFIG_LCD will reserve the memory, CONFIG_VIDEO will not. It might be a good idea to explicitly set gd-fb_addr in the driver though. What do you think ? Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: zynq: Enable generic board for Xilinx Zynq
On Thu, 8 May 2014 15:15:38 +0200 Michal Simek michal.si...@xilinx.com wrote: Enable CONFIG_SYS_GENERIC_BOARD for all Zynq boards. Signed-off-by: Michal Simek michal.si...@xilinx.com --- include/configs/zynq-common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 8e0f93599fc4..153f3fe73d70 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -334,4 +334,6 @@ #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_GENERIC_BOARD + #endif /* __CONFIG_ZYNQ_COMMON_H */ -- 1.8.2.3 Tested-by: Masahiro Yamada yamad...@jp.panasonic.com [on ZC706 board] Best Regards Masahiro Yamada ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot