September 2009 - U-Boot

[U-Boot] [PATCH] new default shortcut to config & build a board
by Mike Frysinger 18 Oct '09

18 Oct '09

The majority of the time that I build things in U-Boot, I want to just build for the board. I don't make board config tweaks after selecting the board. So add a new pattern rule that allows people to combine two steps in one go: `make foo_config && make` => `make foo` This shouldn't conflict with any existing make rules as the pattern rule is used only the rule doesn't already exist. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 02393b6..bf45a0b 100644 --- a/Makefile +++ b/Makefile @@ -495,6 +495,10 @@ unconfig: $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp \ $(obj)include/autoconf.mk $(obj)include/autoconf.mk.dep +%: %_config + $(MAKE) $@_config + $(MAKE) + #======================================================================== # PowerPC #======================================================================== @@ -3505,10 +3509,6 @@ BFIN_BOARDS += ibf-dsp561 $(BFIN_BOARDS:%=%_config) : unconfig @$(MKCONFIG) $(@:_config=) blackfin blackfin $(@:_config=) -$(BFIN_BOARDS): - $(MAKE) $@_config - $(MAKE) - #======================================================================== # AVR32 #======================================================================== -- 1.6.4

4 5

[U-Boot] [PATCH] part_dos: check status flags of partitions
by Daniel Mack 18 Oct '09

18 Oct '09

The current fatload code has a problem together with the way the DOS partition parser is implemented. This hit me when I tried to load a file from a USB stick which had no partition table but a FAT16 directly written to the first sector. With such an environment, get_partition_info_extended() still finds a valid partition at the first sector since the 0x55aa magic is valid for both the MBR and the FAT boot sector. As a result, part_offset in fs/fat/fat.c is then set to some ridiculous value and the code searching for the directory entry gets lots in an endless loop. The fix is quite simple though - we just need to check the status field of the partitions more stricly. According to the specs, it may only contain 0x00 and 0x80. If get_partition_info() fails for this case, the fatload code falls back to the assumption that there is no partition table and does the right thing then. Please consider applying the following patch. Daniel >From 381a85bf04adc228cc70e8fa7af899a6dbf07e42 Mon Sep 17 00:00:00 2001 From: Daniel Mack <daniel(a)caiaq.de> Date: Mon, 28 Sep 2009 11:40:38 +0200 Subject: [PATCH] part_dos: check status flags of partitions Only read partitions which have 0x00 or 0x80 set in their status field. All others are invalid. Signed-off-by: Daniel Mack <daniel(a)caiaq.de> --- disk/part_dos.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/disk/part_dos.c b/disk/part_dos.c index 93bf3dd..e32d58e 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -188,7 +188,8 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part * fdisk does not show the extended partitions that * are not in the MBR */ - if ((pt->sys_ind != 0) && + if (((pt->boot_ind & ~0x80) == 0) && + (pt->sys_ind != 0) && (part_num == which_part) && (is_extended(pt->sys_ind) == 0)) { info->blksz = 512; -- 1.6.3.3

2 3

[U-Boot] [PATCH] galaxy5200: change cs1 configuration
by Eric Millbrandt 18 Oct '09

18 Oct '09

Correct the chip select configuration for the nand flash chip select. Signed-off-by: Eric Millbrandt <emillbrandt(a)dekaresearch.com> --- include/configs/galaxy5200.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h index 3b67ea9..931acfb 100644 --- a/include/configs/galaxy5200.h +++ b/include/configs/galaxy5200.h @@ -210,7 +210,7 @@ /* Chip Select configuration for NAND flash */ #define CONFIG_SYS_CS1_START 0x20000000 #define CONFIG_SYS_CS1_SIZE 0x90000 -#define CONFIG_SYS_CS1_CFG 0x0002d900 +#define CONFIG_SYS_CS1_CFG 0x00025b00 /* Chip Select configuration for Epson S1D13513 */ #define CONFIG_SYS_CS3_START 0x10000000 -- 1.6.3.1

2 1

[U-Boot] [Patch v2] vxworks: Add CONFIG_VXWORKS_PREBOOT
by Niklaus Giger 18 Oct '09

18 Oct '09

The option CONFIG_VXWORKS_PREBOOT allows a board specific vxworks_preboot to be run just before jumping into the vxWorks images. This can be used to alter a register which is used differently by U-boot and vxWorks. The patch defines a weak function which may be overridden by a board specific version. vxworks_preboot should return 0 to indicated that everything worked fine. The error code is checked and the vxWorks image will not be loaded in case of errors. Signed-off-by: Niklaus Giger <niklaus.giger(a)netstal.com> --- board/netstal/mcu25/mcu25.c | 8 ++++++++ common/cmd_elf.c | 11 +++++++++++ include/vxworks.h | 2 ++ 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c index 9054282..d64194d 100644 --- a/board/netstal/mcu25/mcu25.c +++ b/board/netstal/mcu25/mcu25.c @@ -53,6 +53,7 @@ DECLARE_GLOBAL_DATA_PTR; */ #define CPC0_CR0_VALUE 0x0007F03C #define CPC0_CR1_VALUE 0x00004051 +#define CPCO_CR1_USE_EXTERNAL 0x00804051 int board_early_init_f (void) { @@ -161,6 +162,13 @@ int misc_init_r(void) return 0; } +int vxworks_preboot(void) { + if (sys_install_requested()) { + mtdcr(CPC0_CR1, CPCO_CR1_USE_EXTERNAL); + } + return 0; +} + phys_size_t initdram(int board_type) { unsigned int dram_size = 64*1024*1024; diff --git a/common/cmd_elf.c b/common/cmd_elf.c index 63f6fe7..c8eb88a 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -53,6 +53,11 @@ unsigned long do_bootelf_exec (ulong (*entry)(int, char *[]), int argc, char *ar return ret; } +__attribute__((weak)) int vxworks_preboot(void) +{ + return 0; +} + /* ====================================================================== * Interpreter command to boot an arbitrary ELF image from memory. * ====================================================================== */ @@ -100,6 +105,7 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) char *bootline; /* Text of the bootline */ char *tmp; /* Temporary char pointer */ char build_buf[128]; /* Buffer for building the bootline */ + int rc; /* Checking vxworks_preboot */ /* --------------------------------------------------- * @@ -211,6 +217,11 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) printf ("## Using bootline (@ 0x%lx): %s\n", bootaddr, (char *) bootaddr); + rc = vxworks_preboot(); + if (rc != 0) { + printf ("## vxworks_preboot failed with %d\n", rc); + return 1; + } printf ("## Starting vxWorks at 0x%08lx ...\n", addr); ((void (*)(void)) addr) (); diff --git a/include/vxworks.h b/include/vxworks.h index 1633904..2edbf8e 100644 --- a/include/vxworks.h +++ b/include/vxworks.h @@ -50,4 +50,6 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); #define CONFIG_SYS_VXWORKS_SERVERNAME "srv" #endif +int vxworks_preboot(void); + #endif -- 1.6.3.3

2 1

[U-Boot] kirkwood (openrd): saveenv will not work with environment in NAND
by Dieter Kiermaier 18 Oct '09

18 Oct '09

Hi everybody, I try to bring up fw_setenv / fw_printenv in linux kernel but first it want to start with u-boot itself. I built most recent u-boot-marvell git source and get a running u-boot with standard openrd configuration. So far so good. version says: ArtistaNET-III>> version U-Boot 2009.08-00208-g9ef0569-dirty (Sep 29 2009 - 15:42:42) OpenRD_base But saveenv will not work as expected. setenv of new parameter will work but after saveenv and reboot the new parameter is lost and u-boot complains about wrong CRC again. Any help would be very appreciated. Dieter

8 31

[U-Boot] Please pull u-boot-i2c.git next branch
by Heiko Schocher 15 Oct '09

15 Oct '09

The following changes since commit 6b8edfde22acc574b5532e9f086e6a7287a9bc78: Wolfgang Denk (1): Prepare v2009.06-rc1 are available in the git repository at: git://git.denx.de/u-boot-i2c.git next Peter Tyser (12): i2c.h: Provide a default CONFIG_SYS_I2C_SLAVE value cpci750: i2c cleanup Marvell: i2c cleanup mpc7448hpc2: Add CONFIG_SYS_I2C_SPEED define tsi108_i2c: Add i2c_init() stub function cm5200: Make function test command names more unique i2c: Create common default i2c_[set|get]_bus_speed() functions i2c: Remove deprecated individual i2c commands i2c: Update references to individual i2c commands cmd_i2c: Clean up i2c command argument parsing cmd_i2c: Clean up trivial helper functions cmd_i2c: Fix i2c help command output when CONFIG_I2C_MUX README | 20 +---- board/Marvell/common/i2c.c | 19 +++-- board/cm5200/cmd_cm5200.c | 18 ++-- board/esd/cpci750/i2c.c | 16 ++-- board/esd/tasreg/tasreg.c | 4 +- common/cmd_eeprom.c | 4 - common/cmd_i2c.c | 176 +++++++++++++------------------------- cpu/arm920t/at91rm9200/i2c.c | 10 -- cpu/mpc512x/i2c.c | 14 --- cpu/mpc8260/i2c.c | 16 ---- cpu/ppc4xx/40x_spd_sdram.c | 4 - cpu/ppc4xx/44x_spd_ddr.c | 4 - cpu/ppc4xx/i2c.c | 14 --- doc/README.ebony | 20 ++-- doc/README.m52277evb | 8 +-- doc/README.m5373evb | 8 +-- doc/README.m54455evb | 8 +-- doc/README.m5475evb | 8 +-- doc/README.ppc440 | 4 +- doc/README.xpedite1k | 6 +- doc/feature-removal-schedule.txt | 12 --- drivers/i2c/soft_i2c.c | 14 --- drivers/i2c/tsi108_i2c.c | 11 ++- include/configs/DU405.h | 1 - include/configs/DU440.h | 1 - include/configs/MPC8313ERDB.h | 1 - include/configs/MPC8349EMDS.h | 1 - include/configs/MPC8349ITX.h | 1 - include/configs/MPC8360ERDK.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8568MDS.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/MVBLM7.h | 1 - include/configs/PMC440.h | 1 - include/configs/SIMPC8313.h | 1 - include/configs/XPEDITE5200.h | 1 - include/configs/XPEDITE5370.h | 1 - include/configs/ads5121.h | 1 - include/configs/at91rm9200ek.h | 1 - include/configs/bubinga.h | 2 +- include/configs/katmai.h | 1 - include/configs/keymile-common.h | 1 - include/configs/kmeter1.h | 1 - include/configs/korat.h | 1 - include/configs/mpc7448hpc2.h | 1 + include/configs/sacsng.h | 6 +- include/configs/sbc8349.h | 1 - include/configs/socrates.h | 1 - include/configs/taihu.h | 2 +- include/i2c.h | 12 ++- 51 files changed, 140 insertions(+), 324 deletions(-) -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

6 5

[U-Boot] V2 of OMAP3 USB device Support
by Tom Rix 14 Oct '09

14 Oct '09

The technical change is better handling of address setting on the usb handshaking setup phase. Other changes from Jean's comments 2/8 USB add macros for debugging usb device setup. static inline function replacing debug macros 3/8 TWL4030 Add usb PHY support add empty lines between variables and statements other empty lines added for readablity 4/8 OMAP3 Add usb device support 80+ char lines reduced Used MUSB_FLAGS_PRINT macro suggestion lowercased function names multi-lined ep0_state_enum Used suggestion on udelay to 1000 * 1000 add empty lines between variables and statements inverted check of ep0_urb->device_request.wLength other empty lines added for readablity 5/8 OMAP3 zoom1 Add usbtty configuration This was ack-ed by Jean 6/8 OMAP3 beagle Add usbtty configuration This was ack-ed by Jean 8/8 OMAP3 zoom2 Use usbtty if the debug board cleanup using usbtty_* functions or their stubs without #define's

4 12

[U-Boot] UBIFS LZO decompression failure
by Simon Kagstrom 14 Oct '09

14 Oct '09

Hi List! I have a slight problem with UBIFS on the OpenRD base board (an ARM board very similar to sheevaplug). Loading files which have been compressed with LZO by ubifs fails: OpenRD>> ubi part root; ubifsmount rootfs Creating 1 MTD partitions on "nand0": 0x0000001e0000-0x000020000000 : "mtd=1" UBI: attaching mtd1 to ubi0 UBI: physical eraseblock size: 131072 bytes (128 KiB) UBI: logical eraseblock size: 129024 bytes UBI: smallest flash I/O unit: 2048 UBI: sub-page size: 512 UBI: VID header offset: 512 (aligned 512) UBI: data offset: 2048 UBI: attached mtd1 to ubi0 UBI: MTD device name: "mtd=1" UBI: MTD device size: 510 MiB UBI: number of good PEBs: 4081 UBI: number of bad PEBs: 0 UBI: max. allowed volumes: 128 UBI: wear-leveling threshold: 4096 UBI: number of internal volumes: 1 UBI: number of user volumes: 1 UBI: available PEBs: 54 UBI: total number of reserved PEBs: 4027 UBI: number of PEBs reserved for bad PEB handling: 40 UBI: max/mean erase counter: 6/4 UBIFS: mounted UBI device 0, volume 0, name "rootfs" UBIFS: mounted read-only UBIFS: file system size: 511967232 bytes (499968 KiB, 488 MiB, 3968 LEBs) UBIFS: journal size: 25675776 bytes (25074 KiB, 24 MiB, 199 LEBs) UBIFS: media format: w4/r0 (latest is w4/r0) UBIFS: default compressor: LZO UBIFS: reserved for root: 5182151 bytes (5060 KiB) OpenRD>> ubifsload 0x8000000 /boot/primary/uImage Loading file '/boot/primary/uImage' to addr 0x08000000 with size 7196920 (0x006dd0f8)... UBIFS error (pid 0): ubifs_decompress: cannot decompress 3204 bytes, compressor LZO, error -6 UBIFS error (pid 0): read_block: bad data node (block 0, inode 88) UBIFS error (pid 0): do_readpage: cannot read page 0 of inode 88, error -22 Error reading file '/boot/primary/uImage' I've created the filesystem in Linux on the target (v2.6.31). The compression error -6 is LZO_E_LOOKBEHIND_OVERRUN, and it fails because of this test in lzo1x_decompress.c: if (HAVE_LB(m_pos, out, op)) goto lookbehind_overrun; where HAVE_LB is defined as (m_pos < out || m_pos >= op) and the m_pos, out and op values are 0x07ffde77, 0x08000000, 0x08000083 (i.e., the first test fails). The lzo1x_decompress.c file is identical to that in Linux, so something is fishy here. Does it work for the rest of you? In our case it doesn't matter very much since the file (an uImage) is compressed anyway and we therefore save work anyway by marking it as using no compression, but it would be nice if this would work anyhow. // Simon

2 1

[U-Boot] [PATCH 00/13] ppc: Fix relocation
by Peter Tyser 12 Oct '09

12 Oct '09

7 34

[U-Boot] [PATCH 2/7] mpc85xx: Add eSDHC support for MPC8569E-MDS boards
by Anton Vorontsov 12 Oct '09

12 Oct '09

eSDHC is mutually exlusive with UART0* and I2C2. When eSDHC is used, we should switch u-boot console to UART1, and make the proper device-tree fixups. * Actually, according to User's Guide we can use eSDHC in serial (1-bit) mode without disabling UART0, but for me it doesn't work on prototype boards. Signed-off-by: Anton Vorontsov <avorontsov(a)ru.mvista.com> --- board/freescale/mpc8569mds/mpc8569mds.c | 85 +++++++++++++++++++++++++++++++ cpu/mpc85xx/speed.c | 2 + include/asm-ppc/global_data.h | 3 +- include/configs/MPC8569MDS.h | 16 ++++++ 4 files changed, 105 insertions(+), 1 deletions(-) diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index 1e7526a..7c1aaa5 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -23,6 +23,7 @@ */ #include <common.h> +#include <hwconfig.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> @@ -35,6 +36,7 @@ #include <ioports.h> #include <libfdt.h> #include <fdt_support.h> +#include <fsl_esdhc.h> #include "bcsr.h" @@ -303,6 +305,87 @@ local_bus_init(void) out_be32(&lbc->lcrr, (u32)in_be32(&lbc->lcrr)| 0x00030000); } +#ifdef CONFIG_FSL_ESDHC +int board_mmc_init(bd_t *bd) +{ + struct ccsr_gur *gur = (struct ccsr_gur *)CONFIG_SYS_MPC85xx_GUTS_ADDR; + u8 *bcsr = (u8 *)CONFIG_SYS_BCSR_BASE; + + if (!hwconfig("esdhc")) + return 0; + + printf("Enabling eSDHC...\n" + " For eSDHC to function, UART0 and I2C2 should be disabled.\n" + " Redirecting stderr, stdout and stdin to UART1...\n"); + console_assign(stderr, "eserial1"); + console_assign(stdout, "eserial1"); + console_assign(stdin, "eserial1"); + printf("Switched to UART1 (initial log has been printed to UART0).\n"); + + /* Assign I2C2 signals to eSDHC. */ + clrsetbits_be32(&gur->plppar1, PLPPAR1_I2C_BIT_MASK, + PLPPAR1_ESDHC_VAL); + clrsetbits_be32(&gur->plpdir1, PLPDIR1_I2C_BIT_MASK, + PLPDIR1_ESDHC_VAL); + + /* Mux UART0 & I2C2 signals to eSDHC. */ + setbits_8(&bcsr[6], BCSR6_SD_ENABLE); + + return fsl_esdhc_mmc_init(bd); +} + +static void fdt_board_fixup_esdhc(void *blob, bd_t *bd) +{ + const char *status = "disabled"; + int off; + int err; + + /* + * In case of enabled eSDHC, we should disable UART0 and I2C2 + * in the device tree, otherwise nothing to do. + */ + if (!hwconfig("esdhc")) + return; + + off = fdt_path_offset(blob, "serial0"); + if (off < 0) { + printf("WARNING: could not find serial0 alias: %s.\n", + fdt_strerror(off)); + goto disable_i2c2; + } + + err = fdt_setprop(blob, off, "status", status, strlen(status) + 1); + if (err) { + printf("WARNING: could not set status for serial0: %s.\n", + fdt_strerror(err)); + return; + } + +disable_i2c2: + off = -1; + while (1) { + const u32 *idx; + int len; + + off = fdt_node_offset_by_compatible(blob, off, "fsl-i2c"); + if (off < 0) + break; + + idx = fdt_getprop(blob, off, "cell-index", &len); + if (!idx || len != sizeof(*idx)) + continue; + + if (*idx == 1) { + fdt_setprop(blob, off, "status", status, + strlen(status) + 1); + break; + } + } +} +#else +static inline void fdt_board_fixup_esdhc(void *blob, bd_t *bd) {} +#endif + #ifdef CONFIG_PCIE1 static struct pci_controller pcie1_hose; #endif /* CONFIG_PCIE1 */ @@ -449,5 +532,7 @@ void ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_PCIE1 ft_fsl_pci_setup(blob, "pci1", &pcie1_hose); #endif + fdt_fixup_esdhc(blob, bd); + fdt_board_fixup_esdhc(blob, bd); } #endif diff --git a/cpu/mpc85xx/speed.c b/cpu/mpc85xx/speed.c index 286b6b2..73ecb76 100644 --- a/cpu/mpc85xx/speed.c +++ b/cpu/mpc85xx/speed.c @@ -155,6 +155,8 @@ int get_clocks (void) #if defined(CONFIG_MPC8536) gd->sdhc_clk = gd->bus_clk / 2; +#elif defined(CONFIG_MPC8569) + gd->sdhc_clk = gd->bus_clk; #endif #if defined(CONFIG_CPM2) diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index 244c161..7cbcdb7 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -86,7 +86,8 @@ typedef struct global_data { u32 mem_sec_clk; #endif /* CONFIG_MPC8360 */ #endif -#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC8536) +#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8536) || \ + defined(CONFIG_MPC8569) u32 sdhc_clk; #endif #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 32e747e..3d07a5b 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -70,6 +70,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_ENABLE_36BIT_PHYS 1 #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ +#define CONFIG_HWCONFIG #define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00400000 @@ -206,6 +207,7 @@ extern unsigned long get_clock_freq(void); /* Serial Port */ #define CONFIG_CONS_INDEX 1 +#define CONFIG_SERIAL_MULTI 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL @@ -258,8 +260,10 @@ extern unsigned long get_clock_freq(void); #define PLPPAR1_I2C_BIT_MASK 0x0000000F #define PLPPAR1_I2C2_VAL 0x00000000 +#define PLPPAR1_ESDHC_VAL 0x0000000A #define PLPDIR1_I2C_BIT_MASK 0x0000000F #define PLPDIR1_I2C2_VAL 0x0000000F +#define PLPDIR1_ESDHC_VAL 0x00000006 /* * General PCI @@ -450,6 +454,18 @@ extern unsigned long get_clock_freq(void); #undef CONFIG_WATCHDOG /* watchdog disabled */ +#define CONFIG_MMC 1 + +#ifdef CONFIG_MMC +#define CONFIG_FSL_ESDHC +#define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR +#define CONFIG_CMD_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_FAT +#define CONFIG_DOS_PARTITION +#endif + /* * Miscellaneous configurable options */ -- 1.6.3.3

2 4