July 2015 - U-Boot

[U-Boot] [PATCH 0/7] Add Cavium ThunderX support
by Sergey Temerkhanov 02 Jul '15

02 Jul '15

This patch series adds support for Cavium ThunderX 88xx SoC family (http://www.cavium.com/ThunderX_ARM_Processors.html).

3 12

[U-Boot] [v3 00/10] spi: cadence_qspi: sram depth from DT & fix for FIFO width
by Vikas Manocha 02 Jul '15

02 Jul '15

This patchset adds support to get controller sram size from device tree, fix to support different FIFO widths & adds dt binding doc. Also this patchset enables cadence qspi controller for stv0991 soc, saves environment in spi flash & moves CONFIG_OF in the defconfig file. Changes in v3: - Clubbed two patchsets: 1. [v2 0/3] spi: cadence_qspi: sram depth from DT & fix for FIFO width 2. [v2 0/6] stv0991: enable cadence qspi controller & spi flash Changes in v2: - fix the checkpatch error. Vikas Manocha (10): stv0991: enable saving enrironment in spi flash stv0991: move OF_CONTROL config to defconfig stv0991: remove define CONFIG_OF_SEPARATE from board file stv0991: configure clock & pad muxing for qspi stv0991: enable cadence qspi controller & spi flash stv0991: configure device tree for cadence qspi & flash spi: cadence_qspi: move the sram partition in init spi: cadence_qspi: get sram size from device tree spi: cadence_qspi: support FIFO width other than 4 bytes spi: cadence_qspi: add device tree binding doc arch/arm/cpu/armv7/stv0991/clock.c | 4 +- arch/arm/cpu/armv7/stv0991/pinmux.c | 5 ++ arch/arm/dts/socfpga.dtsi | 4 +- arch/arm/dts/socfpga_cyclone5_socrates.dts | 1 - arch/arm/dts/stv0991.dts | 31 ++++++++++ arch/arm/include/asm/arch-stv0991/stv0991_cgu.h | 15 +++++ arch/arm/include/asm/arch-stv0991/stv0991_creg.h | 9 +++ arch/arm/include/asm/arch-stv0991/stv0991_periph.h | 2 + board/st/stv0991/stv0991.c | 8 +++ configs/stv0991_defconfig | 2 +- doc/device-tree-bindings/spi/spi-cadence.txt | 28 +++++++++ drivers/spi/cadence_qspi.c | 1 + drivers/spi/cadence_qspi.h | 1 + drivers/spi/cadence_qspi_apb.c | 62 ++++++++------------ include/configs/stv0991.h | 24 +++++++- 15 files changed, 152 insertions(+), 45 deletions(-) create mode 100644 doc/device-tree-bindings/spi/spi-cadence.txt -- 1.7.9.5

4 17

[U-Boot] [PATCH v3 1/3] arm: support Thumb-1 with CONFIG_SYS_THUMB_BUILD
by Albert ARIBAUD 02 Jul '15

02 Jul '15

When building a Thumb-1-only target with CONFIG_SYS_THUMB_BUILD, some files fail to build, most of the time because they include mcr instructions, which only exist for Thumb-2. Thos patch introduces a Kconfig option CONFIG_THUMB2 and uses it to select between Thumb-2 and ARM mode for the aforementioned files. Signed-off-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> --- This patch has been build-tested and run-tested on ED Mini V2, above the "edmini: switch to SPL" patch, and found to reduce U-Boot size by 25% and SPL size by 14%... and to run fine. :) This patch has also been tested against side effects on the non-Thumb wireless_space target. The binaries produced with and without ths patch were found to differ only by their version string. Changes in v3: - added arch/arm/lib/mem{set,cpy}.S to the list of modules which should always be built in ARM state. - Selected HAS_THUMB2 for CPU_V7M. - Fixed invalidate_l2_cache() when building for Thumb-1. Changes in v2: - fixed a typo in the commit message - added file arch/arm/thumb1/include/asm/proc-armv/system.h, which overrides arch/arm/include/asm/proc-armv/system.h when building for Thumb-1 and provides non-functional but Thumb-compilable IRQ and FIQ related macros and functions. Makefile | 2 + arch/arm/Kconfig | 5 ++ arch/arm/cpu/arm926ejs/Makefile | 11 ++++ arch/arm/cpu/arm926ejs/cache.c | 5 ++ arch/arm/include/asm/cache.h | 4 ++ arch/arm/lib/Makefile | 24 +++++++++ arch/arm/lib/cache.c | 11 ++++ arch/arm/lib/memcpy.S | 4 +- arch/arm/lib/memset.S | 2 +- arch/arm/mach-orion5x/Makefile | 10 ++++ arch/arm/thumb1/include/asm/proc-armv/system.h | 69 ++++++++++++++++++++++++++ examples/standalone/Makefile | 10 ++++ scripts/Makefile.lib | 3 +- 13 files changed, 156 insertions(+), 4 deletions(-) create mode 100644 arch/arm/thumb1/include/asm/proc-armv/system.h diff --git a/Makefile b/Makefile index 37cc4c3..dc881fa 100644 --- a/Makefile +++ b/Makefile @@ -606,6 +606,8 @@ KBUILD_CFLAGS += $(KCFLAGS) UBOOTINCLUDE := \ -Iinclude \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ + $(if $(CONFIG_SYS_THUMB_BUILD), $(if $(CONFIG_HAS_THUMB2),, \ + -I$(srctree)/arch/$(ARCH)/thumb1/include),) \ -I$(srctree)/arch/$(ARCH)/include \ -include $(srctree)/include/linux/kconfig.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0829235..906afd0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -10,6 +10,9 @@ config ARM64 config HAS_VBAR bool +config HAS_THUMB2 + bool + config CPU_ARM720T bool @@ -32,9 +35,11 @@ config CPU_ARM1176 config CPU_V7 bool select HAS_VBAR + select HAS_THUMB2 config CPU_V7M bool + select HAS_THUMB2 config CPU_PXA bool diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 63fa159..fe78922 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -20,3 +20,14 @@ obj-$(CONFIG_MX25) += mx25/ obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ obj-$(if $(filter spear,$(SOC)),y) += spear/ + +# some files can only build in ARM or THUMB2, not THUMB1 + +ifdef CONFIG_SYS_THUMB_BUILD +ifndef CONFIG_HAS_THUMB2 + +CFLAGS_cpu.o := -marm +CFLAGS_cache.o := -marm + +endif +endif diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c index 8d7873c..f12e365 100644 --- a/arch/arm/cpu/arm926ejs/cache.c +++ b/arch/arm/cpu/arm926ejs/cache.c @@ -99,4 +99,9 @@ void flush_cache(unsigned long start, unsigned long size) /* * Stub implementations for l2 cache operations */ + __weak void l2_cache_disable(void) {} + +#if defined CONFIG_SYS_THUMB_BUILD +__weak void invalidate_l2_cache(void) {} +#endif diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h index a836e9f..1f63127 100644 --- a/arch/arm/include/asm/cache.h +++ b/arch/arm/include/asm/cache.h @@ -16,6 +16,9 @@ /* * Invalidate L2 Cache using co-proc instruction */ +#ifdef CONFIG_SYS_THUMB_BUILD +void invalidate_l2_cache(void); +#else static inline void invalidate_l2_cache(void) { unsigned int val=0; @@ -24,6 +27,7 @@ static inline void invalidate_l2_cache(void) : : "r" (val) : "cc"); isb(); } +#endif void l2_cache_enable(void); void l2_cache_disable(void); diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 9a631d1..4272d2f 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -60,3 +60,27 @@ obj-$(CONFIG_DEBUG_LL) += debug.o ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS))) extra-y += eabi_compat.o endif + +# some files can only build in ARM or THUMB2, not THUMB1 + +ifdef CONFIG_SYS_THUMB_BUILD +ifndef CONFIG_HAS_THUMB2 + +# for C files, just apend -marm, which will override previous -mthumb* + +CFLAGS_cache.o := -marm +CFLAGS_cache-cp15.o := -marm + +# For .S, drop -mthumb* and other thumb-related options. +# CFLAGS_REMOVE_* would not have an effet, so AFLAGS_REMOVE_* +# was implemented and is used here. +# Also, define ${target}_NO_THUMB_BUILD for these two targets +# so that the code knows it should not use Thumb. + +AFLAGS_REMOVE_memset.o := -mthumb -mthumb-interwork +AFLAGS_REMOVE_memcpy.o := -mthumb -mthumb-interwork +AFLAGS_memset.o := -DMEMSET_NO_THUMB_BUILD +AFLAGS_memcpy.o := -DMEMCPY_NO_THUMB_BUILD + +endif +endif diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index 74cfde6..7c8878d 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -95,3 +95,14 @@ phys_addr_t noncached_alloc(size_t size, size_t align) return next; } #endif /* CONFIG_SYS_NONCACHED_MEMORY */ + +#if defined(CONFIG_SYS_THUMB_BUILD) +void invalidate_l2_cache(void) +{ + unsigned int val = 0; + + asm volatile("mcr p15, 1, %0, c15, c11, 0 @ invl l2 cache" + : : "r" (val) : "cc"); + isb(); +} +#endif diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index ffaee74..409d5f7 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -13,7 +13,7 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#ifdef CONFIG_SYS_THUMB_BUILD +#if defined(CONFIG_SYS_THUMB_BUILD) && !defined(MEMCPY_NO_THUMB_BUILD) #define W(instr) instr.w #else #define W(instr) instr @@ -62,7 +62,7 @@ /* Prototype: void *memcpy(void *dest, const void *src, size_t n); */ .syntax unified -#ifdef CONFIG_SYS_THUMB_BUILD +#if defined(CONFIG_SYS_THUMB_BUILD) && !defined(MEMCPY_NO_THUMB_BUILD) .thumb .thumb_func #endif diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 49bdff7..b586055 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S @@ -16,7 +16,7 @@ .align 5 .syntax unified -#ifdef CONFIG_SYS_THUMB_BUILD +#if defined(CONFIG_SYS_THUMB_BUILD) && !defined(MEMSET_NO_THUMB_BUILD) .thumb .thumb_func #endif diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile index 546ebcb..33dcad4 100644 --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion5x/Makefile @@ -16,3 +16,13 @@ obj-y += timer.o ifndef CONFIG_SKIP_LOWLEVEL_INIT obj-y += lowlevel_init.o endif + +# some files can only build in ARM or THUMB2, not THUMB1 + +ifdef CONFIG_SYS_THUMB_BUILD +ifndef CONFIG_HAS_THUMB2 + +CFLAGS_cpu.o := -marm + +endif +endif diff --git a/arch/arm/thumb1/include/asm/proc-armv/system.h b/arch/arm/thumb1/include/asm/proc-armv/system.h new file mode 100644 index 0000000..7dfbf3d --- /dev/null +++ b/arch/arm/thumb1/include/asm/proc-armv/system.h @@ -0,0 +1,69 @@ +/* + * Thumb-1 drop-in for the linux/include/asm-arm/proc-armv/system.h + * + * (C) Copyright 2015 + * Albert ARIBAUD <albert.u.boot(a)aribaud.net> + * + * The original file does not build in Thumb mode. However, in U-Boot + * we don't use interrupt context, so we can redefine these as empty + * memory barriers, which makes Thumb-1 compiler happy. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* + * Use the same macro name as linux/include/asm-arm/proc-armv/system.h + * here, so that if the original ever gets included after us, it won't + * try to re-redefine anything. + */ + +#ifndef __ASM_PROC_SYSTEM_H +#define __ASM_PROC_SYSTEM_H + +/* + * Redefine all original macros with static inline functions containing + * a simple memory barrier, so that they produce the same instruction + * ordering constraints as their original counterparts. + * We use static inline functions rather than macros so that we can tell + * the compiler to not complain about unused arguments. + */ + +static inline void local_irq_save( + unsigned long flags __attribute__((unused))) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void local_irq_enable(void) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void local_irq_disable(void) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void __stf(void) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void __clf(void) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void local_save_flags( + unsigned long flags __attribute__((unused))) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +static inline void local_irq_restore( + unsigned long flags __attribute__((unused))) +{ + __asm__ __volatile__ ("" : : : "memory"); +} + +#endif /* __ASM_PROC_SYSTEM_H */ diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index 0863a8c..5a6ae00 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -73,3 +73,13 @@ $(obj)/%.srec: $(obj)/% FORCE $(obj)/%.bin: OBJCOPYFLAGS := -O binary $(obj)/%.bin: $(obj)/% FORCE $(call if_changed,objcopy) + +# some files can only build in ARM or THUMB2, not THUMB1 + +ifdef CONFIG_SYS_THUMB_BUILD +ifndef CONFIG_HAS_THUMB2 + +CFLAGS_stubs.o := -marm + +endif +endif diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 8731fc6..3d5c872 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -104,8 +104,9 @@ modname_flags = $(if $(filter 1,$(words $(modname))),\ orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ $(ccflags-y) $(CFLAGS_$(basetarget).o) _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) -_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ +orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ $(asflags-y) $(AFLAGS_$(basetarget).o) +_a_flags = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags)) _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) # -- 2.1.0

1 2

[U-Boot] Need Help in Building in altera_spi.c file
by Chakra D 02 Jul '15

02 Jul '15

Hello all, Is anyone building / using altera_spi.c module ? Which board currently is using this driver ? I could not find any defconfig file using it. Can someone provide the details of building it... Thanks in advance. Regards, Chakra Divi

3 2

[U-Boot] [ANN] U-Boot v2015.07-rc3 released
by Tom Rini 02 Jul '15

02 Jul '15

Hey all, I've pushed v2015.04-rc3 out to the repository and tarballs should exist soon. I'm a bit behind again and should have done that last Monday, and there's a bit more in here than I'm totally happy with but some of it has been outstanding for a while and others are important follow-up to other things we've done for this release. That said, I think I need to re-think how the merge window works and perhaps follow the kernel rules here, but that's for a separate email. Thanks all! -- Tom

2 1

[U-Boot] [PATCH v1 0/9] mvebu/a38x: Add MMC/SDIO, SATA/AHCI and USB/EHCI support
by Stefan Roese 02 Jul '15

02 Jul '15

This patch series adds support for the following interfaces on the Marvell A38x Soc in mainline U-Boot: - MMC/SDIO/SDHCI - SATA/SCSI/AHCI - USB/EHCI Tested on Marvell Armada 38x DB-88F6820-GP eval board. Thanks, Stefan Stefan Roese (9): mmc: sdhci: Use timer based timeout detection in sdhci_send_command() mmc: sdhci.c: Add config option to use a fixed buffer for transfers arm: mvebu: Add SDIO/SDHCI support for Armada A38x arm: mvebu: db-88f6820-gp: Add MMC/SDIO support block: ahci: Don't enable port interrupts arm: mvebu: Add SATA/SCSI (AHCI) support for Armada A38x arm: mvebu: db-88f6820-gp.h: Add SATA/SCSI (AHCI) support usb: Add EHCI support for Armada 38x (mvebu) arm: mvebu: db-88f6820-gp: Add USB/EHCI support arch/arm/mach-mvebu/cpu.c | 66 +++++++++++++++++++++++++++++++++ arch/arm/mach-mvebu/include/mach/cpu.h | 2 + arch/arm/mach-mvebu/include/mach/gpio.h | 10 +++++ arch/arm/mach-mvebu/include/mach/soc.h | 3 ++ drivers/block/ahci.c | 3 -- drivers/mmc/sdhci.c | 25 ++++++++++--- drivers/usb/host/ehci-marvell.c | 36 ++++++++++++++++++ include/configs/db-88f6820-gp.h | 41 ++++++++++++++++++++ 8 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h -- 2.4.5

3 13

[U-Boot] [PATCH 1/2] defconfig: Add CONFIG_OF_CONTROL in zynq_picozed
by Jagan Teki 02 Jul '15

02 Jul '15

Enable FDT support for zynq_picozed board. Signed-off-by: Jagan Teki <jteki(a)openedev.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> --- configs/zynq_picozed_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index af77a9d..76a76e0 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -6,3 +6,4 @@ CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_OF_CONTROL=y -- 1.9.1

3 8

[U-Boot] [RFC PATCH] ARMv8: add Kconfig and CPU_V8 option
by fenghua＠phytium.com.cn 02 Jul '15

02 Jul '15

From: David Feng <fenghua(a)phytium.com.cn> This patch add Kconfig to armv8. Signed-off-by: David Feng <fenghua(a)phytium.com.cn> --- arch/arm/Kconfig | 16 +++++++++++----- arch/arm/cpu/armv8/Kconfig | 10 ++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 arch/arm/cpu/armv8/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 986b4c5..a01cb3c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -33,6 +33,10 @@ config CPU_V7 bool select HAS_VBAR +config CPU_V8 + bool + select ARM64 + config CPU_PXA bool @@ -729,24 +733,24 @@ config TEGRA config TARGET_VEXPRESS64_AEMV8A bool "Support vexpress_aemv8a" - select ARM64 + select CPU_V8 config TARGET_VEXPRESS64_BASE_FVP bool "Support Versatile Express ARMv8a FVP BASE model" - select ARM64 + select CPU_V8 select SEMIHOSTING config TARGET_VEXPRESS64_JUNO bool "Support Versatile Express Juno Development Platform" - select ARM64 + select CPU_V8 config TARGET_LS2085A_EMU bool "Support ls2085a_emu" - select ARM64 + select CPU_V8 config TARGET_LS2085A_SIMU bool "Support ls2085a_simu" - select ARM64 + select CPU_V8 config TARGET_LS1021AQDS bool "Support ls1021aqds" @@ -855,6 +859,8 @@ source "arch/arm/cpu/armv7/zynq/Kconfig" source "arch/arm/cpu/armv7/Kconfig" +source "arch/arm/cpu/armv8/Kconfig" + source "board/aristainetos/Kconfig" source "board/BuR/kwb/Kconfig" source "board/BuR/tseries/Kconfig" diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig new file mode 100644 index 0000000..5953848 --- /dev/null +++ b/arch/arm/cpu/armv8/Kconfig @@ -0,0 +1,10 @@ +if CPU_V8 + +menu "ARMv8" + +config ARMV8_SWITCH_TO_EL1 + boolean "Switch to exception level 1 when loading OS" + +endmenu + +endif -- 1.7.9.5

2 1

[U-Boot] [PATCH] board: am43xx: Add maintainer information
by Lokesh Vutla 02 Jul '15

02 Jul '15

am43xx_evm_ethboot/usbhost_boot_defconfig entries are missing in MAINTAINER file. Adding entries for them. Reported-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- board/ti/am43xx/MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/ti/am43xx/MAINTAINERS b/board/ti/am43xx/MAINTAINERS index d375278..3d40b17 100644 --- a/board/ti/am43xx/MAINTAINERS +++ b/board/ti/am43xx/MAINTAINERS @@ -5,3 +5,5 @@ F: board/ti/am43xx/ F: include/configs/am43xx_evm.h F: configs/am43xx_evm_defconfig F: configs/am43xx_evm_qspiboot_defconfig +F: configs/am43xx_evm_ethboot_defconfig +F: configs/am43xx_evm_usbhost_boot_defconfig -- 1.7.9.5

1 0

[U-Boot] [PATCH] scsi: fix compiler warning with DEBUG and 48bit LBAs
by Andre Przywara 02 Jul '15

02 Jul '15

Commit 2b42c9317db ("ahci: support LBA48 data reads for 2+TB drives") introduced conditional code which triggers a warning when compiled with DEBUG enabled: In file included from common/cmd_scsi.c:12:0: common/cmd_scsi.c: In function 'scsi_read': include/common.h:109:4: warning: 'smallblks' may be used uninitialized in this function [-Wmaybe-uninitialized] ... Since this is for debug only, take the easy way and initialize the variable explicitly on declaration to avoid the warning. (Fix a nearby whitespace error on the way.) Signed-off-by: Andre Przywara <osp(a)andrep.de> --- Hi, Bin: Sorry for the late reply, does that fix your problem? Tom: Can you take this for 2015.07? Admittedly a quick fix (the debug output for big disks would be bogus). If you are interested: I have a proper solution unfiying all three blocks and fixing the problem properly, but I guess that's nothing for this release still. Cheers, Andre. common/cmd_scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index aaca3e8..31c4319 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -368,7 +368,7 @@ static ulong scsi_read(int device, lbaint_t blknr, lbaint_t blkcnt, { lbaint_t start, blks; uintptr_t buf_addr; - unsigned short smallblks; + unsigned short smallblks = 0; ccb* pccb=(ccb *)&tempccb; device&=0xff; /* Setup device @@ -391,7 +391,7 @@ static ulong scsi_read(int device, lbaint_t blknr, lbaint_t blkcnt, scsi_setup_read16(pccb, start, blocks); start += blocks; blks -= blocks; - } else + } else #endif if (blks > SCSI_MAX_READ_BLK) { pccb->datalen=scsi_dev_desc[device].blksz * SCSI_MAX_READ_BLK; -- 1.8.4

2 1