July 2014 - U-Boot

[U-Boot] [PATCH v4 1/2] linux/compat.h: port lower_32_bits and upper_32_bits from Linux
by Lijun Pan 22 Jul '14

22 Jul '14

[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.Pan(a)freescale.com> --- v4: split v3 into 2 patches. v3: change the comment message for lower_32_bits() and upper_32_bits() change the commit message to argue the necessity of this patch. v2: add git SHA of linux kernel tree. include/linux/compat.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/linux/compat.h b/include/linux/compat.h index 3fdfb39..35e216e 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -57,4 +57,23 @@ , __FILE__, __LINE__); } #define PAGE_SIZE 4096 + +/** + * upper_32_bits - return MSB bits 32-63 of a number if little endian, or + * return MSB bits 0-31 of a number if big endian. + * @n: the number we're accessing + * + * A basic shift-right of a 64- or 32-bit quantity. Use this to suppress + * the "right shift count >= width of type" warning when that quantity is + * 32-bits. + */ +#define upper_32_bits(n) ((u32)(((n) >> 16) >> 16)) + +/** + * lower_32_bits - return LSB bits 0-31 of a number if little endian, or + * return LSB bits 32-63 of a number if big endian. + * @n: the number we're accessing + */ +#define lower_32_bits(n) ((u32)(n)) + #endif -- 1.9.3

2 1

[U-Boot] [PATCH 0/2] Merge all SPARC linker scripts into a single file
by Masahiro Yamada 22 Jul '14

22 Jul '14

In the other architecutres, the default linker scripts are placed at arch/${ARCH}/cpu/u-boot.lds or arch/${ARCH}/cpu/${CPU}/u-boot.lds. On the other hand, SPARC does not have arch-default linker script but has almost the same linker scripts under each board directory. They can be easily merged. I built all SPARC boards and compared MD5SUM. The same binaries are produced before/after this series. So I am sure this clean-up is correct. Masahiro Yamada (2): sparc: merge LEON3 linker scripts sparc: merge LEON2 and LEON3 linker scripts {board/gaisler/grsim => arch/sparc/cpu}/u-boot.lds | 6 +- board/gaisler/gr_cpci_ax2000/u-boot.lds | 143 -------------------- board/gaisler/gr_ep2s60/u-boot.lds | 143 -------------------- board/gaisler/gr_xc3s_1500/u-boot.lds | 145 --------------------- board/gaisler/grsim_leon2/u-boot.lds | 142 -------------------- 5 files changed, 2 insertions(+), 577 deletions(-) rename {board/gaisler/grsim => arch/sparc/cpu}/u-boot.lds (95%) delete mode 100644 board/gaisler/gr_cpci_ax2000/u-boot.lds delete mode 100644 board/gaisler/gr_ep2s60/u-boot.lds delete mode 100644 board/gaisler/gr_xc3s_1500/u-boot.lds delete mode 100644 board/gaisler/grsim_leon2/u-boot.lds -- 1.9.1

2 4

[U-Boot] [PATCH] h2200: Disable SHA256 on FIT images
by Tom Rini 22 Jul '14

22 Jul '14

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 <trini(a)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

1 1

[U-Boot] [PATCH] boards.cfg: re-claim ownership for TQM8xx boards
by Wolfgang Denk 22 Jul '14

22 Jul '14

Signed-off-by: Wolfgang Denk <wd(a)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 <wd(a)denx.de> Active powerpc mpc8xx - tqc tqm8xx TQM823L_LCD TQM823L:LCD,NEC_NL6448BC20 Wolfgang Denk <wd(a)denx.de> -Active powerpc mpc8xx - tqc tqm8xx TQM823M - - +Active powerpc mpc8xx - tqc tqm8xx TQM823M - Wolfgang Denk <wd(a)denx.de> Active powerpc mpc8xx - tqc tqm8xx TQM850L - Wolfgang Denk <wd(a)denx.de> -Active powerpc mpc8xx - tqc tqm8xx TQM850M - - +Active powerpc mpc8xx - tqc tqm8xx TQM850M - Wolfgang Denk <wd(a)denx.de> Active powerpc mpc8xx - tqc tqm8xx TQM855L - Wolfgang Denk <wd(a)denx.de> -Active powerpc mpc8xx - tqc tqm8xx TQM855M - - +Active powerpc mpc8xx - tqc tqm8xx TQM855M - Wolfgang Denk <wd(a)denx.de> Active powerpc mpc8xx - tqc tqm8xx TQM860L - Wolfgang Denk <wd(a)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 - Wolfgang Denk <wd(a)denx.de> +Active powerpc mpc8xx - tqc tqm8xx TQM862L - Wolfgang Denk <wd(a)denx.de> +Active powerpc mpc8xx - tqc tqm8xx TQM862M - Wolfgang Denk <wd(a)denx.de> +Active powerpc mpc8xx - tqc tqm8xx TQM866M - Wolfgang Denk <wd(a)denx.de> +Active powerpc mpc8xx - tqc tqm8xx TQM885D - Wolfgang Denk <wd(a)denx.de> Active powerpc mpc8xx - tqc tqm8xx TTTech TQM823L:LCD,SHARP_LQ104V7DS01 Wolfgang Denk <wd(a)denx.de> -Active powerpc mpc8xx - tqc tqm8xx virtlab2 - - +Active powerpc mpc8xx - tqc tqm8xx virtlab2 - Wolfgang Denk <wd(a)denx.de> Active powerpc mpc8xx - tqc tqm8xx wtk TQM823L:LCD,SHARP_LQ065T9DR51U Wolfgang Denk <wd(a)denx.de> Active powerpc ppc4xx - - csb272 csb272 - Tolunay Orkun <torkun(a)nextio.com> Active powerpc ppc4xx - - csb472 csb472 - Tolunay Orkun <torkun(a)nextio.com> -- 1.9.3

2 1

[U-Boot] [PATCH] dfu: fix: Add the absolute path to the file name for ext4 write operation
by Lukasz Majewski 22 Jul '14

22 Jul '14

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. Signed-off-by: Lukasz Majewski <l.majewski(a)samsung.com> --- drivers/dfu/dfu_mmc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index 72fa03e..38aeab0 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -117,6 +117,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, { const char *fsname, *opname; char cmd_buf[DFU_CMD_BUF_SIZE]; + char *filename = " %s"; char *str_env; int ret; @@ -153,7 +154,10 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, if (op != DFU_OP_SIZE) sprintf(cmd_buf + strlen(cmd_buf), " 0x%x", (unsigned int)buf); - sprintf(cmd_buf + strlen(cmd_buf), " %s", dfu->name); + if (dfu->layout == DFU_FS_EXT4 && op == DFU_OP_WRITE) + filename = " /%s"; + + sprintf(cmd_buf + strlen(cmd_buf), filename, dfu->name); if (op == DFU_OP_WRITE) sprintf(cmd_buf + strlen(cmd_buf), " %lx", *len); -- 2.0.0.rc2

3 3

[U-Boot] [PATCH 0/10] Drop mpc8xx, mpc82xx boards which are orphaned or have no maintainers
by Masahiro Yamada 22 Jul '14

22 Jul '14

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 ---------- include/configs/TQM860M.h | 464 --------- include/configs/TQM862L.h | 464 --------- include/configs/TQM862M.h | 465 --------- include/configs/TQM866M.h | 483 ---------- include/configs/TQM885D.h | 482 ---------- include/configs/ep8260.h | 744 --------------- include/configs/ppmc8260.h | 986 ------------------- include/configs/sacsng.h | 1039 -------------------- include/configs/stxxtc.h | 485 ---------- include/configs/svm_sc8xx.h | 450 --------- include/configs/virtlab2.h | 469 ---------- include/pcmcia.h | 2 +- include/status_led.h | 42 - include/usb/mpc8xx_udc.h | 178 ---- include/usb/udc.h | 4 +- 96 files changed, 44 insertions(+), 26389 deletions(-) delete mode 100644 board/ep8260/Makefile delete mode 100644 board/ep8260/ep8260.c delete mode 100644 board/ep8260/ep8260.h delete mode 100644 board/ep8260/flash.c delete mode 100644 board/ep8260/mii_phy.c 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 board/gen860t/Makefile delete mode 100644 board/gen860t/README delete mode 100644 board/gen860t/beeper.c delete mode 100644 board/gen860t/beeper.h delete mode 100644 board/gen860t/flash.c delete mode 100644 board/gen860t/fpga.c delete mode 100644 board/gen860t/fpga.h delete mode 100644 board/gen860t/gen860t.c delete mode 100644 board/gen860t/ioport.c delete mode 100644 board/gen860t/ioport.h delete mode 100644 board/gen860t/u-boot-flashenv.lds delete mode 100644 board/gen860t/u-boot.lds 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 board/ppmc8260/Makefile delete mode 100644 board/ppmc8260/ppmc8260.c delete mode 100644 board/sacsng/Makefile delete mode 100644 board/sacsng/clkinit.c delete mode 100644 board/sacsng/clkinit.h delete mode 100644 board/sacsng/flash.c delete mode 100644 board/sacsng/ioconfig.h delete mode 100644 board/sacsng/sacsng.c delete mode 100644 board/sixnet/Makefile delete mode 100644 board/sixnet/flash.c delete mode 100644 board/sixnet/fpgadata.c delete mode 100644 board/sixnet/sixnet.c delete mode 100644 board/sixnet/sixnet.h delete mode 100644 board/sixnet/u-boot.lds delete mode 100644 board/stx/stxxtc/Makefile delete mode 100644 board/stx/stxxtc/README.stxxtc delete mode 100644 board/stx/stxxtc/stxxtc.c delete mode 100644 board/stx/stxxtc/u-boot.lds delete mode 100644 board/stx/stxxtc/u-boot.lds.debug 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 drivers/rtc/ds1306.c delete mode 100644 drivers/usb/gadget/mpc8xx_udc.c delete mode 100644 include/configs/FLAGADM.h delete mode 100644 include/configs/GEN860T.h delete mode 100644 include/configs/MUSENKI.h delete mode 100644 include/configs/NSCU.h delete mode 100644 include/configs/SXNI855T.h delete mode 100644 include/configs/Sandpoint8245.h delete mode 100644 include/configs/TK885D.h delete mode 100644 include/configs/TQM823M.h delete mode 100644 include/configs/TQM850M.h delete mode 100644 include/configs/TQM855M.h delete mode 100644 include/configs/TQM860M.h delete mode 100644 include/configs/TQM862L.h delete mode 100644 include/configs/TQM862M.h delete mode 100644 include/configs/TQM866M.h delete mode 100644 include/configs/TQM885D.h delete mode 100644 include/configs/ep8260.h delete mode 100644 include/configs/ppmc8260.h delete mode 100644 include/configs/sacsng.h delete mode 100644 include/configs/stxxtc.h delete mode 100644 include/configs/svm_sc8xx.h delete mode 100644 include/configs/virtlab2.h delete mode 100644 include/usb/mpc8xx_udc.h -- 1.9.1

2 14

[U-Boot] [PATCH] usb: musb-new: core: set MUSB_POWER_HSENAB in MUSB_POWER for host mode
by Daniel Mack 22 Jul '14

22 Jul '14

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 <zonque(a)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

1 0

[U-Boot] [PATCH 0/3] Do not hard-code the command name 'make' in upper-level tools
by Masahiro Yamada 22 Jul '14

22 Jul '14

Masahiro Yamada (3): scripts: add scripts/gnu_make to not hard-code make command MAKEALL: make sure to invoke GNU Make buildman: make sure to invoke GNU Make MAKEALL | 8 +++++--- scripts/gnu_make | 30 ++++++++++++++++++++++++++++++ tools/buildman/builder.py | 3 ++- 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100755 scripts/gnu_make -- 1.9.1

4 9

[U-Boot] m68k: Build problems on some boards
by Vasili Galka 22 Jul '14

22 Jul '14

Hi, I've installed a m68k-elf toolchain (based on gcc 4.8.1) and tried building all m68k boards on latest u-boot/master (MAKEALL -a m68k). While the build succeeds for most of the boards, the following four fail with similar errors: TASREG M5249EVB M5253DEMO M5253EVBE m68k-elf-ld.bfd: m68k:isa-a:mac architecture of input file `/usr/m68k-elf/lib/gcc/m68k-elf/4.8.1/m5206e/libgcc.a(_float.o)' is incompatible with m68k:isa-a:emac output m68k-elf-ld.bfd: m68k:isa-a:mac architecture of input file `/usr/m68k-elf/lib/gcc/m68k-elf/4.8.1/m5206e/libgcc.a(_floatex.o)' is incompatible with m68k:isa-a:emac output m68k-elf-ld.bfd: m68k:isa-a:mac architecture of input file `/usr/m68k-elf/lib/gcc/m68k-elf/4.8.1/m5206e/libgcc.a(_muldi3.o)' is incompatible with m68k:isa-a:emac output ... AFAIU, the architecture of chosen libgcc differs from the architecture of generated object files (one has mac while the other emac). I'm not really familiar with m68k arch... What is wrong here and how should be fixed? Best regards, Vasili

3 3

[U-Boot] Silly question regarding mx28_adjust_mac and MAC OUIs?
by Stuart Longland 22 Jul '14

22 Jul '14

Hi all, Apoligies if this has been asked before. I'm very new to U-Boot, and did look around but found nothing on the topic. I've been doing some porting of U-Boot to a board based around a Freescale i.MX286 CPU. So far thing are working, but I was wondering how one specifies the MAC OUI? As I understand it on this platform, the hardware "fuses" only store the lower 32-bits of the MAC, with the upper 16-bits intended to be hardcoded into device firmware. Looking through U-Boot, I see this is done in mx28_adjust_mac (arch/arm/cpu/arm926ejs/mxs/mxs.c +237). If I wanted to set a different OUI, is there a way to specify an alternate one without patching mx28_adjust_mac directly? Regards, -- Stuart Longland Systems Engineer _ ___ \ /|_) | T: +61 7 3535 9619 \/ | \ | 38b Douglas Street F: +61 7 3535 9699 SYSTEMS Milton QLD 4064 http://www.vrt.com.au

1 0