October 2010 - U-Boot

[U-Boot] The Department Team
by T- Mobile Award 20 Oct '10

20 Oct '10

Your E-mail Address has won USD500.000.00 in the 2010 South Africa T-Mobile promotion for Successful soccer world cup which was played in South Africa. To claim contact Mr. Trevor Vusi Foreign Service Manager Tel: +27 83 688 7776 Fax: +27-86-666-6134 Email: tmobilesa(a)consultant.com Email: tmobilesaa(a)live.co.za Yours sincerely, The Department Team T- Mobile Award

1 0

[U-Boot] [PATCH] MX31: Removed warnings for iomux function
by Stefano Babic 20 Oct '10

20 Oct '10

Removed warnings generated in the mx31_set_pad() function. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- arch/arm/cpu/arm1136/mx31/generic.c | 2 +- arch/arm/include/asm/arch-mx31/mx31.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index cbe8243..db5d3f0 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -97,7 +97,7 @@ void mx31_set_pad(enum iomux_pins pin, u32 config) void *reg; pin &= IOMUX_PADNUM_MASK; - reg = (IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4; + reg = (void *)((IOMUXC_BASE + 0x154) + (pin + 2) / 3 * 4); field = (pin + 2) % 3; l = __raw_readl(reg); diff --git a/arch/arm/include/asm/arch-mx31/mx31.h b/arch/arm/include/asm/arch-mx31/mx31.h index 5a5aa11..a755212 100644 --- a/arch/arm/include/asm/arch-mx31/mx31.h +++ b/arch/arm/include/asm/arch-mx31/mx31.h @@ -27,6 +27,7 @@ extern u32 mx31_get_ipg_clk(void); #define imx_get_uartclk mx31_get_ipg_clk extern void mx31_gpio_mux(unsigned long mode); +extern void mx31_set_pad(enum iomux_pins pin, u32 config); void mx31_uart1_hw_init(void); void mx31_spi2_hw_init(void); -- 1.7.1

3 3

[U-Boot] Pull request: u-boot-arm
by Wolfgang Denk 20 Oct '10

20 Oct '10

The following changes since commit 1ba91ba23396005ef7b42381cc21f0baf78d0d60: dlmalloc.c: Fix gcc alias warning (2010-10-18 22:44:31 +0200) are available in the git repository at: git://git.denx.de/u-boot-arm.git master Albert Aribaud (2): arm: implement ELF relocations edminiv2: add support for ELF relocations Andreas Bießmann (3): at91rm9200ek: convert to at91 at91rm9200: enable USB support at91rm9200ek: enbable USB support Eric Cooper (1): Makefile: rename TEXT_BASE to CONFIG_SYS_TEXT_BASE Heiko Schocher (4): arm926ejs, magnesium: add support for ELF relocations arm926ejs, tx25: add support for ELF relocations armv7, beagle: add support for ELF relocations arm1136, qong: add support for ELF relocations Jason Liu (2): MX5: rename mx51 to mx5 MX5: Remove dead code with ENABLE_IMPRECISE_ABORT Jens Scharsig (1): update board EB+CPUx9K2 John Rigby (7): common/image.c fix length calculation in boot_relocate_fdt common/image.c remove extra calls to be32_to_cpu in boot_get_fdt FDT: Add fixup support for multiple banks of memory FDT: only call boot_get_fdt from generic code boot: change some arch ifdefs to feature ifdefs ARM: add flat device tree support ARM: enable device tree for beagle Magnus Lilja (1): i.MX31: Fix Litekit board to use new ARM relocation support. Marek Vasut (19): PXA: pxafb: Fix indent problems PXA: pxa-regs.h cleanup PXA: pxafb: Add ACX517AKN support PXA: pxafb: Add support for Sharp LQ038J7DH53 PXA: pxafb: Marvell Littleton LCD definition common: Enable serial for PXA250 PXA: Palm Tungsten|C Support PXA: Add initial Palm LifeDrive support PXA: Voipac270 improvements PXA: Balloon3 board support PXA: Add missing MAINTAINERS entries PXA: Add necessary information for RELOC PXA: Fix reloc, Push lowlevel init into C code PXA: Fix vpac270 for Reloc PXA: Fix ZipitZ2 for Reloc PXA: Fix Balloon3 for Reloc PXA: Fix vpac270 OneNAND booter Build: PXA: Fix Vpac270 build variants Build: PXA: Fix TrizepsIV build variants Mikhail Kshevetskiy (4): PXA: remove unused u-boot.lds from board/vpac270 PXA: cleanup vpac270 config and set CONFIG_SYS_HZ to 1000 PXA: fix environment sector size, kernel and environment location for vpac270 PXA: fix MDREFR[APD] bit setting Reinhard Meyer (1): AT91 clock/timer: move static data to global_data struct Stefano Babic (1): MX31: add delay between USB port setup and reset Wolfgang Denk (4): QONG: fix and update board config file Merge branch 'master' of git://git.denx.de/u-boot-imx Merge branch 'elf_reloc' Merge branch 'at91' of git://git.denx.de/u-boot-atmel MAINTAINERS | 13 + MAKEALL | 7 +- Makefile | 19 +- README | 13 + arch/arm/config.mk | 12 +- arch/arm/cpu/arm1136/start.S | 171 +- arch/arm/cpu/arm1136/u-boot.lds | 15 +- arch/arm/cpu/arm926ejs/at91/clock.c | 55 +- arch/arm/cpu/arm926ejs/at91/timer.c | 85 +- arch/arm/cpu/arm926ejs/start.S | 162 +- arch/arm/cpu/arm926ejs/u-boot.lds | 26 +- arch/arm/cpu/armv7/{mx51 => mx5}/Makefile | 0 arch/arm/cpu/armv7/{mx51 => mx5}/clock.c | 42 +- arch/arm/cpu/armv7/{mx51 => mx5}/iomux.c | 2 +- arch/arm/cpu/armv7/{mx51 => mx5}/lowlevel_init.S | 14 - arch/arm/cpu/armv7/{mx51 => mx5}/soc.c | 28 +- arch/arm/cpu/armv7/{mx51 => mx5}/speed.c | 0 arch/arm/cpu/armv7/{mx51 => mx5}/timer.c | 8 +- arch/arm/cpu/armv7/{mx51 => mx5}/u-boot.lds | 0 arch/arm/cpu/armv7/start.S | 131 +- arch/arm/cpu/armv7/u-boot.lds | 7 + arch/arm/cpu/pxa/cpu.c | 255 ++- arch/arm/cpu/pxa/i2c.c | 69 +- arch/arm/cpu/pxa/pxafb.c | 365 ++- arch/arm/cpu/pxa/start.S | 344 +-- arch/arm/cpu/pxa/timer.c | 7 +- arch/arm/cpu/pxa/usb.c | 61 +- arch/arm/include/asm/arch-at91/hardware.h | 1 + .../asm/{arch-mx51 => arch-mx5}/asm-offsets.h | 0 .../include/asm/{arch-mx51 => arch-mx5}/clock.h | 0 .../include/asm/{arch-mx51 => arch-mx5}/crm_regs.h | 0 .../include/asm/{arch-mx51 => arch-mx5}/imx-regs.h | 0 .../include/asm/{arch-mx51 => arch-mx5}/iomux.h | 8 +- .../mx51_pins.h => arch-mx5/mx5x_pins.h} | 6 +- .../asm/{arch-mx51 => arch-mx5}/sys_proto.h | 0 arch/arm/include/asm/arch-pxa/hardware.h | 61 +- arch/arm/include/asm/arch-pxa/macro.h | 20 +- arch/arm/include/asm/arch-pxa/pxa-regs.h | 2688 +++++++++++--------- arch/arm/include/asm/config.h | 5 +- arch/arm/include/asm/global_data.h | 14 + arch/arm/include/asm/u-boot-arm.h | 14 +- arch/arm/lib/board.c | 8 +- arch/arm/lib/bootm.c | 137 +- arch/arm/lib/cache.c | 2 +- arch/m68k/include/asm/config.h | 3 + arch/microblaze/lib/bootm.c | 14 +- arch/nios2/lib/bootm.c | 8 +- arch/powerpc/include/asm/config.h | 3 + arch/sparc/include/asm/config.h | 1 + board/BuS/eb_cpux9k2/config.mk | 1 - board/BuS/eb_cpux9k2/cpux9k2.c | 7 +- board/LaCie/edminiv2/config.mk | 3 +- board/atmel/at91rm9200ek/Makefile | 5 - board/atmel/at91rm9200ek/at91rm9200ek.c | 60 +- board/atmel/at91rm9200ek/config.mk | 3 +- board/atmel/at91rm9200ek/led.c | 58 +- board/atmel/at91rm9200ek/mux.c | 38 - .../arm/cpu/armv7/mx51 => board/balloon3}/Makefile | 27 +- board/balloon3/balloon3.c | 238 ++ board/colibri_pxa270/colibri_pxa270.c | 33 +- board/cradle/cradle.c | 5 +- board/cradle/lowlevel_init.S | 4 +- board/csb226/csb226.c | 13 +- board/delta/delta.c | 37 +- board/delta/nand.c | 110 +- board/freescale/mx51evk/mx51evk.c | 2 +- board/innokom/innokom.c | 14 +- board/karo/tx25/config.mk | 2 +- board/logicpd/imx27lite/config.mk | 4 + board/logicpd/imx31_litekit/config.mk | 2 +- board/logicpd/imx31_litekit/imx31_litekit.c | 10 +- {arch/arm/cpu/armv7/mx51 => board/palmld}/Makefile | 27 +- board/palmld/config.mk | 1 + board/{zipitz2 => palmld}/lowlevel_init.S | 9 +- board/palmld/palmld.c | 69 + board/{vpac270 => palmld}/u-boot.lds | 7 +- {arch/arm/cpu/armv7/mx51 => board/palmtc}/Makefile | 27 +- board/palmtc/config.mk | 1 + board/{vpac270 => palmtc}/lowlevel_init.S | 3 +- .../at91rm9200ek/partition.c => palmtc/palmtc.c} | 61 +- .../at91rm9200ek/misc.c => palmtc/u-boot.lds} | 50 +- board/pxa255_idp/pxa_idp.c | 27 +- board/trizepsiv/conxs.c | 35 +- board/ttcontrol/vision2/vision2.c | 2 +- board/vpac270/Makefile | 17 +- board/vpac270/config.mk | 1 - board/vpac270/vpac270.c | 92 +- board/wepep250/wepep250.c | 11 +- board/zipitz2/Makefile | 10 +- board/zipitz2/config.mk | 1 - board/zipitz2/zipitz2.c | 57 +- board/zylonite/nand.c | 110 +- boards.cfg | 14 +- common/cmd_bootm.c | 6 +- common/fdt_support.c | 86 +- common/image.c | 16 +- common/serial.c | 2 +- doc/README.arm-relocation | 222 +-- drivers/mmc/pxa_mmc.c | 98 +- drivers/serial/serial_pxa.c | 94 +- drivers/usb/host/ehci-mxc.c | 2 + include/configs/at91rm9200ek.h | 286 +-- include/configs/balloon3.h | 274 ++ include/configs/cerf250.h | 3 + include/configs/colibri_pxa270.h | 3 + include/configs/cradle.h | 5 +- include/configs/csb226.h | 3 + include/configs/delta.h | 4 + include/configs/eb_cpux9k2.h | 23 +- include/configs/edminiv2.h | 5 + include/configs/imx31_litekit.h | 7 + include/configs/innokom.h | 3 + include/configs/lubbock.h | 3 + include/configs/mx51evk.h | 4 +- include/configs/omap3_beagle.h | 9 + include/configs/palmld.h | 276 ++ include/configs/palmtc.h | 248 ++ include/configs/pleb2.h | 3 + include/configs/pxa255_idp.h | 3 + include/configs/qong.h | 32 +- include/configs/trizepsiv.h | 3 + include/configs/tx25.h | 2 +- include/configs/vision2.h | 4 +- include/configs/vpac270.h | 138 +- include/configs/wepep250.h | 4 + include/configs/xaeniax.h | 3 + include/configs/xm250.h | 3 + include/configs/xsengine.h | 3 + include/configs/zipitz2.h | 10 +- include/configs/zylonite.h | 3 + include/fdt_support.h | 1 + include/image.h | 9 +- nand_spl/board/karo/tx25/u-boot.lds | 13 + onenand_ipl/board/vpac270/Makefile | 5 +- 134 files changed, 4843 insertions(+), 3290 deletions(-) copy arch/arm/cpu/armv7/{mx51 => mx5}/Makefile (100%) rename arch/arm/cpu/armv7/{mx51 => mx5}/clock.c (85%) rename arch/arm/cpu/armv7/{mx51 => mx5}/iomux.c (99%) rename arch/arm/cpu/armv7/{mx51 => mx5}/lowlevel_init.S (95%) rename arch/arm/cpu/armv7/{mx51 => mx5}/soc.c (81%) rename arch/arm/cpu/armv7/{mx51 => mx5}/speed.c (100%) rename arch/arm/cpu/armv7/{mx51 => mx5}/timer.c (92%) rename arch/arm/cpu/armv7/{mx51 => mx5}/u-boot.lds (100%) rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/asm-offsets.h (100%) rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/clock.h (100%) rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/crm_regs.h (100%) rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/imx-regs.h (100%) rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/iomux.h (98%) rename arch/arm/include/asm/{arch-mx51/mx51_pins.h => arch-mx5/mx5x_pins.h} (99%) rename arch/arm/include/asm/{arch-mx51 => arch-mx5}/sys_proto.h (100%) delete mode 100644 board/BuS/eb_cpux9k2/config.mk delete mode 100644 board/atmel/at91rm9200ek/mux.c copy {arch/arm/cpu/armv7/mx51 => board/balloon3}/Makefile (70%) create mode 100644 board/balloon3/balloon3.c copy {arch/arm/cpu/armv7/mx51 => board/palmld}/Makefile (70%) create mode 100644 board/palmld/config.mk rename board/{zipitz2 => palmld}/lowlevel_init.S (90%) create mode 100644 board/palmld/palmld.c rename board/{vpac270 => palmld}/u-boot.lds (90%) rename {arch/arm/cpu/armv7/mx51 => board/palmtc}/Makefile (70%) create mode 100644 board/palmtc/config.mk rename board/{vpac270 => palmtc}/lowlevel_init.S (95%) rename board/{atmel/at91rm9200ek/partition.c => palmtc/palmtc.c} (50%) rename board/{atmel/at91rm9200ek/misc.c => palmtc/u-boot.lds} (57%) delete mode 100644 board/vpac270/config.mk delete mode 100644 board/zipitz2/config.mk create mode 100644 include/configs/balloon3.h create mode 100644 include/configs/palmld.h create mode 100644 include/configs/palmtc.h 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: wd(a)denx.de He'd heard her use that sweet, innocent tone of voice before. It meant that, pretty soon, there was going to be trouble. - Terry Pratchett, _Truckers_

1 1

[U-Boot] [PULL] U-Boot-pxa pull request
by Marek Vasut 20 Oct '10

20 Oct '10

Hi, please pull my git://git.denx.de/u-boot-pxa for-wd-testing branch into your u- boot-testing/Makefile-cleanup branch. Thanks The following changes since commit a5cb985d8006bd1bb6d188b84f435f5d007fd6ac: Makefile: move all Power Architecture boards into boards.cfg (2010-10-17 01:34:08 +0200) are available in the git repository at: git://git.denx.de/u-boot-pxa.git for-wd-testing Marek Vasut (19): PXA: pxafb: Fix indent problems PXA: pxa-regs.h cleanup PXA: pxafb: Add ACX517AKN support PXA: pxafb: Add support for Sharp LQ038J7DH53 PXA: pxafb: Marvell Littleton LCD definition common: Enable serial for PXA250 PXA: Palm Tungsten|C Support PXA: Add initial Palm LifeDrive support PXA: Voipac270 improvements PXA: Balloon3 board support PXA: Add missing MAINTAINERS entries PXA: Add necessary information for RELOC PXA: Fix reloc, Push lowlevel init into C code PXA: Fix vpac270 for Reloc PXA: Fix ZipitZ2 for Reloc PXA: Fix Balloon3 for Reloc PXA: Fix vpac270 OneNAND booter Build: PXA: Fix Vpac270 build variants Build: PXA: Fix TrizepsIV build variants Mikhail Kshevetskiy (4): PXA: remove unused u-boot.lds from board/vpac270 PXA: cleanup vpac270 config and set CONFIG_SYS_HZ to 1000 PXA: fix environment sector size, kernel and environment location for vpac270 PXA: fix MDREFR[APD] bit setting MAINTAINERS | 9 + MAKEALL | 7 +- Makefile | 17 - arch/arm/cpu/pxa/cpu.c | 255 +++- arch/arm/cpu/pxa/i2c.c | 69 +- arch/arm/cpu/pxa/pxafb.c | 365 +++-- arch/arm/cpu/pxa/start.S | 346 ++--- arch/arm/cpu/pxa/timer.c | 7 +- arch/arm/cpu/pxa/usb.c | 61 +- arch/arm/include/asm/arch-pxa/hardware.h | 61 +- arch/arm/include/asm/arch-pxa/macro.h | 20 +- arch/arm/include/asm/arch-pxa/pxa-regs.h | 2688 +++++++++++++++-------------- board/balloon3/Makefile | 47 + board/balloon3/balloon3.c | 238 +++ board/colibri_pxa270/colibri_pxa270.c | 33 +- board/cradle/cradle.c | 5 +- board/cradle/lowlevel_init.S | 4 +- board/csb226/csb226.c | 13 +- board/delta/delta.c | 37 +- board/delta/nand.c | 110 +- board/innokom/innokom.c | 14 +- board/palmld/Makefile | 49 + board/palmld/config.mk | 1 + board/{zipitz2 => palmld}/lowlevel_init.S | 9 +- board/palmld/palmld.c | 69 + board/{vpac270 => palmld}/u-boot.lds | 7 +- board/palmtc/Makefile | 49 + board/palmtc/config.mk | 1 + board/{vpac270 => palmtc}/lowlevel_init.S | 3 +- board/palmtc/palmtc.c | 59 + board/{vpac270 => palmtc}/u-boot.lds | 7 +- board/pxa255_idp/pxa_idp.c | 27 +- board/trizepsiv/conxs.c | 35 +- board/vpac270/Makefile | 17 +- board/vpac270/config.mk | 1 - board/vpac270/vpac270.c | 92 +- board/wepep250/wepep250.c | 11 +- board/zipitz2/Makefile | 10 +- board/zipitz2/config.mk | 1 - board/zipitz2/zipitz2.c | 57 +- board/zylonite/nand.c | 110 +- boards.cfg | 8 + common/serial.c | 2 +- drivers/mmc/pxa_mmc.c | 98 +- drivers/serial/serial_pxa.c | 94 +- include/configs/balloon3.h | 274 +++ include/configs/cerf250.h | 3 + include/configs/colibri_pxa270.h | 3 + include/configs/cradle.h | 5 +- include/configs/csb226.h | 3 + include/configs/delta.h | 4 + include/configs/innokom.h | 3 + include/configs/lubbock.h | 3 + include/configs/palmld.h | 276 +++ include/configs/palmtc.h | 248 +++ include/configs/pleb2.h | 3 + include/configs/pxa255_idp.h | 3 + include/configs/trizepsiv.h | 3 + include/configs/vpac270.h | 138 +- include/configs/wepep250.h | 4 + include/configs/xaeniax.h | 3 + include/configs/xm250.h | 3 + include/configs/xsengine.h | 3 + include/configs/zipitz2.h | 10 +- include/configs/zylonite.h | 3 + onenand_ipl/board/vpac270/Makefile | 5 +- 66 files changed, 4017 insertions(+), 2206 deletions(-) create mode 100644 board/balloon3/Makefile create mode 100644 board/balloon3/balloon3.c create mode 100644 board/palmld/Makefile create mode 100644 board/palmld/config.mk rename board/{zipitz2 => palmld}/lowlevel_init.S (90%) create mode 100644 board/palmld/palmld.c copy board/{vpac270 => palmld}/u-boot.lds (90%) create mode 100644 board/palmtc/Makefile create mode 100644 board/palmtc/config.mk rename board/{vpac270 => palmtc}/lowlevel_init.S (95%) create mode 100644 board/palmtc/palmtc.c rename board/{vpac270 => palmtc}/u-boot.lds (90%) delete mode 100644 board/vpac270/config.mk delete mode 100644 board/zipitz2/config.mk create mode 100644 include/configs/balloon3.h create mode 100644 include/configs/palmld.h create mode 100644 include/configs/palmtc.h

2 2

[U-Boot] [PATCH] Update TEXT_BASE to CONFIG_SYS_TEXT_BASE
by Sughosh Ganu 20 Oct '10

20 Oct '10

This was missed out in a couple of files under nand_spl Signed-off-by: Sughosh Ganu <urwithsughosh(a)gmail.com> --- nand_spl/nand_boot.c | 3 ++- nand_spl/nand_boot_fsl_nfc.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c index 4d6db14..a137625 100644 --- a/nand_spl/nand_boot.c +++ b/nand_spl/nand_boot.c @@ -224,7 +224,8 @@ static int nand_load(struct mtd_info *mtd, unsigned int offs, #if defined(CONFIG_ARM) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC) void board_init_f (ulong bootflag) { - relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL, TEXT_BASE); + relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL, + CONFIG_SYS_TEXT_BASE); } #endif diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c index 959f162..833cf47 100644 --- a/nand_spl/nand_boot_fsl_nfc.c +++ b/nand_spl/nand_boot_fsl_nfc.c @@ -266,7 +266,8 @@ static int nand_load(unsigned int from, unsigned int size, unsigned char *buf) #if defined(CONFIG_ARM) && !defined(CONFIG_SYS_ARM_WITHOUT_RELOC) void board_init_f (ulong bootflag) { - relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL, TEXT_BASE); + relocate_code (CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN, NULL, + CONFIG_SYS_TEXT_BASE); } #endif -- 1.7.0.4

2 1

[U-Boot] [PATCH] Makefile: rename TEXT_BASE to CONFIG_SYS_TEXT_BASE
by Eric Cooper 19 Oct '10

19 Oct '10

--- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 30a564d..a3136da 100644 --- a/Makefile +++ b/Makefile @@ -341,7 +341,7 @@ $(obj)u-boot.imx: $(obj)u-boot.bin $(obj)u-boot.kwb: $(obj)u-boot.bin $(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(TEXT_BASE) -d $< $@ + -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@ $(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)tools/ubsha1 $(obj)u-boot.bin -- 1.7.1

2 3

[U-Boot] [PATCH] board_init_r: Removed unused cmdtp variable
by Richard Retanubun 19 Oct '10

19 Oct '10

From 38c6ceb464f63d3705d30d6603624e7d0933f428 Mon Sep 17 00:00:00 2001 From: Richard Retanubun <RichardRetanubun(a)RuggedCom.com> Date: Fri, 1 Oct 2010 10:17:26 -0400 Subject: [PATCH] board_init_r: Removed unused cmdtp variable Follow up to commit 620f1f6a64095ed558e68d37f1965d015cd49b02 removed compiler warning for (now) unused cmd_tbl_t* cmdtp --- Hi Heiko, Not sure if you caught this one already, just a simple unused variable cleanup - Richard arch/avr32/lib/board.c | 1 - arch/m68k/lib/board.c | 1 - arch/mips/lib/board.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c index e6b81cc..96ccc7f 100644 --- a/arch/avr32/lib/board.c +++ b/arch/avr32/lib/board.c @@ -257,7 +257,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) extern char * env_name_spec; #endif char *s; - cmd_tbl_t *cmdtp; bd_t *bd; gd = new_gd; diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index acbdc58..3689ae3 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -405,7 +405,6 @@ board_init_f (ulong bootflag) */ void board_init_r (gd_t *id, ulong dest_addr) { - cmd_tbl_t *cmdtp; char *s; bd_t *bd; extern void malloc_bin_reloc (void); diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c index 2f259cb..cdc7824 100644 --- a/arch/mips/lib/board.c +++ b/arch/mips/lib/board.c @@ -284,7 +284,6 @@ void board_init_f(ulong bootflag) void board_init_r (gd_t *id, ulong dest_addr) { - cmd_tbl_t *cmdtp; #ifndef CONFIG_SYS_NO_FLASH ulong size; #endif -- 1.7.1

4 7

[U-Boot] [PATCH] Add UBI README
by Stefan Roese 19 Oct '10

19 Oct '10

This patch adds a small README to describe the usage of the U-Boot UBI commands. Signed-off-by: Stefan Roese <sr(a)denx.de> --- doc/README.ubi | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 144 insertions(+), 0 deletions(-) create mode 100644 doc/README.ubi diff --git a/doc/README.ubi b/doc/README.ubi new file mode 100644 index 0000000..da2dfac --- /dev/null +++ b/doc/README.ubi @@ -0,0 +1,144 @@ +------------------- +UBI usage in U-Boot +------------------- + +Here the list of the currently implemented UBI commands: + +=> help ubi +ubi - ubi commands + +Usage: +ubi part [part] [offset] + - Show or set current partition (with optional VID header offset) +ubi info [l[ayout]] - Display volume and ubi layout information +ubi create[vol] volume [size] [type] - create volume name with size +ubi write[vol] address volume size - Write volume from address with size +ubi read[vol] address volume [size] - Read volume to address with size +ubi remove[vol] volume - Remove volume +[Legends] + volume: character name + size: specified in bytes + type: s[tatic] or d[ynamic] (default=dynamic) + + +The first command that is needed to be issues is "ubi part" to connect +one mtd partition to the UBI subsystem. This command will either create +a new UBI device on the requested MTD partition. Or it will attach a +previously created UBI device. The other UBI commands will only work +when such a UBI device is attached (via "ubi part"). Here an example: + +=> mtdparts + +device nor0 <1fc000000.nor_flash>, # parts = 6 + #: name size offset mask_flags + 0: kernel 0x00200000 0x00000000 0 + 1: dtb 0x00040000 0x00200000 0 + 2: root 0x00200000 0x00240000 0 + 3: user 0x01ac0000 0x00440000 0 + 4: env 0x00080000 0x01f00000 0 + 5: u-boot 0x00080000 0x01f80000 0 + +active partition: nor0,0 - (kernel) 0x00200000 @ 0x00000000 + +defaults: +mtdids : nor0=1fc000000.nor_flash +mtdparts: mtdparts=1fc000000.nor_flash:2m(kernel),256k(dtb),2m(root),27392k(user),512k(env),512k(u-boot) + +=> ubi part root +Creating 1 MTD partitions on "nor0": +0x000000240000-0x000000440000 : "mtd=2" +UBI: attaching mtd1 to ubi0 +UBI: physical eraseblock size: 262144 bytes (256 KiB) +UBI: logical eraseblock size: 262016 bytes +UBI: smallest flash I/O unit: 1 +UBI: VID header offset: 64 (aligned 64) +UBI: data offset: 128 +UBI: attached mtd1 to ubi0 +UBI: MTD device name: "mtd=2" +UBI: MTD device size: 2 MiB +UBI: number of good PEBs: 8 +UBI: number of bad PEBs: 0 +UBI: max. allowed volumes: 128 +UBI: wear-leveling threshold: 4096 +UBI: number of internal volumes: 1 +UBI: number of user volumes: 1 +UBI: available PEBs: 0 +UBI: total number of reserved PEBs: 8 +UBI: number of PEBs reserved for bad PEB handling: 0 +UBI: max/mean erase counter: 2/1 + + +Now that the UBI device is attached, this device can be modified +using the following commands: + +ubi info Display volume and ubi layout information +ubi createvol Create UBI volume on UBI device +ubi removevol Remove UBI volume from UBI device +ubi read Read data from UBI volume to memory +ubi write Write data from memory to UBI volume + + +Here a few examples on the usage: + +=> ubi create testvol +Creating dynamic volume testvol of size 1048064 + +=> ubi info l +UBI: volume information dump: +UBI: vol_id 0 +UBI: reserved_pebs 4 +UBI: alignment 1 +UBI: data_pad 0 +UBI: vol_type 3 +UBI: name_len 7 +UBI: usable_leb_size 262016 +UBI: used_ebs 4 +UBI: used_bytes 1048064 +UBI: last_eb_bytes 262016 +UBI: corrupted 0 +UBI: upd_marker 0 +UBI: name testvol + +UBI: volume information dump: +UBI: vol_id 2147479551 +UBI: reserved_pebs 2 +UBI: alignment 1 +UBI: data_pad 0 +UBI: vol_type 3 +UBI: name_len 13 +UBI: usable_leb_size 262016 +UBI: used_ebs 2 +UBI: used_bytes 524032 +UBI: last_eb_bytes 2 +UBI: corrupted 0 +UBI: upd_marker 0 +UBI: name layout volume + +=> ubi info +UBI: MTD device name: "mtd=2" +UBI: MTD device size: 2 MiB +UBI: physical eraseblock size: 262144 bytes (256 KiB) +UBI: logical eraseblock size: 262016 bytes +UBI: number of good PEBs: 8 +UBI: number of bad PEBs: 0 +UBI: smallest flash I/O unit: 1 +UBI: VID header offset: 64 (aligned 64) +UBI: data offset: 128 +UBI: max. allowed volumes: 128 +UBI: wear-leveling threshold: 4096 +UBI: number of internal volumes: 1 +UBI: number of user volumes: 1 +UBI: available PEBs: 0 +UBI: total number of reserved PEBs: 8 +UBI: number of PEBs reserved for bad PEB handling: 0 +UBI: max/mean erase counter: 4/1 + +=> ubi write 800000 testvol 80000 +Volume "testvol" found at volume id 0 + +=> ubi read 900000 testvol 80000 +Volume testvol found at volume id 0 +read 524288 bytes from volume 0 to 900000(buf address) + +=> cmp.b 800000 900000 80000 +Total of 524288 bytes were the same -- 1.7.3.1

2 1

[U-Boot] [PATCH] cmd_fpga: cleanup help and check parameters
by Stefano Babic 19 Oct '10

19 Oct '10

The usage and help for the fpga command is wrong and incomplete, and the parameters are not checked before to be passed to the underlying subfunction. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- common/cmd_fpga.c | 50 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 39 insertions(+), 11 deletions(-) diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c index e50c9de..0ad310f 100644 --- a/common/cmd_fpga.c +++ b/common/cmd_fpga.c @@ -163,6 +163,7 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) char *devstr = getenv ("fpga"); char *datastr = getenv ("fpgadata"); int rc = FPGA_FAIL; + int wrong_parms = 0; #if defined (CONFIG_FIT) const char *fit_uname = NULL; ulong fit_addr; @@ -229,6 +230,32 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) break; } + if (dev == FPGA_INVALID_DEVICE) { + puts("FPGA device not specified\n"); + op = FPGA_NONE; + } + + switch (op) { + case FPGA_NONE: + case FPGA_INFO: + break; + case FPGA_LOAD: + case FPGA_LOADB: + case FPGA_DUMP: + if (!fpga_data || !data_size) + wrong_parms = 1; + break; + case FPGA_LOADMK: + if (!fpga_data) + wrong_parms = 1; + break; + } + + if (wrong_parms) { + puts("Wrong parameters for FPGA request\n"); + op = FPGA_NONE; + } + switch (op) { case FPGA_NONE: return cmd_usage(cmdtp); @@ -342,17 +369,18 @@ static int fpga_get_op (char *opstr) } U_BOOT_CMD (fpga, 6, 1, do_fpga, - "loadable FPGA image support", - "fpga [operation type] [device number] [image address] [image size]\n" - "fpga operations:\n" - "\tinfo\tlist known device information\n" - "\tload\tLoad device from memory buffer\n" - "\tloadb\tLoad device from bitstream buffer (Xilinx devices only)\n" - "\tloadmk\tLoad device generated with mkimage\n" - "\tdump\tLoad device to memory buffer" + "loadable FPGA image support", + "[operation type] [device number] [image address] [image size]\n" + "fpga operations:\n" + " dump\t[dev]\t\t\tLoad device to memory buffer\n" + " info\t[dev]\t\t\tlist known device information\n" + " load\t[dev] [address] [size]\tLoad device from memory buffer\n" + " loadb\t[dev] [address] [size]\t" + "Load device from bitstream buffer (Xilinx only)\n" + " loadmk [dev] [address]\tLoad device generated with mkimage" #if defined(CONFIG_FIT) - "\n" - "\tFor loadmk operating on FIT format uImage address must include\n" - "\tsubimage unit name in the form of addr:<subimg_uname>" + "\n" + "\tFor loadmk operating on FIT format uImage address must include\n" + "\tsubimage unit name in the form of addr:<subimg_uname>" #endif ); -- 1.7.1

2 1

[U-Boot] [PATCH] FPGA: Add missing prototype
by Stefano Babic 19 Oct '10

19 Oct '10

Add prototype function for ispVMFreeMem to remove warnings when support for Lattice FPGA is compiled. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- include/lattice.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/lattice.h b/include/lattice.h index 33d2ac3..75729b6 100755 --- a/include/lattice.h +++ b/include/lattice.h @@ -308,6 +308,7 @@ int lattice_info(Lattice_desc *desc); void ispVMStart(void); void ispVMEnd(void); +extern void ispVMFreeMem(void); signed char ispVMCode(void); void ispVMDelay(unsigned short int a_usMicroSecondDelay); void ispVMCalculateCRC32(unsigned char a_ucData); -- 1.7.1

2 1