November 2011 - U-Boot

[U-Boot] [PATCH] Improve Power Management in SMC911X driver.
by Bertrand Cachet 15 Nov '11

15 Nov '11

>From datasheet, when READY bit is set inside PM_CTRL register, it means that device is already in *normal* (D0) mode => it doesn't need to be wake-up. With this patch, we only wake-up (writing on TEST_BYTE register) if PM_MODE bits of PM_CTRL register is in D1/D2 mode. Signed-off-by: Bertrand Cachet <bertrand.cachet(a)heig-vd.ch> --- drivers/net/smc911x.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 8ce08a9..61f7669 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h @@ -471,8 +471,12 @@ static void smc911x_reset(struct eth_device *dev) { int timeout; - /* Take out of PM setting first */ - if (smc911x_reg_read(dev, PMT_CTRL) & PMT_CTRL_READY) { + /* Take out of PM setting first */ + /* + * If PMT_CTRL_READY bit is set to 1b => power management is + * already ready + */ + if ((smc911x_reg_read(dev, PMT_CTRL) & PMT_CTRL_READY) == 0) { /* Write to the bytetest will take out of powerdown */ smc911x_reg_write(dev, BYTE_TEST, 0x0); -- 1.7.5.4

2 1

[U-Boot] [PATCH] x86: Fix a recently added bug in the relocation code
by Gabe Black 15 Nov '11

15 Nov '11

Signed-off-by: Gabe Black <gabeblack(a)chromium.org> --- arch/x86/lib/board.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 18e0ede..4a791dd 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -220,6 +220,9 @@ static int do_elf_reloc_fixups(void) Elf32_Addr *offset_ptr_rom; Elf32_Addr *offset_ptr_ram; + /* The size of the region of u-boot that runs out of RAM. */ + uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start; + do { /* Get the location from the relocation entry */ offset_ptr_rom = (Elf32_Addr *)re_src->r_offset; -- 1.7.3.1

3 2

[U-Boot] [PATCH] sh: sh_eth: Add support SH7724
by Nobuhiro Iwamatsu 15 Nov '11

15 Nov '11

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- drivers/net/sh_eth.c | 42 +++++++++++++++++++++++------------------- drivers/net/sh_eth.h | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 60 insertions(+), 23 deletions(-) diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 27d0401..995e249 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -1,8 +1,8 @@ /* * sh_eth.c - Driver for Renesas SH7763's ethernet controler. * - * Copyright (C) 2008 Renesas Solutions Corp. - * Copyright (c) 2008 Nobuhiro Iwamatsu + * Copyright (C) 2008, 2011 Renesas Solutions Corp. + * Copyright (c) 2008, 2011 Nobuhiro Iwamatsu * Copyright (c) 2007 Carlos Munoz <carlos(a)kenati.com> * * This program is free software; you can redistribute it and/or modify @@ -371,7 +371,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) outl(0, TFTR(port)); outl((FIFO_SIZE_T | FIFO_SIZE_R), FDR(port)); outl(RMCR_RST, RMCR(port)); -#ifndef CONFIG_CPU_SH7757 +#if !defined(CONFIG_CPU_SH7757) && !defined(CONFIG_CPU_SH7724) outl(0, RPADIR(port)); #endif outl((FIFO_F_D_RFF | FIFO_F_D_RFD), FCFTR(port)); @@ -393,16 +393,19 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) outl(val, MALR(port)); outl(RFLR_RFL_MIN, RFLR(port)); -#ifndef CONFIG_CPU_SH7757 +#if !defined(CONFIG_CPU_SH7757) && !defined(CONFIG_CPU_SH7724) outl(0, PIPR(port)); #endif +#if !defined(CONFIG_CPU_SH7724) outl(APR_AP, APR(port)); outl(MPR_MP, MPR(port)); -#ifdef CONFIG_CPU_SH7757 - outl(TPAUSER_UNLIMITED, TPAUSER(port)); -#else +#endif +#if defined(CONFIG_CPU_SH7763) outl(TPAUSER_TPAUSE, TPAUSER(port)); +#elif defined(CONFIG_CPU_SH7757) + outl(TPAUSER_UNLIMITED, TPAUSER(port)); #endif + /* Configure phy */ ret = sh_eth_phy_config(eth); if (ret) { @@ -412,33 +415,34 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) phy = port_info->phydev; phy_startup(phy); + val = 0; + /* Set the transfer speed */ -#ifdef CONFIG_CPU_SH7763 if (phy->speed == 100) { printf(SHETHER_NAME ": 100Base/"); +#ifdef CONFIG_CPU_SH7763 outl(GECMR_100B, GECMR(port)); +#elif defined(CONFIG_CPU_SH7757) + outl(1, RTRATE(port)); +#elif defined(CONFIG_CPU_SH7724) + val = ECMR_RTM; +#endif } else if (phy->speed == 10) { printf(SHETHER_NAME ": 10Base/"); +#ifdef CONFIG_CPU_SH7763 outl(GECMR_10B, GECMR(port)); - } -#endif -#if defined(CONFIG_CPU_SH7757) - if (phy->speed == 100) { - printf("100Base/"); - outl(1, RTRATE(port)); - } else if (phy->speed == 10) { - printf("10Base/"); +#elif defined(CONFIG_CPU_SH7757) outl(0, RTRATE(port)); - } #endif + } /* Check if full duplex mode is supported by the phy */ if (phy->duplex) { printf("Full\n"); - outl((ECMR_CHG_DM|ECMR_RE|ECMR_TE|ECMR_DM), ECMR(port)); + outl(val | (ECMR_CHG_DM|ECMR_RE|ECMR_TE|ECMR_DM), ECMR(port)); } else { printf("Half\n"); - outl((ECMR_CHG_DM|ECMR_RE|ECMR_TE), ECMR(port)); + outl(val | (ECMR_CHG_DM|ECMR_RE|ECMR_TE), ECMR(port)); } return ret; diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index dd6a422..589cc11 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -1,8 +1,8 @@ /* * sh_eth.h - Driver for Renesas SuperH ethernet controler. * - * Copyright (C) 2008 Renesas Solutions Corp. - * Copyright (c) 2008 Nobuhiro Iwamatsu + * Copyright (C) 2008, 2011 Renesas Solutions Corp. + * Copyright (c) 2008, 2011 Nobuhiro Iwamatsu * Copyright (c) 2007 Carlos Munoz <carlos(a)kenati.com> * * This program is free software; you can redistribute it and/or modify @@ -162,6 +162,32 @@ struct sh_eth_dev { #define MAHR(port) (BASE_IO_ADDR + 0x800 * (port) + 0x01c0) #define MALR(port) (BASE_IO_ADDR + 0x800 * (port) + 0x01c8) #define RTRATE(port) (BASE_IO_ADDR + 0x800 * (port) + 0x01fc) + +#elif defined(CONFIG_CPU_SH7724) +#define BASE_IO_ADDR 0xA4600000 + +#define TDLAR(port) (BASE_IO_ADDR + 0x0018) +#define RDLAR(port) (BASE_IO_ADDR + 0x0020) + +#define EDMR(port) (BASE_IO_ADDR + 0x0000) +#define EDTRR(port) (BASE_IO_ADDR + 0x0008) +#define EDRRR(port) (BASE_IO_ADDR + 0x0010) +#define EESR(port) (BASE_IO_ADDR + 0x0028) +#define EESIPR(port) (BASE_IO_ADDR + 0x0030) +#define TRSCER(port) (BASE_IO_ADDR + 0x0038) +#define TFTR(port) (BASE_IO_ADDR + 0x0048) +#define FDR(port) (BASE_IO_ADDR + 0x0050) +#define RMCR(port) (BASE_IO_ADDR + 0x0058) +#define FCFTR(port) (BASE_IO_ADDR + 0x0070) +#define ECMR(port) (BASE_IO_ADDR + 0x0100) +#define RFLR(port) (BASE_IO_ADDR + 0x0108) +#define ECSIPR(port) (BASE_IO_ADDR + 0x0118) +#define PIR(port) (BASE_IO_ADDR + 0x0120) +#define APR(port) (BASE_IO_ADDR + 0x0154) +#define MPR(port) (BASE_IO_ADDR + 0x0158) +#define TPAUSER(port) (BASE_IO_ADDR + 0x0164) +#define MAHR(port) (BASE_IO_ADDR + 0x01c0) +#define MALR(port) (BASE_IO_ADDR + 0x01c8) #endif /* @@ -183,7 +209,7 @@ enum DMAC_M_BIT { EDMR_SRST = 0x03, EMDR_DESC_R = 0x30, /* Descriptor reserve size */ EDMR_EL = 0x40, /* Litte endian */ -#elif defined CONFIG_CPU_SH7757 +#elif defined (CONFIG_CPU_SH7757) || defined (CONFIG_CPU_SH7724) EDMR_SRST = 0x01, EMDR_DESC_R = 0x30, /* Descriptor reserve size */ EDMR_EL = 0x40, /* Litte endian */ @@ -325,7 +351,8 @@ enum FCFTR_BIT { /* Transfer descriptor bit */ enum TD_STS_BIT { -#if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7757) +#if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7757) \ + || defined(CONFIG_CPU_SH7724) TD_TACT = 0x80000000, #else TD_TACT = 0x7fffffff, @@ -350,6 +377,10 @@ enum FELIC_MODE_BIT { ECMR_PMDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020, ECMR_ILB = 0x00000008, ECMR_ELB = 0x00000004, ECMR_DM = 0x00000002, ECMR_PRM = 0x00000001, +#ifdef CONFIG_CPU_SH7724 + ECMR_RTM = 0x00000010, +#endif + }; #ifdef CONFIG_CPU_SH7763 @@ -357,6 +388,8 @@ enum FELIC_MODE_BIT { ECMR_TXF | ECMR_MCT) #elif CONFIG_CPU_SH7757 #define ECMR_CHG_DM (ECMR_ZPF) +#elif CONFIG_CPU_SH7724 +#define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF) #else #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF | ECMR_MCT) #endif -- 1.7.7

1 1

[U-Boot] [PATCH] sh: Add updating method of SPI ROM to README of sh7757lcr
by Nobuhiro Iwamatsu 15 Nov '11

15 Nov '11

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- doc/README.sh7757lcr | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/doc/README.sh7757lcr b/doc/README.sh7757lcr index 49fea50..78a9b8f 100644 --- a/doc/README.sh7757lcr +++ b/doc/README.sh7757lcr @@ -61,3 +61,17 @@ You can write MAC address to SPI ROM. ETHERC ch1 = 00:00:87:6c:21:81 GETHERC ch0 = 00:00:87:6c:21:82 GETHERC ch1 = 00:00:87:6c:21:83 + + +Update SPI ROM: +============================ + +1. Copy u-boot image to RAM area. +2. Probe SPI device. + => sf probe 0 + 8192 KiB M25P64 at 0:0 is now current device +3. Erase SPI ROM. + => sf erase 0 80000 +4. Write u-boot image to SPI ROM. + => sf write 0x89000000 0 80000 + -- 1.7.7

2 1

[U-Boot] [PATCH] [x86] Don't relocate symbols which point to things that aren't relocated
by Gabe Black 15 Nov '11

15 Nov '11

This change adds an upper bound for symbols which are fixed up after u-boot is relocated into RAM. This way portions that are left at their original location can be referred to without having to manually fix up any pointers. Signed-off-by: Gabe Black <gabeblack(a)chromium.org> --- arch/x86/lib/bios_setup.c | 7 ++----- arch/x86/lib/board.c | 14 +++++++++++--- arch/x86/lib/realmode.c | 7 ++----- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/arch/x86/lib/bios_setup.c b/arch/x86/lib/bios_setup.c index 6c6b0fe..8112f33 100644 --- a/arch/x86/lib/bios_setup.c +++ b/arch/x86/lib/bios_setup.c @@ -140,11 +140,8 @@ static void setvector(int vector, u16 segment, void *handler) int bios_setup(void) { - /* - * The BIOS section is not relocated and still in the ROM. The - * __bios_start symbol was adjusted, though, so adjust it back. - */ - ulong bios_start = (ulong)&__bios_start - gd->reloc_off; + /* The BIOS section is not relocated and still in the ROM. */ + ulong bios_start = (ulong)&__bios_start; ulong bios_size = (ulong)&__bios_size; static int done=0; diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index 8963580..ac135b7 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -227,10 +227,18 @@ static int do_elf_reloc_fixups(void) Elf32_Rel *re_src = (Elf32_Rel *)(&__rel_dyn_start); Elf32_Rel *re_end = (Elf32_Rel *)(&__rel_dyn_end); + /* The size of the region of u-boot that runs out of RAM. */ + uintptr_t size = &__bss_end - &__text_start; + do { - if (re_src->r_offset >= CONFIG_SYS_TEXT_BASE) - if (*(Elf32_Addr *)(re_src->r_offset + gd->reloc_off) >= CONFIG_SYS_TEXT_BASE) - *(Elf32_Addr *)(re_src->r_offset + gd->reloc_off) += gd->reloc_off; + if (re_src->r_offset >= CONFIG_SYS_TEXT_BASE) { + Elf32_Addr *addr = (Elf32_Addr *) + (re_src->r_offset + gd->reloc_off); + if (*addr >= CONFIG_SYS_TEXT_BASE && + *addr < (CONFIG_SYS_TEXT_BASE + size)) { + *addr += gd->reloc_off; + } + } } while (re_src++ < re_end); return 0; diff --git a/arch/x86/lib/realmode.c b/arch/x86/lib/realmode.c index f8f2251..7637e2c 100644 --- a/arch/x86/lib/realmode.c +++ b/arch/x86/lib/realmode.c @@ -34,11 +34,8 @@ extern char realmode_enter; int realmode_setup(void) { - /* - * The realmode section is not relocated and still in the ROM. The - * __realmode_start symbol was adjusted, though, so adjust it back. - */ - ulong realmode_start = (ulong)&__realmode_start - gd->reloc_off; + /* The realmode section is not relocated and still in the ROM. */ + ulong realmode_start = (ulong)&__realmode_start; ulong realmode_size = (ulong)&__realmode_size; /* copy the realmode switch code */ -- 1.7.3.1

3 10

[U-Boot] (no subject)
by Western Union Office 15 Nov '11

15 Nov '11

How are you doing today? I write to inform you that we have already sent you $9,000.00USD dollars through Western union as we have been given the mandate to transfer your full benefited sum of $700,000.00 USD (Seven Hundred Thousand US Dollars) via our office here (Western Union) by the United nations in conjunction with the ECOWAS as a compensation. I called to give you the information through phone as internet hackers were many but I cannot reach you yesterday even this morning.So,I decided to email you the MTCN and sender name so that you can pick up this $9,000.00USD to enable us send another $9,000.00USD by tomorrow as you knows we will be sending you only $9,000.00USD per day. All you need to do now is to visit any Western Union office or outlet close to you in your city with the payment information giving to you and your full name in your ID card as the receiver's name to pick up your First payment of $9,000USD and get back to us as soon as possible to enable us send another $9,000.00USD by tomorrow. Manager :Mr Ken Texman Contact Email: westumt(a)kimo.com Email me once you picked up this $9,000.00USD today. Here is the western union information to pick up the $9,000.00USD, Payment Information. Sender's Name:_________Austin Ginika Amount Sent______________$9,000.00 USD MTCN :___________________8492251083 Country:_________________NIGERIA Text Question:___________Trust Answer:__________________God With due respect please get back to us urgently after the pick of the money and if you have any problem you can as well contact us immediately. NOTE: You are advice to keep this transaction strictly confidential pending claim, this is to avoid any double crossing. Thanks Mr Ken Texman Western Union Office. Wie geht es dir heute? Ich schreibe, um Ihnen mitzuteilen, dass wir bereits an Sie $ 9,000.00 USD-Dollar über Western Union, wie wir das Mandat zu Ihrer vollen Genuss Summe von $ 700,000.00 USD (siebenhunderttausend US-Dollar) Übertragung über unser Büro hier (Western Union) durch die gegeben haben, Vereinten Nationen in Verbindung mit der ECOWAS als Ausgleich. Ich rief, um Ihnen die Informationen über das Telefon als Internet-Hacker waren viele, aber ich kann Sie nicht erreichen gestern auch diese morning.So, beschloss ich, schreiben Sie eine Email MTCN und Name des Absenders, so dass Sie abholen können diese $ 9,000.00 USD, damit wir anderen schicken $ 9,000.00 USD von morgen, wie Sie wissen, senden wir Ihnen nur $ 9,000.00 USD pro Tag. Alles, was Sie jetzt tun müssen, ist jeder Western Union Büro oder Steckdose in der Nähe zu Ihnen in Ihre Stadt mit der Zahlung Informationen geben Ihnen und Ihren vollständigen Namen in Ihrer ID-Karte als den Namen des Empfängers zu holen Ihre erste Zahlung von $ 9.000 USD und besuchen Sie wieder zu uns so bald wie möglich, damit wir schicken weitere $ 9,000.00 USD von morgen. Manager: Herr Ken Texman Kontakt Email: westumt(a)kimo.com Bitte schicken Sie mir, wenn Sie abgeholt diesem $ 9,000.00 USD heute. Hier ist die western union Informationen abholen $ 9,000.00 USD, Zahlungsinformationen. Name des Absenders :_________ Austin Ginika Amount Sent______________ $ 9,000.00 USD MTCN :___________________ 8492251083 Land :_________________ NIGERIA Text Frage :___________ Vertrauen Antwort :__________________ Gott Bei allem Respekt wenden Sie sich bitte an uns zurück dringend nach der Abholung des Geldes, und wenn Sie irgendein Problem haben, können Sie auch umgehend Kontakt mit uns. Hinweis: Sie werden beraten, damit diese Transaktion streng vertraulich anhängiges Verfahren, so ist dies eine doppelte Kreuzung zu vermeiden. Dank Herr Ken Texman Western Union Office.

1 0

[U-Boot] [PATCH v3 0/4] Tegra2: mmc DMA related fixes
by Anton Staaf 14 Nov '11

14 Nov '11

I have removed the bounce buffer implmenetation from this patch set as it feels like a separate task now. This patch set is just magic number cleanup , a bit of refactoring, and bug fixes in the existing Tegra2 MMC driver. Changes in v2: - Added initial patch to define Tegra MMC register field values - Remove patches for bounce buffer implementation Changes in v3: - Added back comments about register values - Shortened #defined macro names Anton Staaf (4): Tegra2: mmc: define register field values in tegra2_mmc.h Tegra2: mmc: Support DMA restarts at buffer boundaries Tegra2: mmc: Add data transfer completion timeout Tegra2: mmc: Factor out mmc_wait_inhibit functionality drivers/mmc/tegra2_mmc.c | 130 ++++++++++++++++++++++++++++++---------------- drivers/mmc/tegra2_mmc.h | 49 +++++++++++++++++ 2 files changed, 134 insertions(+), 45 deletions(-) Cc: Andy Fleming <afleming(a)gmail.com> Cc: Tom Warren <twarren(a)nvidia.com> Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> -- 1.7.3.1

2 5

[U-Boot] ppc -Os and _restgpr_##_x errors
by Mike Frysinger 14 Nov '11

14 Nov '11

am i the only one seeing errors like: board/esd/cpciiser4/libcpciiser4.o: In function `board_early_init_f': board/esd/cpciiser4/cpciiser4.c:139: undefined reference to `_restgpr_26_x' i'm using a gcc-4.5.x toolchain here. should we import crtsavres.S from Linux to fix this ? -mike

5 8

[U-Boot] Apple Winning details
by Promotion Result 14 Nov '11

14 Nov '11

Apple Inc Promotion/Prize Award Dept. Ref: 4 Queens Road, London Watford WD18 9BR United Kingdom. Registration details Registered office: Tolpits Lane, Watford, Herts WD18 9RN Registered in England and Wales No. 2822203 APPLE 30TH WORLD-WIDE ANNIVERSARY CELEBRATION PROMO. This program is organized by Apple Company, endorsed by the European Promo guild in conjunction with NGO organizations in Switzerland. We are pleased to inform you of the result of the just concluded draws of Apple Inc Promo program, Apple Promo draw was conducted on-line by an automated random computer ballot Search from the Internet. No tickets were sold. This draw is conducted to mark Apple 30th years of production. Apple 30th Anniversary Promo was conducted from an exclusive list of e-mail addresses of individual and corporate bodies. The selection process was carried out through random selection in our computerized email selection machine from a database of over 2,500,000 email addresses drawn from all the continents of the world. Emails were provided by the entire register domain. This result is now released to you. And your email address attached in the A Category. All email addresses were selected through a computer ballot system in which your email address was selected as one of the lucky winners, your lucky number is: (01) (04) (28) (26) (27) (49) (21). And bonus ball number (29), which consequently emerged you as the only winner in the United Kingdom Booklet. You been approved for a lump prize off of £1,400,000.00 (One Million, Four Hundred Thousand British pounds) in cash credited to File APP/EBD/011. To begin your claim, you are required to send the necessary information to our London help line below: Name---- Country---- Address--- Occupation--- Lucky number--- bonus ball number--- Helpline Service Mr. Philips Anderson Information and Payment Bureau: London Representative Office. Tel: +44-703-596-0866 Tel: +44-702-408-5616 Tel: +44-703-597-0143 Fax: +44-844-774-2197 Email: apple.transferprocedure(a)yahoo.co.uk Cc Mrs, Selin Dulge Promotions Manager Apple Promo Board

1 0

[U-Boot] [PATCH] BOOT: Add "bootz" command to boot Linux zImage
by Marek Vasut 14 Nov '11

14 Nov '11

This command boots Linux zImage from where the zImage is loaded to. Passing initrd and fdt is supported. Tested on PXA270 based Voipac PXA270. Signed-off-by: Marek Vasut <marek.vasut(a)gmail.com> Cc: Tom Warren <TWarren(a)nvidia.com> Cc: albert.u.boot(a)aribaud.net Cc: afleming(a)gmail.com, Cc: Simon Glass <sjg(a)chromium.org>, Cc: Stephen Warren <swarren(a)nvidia.com> --- common/Makefile | 1 + common/cmd_bootz.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+), 0 deletions(-) create mode 100644 common/cmd_bootz.c diff --git a/common/Makefile b/common/Makefile index 1b672ad..1ddf77a 100644 --- a/common/Makefile +++ b/common/Makefile @@ -42,6 +42,7 @@ COBJS-y += xyzModem.o # core command COBJS-y += cmd_boot.o COBJS-$(CONFIG_CMD_BOOTM) += cmd_bootm.o +COBJS-$(CONFIG_CMD_BOOTZ) += cmd_bootz.o COBJS-y += cmd_help.o COBJS-y += cmd_nvedit.o COBJS-y += cmd_version.o diff --git a/common/cmd_bootz.c b/common/cmd_bootz.c new file mode 100644 index 0000000..bb35209 --- /dev/null +++ b/common/cmd_bootz.c @@ -0,0 +1,178 @@ +/* + * Copyright (C) 2011 Marek Vasut <marek.vasut(a)gmail.com> + * + * Based on code: + * (C) Copyright 2000-2009 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * 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 <watchdog.h> +#include <command.h> +#include <image.h> +#include <malloc.h> +#include <u-boot/zlib.h> +#include <bzlib.h> +#include <environment.h> +#include <lmb.h> +#include <linux/ctype.h> +#include <asm/byteorder.h> + +#if defined(CONFIG_CMD_USB) +#include <usb.h> +#endif + +#if defined(CONFIG_SYS_HUSH_PARSER) +#include <hush.h> +#endif + +#if defined(CONFIG_OF_LIBFDT) +#include <fdt.h> +#include <libfdt.h> +#include <fdt_support.h> +#endif + +#define IH_INITRD_ARCH IH_ARCH_DEFAULT + +extern int do_bootm_linux(int flag, int argc, char *argv[], + bootm_headers_t *images); + +static void bootm_start_lmb(bootm_headers_t *images) +{ +#ifdef CONFIG_LMB + ulong mem_start; + phys_size_t mem_size; + + lmb_init(&images->lmb); + + mem_start = getenv_bootm_low(); + mem_size = getenv_bootm_size(); + + lmb_add(&images->lmb, (phys_addr_t)mem_start, mem_size); + + arch_lmb_reserve(&images->lmb); + board_lmb_reserve(&images->lmb); +#else +# define lmb_reserve(lmb, base, size) +#endif +} + +static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], + bootm_headers_t *images) +{ + int ret; + + memset(images, 0, sizeof(bootm_headers_t)); + + bootm_start_lmb(images); + + /* Setup Linux kernel zImage entry point */ + if (argc < 2) { + images->ep = load_addr; + debug("* kernel: default image load address = 0x%08lx\n", + load_addr); + } else { + images->ep = simple_strtoul(argv[1], NULL, 16); + debug("* kernel: cmdline image address = 0x%08lx\n", + images->ep); + } + + lmb_reserve(&images->lmb, images->ep, 16 * 1024*1024); + + /* Find ramdisk */ + ret = boot_get_ramdisk(argc, argv, images, IH_INITRD_ARCH, + &images->rd_start, &images->rd_end); + if (ret) { + puts("Ramdisk image is corrupt or invalid\n"); + return 1; + } + +#if defined(CONFIG_OF_LIBFDT) + /* find flattened device tree */ + ret = boot_get_fdt(flag, argc, argv, images, + &images->ft_addr, &images->ft_len); + if (ret) { + puts("Could not find a valid device tree\n"); + return 1; + } + + set_working_fdt_addr(images->ft_addr); +#endif + + return 0; +} + +int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + ulong iflag; + bootm_headers_t images; + + if (bootz_start(cmdtp, flag, argc, argv, &images)) + return 1; + + /* + * We have reached the point of no return: we are going to + * overwrite all exception vector code, so we cannot easily + * recover from any failures any more... + */ + iflag = disable_interrupts(); + +#if defined(CONFIG_CMD_USB) + /* + * turn off USB to prevent the host controller from writing to the + * SDRAM while Linux is booting. This could happen (at least for OHCI + * controller), because the HCCA (Host Controller Communication Area) + * lies within the SDRAM and the host controller writes continously to + * this area (as busmaster!). The HccaFrameNumber is for example + * updated every 1 ms within the HCCA structure in SDRAM! For more + * details see the OpenHCI specification. + */ + usb_stop(); +#endif + +#ifdef CONFIG_SILENT_CONSOLE + fixup_silent_linux(); +#endif + arch_preboot_os(); + + do_bootm_linux(0, argc, argv, &images); +#ifdef DEBUG + puts("\n## Control returned to monitor - resetting...\n"); +#endif + do_reset(cmdtp, flag, argc, argv); + + return 1; +} + +U_BOOT_CMD( + bootz, CONFIG_SYS_MAXARGS, 1, do_bootz, + "boot Linux zImage image from memory", + "[addr [initrd] [fdt]]\n - boot Linux zImage stored in memory\n" + "\tThe argument 'initrd' is optional and specifies the address\n" + "\tof the initrd in memory.\n" +#if defined(CONFIG_OF_LIBFDT) + "\tWhen booting a Linux kernel which requires a flat device-tree\n" + "\ta third argument is required which is the address of the\n" + "\tdevice-tree blob. To boot that kernel without an initrd image,\n" + "\tuse a '-' for the second argument. If you do not pass a third\n" + "\ta bd_info struct will be passed instead\n" +#endif +); -- 1.7.7.1

2 4