December 2014 - U-Boot

[U-Boot] [PATCH] arm: omap3: cm-t35: convert to generic board
by Nikita Kiryanov 07 Jan '15

07 Jan '15

Convert cm-t35 to generic board. Cc: Igor Grinberg <grinberg(a)compulab.co.il> Cc: Tom Rini <trini(a)ti.com> Signed-off-by: Nikita Kiryanov <nikita(a)compulab.co.il> --- include/configs/cm_t35.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index ccd9b88..9767512 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -25,6 +25,7 @@ #define CONFIG_CMD_GPIO #define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */ #define CONFIG_OMAP_COMMON +#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SDRC /* The chip has SDRC controller */ -- 1.9.1

3 2

[U-Boot] [PATCH] cmd_bdinfo: check for CONFIG_ARC instead of CONFIG_ARC700
by Alexey Brodkin 07 Jan '15

07 Jan '15

For all flavours of ARC we execute the same code in "bdinfo" so we may safely check for CONFIG_ARC. This is especially important since we're about to add more types of ARC so existing check won't work in all cases. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Tom Rini <trini(a)ti.com> --- common/cmd_bdinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index f0b713c..e6d8a7a 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -515,7 +515,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; } -#elif defined(CONFIG_ARC700) +#elif defined(CONFIG_ARC) int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { -- 2.1.0

2 1

[U-Boot] [PATCH 1/1] cmd, fdt: fix working_fdt is set to wrong value
by Hua Yanghao 07 Jan '15

07 Jan '15

Being a long time u-boot developer, this is the first time I'm trying to get some fix for the open source code back to mainline. If anything wrong during the process, please be gentle :-) Thank you. >From 225c8f8f2af4cf6092260e5c133d90096e2f3352 Mon Sep 17 00:00:00 2001 From: Hua Yanghao <huayanghao(a)gmail.com> Date: Mon, 22 Dec 2014 04:32:39 +0800 Subject: [PATCH 1/1] cmd, fdt: fix working_fdt is set to wrong value Instead of setting working_fdt to map_sysmem(addr) (e.g. blob), it should be set to addr directly as inside set_working_fdt_addr it uses map_sysmem(addr) again. To test: ./u-boot -d dts/dt.bin , then issue: fdt addr 0x100, fdt print will then cause an segmentation fault. After this fix fdt print is functional. --- common/cmd_fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index 5640ded..d5eebcb 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -123,7 +123,7 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (control) gd->fdt_blob = blob; else - set_working_fdt_addr(blob); + set_working_fdt_addr((void *)addr); if (argc >= 2) { int len; -- 2.1.0

3 5

[U-Boot] [PATCH] ARM: bootm: do not add PSCI to fdt when booting in secure mode.
by Ian Campbell 07 Jan '15

07 Jan '15

Commit 8bc347e2ec17 "ARM: bootm: Allow booting in secure mode on hyp capable systems" added the capability to select nonsec vs sec mode boot via an environment var. There is a subtle gotcha with this functionality, which is that the PSCI nodes are still created in the fdt (via armv7_update_dt->fdt_psci) even when booting in secure mode. Which means that if the kernel is PSCI aware then it will fail to boot because it will try and do PSCI from secure world, which won't work. This likely didn't get noticed before because the original purpose was to support booting the legacy linux-sunxi kernels which don't understand PSCI. To fix expose boot_nonsec (renaming with armv7_ prefix) outside of bootm.c and use from the virt-dt code. As well as avoiding the creation of the PSCI nodes we should also avoid reserving the secure RAM, so do so. Signed-off-by: Ian Campbell <ijc(a)hellion.org.uk> Cc: Hans de Goede <hdegoede(a)redhat.com> Cc: Albert ARIBAUD <albert.u.boot(a)aribaud.net> Cc: Tom Rini <trini(a)ti.com> --- I think this should go into v2015.01 as a bug fix. --- arch/arm/cpu/armv7/virt-dt.c | 2 ++ arch/arm/include/asm/armv7.h | 1 + arch/arm/lib/bootm.c | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c index 0b0d6a7..ad19e4c 100644 --- a/arch/arm/cpu/armv7/virt-dt.c +++ b/arch/arm/cpu/armv7/virt-dt.c @@ -90,6 +90,8 @@ static int fdt_psci(void *fdt) int armv7_update_dt(void *fdt) { + if (!armv7_boot_nonsec()) + return 0; #ifndef CONFIG_ARMV7_SECURE_BASE /* secure code lives in RAM, keep it alive */ fdt_add_mem_rsv(fdt, (unsigned long)__secure_start, diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h index 323f282..a13da23 100644 --- a/arch/arm/include/asm/armv7.h +++ b/arch/arm/include/asm/armv7.h @@ -80,6 +80,7 @@ void v7_outer_cache_inval_range(u32 start, u32 end); int armv7_init_nonsec(void); int armv7_update_dt(void *fdt); +bool armv7_boot_nonsec(void); /* defined in assembly file */ unsigned int _nonsec_init(void); diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index a7f7c67..0c1298a 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -238,7 +238,7 @@ static void boot_prep_linux(bootm_headers_t *images) } #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) -static bool boot_nonsec(void) +bool armv7_boot_nonsec(void) { char *s = getenv("bootm_boot_mode"); #ifdef CONFIG_ARMV7_BOOT_SEC_DEFAULT @@ -305,7 +305,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) if (!fake) { #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) - if (boot_nonsec()) { + if (armv7_boot_nonsec()) { armv7_init_nonsec(); secure_ram_addr(_do_nonsec_entry)(kernel_entry, 0, machid, r2); -- 2.1.3

3 2

[U-Boot] [PATCH 1/3] socfpga: Drop redundant save_boot_params
by Tom Rini 07 Jan '15

07 Jan '15

The save_boot_params function here is the same as the default weak one from arch/arm/cpu/armv7/start.S, drop. Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Vince Bridgers <vbridger(a)opensource.altera.com> Cc: Chin Liang See <clsee(a)altera.com> Cc: Marek Vasut <marex(a)denx.de> Signed-off-by: Tom Rini <trini(a)ti.com> --- arch/arm/cpu/armv7/socfpga/lowlevel_init.S | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/arm/cpu/armv7/socfpga/lowlevel_init.S b/arch/arm/cpu/armv7/socfpga/lowlevel_init.S index 2f2e9fc..afed773 100644 --- a/arch/arm/cpu/armv7/socfpga/lowlevel_init.S +++ b/arch/arm/cpu/armv7/socfpga/lowlevel_init.S @@ -7,13 +7,6 @@ #include <config.h> #include <version.h> -/* Save the parameter pass in by previous boot loader */ -.global save_boot_params -save_boot_params: - /* no parameter to save */ - bx lr - - /* Set up the platform, once the cpu has been initialized */ .globl lowlevel_init lowlevel_init: -- 1.7.9.5

3 8

[U-Boot] [PATCH 0/2] ARM: OMAP4: Fix SDP4430 ES2.3 breakage
by Nishanth Menon 07 Jan '15

07 Jan '15

With commit 47a4bea6af77b01d59a410d09a4c34b2dd14cf50 ("ARM: omap4: Update sdram setting for panda rev A6") which attempted to "fix" Panda ES B3 problem of a different DDR by checking for CPU revision and changing configuration as per Panda for configuration that is common for SDP4430 and Panda. This resulted in all OMAP4430 SDP with processor boards > ES2.3 being now broken. This does not obviously help the situation :). So fix it by doing the missing DMM configuration needed for Panda as an override of the weak function and revert the bad commit. based on v2015.01-rc3 tag. Bootlogs: http://slexy.org/view/s2r58bpvpp (Panda ES B3) http://slexy.org/view/s20v9cq7mc (SDP4430 ES2.3) previously (broken v2015.01-rc3 for SDP4430 ES2.3 : http://slexy.org/view/s2fPVW28hd) Nishanth Menon (2): ARM: OMAP4: Panda: rework DMM logic Revert "ARM: omap4: Update sdram setting for panda rev A6" arch/arm/cpu/armv7/omap4/sdram_elpida.c | 4 ---- arch/arm/include/asm/arch-omap4/sys_proto.h | 3 +++ board/ti/panda/panda.c | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) -- 1.7.9.5

2 4

[U-Boot] [PATCH] TI: armv7: enable UUID and PART
by Nishanth Menon 07 Jan '15

07 Jan '15

Enable UUID and partition support for scripted handling platforms with MMC and eMMC and varied partitioning schemes And remove it from headers that end up redefining it. Signed-off-by: Nishanth Menon <nm(a)ti.com> --- Based on v2015.01-rc3 tag include/configs/am335x_evm.h | 2 -- include/configs/am43xx_evm.h | 2 -- include/configs/beagle_x15.h | 2 -- include/configs/dra7xx_evm.h | 2 -- include/configs/omap5_uevm.h | 2 -- include/configs/ti_armv7_common.h | 2 ++ 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 560e3bf..0004750 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -47,8 +47,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #ifdef CONFIG_NAND #define NANDARGS \ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 4472c3e..b00585c 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -148,8 +148,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/beagle_x15.h b/include/configs/beagle_x15.h index cc36330..b233301 100644 --- a/include/configs/beagle_x15.h +++ b/include/configs/beagle_x15.h @@ -42,8 +42,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART /* CPSW Ethernet */ #define CONFIG_CMD_NET /* 'bootp' and 'tftp' */ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 174a711..dee2b11 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -48,8 +48,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #define CONFIG_HSMMC2_8BIT /* CPSW Ethernet */ diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index e07795f..0ca4e82 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -36,8 +36,6 @@ /* Enhance our eMMC support / experience. */ #define CONFIG_CMD_GPT #define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #define CONFIG_HSMMC2_8BIT #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 93bcce2..081b39d 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -187,6 +187,8 @@ #define CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT4 #define CONFIG_CMD_FS_GENERIC +#define CONFIG_PARTITION_UUIDS +#define CONFIG_CMD_PART #endif /* -- 1.7.9.5

2 1

[U-Boot] [PATCH] fs: fat: read: fix fat16 ls/read issue
by Przemyslaw Marczak 07 Jan '15

07 Jan '15

The present fat implementation ignores FAT16 long name directory entries which aren't placed in a single sector. This was becouse of the buffer was always filled by the two sectors, and the loop was made also for two sectors. If some file long name entries are stored in two sectors, the we have two cases: Case 1: Both of sectors are in the buffer - all required data for long file name is in the buffer. - Read OK! Case 2: The current directory entry is placed at the end of the second buffered sector. And the next entries are placed in a sector which is not buffered yet. Then two next sectors are buffered and the mentioned entry is ignored. - Read fail! This commit fixes this issue by: - read two sectors after loop on each single is done - keep the last used sector as a first in the buffer before the read of two next The commit doesn't affects the fat32 imlementation, which works good as previous. Signed-off-by: Przemyslaw Marczak <p.marczak(a)samsung.com> Cc: Mikhail Zolotaryov <lebon(a)lebon.org.ua> Cc: Tom Rini <trini(a)ti.com> Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Suriyan Ramasami <suriyan.r(a)gmail.com> Cc: Lukasz Majewski <l.majewski(a)samsung.com> Cc: Wolfgang Denk <wd(a)denx.de> --- fs/fat/fat.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 04a51db..afbf12d 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -823,8 +823,11 @@ int do_fat_read_at(const char *filename, loff_t pos, void *buffer, int ret = -1; int firsttime; __u32 root_cluster = 0; + __u32 read_blk; int rootdir_size = 0; - int j; + int j, k; + int do_read; + __u8 *dir_ptr; if (read_bootsectandvi(&bs, &volinfo, &mydata->fatsize)) { debug("Error: reading boot sector\n"); @@ -910,23 +913,35 @@ int do_fat_read_at(const char *filename, loff_t pos, void *buffer, } j = 0; + k = 0; while (1) { int i; - if (j == 0) { + if (mydata->fatsize == 32 || !k) { + dir_ptr = do_fat_read_at_block; + k = 1; + } else { + dir_ptr = (do_fat_read_at_block + mydata->sect_size); + memcpy(do_fat_read_at_block, dir_ptr, mydata->sect_size); + } + + do_read = 1; + + if (mydata->fatsize == 32 && j) + do_read = 0; + + if (do_read) { debug("FAT read sect=%d, clust_size=%d, DIRENTSPERBLOCK=%zd\n", cursect, mydata->clust_size, DIRENTSPERBLOCK); - if (disk_read(cursect, - (mydata->fatsize == 32) ? - (mydata->clust_size) : - PREFETCH_BLOCKS, - do_fat_read_at_block) < 0) { + read_blk = (mydata->fatsize == 32) ? + mydata->clust_size : PREFETCH_BLOCKS; + if (disk_read(cursect, read_blk, dir_ptr) < 0) { debug("Error: reading rootdir block\n"); goto exit; } - dentptr = (dir_entry *) do_fat_read_at_block; + dentptr = (dir_entry *)dir_ptr; } for (i = 0; i < DIRENTSPERBLOCK; i++) { @@ -951,7 +966,7 @@ int do_fat_read_at(const char *filename, loff_t pos, void *buffer, get_vfatname(mydata, root_cluster, - do_fat_read_at_block, + dir_ptr, dentptr, l_name); if (dols == LS_ROOT) { -- 1.9.1

3 25

[U-Boot] [PATCH] da850evm: Use generic board and libfdt, fix size for SPI flash
by Peter Howard 07 Jan '15

07 Jan '15

Add defines to use CONFIG_SYS_GENERIC_BOARD and CONFIG_OF_LIBFDT. Semi-separate to this: the size of the image for the da850evm has increased to the point that the size in da850evm.h and the offset for the environment in SPI flash no longer work. They are modified to account for the larger image size. Signed-off-by: Peter Howard <phoward(a)gme.net.au> --- include/configs/da850evm.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index e5f8afe..e5a612c 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -157,7 +157,7 @@ #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 -#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x30000 +#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 #endif /* @@ -251,7 +251,7 @@ #undef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (64 << 10) -#define CONFIG_ENV_OFFSET (256 << 10) +#define CONFIG_ENV_OFFSET (512 << 10) #define CONFIG_ENV_SECT_SIZE (64 << 10) #define CONFIG_SYS_NO_FLASH #endif @@ -259,6 +259,7 @@ /* * U-Boot general configuration */ +#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_MISC_INIT_R #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOOTFILE "uImage" /* Boot file name */ @@ -275,6 +276,7 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_CRC32_VERIFY #define CONFIG_MX_CYCLIC +#define CONFIG_OF_LIBFDT /* * Linux Information -- 1.9.3

3 6

[U-Boot] [PATCH 0/5] arm: omap: reset sata on OS boot
by Dmitry Lifshitz 07 Jan '15

07 Jan '15

This series adds a SATA controller reset mechanism for OMAP platforms. On OMAP platforms SATA support is provided via SCSI subsystem. Implement missing SCSI reset command. Use the new functionality to reset SATA on OS boot. Dmitry Lifshitz (5): ahci: introduce ahci_reset() ahci-plat: provide a weak scsi_bus_reset() hook OMAP5+: sata/scsi: implement scsi_bus_reset() arm: omap: reset sata on boot omap5: cm-t54: add sata support arch/arm/cpu/armv7/omap-common/boot-common.c | 9 +++++ arch/arm/cpu/armv7/omap-common/sata.c | 6 +++ drivers/block/ahci.c | 50 ++++++++++++++++---------- include/ahci.h | 1 + include/configs/cm_t54.h | 13 +++++++ 5 files changed, 60 insertions(+), 19 deletions(-) -- 1.7.5.4

2 16