March 2011 - U-Boot

[U-Boot] [PATCHv2] fdt_support: Fix buffer overflow in fdt_fixup_memory_banks
by Kyle Moffett 05 Apr '11

05 Apr '11

When fdt_fixup_memory_banks is called with 2-cell address and size fields in the device-tree (IE: 64-bit address and size), then it will overflow its on-stack "tmp" buffer. This fixes the buffer size and adds a comment explaining how many bytes need to be allocated per record. Signed-off-by: Kyle Moffett <Kyle.D.Moffett(a)boeing.com> Cc: Jerry Van Baren <vanbaren(a)cideas.com> --- Changelog: v2: Resubmitted separately from the other HWW-1U-1A changes. common/fdt_support.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 6c98e5b..edcf04a 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -394,7 +394,7 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) { int err, nodeoffset; int addr_cell_len, size_cell_len, len; - u8 tmp[banks * 8]; + u8 tmp[banks * 16]; /* Up to 64-bit address + 64-bit size */ int bank; err = fdt_check_header(blob); -- 1.7.2.3

3 2

[U-Boot] [PATCH] [v4] powerpc: clean up DIU macro definitions for Freescale reference boards
by Timur Tabi 05 Apr '11

05 Apr '11

Clean up the macro defintions used to enable DIU (video) support on the MPC8610HPCD and the MPC5121ADS so that they look more like the P1022DS, which is newer. Add software cursor support to all three boards. Also document the CONFIG_FSL_DIU_FB in the README. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- README | 22 ++++++++++++++++++++++ include/configs/MPC8610HPCD.h | 13 ++++--------- include/configs/P1022DS.h | 3 +-- include/configs/mpc5121ads.h | 9 ++++----- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/README b/README index 755d17c..9597fed 100644 --- a/README +++ b/README @@ -1057,6 +1057,28 @@ The following options need to be configured: and 16bpp modes defined by CONFIG_VIDEO_SED13806_8BPP or CONFIG_VIDEO_SED13806_16BPP + CONFIG_FSL_DIU_FB + Enable the Freescale DIU video driver. Reference boards for + SOCs that have a DIU should define this macro to enable DIU + support, and should also define these other macros: + + CONFIG_SYS_DIU_ADDR + CONFIG_VIDEO + CONFIG_CMD_BMP + CONFIG_CFB_CONSOLE + CONFIG_VIDEO_SW_CURSOR + CONFIG_VGA_AS_SINGLE_DEVICE + CONFIG_VIDEO_LOGO + CONFIG_VIDEO_BMP_LOGO + + The DIU driver will look for the 'monitor' environment variable, + and if defined, enable the DIU as a console during boot. This + variable should be set to one of these values: + + '0' Output video to the DVI connector + '1' Output video to the LVDS connector + '2' Output video to the Dual-Link LVDS connector + - Keyboard Support: CONFIG_KEYBOARD diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 03ee394..de01c31 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -21,14 +21,14 @@ #define CONFIG_SYS_TEXT_BASE 0xfff00000 -#define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ /* video */ -#undef CONFIG_VIDEO - -#ifdef CONFIG_VIDEO +#ifdef CONFIG_FSL_DIU_FB +#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x2c000) +#define CONFIG_VIDEO #define CONFIG_CMD_BMP #define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO @@ -88,8 +88,6 @@ #define CONFIG_SYS_CCSRBAR_PHYS_HIGH 0x0 #define CONFIG_SYS_CCSRBAR_PHYS CONFIG_SYS_CCSRBAR_PHYS_LOW -#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR+0x2c000) - /* DDR Setup */ #define CONFIG_FSL_DDR2 #undef CONFIG_FSL_DDR_INTERACTIVE @@ -494,9 +492,6 @@ #define CONFIG_WATCHDOG /* watchdog enabled */ #define CONFIG_SYS_WATCHDOG_FREQ 5000 /* Feed interval, 5s */ -/*DIU Configuration*/ -#define DIU_CONNECT_TO_DVI /* DIU controller connects to DVI encoder*/ - /* * Miscellaneous configurable options */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index cb24041..ed2bada 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -185,13 +185,12 @@ #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* Video */ -#undef CONFIG_FSL_DIU_FB - #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) #define CONFIG_VIDEO #define CONFIG_CMD_BMP #define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index f966325..e7ef298 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -46,16 +46,16 @@ */ #define CONFIG_E300 1 /* E300 Family */ #define CONFIG_MPC512X 1 /* MPC512X family */ -#define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ #define CONFIG_SYS_TEXT_BASE 0xFFF00000 /* video */ -#undef CONFIG_VIDEO - -#ifdef CONFIG_VIDEO +#ifdef CONFIG_FSL_DIU_FB +#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_IMMR + 0x2100) +#define CONFIG_VIDEO #define CONFIG_CMD_BMP #define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_SW_CURSOR #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO @@ -74,7 +74,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_SYS_IMMR 0x80000000 -#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_IMMR+0x2100) #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest region */ #define CONFIG_SYS_MEMTEST_END 0x00400000 -- 1.7.3.4

5 11

[U-Boot] [PATCH 1/2] env_mmc: Allow board code to override the environment address
by Kumar Gala 05 Apr '11

05 Apr '11

From: Mingkai Hu <Mingkai.hu(a)freescale.com> On some boards the environment may not be located at a fixed address in the MMC/SDHC card. This allows those boards to implement their own means to report what address the environment is located at. Signed-off-by: Mingkai Hu <Mingkai.hu(a)freescale.com> Signed-off-by: Jerry Huang <Chang-Ming.Huang(a)freescale.com> Signed-off-by: Zhao Chenhui <b35336(a)freescale.com> Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- common/env_mmc.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/common/env_mmc.c b/common/env_mmc.c index 71dcc4c..83f40f4 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2008-2010 Freescale Semiconductor, Inc. + * (C) Copyright 2008-2011 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -51,6 +51,19 @@ static void use_default(void); DECLARE_GLOBAL_DATA_PTR; +#if !defined(CONFIG_ENV_OFFSET) +#define CONFIG_ENV_OFFSET 0 +#endif + +static int __mmc_get_env_addr(struct mmc *mmc, u32 *env_addr) +{ + *env_addr = CONFIG_ENV_OFFSET; + return 0; +} +__attribute__((weak, alias("__mmc_get_env_addr"))) +int mmc_get_env_addr(struct mmc *mmc, u32 *env_addr); + + uchar env_get_char_spec(int index) { return *((uchar *)(gd->env_addr + index)); @@ -102,10 +115,14 @@ int saveenv(void) ssize_t len; char *res; struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV); + u32 offset; if (init_mmc_for_env(mmc)) return 1; + if(mmc_get_env_addr(mmc, &offset)) + return 1; + res = (char *)&env_new.data; len = hexport_r(&env_htab, '\0', &res, ENV_SIZE); if (len < 0) { @@ -114,7 +131,7 @@ int saveenv(void) } env_new.crc = crc32(0, env_new.data, ENV_SIZE); printf("Writing to MMC(%d)... ", CONFIG_SYS_MMC_ENV_DEV); - if (write_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, (u_char *)&env_new)) { + if (write_env(mmc, CONFIG_ENV_SIZE, offset, (u_char *)&env_new)) { puts("failed\n"); return 1; } @@ -141,16 +158,22 @@ inline int read_env(struct mmc *mmc, unsigned long size, void env_relocate_spec(void) { #if !defined(ENV_IS_EMBEDDED) - char buf[CONFIG_ENV_SIZE]; + char buf[CONFIG_ENV_SIZE]; struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV); + u32 offset; if (init_mmc_for_env(mmc)) { use_default(); return; } - if (read_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) { + if(mmc_get_env_addr(mmc, &offset)) { + use_default(); + return ; + } + + if (read_env(mmc, CONFIG_ENV_SIZE, offset, buf)) { use_default(); return; } -- 1.7.2.3

2 7

[U-Boot] [PATCH] [MPC837x v2] Make it work again with USB.
by Andre Schwarz 05 Apr '11

05 Apr '11

USB register range IMMR+0x00-0xff is reserved and hangs the CPU. Signed-off-by: Andre Schwarz <andre.schwarz(a)matrix-vision.de> --- arch/powerpc/cpu/mpc83xx/cpu_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index 7a1cae7..cfead18 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -327,7 +327,7 @@ void cpu_init_f (volatile immap_t * im) im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR; #endif #ifdef CONFIG_USB_EHCI_FSL -#ifndef CONFIG_MPC834x +#if !defined(CONFIG_MPC834x) && !defined(CONFIG_MPC837x) uint32_t temp; struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR; -- 1.7.0.4

3 9

[U-Boot] [PATCH] powerpc/ppc4xx: add ENTRY() to linker script
by jozsef imrek 04 Apr '11

04 Apr '11

Add ENTRY() command to the linker script so that entry point is correctly marked in the final ELF file. Signed-off-by: jozsef imrek <mazsi(a)imrek.org> --- arch/powerpc/cpu/ppc4xx/u-boot.lds | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds index 656f59a..b82e1e8 100644 --- a/arch/powerpc/cpu/ppc4xx/u-boot.lds +++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds @@ -38,6 +38,8 @@ PHDRS bss PT_LOAD; } +ENTRY(_start) + SECTIONS { /* Read-only sections, merged into text segment: */ -- 1.7.2.5

3 3

[U-Boot] [0/6] Patch serie UBI min I/O size fixes
by Holger Brunck 04 Apr '11

04 Apr '11

This patch serie fixes a problem in the UBI layer. The min I/O size has currently a fixed value of 1 for NOR flashes. But for NOR flashes the min I/O size has to be equal to the size of the writebuffer of the flash. Therefore the mtd layer was enhanced with the writebuffer which was later on used in the ubi layer to set the min I/O size. This patches fixes problems with flash types with a writebuffersize > 128 Byte and is mainly taken from the similar linux patches. See MTD mailing list posts: http://lists.infradead.org/pipermail/linux-mtd/2010-December/033460.html Without the u-boot patches attaching to a ubi device with a min I/O buffer larger than 128 would fail. Best Regards

2 2

[U-Boot] Booting kernel from NAND flash on AT91SAM9 custom board using fsload
by Nicholas Kinar 04 Apr '11

04 Apr '11

Hello, I've designed a custom circuit board based around the AT91SAM9RL64 processor from Atmel. This is an ARM9 AT91SAM9 series chip. The Atmel evaluation kit for this processor is supported by U-Boot, and the configuration header file can be found in the u-boot-2010.09 source code distribution (/include/configs/at91sam9rlek.h). To support my custom hardware, I've made small changes to the /include/configs/at91sam9rlek.h configuration file and to the files in the /board/atmel/at91sam9rlek/ directory. On my custom circuit board, the AT91bootstrap first-order bootloader is loaded from SPI Dataflash. In turn, the AT91bootstrap code loads U-Boot to SDRAM memory and then jumps to the load address. The U-Boot binary is also stored on SPI dataflash. I am able to successfully load U-Boot on my custom hardware, and I am able to use the nand subsystem commands to access the NAND flash. I would like to use the fsload command to load the Linux kernel from a JFFS2 filesystem written to the NAND flash, but to me it is not immediately clear what I need to modify in the U-Boot code to be able to do this. Perhaps the YAFFS filesystem would be more appropriate? I've found several mailing list threads on a related question, but I still can't determine how to boot from NAND flash. Does fsload only support NOR flash, or is it possible to use fsload on NAND flash? [1] http://lists.denx.de/pipermail/u-boot/2007-December/027578.html [2] http://www.mail-archive.com/u-boot@lists.denx.de/msg28173.html [3] http://old.nabble.com/NAND-boot-from-file-td7930776.html [4] http://blackfin.uclinux.org/gf/project/u-boot/forum/?_forum_action=ForumMes… As suggested in thread [4] above, I tried replacing jffs2_1pass.c with jffs2_nand_1pass.c in the fs/jffs2 directory. Also as instructed in the README.NAND, README.JFFS2 and README.JFFS2_NAND files found in the /doc/ directory, I've tried defining the following in my /include/configs/at91sam9rlek.h configuration file: #define CONFIG_JFFS2_NAND 1 #define CONFIG_CMD_JFFS2 #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_CMD_NAND 1 However, after making these changes, the compilation process does not work, with the following error being reported: make[1]: Entering directory `/home/nkinar/DEVICE-CODE/uboot/u-boot-2010.09/common' arm-none-linux-gnueabi-gcc -g -Os -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DTEXT_BASE=0x23f00000 -I/home/nkinar/DEVICE-CODE/uboot/u-boot-2010.09/include -fno-builtin -ffreestanding -nostdinc -isystem /home/nkinar/CodeSourcery/Sourcery_G++_Lite/bin/../lib/gcc/arm-none-linux-gnueabi/4.5.1/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5te -Wall -Wstrict-prototypes -fno-stack-protector \ -o cmd_jffs2.o cmd_jffs2.c -c cmd_jffs2.c: In function 'mtd_device_validate': cmd_jffs2.c:172:24: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'flash_info' cmd_jffs2.c:172:24: error: 'flash_info' undeclared (first use in this function) cmd_jffs2.c:172:24: note: each undeclared identifier is reported only once for each function it appears in cmd_jffs2.c:172:35: error: expected expression before ']' token cmd_jffs2.c: In function 'get_part_sector_size_nor': cmd_jffs2.c:275:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'flash_info' cmd_jffs2.c:275:22: error: 'flash_info' undeclared (first use in this function) cmd_jffs2.c:275:33: error: expected expression before ']' token cmd_jffs2.c:279:2: error: 'flash_info_t' undeclared (first use in this function) cmd_jffs2.c:279:16: error: 'flash' undeclared (first use in this function) make[1]: *** [cmd_jffs2.o] Error 1 make[1]: Leaving directory `/home/nkinar/DEVICE-CODE/uboot/u-boot-2010.09/common' make: *** [common/libcommon.a] Error 2 What do I need to update in U-Boot to be able to use fsload on my custom hardware?

4 13

[U-Boot] Network Code Custodian ?
by Gray Remlin 03 Apr '11

03 Apr '11

Who is the custodian for the network code ?

3 2

[U-Boot] [PATCH v2] MX5: Enable flat-device-tree support on mx53 loco board
by Jason Liu 02 Apr '11

02 Apr '11

Signed-off-by: Jason Liu <jason.hui(a)linaro.org> --- Grant has submit one patchset: ARM device tree support improvements which remove device tree booting dependency on CONFIG_SYS_BOOTMAPSZ. Will provide patchset to clean CONFIG_SYS_BOOTMAPSZ after the patches applied to u-boot mainline --- Change log: v2: Fix the git commit log issue by move the "Grant..." below the S-O-B line --- include/configs/mx53loco.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 585e8c8..9c7dcc9 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -193,4 +193,7 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_OF_LIBFDT +#define CONFIG_SYS_BOOTMAPSZ 0x800000 + #endif /* __CONFIG_H */ -- 1.7.1

2 1

[U-Boot] CFI flash broken for 8-bit bus
by Aaron Williams 02 Apr '11

02 Apr '11

Hi, I am running into issues in that the CFI code is broken for flash with an 8- bit bus. The problem is that the CFI code uses the wrong addresses for 8-bits vs 16-bits. The CFI function flash_map incorrectly calculates the byte offset with Spansion flash. In our case, we have an 8-bit Spansion S29GL-N MirrorBit flash chip on an 8- bit bus. According to the data sheet, in 8-bit mode the first unlock address is 0xAAA and the second is 0x555. Basically all of the addresses are approximately double what they are in 16-bit mode. Most of the addresses in the CFI code are wrong for 8-bit mode. They should be as follows: unlock1: 0xAAA unlock2: 0x555 CFI Query: 0xAA Offset Device ID: 0x02, 0x1c, 0x1e Offset Silicon Sector Factory Protect: 0x6 Sector protect verify (sector address) + 4 The problem is that the dectection code detects (incorrectly) that we're an 8- bit device on a 16-bit bus when in fact it's an 8-bit bus. For 16-bits, it's: unlock1: 0x555 unlock2: 0x2aa CFI Query: 0x55 Offset Device ID: 0x1, 0x0e, 0x0f Now, in 16-bit mode these addresses should be effectively doubled so they should look to be the same to software as I understand it. This is all taken from the datasheet. Note that the CFI code works fine with the flash hooked up as 16-bit on a 16- bit bus. If it's an 8-bit flash on a 16-bit bus then the addresses should be doubled. flash detect cfi fwc addr 1ec00000 cmd f0 f0 8bit x 8 bit fwc addr 1ec00000 cmd ff ff 8bit x 8 bit fwc addr 1ec00055 cmd 98 98 8bit x 8 bit <== should be 0x1ec000AA is= cmd 51(Q) addr 1ec00010 is= 0 51 fwc addr 1ec00000 cmd f0 f0 8bit x 8 bit fwc addr 1ec00000 cmd ff ff 8bit x 8 bit fwc addr 1ec00555 cmd 98 98 8bit x 8 bit is= cmd 51(Q) addr 1ec00010 is= 0 51 fwc addr 1ec00000 cmd f0 f0f0 16bit x 8 bit fwc addr 1ec00000 cmd ff ffff 16bit x 8 bit fwc addr 1ec000aa cmd 98 9898 16bit x 8 bit is= cmd 51(Q) addr 1ec00020 is= 5151 5151 is= cmd 52(R) addr 1ec00022 is= 5252 5252 is= cmd 59(Y) addr 1ec00024 is= 5959 5959 device interface is 2 found port 2 chip 1 port 16 bits chip 8 bits 00 : 51 52 59 02 00 40 00 00 00 00 00 27 36 00 00 06 QRY..@.....'6... 10 : 06 09 13 03 05 03 02 18 02 00 06 00 01 7f 00 00 ................ 20 : 02 00 00 00 00 00 00 00 00 00 00 00 00 08 13 e8 ................ fwc addr 1ec00000 cmd f0 f0f0 16bit x 8 bit fwc addr 1ec01554 cmd aa aaaa 16bit x 8 bit fwc addr 1ec00aaa cmd 55 5555 16bit x 8 bit fwc addr 1ec01554 cmd 90 9090 16bit x 8 bit fwc addr 1ec00000 cmd f0 f0f0 16bit x 8 bit fwc addr 1ec000aa cmd 98 9898 16bit x 8 bit manufacturer is 2 manufacturer id is 0x0 device id is 0x3f device id2 is 0x0 cfi version is 0x3133 size_ratio 1 port 16 bits chip 8 bits found 1 erase regions erase region 0: 0x0200007f erase_region_count = 128 erase_region_size = 131072 fwc addr 1ec00000 cmd f0 f0 8bit x 8 bit fwc addr 1fbe0000 cmd 70 70 8bit x 8 bit flash_is_busy: 0 Flash: 16 MiB -Aaron

4 9