November 2012 - U-Boot

[U-Boot] [PATCH v3 01/12] x86: Allow compiling out realmode/bios code
by Simon Glass 30 Nov '12

30 Nov '12

From: Gabe Black <gabeblack(a)chromium.org> We don't want this for coreboot, so provide a way of compiling it out. Signed-off-by: Gabe Black <gabeblack(a)chromium.org> Signed-off-by: Stefan Reinauer <reinauer(a)chromium.org> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Check for CONFIG_X86_NO_REAL_MODE in the zimage code Changes in v2: - Rename real mode option to CONFIG_X86_NO_REAL_MODE README | 6 ++++++ arch/x86/lib/Makefile | 9 ++++++--- arch/x86/lib/video.c | 2 ++ arch/x86/lib/zimage.c | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/README b/README index b9a3685..ed7d270 100644 --- a/README +++ b/README @@ -3668,6 +3668,12 @@ Low Level (hardware related) configuration options: If defined, the x86 reset vector code is excluded. You will need to do this when U-Boot is running from Coreboot. +- CONFIG_X86_NO_REAL_MODE + If defined, x86 real mode code is omitted. This assumes a + 32-bit environment where such code is not needed. You will + need to do this when U-Boot is running from Coreboot. + + Freescale QE/FMAN Firmware Support: ----------------------------------- diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 51836da..4325b25 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -25,11 +25,16 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(ARCH).o +ifeq ($(CONFIG_X86_NO_REAL_MODE),) SOBJS-$(CONFIG_SYS_PC_BIOS) += bios.o SOBJS-$(CONFIG_SYS_PCI_BIOS) += bios_pci.o -SOBJS-$(CONFIG_SYS_X86_REALMODE) += realmode_switch.o +COBJS-y += realmode.o +SOBJS-y += realmode_switch.o COBJS-$(CONFIG_SYS_PC_BIOS) += bios_setup.o +COBJS-$(CONFIG_VIDEO) += video_bios.o +endif + COBJS-y += board.o COBJS-y += bootm.o COBJS-y += cmd_boot.o @@ -41,11 +46,9 @@ COBJS-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o COBJS-$(CONFIG_SYS_GENERIC_TIMER) += pcat_timer.o COBJS-$(CONFIG_PCI) += pci.o COBJS-$(CONFIG_PCI) += pci_type1.o -COBJS-$(CONFIG_SYS_X86_REALMODE) += realmode.o COBJS-y += relocate.o COBJS-y += string.o COBJS-$(CONFIG_SYS_X86_ISR_TIMER) += timer.o -COBJS-$(CONFIG_VIDEO) += video_bios.o COBJS-$(CONFIG_VIDEO) += video.o COBJS-$(CONFIG_CMD_ZBOOT) += zimage.o diff --git a/arch/x86/lib/video.c b/arch/x86/lib/video.c index 3d6b24d..20e2416 100644 --- a/arch/x86/lib/video.c +++ b/arch/x86/lib/video.c @@ -222,8 +222,10 @@ int video_init(void) int drv_video_init(void) { +#ifndef CONFIG_X86_NO_REAL_MODE if (video_bios_init()) return 1; +#endif return video_init(); } diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 2214286..b8c672b 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -171,7 +171,7 @@ struct boot_params *load_zimage(char *image, unsigned long kernel_size, else *load_address = (void *)ZIMAGE_LOAD_ADDR; -#if defined CONFIG_ZBOOT_32 +#if (defined CONFIG_ZBOOT_32 || defined CONFIG_X86_NO_REAL_MODE) printf("Building boot_params at 0x%8.8lx\n", (ulong)setup_base); memset(setup_base, 0, sizeof(*setup_base)); setup_base->hdr = params->hdr; @@ -237,7 +237,7 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, struct setup_header *hdr = &setup_base->hdr; int bootproto = get_boot_protocol(hdr); -#if defined CONFIG_ZBOOT_32 +#if (defined CONFIG_ZBOOT_32 || defined CONFIG_X86_NO_REAL_MODE) setup_base->e820_entries = install_e820_map( ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map); #endif -- 1.7.7.3

1 0

[U-Boot] Switch from mmcboot to ramboot?
by Grant 30 Nov '12

30 Nov '12

How can I tell u-boot to boot with the ramboot= definition instead of mmcboot= ? - Grant

3 3

[U-Boot] [PATCH v2 5/5] x86: Select stdio devices for coreboot
by Simon Glass 29 Nov '12

29 Nov '12

We want to support VGA, serial, USB keyboard and the Coreboot memory console buffer. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Collect settings in one place - Use eserial0 instead of serial since this is now the correct name - define CONFIG_EXTRA_ENV_SETTINGS so that these settings come through include/configs/coreboot.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index 5da006f..cfe5db3 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -92,6 +92,15 @@ #define CONFIG_SYS_NS16550_COM2 UART1_BASE #define CONFIG_SYS_NS16550_PORT_MAPPED +#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,eserial0\0" \ + "stdout=vga,eserial0,cbmem\0" \ + "stderr=vga,eserial0,cbmem\0" + +#define CONFIG_CONSOLE_MUX +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_STDIO_DEREGISTER +#define CONFIG_CBMEM_CONSOLE + /* max. 1 IDE bus */ #define CONFIG_SYS_IDE_MAXBUS 1 /* max. 1 drive per IDE bus */ @@ -243,4 +252,7 @@ */ #define CONFIG_PCI +#define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_STD_DEVICES_SETTINGS + #endif /* __CONFIG_H */ -- 1.7.7.3

1 0

[U-Boot] [PATCH 1/3] tegra: only define TEGRA_DEVICE_SETTINGS if not already defined
by Stephen Warren 29 Nov '12

29 Nov '12

From: Stephen Warren <swarren(a)nvidia.com> seaboard.h attempts to undefine TEGRA_DEVICE_SETTINGS and provide a custom value. This worked when the "pre" included tegra20-common.h provided the default. However, changes in the main U-Boot repo removed this default from the "pre" included tegra20-common.h to the "post" included tegra-common-post.h, which uncondtionally provides the value. This causes the following compile warnings: In file included from /home/swarren/shared/git_wa/u-boot/include/configs/seaboard.h:129:0, from /home/swarren/shared/git_wa/u-boot/include/config.h:10, from /home/swarren/shared/git_wa/u-boot/include/common.h:37, from lib/asm-offsets.c:18: /home/swarren/shared/git_wa/u-boot/include/configs/tegra-common-post.h:163:0: warning: "TEGRA_DEVICE_SETTINGS" redefined /home/swarren/shared/git_wa/u-boot/include/configs/seaboard.h:110:0: note: this is the location of the previous definition Solve this by modifying tegra-common-post.h to only provide a value for TEGRA_DEVICE_SETTINGS if the board-specific header has not already provided a custom value. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- My personal opinion is that when u-boot-tegra/master is rebuilt, this series should be the first patches in the branch, and the current patches that are in u-boot-tegra/next which add LCD support for boards other than Seaboard should be re-written to assume that tegra-common-post.h will provide the appropriate value for TEGRA_DEVICE_SETTINGS, and hence the board config .h files don't need to define any custom value for TEGRA_DEVICE_SETTINGS. Otherwise, if you "git bisect" the next version of u-boot-tegra/master, you'll get the same compile warnings I mention above on all the other boards until the point when patch 1 in this series is applied. include/configs/tegra-common-post.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index ab62e71..1662844 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -146,6 +146,7 @@ "fdt_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x02100000\0" \ +#ifndef TEGRA_DEVICE_SETTINGS #ifdef CONFIG_TEGRA_KEYBOARD #define STDIN_KBD_KBC ",tegra-kbc" #else @@ -165,6 +166,8 @@ "stdout=serial\0" \ "stderr=serial\0" \ +#endif /* TEGRA_DEVICE_SETTINGS */ + #define CONFIG_EXTRA_ENV_SETTINGS \ TEGRA_DEVICE_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ -- 1.7.10.4

3 9

[U-Boot] [PATCH] tegra: remove custom TEGRA_DEVICE_SETTINGS for board files
by Marc Dietrich 29 Nov '12

29 Nov '12

TEGRA_DEVICE_SETTINGS lives now in tegra-common-post.h. This removes custom TEGRA_DEVICE_SETTINGS for all tegra boards providing video output, except seaboard, which was fixed by Stephen already. Cc: Thierry Reding <thierry.reding(a)avionic-design.de> Signed-off-by: Marc Dietrich <marvin24(a)gmx.de> --- Tom, this needs to be applied ontop of Stephen's patch "tegra: only define TEGRA_DEVICE_SETTINGS if not already defined" include/configs/medcom-wide.h | 6 ------ include/configs/paz00.h | 6 ------ include/configs/tec.h | 6 ------ 3 files changed, 18 deletions(-) diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index 452d587..bae4ba0 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -78,12 +78,6 @@ "ext2load mmc 0 0x17000000 /boot/uImage;" \ "bootm" -#undef TEGRA_DEVICE_SETTINGS -#define TEGRA_DEVICE_SETTINGS \ - "stdin=serial\0" \ - "stdout=serial,lcd\0" \ - "stderr=serial,lcd\0" - /* LCD support */ #define CONFIG_LCD #define CONFIG_PWM_TEGRA diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 4a74d00..2edb4aa 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -72,12 +72,6 @@ #define CONFIG_CMD_NET #define CONFIG_CMD_DHCP -#undef TEGRA_DEVICE_SETTINGS -#define TEGRA_DEVICE_SETTINGS \ - "stdin=serial\0" \ - "stdout=serial,lcd\0" \ - "stderr=serial,lcd\0" - /* LCD support */ #define CONFIG_LCD #define CONFIG_PWM_TEGRA diff --git a/include/configs/tec.h b/include/configs/tec.h index 815afa6..caeb9cd 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -85,12 +85,6 @@ "ext2load mmc 0 0x17000000 /boot/uImage;" \ "bootm" -#undef TEGRA_DEVICE_SETTINGS -#define TEGRA_DEVICE_SETTINGS \ - "stdin=serial\0" \ - "stdout=serial,lcd\0" \ - "stderr=serial,lcd\0" - /* LCD support */ #define CONFIG_LCD #define CONFIG_PWM_TEGRA -- 1.8.0

2 1

[U-Boot] [Pull] u-boot-fdt/master
by Jerry Van Baren 29 Nov '12

29 Nov '12

Dear Tom, Please pull u-boot-fdt to fix the global_data compilation issue introduced in "[PATCH 14/14] fdt: Set kernaddr if fdt indicates a kernel is present" (identified by Dennis Lan). Thanks, gvb The following changes since commit d41b3cc16fd97da23900f79e8fefdeedeebde8f6: Merge branch 'master' of git://git.denx.de/u-boot-mips (2012-11-27 20:34:51 -0700) are available in the git repository at: git://git.denx.de/u-boot-fdt.git master for you to fetch changes up to f39612d360c02ce97e7ca7a872693f348f7ec8fd: fdt: Correct global_data condition in main (2012-11-28 19:26:49 -0500) ---------------------------------------------------------------- Simon Glass (1): fdt: Correct global_data condition in main common/main.c | 2 -- 1 file changed, 2 deletions(-)

2 1

[U-Boot] [PATCH v0] mmc: forced sector mode when accessing OCR register
by Davide Bonfanti 29 Nov '12

29 Nov '12

Some eMMC require this setting to work properly. Tested on: - Toshiba THGBM2G8D8FBAIB (the one giving the problem) - Toshiba THGBM4G4D1HBAR - Micron MTFC4GMVEA - Hynix H26M64002BNR - SanDisk SDIN5E1-32G Signed-off-by: Davide Bonfanti <davide.bonfanti(a)bticino.it> --- drivers/mmc/mmc.c | 3 ++- include/mmc.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 5ffd8c5..cf66811 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -530,7 +530,8 @@ static int mmc_send_op_cond(struct mmc *mmc) cmd.cmdarg = (mmc_host_is_spi(mmc) ? 0 : (mmc->voltages & (cmd.response[0] & OCR_VOLTAGE_MASK)) | - (cmd.response[0] & OCR_ACCESS_MODE)); + (cmd.response[0] & OCR_ACCESS_MODE)) | + OCR_ACCESS_SECTOR_MODE; if (mmc->host_caps & MMC_MODE_HC) cmd.cmdarg |= OCR_HCS; diff --git a/include/mmc.h b/include/mmc.h index a13e2bd..f1314d8 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -108,6 +108,7 @@ #define OCR_HCS 0x40000000 #define OCR_VOLTAGE_MASK 0x007FFF80 #define OCR_ACCESS_MODE 0x60000000 +#define OCR_ACCESS_SECTOR_MODE (1 << 30) #define SECURE_ERASE 0x80000000 -- 1.7.9.5 Ce message, ainsi que tous les fichiers joints à ce message, peuvent contenir des informations sensibles et/ ou confidentielles ne devant pas être divulguées. Si vous n'êtes pas le destinataire de ce message (ou que vous recevez ce message par erreur), nous vous remercions de le notifier immédiatement à son expéditeur, et de détruire ce message. Toute copie, divulgation, modification, utilisation ou diffusion, non autorisée, directe ou indirecte, de tout ou partie de ce message, est strictement interdite. This e-mail, and any document attached hereby, may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized, direct or indirect, copying, disclosure, distribution or other use of the material or parts thereof is strictly forbidden.

3 2

[U-Boot] [PATCH] mmc: Add an mmcsilent option
by Pantelis Antoniou 29 Nov '12

29 Nov '12

When using MMC commands for dfu there is considerable noise. Suppress mmc messages when mmcsilent is set. Signed-off-by: Pantelis Antoniou <panto(a)antoniou-consulting.com> --- common/cmd_mmc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 4c19df7..73383f3 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -278,8 +278,9 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } - printf("\nMMC %s: dev # %d, block # %d, count %d ... ", - argv[1], curr_device, blk, cnt); + if (getenv("mmcsilent") == NULL) + printf("\nMMC %s: dev # %d, block # %d, count %d ... ", + argv[1], curr_device, blk, cnt); mmc_init(mmc); @@ -301,8 +302,9 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) BUG(); } - printf("%d blocks %s: %s\n", - n, argv[1], (n == cnt) ? "OK" : "ERROR"); + if (getenv("mmcsilent") == NULL) + printf("%d blocks %s: %s\n", + n, argv[1], (n == cnt) ? "OK" : "ERROR"); return (n == cnt) ? 0 : 1; } -- 1.7.12

4 4

[U-Boot] [PATCH 0/2] AM335x_EVM DFU support
by Pantelis Antoniou 29 Nov '12

29 Nov '12

This patchset enables DFU for the AM335x_EVM family of boards. Pantelis Antoniou (2): am335x_evm: Define CONFIG_SYS_CACHELINE_SIZE am335x_evm: Add DFU config include/configs/am335x_evm.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) -- 1.7.12

3 5

[U-Boot] mtd/cfi: SST39VF3201B flash model not properly handled
by Angelo Dureghello 29 Nov '12

29 Nov '12

Dear All, as Wolfgang Denx suggested me, i am trying to use the u-boot CFI driver with a CFI flash (SSTVF3201B). This flash chip allows erasing/writing blocks of 4 KBytes (called "sectors" in the SST datasheet), or 64 KBytes (called "blocks"). The command sequence table for this flash shows 2 different commands to operate on these 2 kind of blocks. 0x50 is for "sector erase" and "0x30" (the command used from u-boot CFI driver as AMD_CMD_ERASE_SECTOR) is for the 64KB "block" erase. The issue: now, u-boot CFI driver works fine on 64KB boundary ranges, but if i expect to erase a 4KB sector size i get a full 64KB block erased. Proposed solution: Initially, a single sector size definition would be good enough for this chip, so the user should specify if he wants a 64 or 4 KB sector to be used, using some CFG_X. CFI driver, through queries, should be able to identify this particular chip so that it can be handled in a specific way from the CFI driver (cmd 0x50 for 4KB secotrs, or 0x30 for 64KB secotrs). I am thinking about to post a patch on this. Anyway, until new AMCORE board patch is not accepted, there is the chance this can result as a "dead code" if no-one use this flash chip except me. So, before i start, please let me know how to proceed, maybe is better to use a specific flash.c for my board for now ? Or if you think a patch can be useful, any suggestion on how to implement it is really welcome. Best Regards, Angelo Dureghello

2 2