October 2012 - U-Boot

[U-Boot] [PATCH] arm1136: cosmetic: Remove double test on CONFIG_SYS_DCACHE_OFF
by Benoît Thébaudeau 10 Nov '12

10 Nov '12

Remove a redundant '#ifndef CONFIG_SYS_DCACHE_OFF' nested in the same #ifndef. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> --- .../arch/arm/cpu/arm1136/cpu.c | 2 -- 1 file changed, 2 deletions(-) diff --git u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/cpu.c u-boot-4d3c95f/arch/arm/cpu/arm1136/cpu.c index b98e3d9..1136c1d 100644 --- u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/cpu.c +++ u-boot-4d3c95f/arch/arm/cpu/arm1136/cpu.c @@ -146,9 +146,7 @@ void enable_caches(void) #ifndef CONFIG_SYS_ICACHE_OFF icache_enable(); #endif -#ifndef CONFIG_SYS_DCACHE_OFF dcache_enable(); -#endif } #else /* #ifndef CONFIG_SYS_DCACHE_OFF */

2 9

[U-Boot] [PATCH 0/2] socfpga/spl: Cleanup
by Vikram Narayanan 10 Nov '12

10 Nov '12

Cleanups for SPL/socfpga. Cc: Dinh Nguyen <dinguyen(a)altera.com> Vikram Narayanan (2): arm/socfpga: Remove timer_init from spl_board_init socfpga/spl: Remove malloc.h arch/arm/cpu/armv7/socfpga/spl.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) -- 1.7.4.1

4 6

[U-Boot] [PATCH 1/4] microblaze: Fix compilation warning in ext2_find_next_zero_bit
by Michal Simek 08 Nov '12

08 Nov '12

ext2_find_next_zero_bit must be also static if __swab32 is also static. Warning: include/asm/bitops.h:369:22: warning: '__fswab32' is static but used in inline function 'ext2_find_next_zero_bit' which is not static [enabled by default] Signed-off-by: Michal Simek <monstr(a)monstr.eu> --- arch/microblaze/include/asm/bitops.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/microblaze/include/asm/bitops.h b/arch/microblaze/include/asm/bitops.h index e8c835f..eafa2b5 100644 --- a/arch/microblaze/include/asm/bitops.h +++ b/arch/microblaze/include/asm/bitops.h @@ -319,7 +319,8 @@ extern __inline__ int ext2_test_bit(int nr, const volatile void * addr) #define ext2_find_first_zero_bit(addr, size) \ ext2_find_next_zero_bit((addr), (size), 0) -extern __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned long size, unsigned long offset) +static inline unsigned long ext2_find_next_zero_bit(void *addr, + unsigned long size, unsigned long offset) { unsigned long *p = ((unsigned long *) addr) + (offset >> 5); unsigned long result = offset & ~31UL; -- 1.7.0.4

3 12

[U-Boot] S-o-b entries for bcm2708 SDHCI driver in the downstream R.Pi Linux kernel
by Stephen Warren 08 Nov '12

08 Nov '12

(Sorry for the resend; I sent this to the wrong U-Boot mailing list the first time around) Dom, ddv2005, Gray, I'm trying to get Signed-off-by lines for all code in the Raspberry Pi Linux kernel trees related to the SDHCI driver (or just everything). The list of relevant commits for SDHCI is below. Can you please check Documentation/SubmittingPatches in the kernel source tree, and if you're able to, provide your Signed-of-by lines for all of the patches I list below that were either authored by you, or passed through you (the latter I assume mainly in the case of Dom who applied these to git). Related, do you know who the following person is: Grigori Goronzy <greg@blackbox>; he's the author of at least one patch, but the email address is invalid. Dom, it'd be great if you could obtain the appropriate S-o-b lines from all contributors to your kernel trees, then rebase these branches and add the appropriate S-o-bs to all the patches. If in the future you make sure that all the git metadata and S-o-b entries are present and valid in all the commits (full name and valid email address), we won't have to go back to people and validate this after the fact again. Note: the patch list below is every patch that touches the driver. It may be possible to analyze each patch and find only those that touched the specific subset of code that Oleksandr used for U-Boot. I can give that a try if getting S-o-bs for all the patches proves problematic. Of course, that will then simply defer the issue until someone attempts to upstream the whole downstream Linux SDHCI driver into the upstream Linux kernel... Thanks very much! rpi-3.2.27: > 118e2d3 Allow the number of cycles delay between sdcard peripheral writes to be specified on command line with sdhci-bcm2708.cycle_delay > 7042895 Enable low latency mode by default in sdcard driver. Can be disabled with sdhci-bcm2708.enable_llm=0 > 307d9fb Fix build for non-preempt case. Fix warning > e886b45 Add low-latency mode to sdcard driver. Enable with sdhci-bcm2708.enable_llm=1. Thanks ddv2005. > 2c671b9 Fix spinlock recursion in sdhci-bcm2708.c > 147779e Add module parameter for missing_status quirk. sdhci-bcm2708.missing_status=0 may improve interrupt latency > 31c350f sdhci-bcm2708: use multiblock-type transfers for single blocks > 3a47543 sdhci-bcm2708: use extension FIFO to buffer DMA transfers > 0bf2669 Add sync_after_dma module parameter > f1da243 Use ndelay rather than udelay. Thanks lb Who is lb? > 63aa167 Fix bool/int error, part 2 > d34d49e Fix bool/int error > d7afba1 sdhci-bcm2708: raise DMA sync timeout > 84042ac Allow emmc clock to be specified as command line parameter > 70b125d sdhci-bcm2708: assume 50 MHz eMMC clock > d7156c5 sdhci-bcm2708: add allow_highspeed parameter > 8f82daa sdhci-bcm2708: add additional quirks > 6ab6d02 sdhci-bcm2708: remove custom clock handling > 8390fb8 sdhci-bcm2708: speed up DMA sync > 2d05297 sdcard patch improvements from naren Who is naren? > e9382f7 possible fix for sdcard missing status. Thank naren > 2456b9f Replace #if 1 sections by local configuration #defines (tidy) > 8a93b2a Fix problem with dma that could corrupt sdcard, especially when L2 enabled > 5961574 Fix for mmc timeouts when erasing multiple blocks > 031ee3e Main bcm2708 linux port Are these actually all authored by who git says they are? I notice that the two commits I called out above have a git authorship field of Dom Cobley, even though the patch subject implies someone else wrote them. rpi-3.6.y: > a2386d3 Fix up issues with rebase > f34c715 Allow the number of cycles delay between sdcard peripheral writes to be specified on command line with sdhci-bcm2708.cycle_delay > f0dbf1e Enable low latency mode by default in sdcard driver. Can be disabled with sdhci-bcm2708.enable_llm=0 > da819bb Fix build for non-preempt case. Fix warning > f26afe4 Add low-latency mode to sdcard driver. Enable with sdhci-bcm2708.enable_llm=1. Thanks ddv2005. > 641bd2c Fix spinlock recursion in sdhci-bcm2708.c > ee410b8 Add module parameter for missing_status quirk. sdhci-bcm2708.missing_status=0 may improve interrupt latency > e1ccc32 sdhci-bcm2708: use multiblock-type transfers for single blocks > 34eec60 sdhci-bcm2708: use extension FIFO to buffer DMA transfers > 1245667 Add sync_after_dma module parameter > 0b047fb Use ndelay rather than udelay. Thanks lb > 234c311 Fix bool/int error, part 2 > 27f5be9 Fix bool/int error > ab619f6 sdhci-bcm2708: raise DMA sync timeout > 1b89d0c Allow emmc clock to be specified as command line parameter > 5109353 sdhci-bcm2708: assume 50 MHz eMMC clock > ce8e5cb sdhci-bcm2708: add allow_highspeed parameter > aa86832 sdhci-bcm2708: add additional quirks > e2076c4 sdhci-bcm2708: remove custom clock handling > f354b15 sdhci-bcm2708: speed up DMA sync > 9c9780e sdcard patch improvements from naren > d47f5ca possible fix for sdcard missing status. Thank naren > 1ba126b Replace #if 1 sections by local configuration #defines (tidy) > 7a69d91 Fix problem with dma that could corrupt sdcard, especially when L2 enabled > f5fe324 Fix for mmc timeouts when erasing multiple blocks > f5b930b Main bcm2708 linux port

2 4

[U-Boot] [PATCH] patman: Issue empty change logs for unchanged patches
by Simon Glass 08 Nov '12

08 Nov '12

Often a particular patch may change only for some versions of a series. For versions where there is no change, issue a change log indicating that (for example 'Changes in v4: None'). For such lines, don't add a blank line afterwards, to conserve space. Use list.insert() instead of list = [item] + list. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/patman/series.py | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/patman/series.py b/tools/patman/series.py index a283a2d..d2971f4 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -145,10 +145,11 @@ class Series(dict): Return: The change log as a list of strings, one per line - Changes in v2: + Changes in v4: - Jog the dial back closer to the widget - Changes in v1: + Changes in v3: None + Changes in v2: - Fix the widget - Jog the dial @@ -162,12 +163,16 @@ class Series(dict): if commit and this_commit != commit: continue out.append(text) - if out: - out = ['Changes in v%d:' % change] + out - if need_blank: - out = [''] + out - final += out - need_blank = True + line = 'Changes in v%d:' % change + have_changes = len(out) > 0 + if have_changes: + out.insert(0, line) + else: + out = [line + ' None'] + if need_blank: + out.insert(0, '') + final += out + need_blank = have_changes if self.changes: final.append('') return final -- 1.7.7.3

3 2

[U-Boot] [PATCH v6 1/7] powerpc: Extract EPAPR_MAGIC constants into processor.h
by Stefan Roese 07 Nov '12

07 Nov '12

By extracting these defines into a header, they can be re-used by other C sources as well. This will be done by the SPL framework OS boot support. Signed-off-by: Stefan Roese <sr(a)denx.de> --- Changes in v6: - Fix compile warning: release.S:354:0: warning: "EPAPR_MAGIC" redefined arch/powerpc/cpu/mpc85xx/release.S | 1 - arch/powerpc/include/asm/processor.h | 6 ++++++ arch/powerpc/lib/bootm.c | 6 ------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/release.S b/arch/powerpc/cpu/mpc85xx/release.S index 4ba44a9..d2e94b8 100644 --- a/arch/powerpc/cpu/mpc85xx/release.S +++ b/arch/powerpc/cpu/mpc85xx/release.S @@ -351,7 +351,6 @@ __secondary_reset_vector: .align L1_CACHE_SHIFT .global __second_half_boot_page __second_half_boot_page: -#define EPAPR_MAGIC 0x45504150 #define ENTRY_ADDR_UPPER 0 #define ENTRY_ADDR_LOWER 4 #define ENTRY_R3_UPPER 8 diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 7aa3231..19fe250 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -1342,4 +1342,10 @@ void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); #endif #endif /* CONFIG_MACH_SPECIFIC */ +#if defined(CONFIG_MPC85xx) || defined(CONFIG_440) + #define EPAPR_MAGIC (0x45504150) +#else + #define EPAPR_MAGIC (0x65504150) +#endif + #endif /* __ASM_PPC_PROCESSOR_H */ diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 53dc4df..e3fee0b 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -87,12 +87,6 @@ static void boot_jump_linux(bootm_headers_t *images) * r8: 0 * r9: 0 */ -#if defined(CONFIG_MPC85xx) || defined(CONFIG_440) - #define EPAPR_MAGIC (0x45504150) -#else - #define EPAPR_MAGIC (0x65504150) -#endif - debug (" Booting using OF flat tree...\n"); WATCHDOG_RESET (); (*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC, -- 1.8.0

5 7

[U-Boot] [PATCH v5 0/7] SPL: Port SPL framework to powerpc
by Stefan Roese 07 Nov '12

07 Nov '12

This patchset ports the SPL framework to powerpc. Its based on the SPL generalization lately done by Tom Rini. The patches is based on the current "master" branch. Additionally, a new MPC5200 board port is included, the a3m071 board port. This board port uses this SPL framework mainly to speed up booting into the OS (Linux of course). Detection of Linux vs. U-Boot booting is done here by checking the environment variable "boot_os". If "boot_os" is set to "yes", then the OS (Linux) is booted. Otherwise the "real" U-Boot is booted. Tom, what do you think? I would really like to get this included now. Would you prefer if I would push this patch series into a git repo where you could pull from? Thanks, Stefan Changes in v5: - Remove timer_init() for PPC systems - Remove some unneeded defines from a3m071.h (e.g. LIME related) - Configure PCS2 not for SPI as default Changes in v4: - Build spl.o only for SPL image - getenv_f not extracted into separate file. Only Makefile additions for SPL_BUILD needed. - Add remark to call "fdt chosen" to board/a3m071/README - Configure PCS2 as CODEC2 (SPI) - Drop patch fdt: cmd_fdt: Call fdt_chosen() from "fdt boardsetup" Changes in v3: - Rebased on current master plus SPL framework v7 - Don't use special MPC5xxx memcpy in SPL - Move linker symbols to header spl.h (checkpatch) Changes in v2: - Rebased on Tom's SPL framework patches v4 - Add option to skip copying of the mkimage header - Rebased on Tom's SPL framework patches v4 - Rebased on Tom's SPL framework patches v4 - a3m071 build: Concat SPL binary and u-boot.img directly (no padding) Stefan Roese (7): powerpc: Extract EPAPR_MAGIC constants into processor.h SPL: Port SPL framework to powerpc env: Enable getenv_f() for SPL_BUILD mpc5200: Add SPL support mpc5200: Add a3m071 board support Makefile: Add possibility to set entry-point for u-boot.img Makefile: Add target for combined spl/u-boot.bin & u-boot.img MAINTAINERS | 2 + Makefile | 14 +- arch/powerpc/cpu/mpc5xxx/Makefile | 4 + arch/powerpc/cpu/mpc5xxx/spl_boot.c | 79 +++++++ arch/powerpc/cpu/mpc5xxx/start.S | 22 ++ arch/powerpc/cpu/mpc5xxx/u-boot-spl.lds | 57 +++++ arch/powerpc/include/asm/processor.h | 6 + arch/powerpc/include/asm/spl.h | 31 +++ arch/powerpc/lib/Makefile | 14 ++ arch/powerpc/lib/bootm.c | 6 - arch/powerpc/lib/spl.c | 42 ++++ board/a3m071/Makefile | 36 +++ board/a3m071/README | 80 +++++++ board/a3m071/a3m071.c | 335 ++++++++++++++++++++++++++++ board/a3m071/mt46v16m16-75.h | 32 +++ boards.cfg | 1 + common/Makefile | 3 + common/spl/spl.c | 16 ++ include/configs/a3m071.h | 380 ++++++++++++++++++++++++++++++++ 19 files changed, 1153 insertions(+), 7 deletions(-) create mode 100644 arch/powerpc/cpu/mpc5xxx/spl_boot.c create mode 100644 arch/powerpc/cpu/mpc5xxx/u-boot-spl.lds create mode 100644 arch/powerpc/include/asm/spl.h create mode 100644 arch/powerpc/lib/spl.c create mode 100644 board/a3m071/Makefile create mode 100644 board/a3m071/README create mode 100644 board/a3m071/a3m071.c create mode 100644 board/a3m071/mt46v16m16-75.h create mode 100644 include/configs/a3m071.h -- 1.8.0

3 11

[U-Boot] [PATCH 1/7] ide: Add printf format string for CONFIG_SYS_64BIT_LBA option
by Simon Glass 07 Nov '12

07 Nov '12

From: Gabe Black <gabeblack(a)chromium.org> The size of an LBA type changes depending on this option. We need to use a different printf() string in each case, so create a define for this. Signed-off-by: Gabe Black <gabeblack(a)chromium.org> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- include/ide.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ide.h b/include/ide.h index 385e909..18d63b2 100644 --- a/include/ide.h +++ b/include/ide.h @@ -42,8 +42,10 @@ #ifdef CONFIG_SYS_64BIT_LBA typedef uint64_t lbaint_t; +#define LBAF "%llx" #else typedef ulong lbaint_t; +#define LBAF "%lx" #endif /* -- 1.7.7.3

6 30

[U-Boot] [PATCH] MAKEALL: Add spear platform target to compile all SPEAr boards
by Stefan Roese 07 Nov '12

07 Nov '12

Signed-off-by: Stefan Roese <sr(a)denx.de> --- MAKEALL | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAKEALL b/MAKEALL index 2e8b997..a553521 100755 --- a/MAKEALL +++ b/MAKEALL @@ -365,6 +365,12 @@ LIST_pxa="$(boards_by_cpu pxa)" LIST_ixp="$(boards_by_cpu ixp)" ######################################################################### +## SPEAr Systems +######################################################################### + +LIST_spear="$(boards_by_soc spear)" + +######################################################################### ## ARM groups ######################################################################### -- 1.7.10.3

2 1

[U-Boot] [PATCH 0/7] lcd/video: Add parameter API and compressed bitmaps
by Simon Glass 07 Nov '12

07 Nov '12

This series contains patches to create an API to read lcd/video parameters such as the screen size. It also adds support for displaying compressed bitmaps. Ultimately it would be nice to unify lcd and video more, and this is a step towards that. Board files still need to decide which to use, but the same parameters are available in both. Stefan Reinauer (2): video: Provide an API to access video parameters video: Implement additional video API functions in cfb_console Tom Wai-Hong Tam (3): lcd: Fix BMP decode bug that skips the wrong padded row lcd: Fix fb offset calculation for bpix == 16 in BMP display lcd: Implement RLE8 bitmap decoding Vadim Bendebury (2): lcd: Provide an API to access LCD parameters video: Skip bitmaps which do not fit into the screen in cfb_console README | 5 + common/cmd_bmp.c | 4 +- common/lcd.c | 184 +++++++++++++++++++++++++++++++++++++++++-- drivers/video/cfb_console.c | 39 +++++++++ include/lcd.h | 36 +++++++++ include/video.h | 48 +++++++++++ 6 files changed, 307 insertions(+), 9 deletions(-) -- 1.7.7.3

4 14