January 2013 - U-Boot

[U-Boot] [PATCH] README.qemu-mips: move README file from board to doc directory
by daniel.schwierzeck＠gmail.com 12 Jan '13

12 Jan '13

From: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> --- board/qemu-mips/README => doc/README.qemu-mips | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename board/qemu-mips/README => doc/README.qemu-mips (100%) diff --git a/board/qemu-mips/README b/doc/README.qemu-mips similarity index 100% rename from board/qemu-mips/README rename to doc/README.qemu-mips -- 1.8.0.3

1 0

[U-Boot] [PATCH] MIPS: bootm.c: drop obsolete Qemu specific bootm implementation
by daniel.schwierzeck＠gmail.com 12 Jan '13

12 Jan '13

From: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> The Qemu specific bootm implementation was intended for a special Qemu target in Linux kernel. But this target has been dropped in v2.6.25-rc1 by commit 302922e5f6901eb6f29c58539631f71b3d9746b8 Author: Ralf Baechle <ralf(a)linux-mips.org> Date: Tue Jan 29 10:15:02 2008 +0000 [MIPS] Qemu: Remove platform. The Qemu platform was originally implemented to have an easily supportable platform until Qemu reaches a state where it emulates a real world system. Since the latest release Qemu is capable of emulating the MIPSsim and Malta platforms, so this goal has been reached. The Qemu plaform is also rather underfeatured so less useful than a Malta emulation. Thus the special bootm implementation is obsolete by now and can be dropped. The Qemu support in U-Boot should be converted to MIPS Malta to support booting of Linux kernels. Signed-off-by: Gabor Juhos <juhosg(a)openwrt.org> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> --- arch/mips/lib/Makefile | 4 --- arch/mips/lib/bootm_qemu_mips.c | 78 ----------------------------------------- 2 files changed, 82 deletions(-) delete mode 100644 arch/mips/lib/bootm_qemu_mips.c diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 967e98a..a68a564 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -35,11 +35,7 @@ LGOBJS := $(addprefix $(obj),$(GLSOBJS)) SOBJS-y += COBJS-y += board.o -ifeq ($(CONFIG_QEMU_MIPS),y) -COBJS-y += bootm_qemu_mips.o -else COBJS-y += bootm.o -endif SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) diff --git a/arch/mips/lib/bootm_qemu_mips.c b/arch/mips/lib/bootm_qemu_mips.c deleted file mode 100644 index 0815c9c..0000000 --- a/arch/mips/lib/bootm_qemu_mips.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * (C) Copyright 2008 - * Jean-Christophe PLAGNIOL-VILLARD <jcplagniol(a)jcrosoft.com> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#include <common.h> -#include <command.h> -#include <image.h> -#include <asm/byteorder.h> -#include <asm/addrspace.h> - -DECLARE_GLOBAL_DATA_PTR; - -int do_bootm_linux(int flag, int argc, char * const argv[], - bootm_headers_t *images) -{ - void (*theKernel) (int, char **, char **, int *); - char *bootargs = getenv("bootargs"); - char *start; - uint len; - - /* find kernel entry point */ - theKernel = (void (*)(int, char **, char **, int *))images->ep; - - bootstage_mark(BOOTSTAGE_ID_RUN_OS); - - debug("## Transferring control to Linux (at address %08lx) ...\n", - (ulong) theKernel); - - gd->bd->bi_boot_params = gd->bd->bi_memstart + (16 << 20) - 256; - debug("%-12s= 0x%08lX\n", "boot_params", (ulong)gd->bd->bi_boot_params); - - /* set Magic */ - *(int32_t *)(gd->bd->bi_boot_params - 4) = 0x12345678; - /* set ram_size */ - *(int32_t *)(gd->bd->bi_boot_params - 8) = gd->ram_size; - - start = (char *)gd->bd->bi_boot_params; - - len = strlen(bootargs); - - strncpy(start, bootargs, len + 1); - - start += len; - - len = images->rd_end - images->rd_start; - if (len > 0) { - start += sprintf(start, " rd_start=0x%08X rd_size=0x%0X", - (uint) UNCACHED_SDRAM(images->rd_start), - (uint) len); - } - - /* we assume that the kernel is in place */ - printf("\nStarting kernel ...\n\n"); - - theKernel(0, NULL, NULL, 0); - - /* does not return */ - return 1; -} -- 1.8.0.3

2 1

[U-Boot] [PATCH] fdt: fix dts preprocessor options
by Allen Martin 12 Jan '13

12 Jan '13

Using "-ansi" preprocessor option will cause dts lines that begin with '#' to choke the preprocessor. Change to "-x assembler-with-cpp" instead which is what the kernel uses to preprocess dts files. Signed-off-by: Allen Martin <amartin(a)nvidia.com> --- dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dts/Makefile b/dts/Makefile index 785104e..922c78c 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -36,7 +36,7 @@ $(error Your architecture does not have device tree support enabled. \ Please define CONFIG_ARCH_DEVICE_TREE)) # We preprocess the device tree file provide a useful define -DTS_CPPFLAGS := -ansi \ +DTS_CPPFLAGS := -x assembler-with-cpp \ -DARCH_CPU_DTS=\"$(SRCTREE)/arch/$(ARCH)/dts/$(CONFIG_ARCH_DEVICE_TREE).dtsi\" \ -DBOARD_DTS=\"$(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts/$(DEVICE_TREE).dts\" -- 1.7.10.4

3 2

[U-Boot] [PATCH v2 01/10] arm: move flush_dcache_all() to just before disable cache
by Simon Glass 12 Jan '13

12 Jan '13

From: Arun Mankuzhi <arun.m(a)samsung.com> In Cortex-A15 architecture, when we run cache invalidate the cache clean operation executes automatically. So if there are any dirty cache lines before disabling the L2 cache these will be synchronized with the main memory when invalidate_dcache_all() runs in the last part of U-boot The two functions after flush_dcache_all is using the stack. So this data will be on the cache. After disable when invalidate is called the data will be flushed from cache to memory. This corrupts the stack in invalida_dcache_all. So this change is required to avoid the u-boot hang. So flush has to be done just before clearing CR_C bit Signed-off-by: Arun Mankuzhi <arun.m(a)samsung.com> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: None arch/arm/lib/cache-cp15.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index 939de10..06119c8 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -124,8 +124,11 @@ static void cache_disable(uint32_t cache_bit) return; /* if disabling data cache, disable mmu too */ cache_bit |= CR_M; - flush_dcache_all(); } + reg = get_cr(); + cp_delay(); + if (cache_bit == (CR_C | CR_M)) + flush_dcache_all(); set_cr(reg & ~cache_bit); } #endif -- 1.7.7.3

4 13

[U-Boot] [PATCH] arm: at91sam9x5: add dataflash boot support
by Bo Shen 12 Jan '13

12 Jan '13

Add dataflash boot support on at91sam9x5ek board Signed-off-by: Bo Shen <voice.shen(a)atmel.com> --- boards.cfg | 1 + include/configs/at91sam9x5ek.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/boards.cfg b/boards.cfg index 70a1569..e799d9b 100644 --- a/boards.cfg +++ b/boards.cfg @@ -97,6 +97,7 @@ at91sam9m10g45ek_nandflash arm arm926ejs at91sam9m10g45ek atmel at91sam9rlek_dataflash arm arm926ejs at91sam9rlek atmel at91 at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH at91sam9rlek_nandflash arm arm926ejs at91sam9rlek atmel at91 at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH at91sam9x5ek_nandflash arm arm926ejs at91sam9x5ek atmel at91 at91sam9x5ek:AT91SAM9X5,SYS_USE_NANDFLASH +at91sam9x5ek_dataflash arm arm926ejs at91sam9x5ek atmel at91 at91sam9x5ek:AT91SAM9X5,SYS_USE_DATAFLASH at91sam9x5ek_spiflash arm arm926ejs at91sam9x5ek atmel at91 at91sam9x5ek:AT91SAM9X5,SYS_USE_SPIFLASH at91sam9x5ek_mmc arm arm926ejs at91sam9x5ek atmel at91 at91sam9x5ek:AT91SAM9X5,SYS_USE_MMC at91sam9xeek_dataflash_cs0 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS0 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 1317582..a034ed0 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -178,6 +178,16 @@ #define CONFIG_BOOTCOMMAND "sf probe 0; " \ "sf read 0x22000000 0x100000 0x300000; " \ "bootm 0x22000000" +#elif defined(CONFIG_SYS_USE_DATAFLASH) +/* bootstrap + u-boot + env + linux in data flash */ +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_OFFSET 0x4200 +#define CONFIG_ENV_SIZE 0x4200 +#define CONFIG_ENV_SECT_SIZE 0x210 +#define CONFIG_ENV_SPI_MAX_HZ 30000000 +#define CONFIG_BOOTCOMMAND "sf probe 0; " \ + "sf read 0x22000000 0x84000 0x294000; " \ + "bootm 0x22000000" #else /* CONFIG_SYS_USE_MMC */ /* bootstrap + u-boot + env + linux in mmc */ #define CONFIG_ENV_IS_IN_MMC -- 1.7.9.5

3 5

[U-Boot] [PATCH 0/7] tegra: SPI drivers
by Allen Martin 12 Jan '13

12 Jan '13

This series updates the tegra20 SPI driver to add fdt support and adds a new tegra30 SPI driver. This series depends on the following patches: Allen Martin: fdt: fix dts preprocessor options tegra: remove IRDA pinmux synonym Testing was done on seaboard (tegra20) and cardhu (tegra30). Allen Martin (7): tegra: fdt: add apbdma node tegra: spi: add fdt support to tegra SPI SFLASH driver tegra30: add SBC1 to periph id mapping table tegra30: fdt: add SPI SLINK nodes tegra: add addresses of SPI SLINK controllers tegra: add SPI SLINK driver tegra: cardhu: config: enable SPI arch/arm/cpu/tegra30-common/clock.c | 2 +- arch/arm/dts/tegra20.dtsi | 34 +++ arch/arm/dts/tegra30.dtsi | 114 +++++++++ arch/arm/include/asm/arch-tegra/tegra.h | 6 + arch/arm/include/asm/arch-tegra/tegra_slink.h | 84 +++++++ board/nvidia/common/board.c | 3 +- drivers/spi/Makefile | 1 + drivers/spi/tegra_slink.c | 333 +++++++++++++++++++++++++ drivers/spi/tegra_spi.c | 42 +++- include/configs/cardhu.h | 11 + include/fdtdec.h | 2 + lib/fdtdec.c | 2 + 12 files changed, 631 insertions(+), 3 deletions(-) create mode 100644 arch/arm/include/asm/arch-tegra/tegra_slink.h create mode 100644 drivers/spi/tegra_slink.c -- 1.7.10.4

2 17

[U-Boot] Moving from 1.1.6 to 2012.07 for Coldfire help
by Steve deRosier 12 Jan '13

12 Jan '13

Hi all, I'm stuck trying to get Linux to boot from U-Boot on a Coldfire system and I'd love some ideas of what to try next. I'm upgrading a uClinux system from a 2.4 kernel to 3.3. Additionally I'm trying to upgrade the boot-loader from u-boot 1.1.6 to release 2012.07. The board is based on a MCF5235EVB. I did the Linux upgrade first, and am successfully getting the existing system boot loader to boot my upgraded Linux 3.3 images. Now I've moved on to upgrading u-boot. I was able to get U-Boot to come up successfully and it recognizes my Linux image and a bootm command starts just fine. It does the checks, uncompresses, and goes to boot. I turned on the debug messages in U-Boot, so I get the "## Transferring control to Linux (at address 0x20000) ..." message, it goes and does the jump and then...nothing... Note that the exact same Linux image boots fine from 1.1.6. My 1.1.6 can boot both the 2.4 legacy image as well as my new 3.3 image. Unfortunately I've got minimal visibility into the system (My BDM interface is being a PITA, I've got assembly-only stepping, using CodeWarrior!!@#!@$!, in flash only. Pretty much nothing else other than flash access is functioning right with the BDM at the moment), so I've been relegated to debug-via-printf, which isn't terribly useful at the interface between u-boot and linux. Through reading code, I see a huge discrepancy between how 1.1.6 and 2012.07 starts the kernel. 1.1.6 uses a line: theKernel (linux_argc, linux_argv, linux_env, 0); 2012.07: /* * Linux Kernel Parameters (passing board info data): * sp+00: Ignore, side effect of using jsr to jump to kernel * sp+04: ptr to board info data * sp+08: initrd_start or 0 if no initrd * sp+12: initrd_end - unused if initrd_start is 0 * sp+16: Start of command line string * sp+20: End of command line string */ (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end); Clearly different... I'd assume that U-Boot's Linux starting magic is in sync with the current Linux kernel, but if that's the case, and these are actually as different as they appear, then the OLD U-Boot should have a problem starting the NEW kernel also. For grins, I grafted on the old sequence code into the new U-Boot, but that (as expected) failed also. I looked at the Coldfire startup code in Linux and it looks like it corrosponds to the same comment in U-Boot, and interestingly it seems to discard the bd_t structure that's passed in first. So far I think I've figured this out: * The FDT isn't used on Coldfire targets. * The Coldfire code discards the bd_t data passed in through u-boot. * Something funky is going on keeping Linux from booting, and it happens early enough that I can't see it on the console. If it makes a difference, for some reason we load kernel at 0x20000 and jump to 0x20000. This is a legacy of the existing project, I've tried to change it to 0x0, but that didn't help either. I had suspected it had to do with where the old bootloader placed itself in RAM, but it shouldn't be an issue with the new bootloader. For reference: RAM: 0x00000000, 32MB SRAM: 0x20000000 MBAR: 0x40000000 Flash: 0xFFC00000, 4mb (second flash module at 0xFF800000, but U-Boot doesn't know about that one). Image is stored at 0xFFC40000 and uses an initrd romfs immedately after the kernel Basic setup and design is similar to the 5235EVB. CONFIG_UBOOT, MTD_UCLINUX and MTD_UCLINUX_EBSS are all Y. I've been bashing my head against this wall all week, so I'd love it if anyone's got some ideas. Thanks, - Steve 5235IWI> bootm 0xffc40000 ## Current stack ends at 0x01f2ca2c * kernel: cmdline image address = 0xffc40000 ## Booting kernel from Legacy Image at ffc40000 ... Image Name: IWI 007 Image Type: M68K Linux Kernel Image (gzip compressed) Data Size: 2270515 Bytes = 2.2 MiB Load Address: 00020000 Entry Point: 00020000 Verifying Checksum ... OK kernel data at 0xffc40040, len = 0x0022a533 (2270515) ## No init Ramdisk ramdisk start = 0x00000000, ramdisk end = 0x00000000 Uncompressing Kernel Image ... OK kernel loaded at 0x00020000, end = 0x00470404 ## cmdline at 0x01f2c520 ... 0x01f2c520 ## kernel board info at 0x01f2c4e0 memstart = 0x00000000 memsize = 0x02000000 flashstart = 0xFFC00000 flashsize = 0x00400000 flashoffset = 0x00000000 sramstart = 0x20000000 sramsize = 0x00010000 mbar = 0x40000000 cpufreq = 150 MHz busfreq = 75 MHz baudrate = 57600 bps ## initrd_high = 0xffffffff, copy_to_ram = 1 ramdisk load start = 0x00000000, ramdisk load end = 0x00000000 ## Transferring control to Linux (at address 00020000) ...

1 0

[U-Boot] [PATCH 1/1] m68k/lib: fix serial driver relocation
by Angelo Dureghello 12 Jan '13

12 Jan '13

Fix coldfire serial driver bindings no more relocated to ram after last changes to drivers/serial/serial.c (regression). Serial initialization in ram has to be called after that gd->reloc_off is calculated. Signed-off-by: Angelo Dureghello <sysamfw(a)gmail.com> Cc: Jason Jin <jason.jin(a)freescale.com> --- diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index 02d73fd..373570c 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -402,14 +402,14 @@ void board_init_r (gd_t *id, ulong dest_addr) gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ - serial_initialize(); - debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr); WATCHDOG_RESET (); gd->reloc_off = dest_addr - CONFIG_SYS_MONITOR_BASE; + serial_initialize(); + monitor_flash_len = (ulong)&__init_end - dest_addr; #if defined(CONFIG_NEEDS_MANUAL_RELOC)

3 2

[U-Boot] Pull request: u-boot-arm/master
by Albert ARIBAUD 12 Jan '13

12 Jan '13

Hello Tom, The following changes since commit 61bdb9133593f0f881a57232039296f64bd662ed: arm: remove useless code in start.S files (2013-01-08 22:14:54 +0100) are available in the git repository at: git://git.denx.de/u-boot-arm.git master for you to fetch changes up to 59ee45ee91cc91b392a8e2684bfcb8c933ce4967: Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' (2013-01-11 18:17:33 +0100) ---------------------------------------------------------------- Albert ARIBAUD (6): mv88e61xx: refactor PHY and SWITCH level-code kirkwood: make MPP arrays static const ARM: lacie_kw: add support for WIRELESS_SPACE Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master' Merge 'u-boot-atmel/master' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' Andreas Bießmann (1): mv-common.h: increase malloc arena to 4MiB Arun Mankuzhi (1): arm: move flush_dcache_all() to just before disable cache Bo Shen (1): spi: atmel: sam9m10g45 also support WDRBT bit Gabe Black (1): arm: Keep track of the tlb size as well as its location Holger Brunck (3): arm/km: fix memory settings km/common: drop unneeded std* environment variables km/common: cosmetic change reported from checkpatch Javier Martinez Canillas (3): OMAP3: igep00x0: add CONFIG_SPL_BOARD_INIT for CONFIG_SPL_NAND_SUPPORT serial/ns16550: add an option to avoid hanging on broken platforms OMAP3: igep00x0: add CONFIG_SYS_NS16550_BROKEN_TEMT Luke Lowrey (1): arch-kirkwood: Ethernet port macro returning incorrect address Michael Walle (1): lsxl: unset ncip for rescue mode Nishanth Menon (1): Makefile: remove MLO.byteswap on clobber Richard Genoud (3): at91sam9x5: enable USB support for 9x5ek board. at91sam9x5ek: regroup FAT/DOS features at91sam9x5ek: add USB configuration Simon Glass (6): arm: Move fdt check earlier so that board_early_init_f() can use it arm: Add CONFIG_DELAY_ENVIRONMENT to delay environment loading Document the CONFIG_DISPLAY_BOARDINFO option arm: Add CONFIG_DISPLAY_BOARDINFO_LATE to display board info on LCD Add option to display customised memory information arm: Move bootstage record for board_init_f() to after arch_cpu_init() Taylor Hutt (1): arm: Tabify code for MMC initialization Tom Wai-Hong Tam (1): arm: Make interrupts.o and reset.o in libarm also appear in SPL Valentin Longchamp (1): arm/km: remove duplicate code Makefile | 2 +- README | 28 ++ arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 13 + arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 +- arch/arm/include/asm/arch-at91/at91sam9x5.h | 2 + arch/arm/include/asm/arch-kirkwood/cpu.h | 2 +- arch/arm/include/asm/arch-kirkwood/mpp.h | 2 +- arch/arm/include/asm/global_data.h | 1 + arch/arm/lib/Makefile | 5 +- arch/arm/lib/board.c | 75 +++- arch/arm/lib/cache-cp15.c | 5 +- board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/LaCie/wireless_space/Makefile | 46 ++ board/LaCie/wireless_space/kwbimage.cfg | 82 ++++ board/LaCie/wireless_space/wireless_space.c | 176 ++++++++ board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/rd6281a/rd6281a.c | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 3 + board/buffalo/lsxl/lsxl.c | 7 +- board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/d-link/dns325/dns325.c | 2 +- board/iomega/iconnect/iconnect.c | 2 +- board/karo/tk71/tk71.c | 2 +- board/keymile/common/common.c | 2 +- board/keymile/km_arm/km_arm.c | 16 +- board/keymile/km_arm/kwbimage-memphis.cfg | 6 +- board/keymile/km_arm/kwbimage.cfg | 6 +- board/keymile/km_arm/kwbimage_128M16_1.cfg | 25 +- board/keymile/km_arm/kwbimage_256M8_1.cfg | 25 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- boards.cfg | 1 + common/cmd_mem.c | 27 ++ drivers/net/phy/mv88e61xx.c | 495 ++++++++++++++-------- drivers/net/phy/mv88e61xx.h | 39 +- drivers/serial/ns16550.c | 2 + drivers/spi/atmel_spi.c | 2 +- drivers/spi/kirkwood_spi.c | 12 +- drivers/usb/host/ohci-at91.c | 6 +- include/common.h | 9 + include/config_cmd_all.h | 1 + include/configs/at91sam9x5ek.h | 29 +- include/configs/igep00x0.h | 4 + include/configs/km/keymile-common.h | 3 - include/configs/lsxl.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/wireless_space.h | 194 +++++++++ include/netdev.h | 21 +- 53 files changed, 1090 insertions(+), 318 deletions(-) create mode 100644 board/LaCie/wireless_space/Makefile create mode 100644 board/LaCie/wireless_space/kwbimage.cfg create mode 100644 board/LaCie/wireless_space/wireless_space.c create mode 100644 include/configs/wireless_space.h Amicalement, -- Albert.

2 1

[U-Boot] [PATCH] configs: omap4_common: support load from uEnv.txt
by Nishanth Menon 11 Jan '13

11 Jan '13

if traditionally used boot.scr is not found see if uEnv.txt is available to load environment. uenvcmd is executed after load of uEnv.txt if it is defined in the environment text file Signed-off-by: Nishanth Menon <nm(a)ti.com> --- include/configs/omap4_common.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index a32369a..8b71beb 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -159,6 +159,10 @@ "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ "source ${loadaddr}\0" \ + "bootenv=uEnv.txt\0" \ + "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc ...; " \ + "env import -t $loadaddr $filesize\0" \ "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ "mmcboot=echo Booting from mmc${mmcdev} ...; " \ "run mmcargs; " \ @@ -169,6 +173,14 @@ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ + "if run loadbootenv; then " \ + "echo Loaded environment from ${bootenv};" \ + "run importbootenv;" \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ + "fi;" \ "if run loaduimage; then " \ "run mmcboot; " \ "fi; " \ -- 1.7.9.5

1 1