October 2010 - U-Boot

[U-Boot] [PATCH 0/5] Add Marvell New Soc Support ARMADA100
by Prafulla Wadaskar 28 Oct '10

28 Oct '10

This patch series adds basic ARMADA100 support, with minimal drivers (UART, MFP) support and Aspenite-DB board support for simple boot Prafulla WADASKAR (3): arm: Add Support for Marvell ARMADA 100 Familiy SoCs. Serial: Add UART support for Marvell ARMADA 100 SoCs. Armada100: Add Board Support for Marvell Aspenite-DB Prafulla Wadaskar (2): gpio: Add Multu-Function-Pin configuration driver for Marvell SoCs add mfp configuration support for ARMADA100 MAINTAINERS | 1 + MAKEALL | 1 + arch/arm/cpu/arm926ejs/armada100/Makefile | 46 +++++ arch/arm/cpu/arm926ejs/armada100/cpu.c | 92 ++++++++++ arch/arm/cpu/arm926ejs/armada100/dram.c | 122 +++++++++++++ arch/arm/cpu/arm926ejs/armada100/timer.c | 199 +++++++++++++++++++++ arch/arm/include/asm/arch-armada100/armada100.h | 120 +++++++++++++ arch/arm/include/asm/arch-armada100/cpu.h | 53 ++++++ arch/arm/include/asm/arch-armada100/mfp.h | 218 +++++++++++++++++++++++ board/Marvell/aspenite/Makefile | 52 ++++++ board/Marvell/aspenite/aspenite.c | 53 ++++++ board/Marvell/aspenite/config.mk | 26 +++ boards.cfg | 1 + drivers/gpio/Makefile | 1 + drivers/gpio/mfp.c | 105 +++++++++++ drivers/serial/ns16550.c | 16 ++ drivers/serial/serial.c | 3 + include/configs/aspenite.h | 133 ++++++++++++++ include/mfp.h | 97 ++++++++++ 19 files changed, 1339 insertions(+), 0 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/armada100/Makefile create mode 100644 arch/arm/cpu/arm926ejs/armada100/cpu.c create mode 100644 arch/arm/cpu/arm926ejs/armada100/dram.c create mode 100644 arch/arm/cpu/arm926ejs/armada100/timer.c create mode 100644 arch/arm/include/asm/arch-armada100/armada100.h create mode 100644 arch/arm/include/asm/arch-armada100/cpu.h create mode 100755 arch/arm/include/asm/arch-armada100/mfp.h create mode 100644 board/Marvell/aspenite/Makefile create mode 100644 board/Marvell/aspenite/aspenite.c create mode 100644 board/Marvell/aspenite/config.mk create mode 100644 drivers/gpio/mfp.c create mode 100644 include/configs/aspenite.h create mode 100644 include/mfp.h -- 1.7.2.1

3 10

[U-Boot] [PATCH] Blackfin: fix building after asm-offsets.h intro
by Mike Frysinger 28 Oct '10

28 Oct '10

Since some of the defines in our config.h use the generated defines, we need to include the generated header. This fixes building of the Blackfin start.S file (where the stack is setup). Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- arch/blackfin/include/asm/config.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h index 34ca68c..ae61402 100644 --- a/arch/blackfin/include/asm/config.h +++ b/arch/blackfin/include/asm/config.h @@ -9,6 +9,9 @@ #ifndef __ASM_BLACKFIN_CONFIG_POST_H__ #define __ASM_BLACKFIN_CONFIG_POST_H__ +/* Some of our defines use this (like CONFIG_SYS_GBL_DATA_ADDR) */ +#include <asm-offsets.h> + #ifndef CONFIG_BFIN_SCRATCH_REG # define CONFIG_BFIN_SCRATCH_REG retn #endif -- 1.7.3.2

1 0

[U-Boot] [PATCH] env_sf: updated to the new environment code
by Stefano Babic 28 Oct '10

28 Oct '10

Functions to store/retrieve the environment from a SPI flash was not updated to the new environment code. The non-redundant case was not working correctly, reporting ""Environment SPI flash not initialized" and the code was not compiled clean in the redundant case. The patch fixes these issue and makes the code more coherent with other environment storage (nand, flash). Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- common/env_sf.c | 172 +++++++++++++++++++++++++------------------------------ 1 files changed, 77 insertions(+), 95 deletions(-) diff --git a/common/env_sf.c b/common/env_sf.c index fb0c39b..a597b24 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -51,7 +51,7 @@ static ulong env_new_offset = CONFIG_ENV_OFFSET_REDUND; #define ACTIVE_FLAG 1 #define OBSOLETE_FLAG 0 -#endif /* CONFIG_ENV_ADDR_REDUND */ +#endif /* CONFIG_ENV_OFFSET_REDUND */ DECLARE_GLOBAL_DATA_PTR; @@ -69,13 +69,6 @@ uchar env_get_char_spec(int index) } #if defined(CONFIG_ENV_OFFSET_REDUND) -void swap_env(void) -{ - ulong tmp_offset = env_offset; - - env_offset = env_new_offset; - env_new_offset = tmp_offset; -} int saveenv(void) { @@ -89,8 +82,13 @@ int saveenv(void) char flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG; if (!env_flash) { - puts("Environment SPI flash not initialized\n"); - return 1; + env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, + CONFIG_ENV_SPI_CS, + CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); + if (!env_flash) { + set_default_env("!spi_flash_probe() failed"); + return 1; + } } res = (char *)&env_new.data; @@ -102,6 +100,14 @@ int saveenv(void) env_new.crc = crc32(0, env_new.data, ENV_SIZE); env_new.flags = ACTIVE_FLAG; + if (gd->env_valid == 1) { + env_new_offset = CONFIG_ENV_OFFSET_REDUND; + env_offset = CONFIG_ENV_OFFSET; + } else { + env_new_offset = CONFIG_ENV_OFFSET; + env_offset = CONFIG_ENV_OFFSET_REDUND; + } + /* Is the sector larger than the env (i.e. embedded) */ if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) { saved_size = CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SIZE; @@ -130,27 +136,9 @@ int saveenv(void) goto done; puts("Writing to SPI flash..."); - ret = spi_flash_write(env_flash, - env_new_offset + offsetof(env_t, data), - sizeof(env_new.data), env_new.data); - if (ret) - goto done; - - ret = spi_flash_write(env_flash, - env_new_offset + offsetof(env_t, crc), - sizeof(env_new.crc), &env_new.crc); - if (ret) - goto done; - ret = spi_flash_write(env_flash, - env_offset + offsetof(env_t, flags), - sizeof(env_new.flags), &flag); - if (ret) - goto done; - - ret = spi_flash_write(env_flash, - env_new_offset + offsetof(env_t, flags), - sizeof(env_new.flags), &new_flag); + ret = spi_flash_write(env_flash, env_new_offset, + CONFIG_ENV_SIZE, &env_new); if (ret) goto done; @@ -161,11 +149,18 @@ int saveenv(void) goto done; } - swap_env(); + ret = spi_flash_write(env_flash, + env_offset + offsetof(env_t, flags), + sizeof(env_new.flags), &flag); + if (ret) + goto done; - ret = 0; puts("done\n"); + gd->env_valid = (gd->env_valid == 2 ? 1 : 2); + + printf("Valid environment: %d\n", gd->env_valid); + done: if (saved_buffer) free(saved_buffer); @@ -178,7 +173,7 @@ void env_relocate_spec(void) int crc1_ok = 0, crc2_ok = 0; env_t *tmp_env1 = NULL; env_t *tmp_env2 = NULL; - env_t ep; + env_t *ep = NULL; uchar flag1, flag2; /* current_env is set only in case both areas are valid! */ int current_env = 0; @@ -219,90 +214,57 @@ void env_relocate_spec(void) flag2 = tmp_env2->flags; } - if (!crc1_ok && !crc2_ok) - goto err_crc; - else if (crc1_ok && !crc2_ok) { + if (!crc1_ok && !crc2_ok) { + free(tmp_env1); + free(tmp_env2); + set_default_env("!bad CRC"); + return; + } else if (crc1_ok && !crc2_ok) { gd->env_valid = 1; ep = tmp_env1; } else if (!crc1_ok && crc2_ok) { gd->env_valid = 1; - ep = tmp_env2; - swap_env(); } else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) { gd->env_valid = 1; - ep = tmp_env1; } else if (flag1 == OBSOLETE_FLAG && flag2 == ACTIVE_FLAG) { - gd->env_valid = 1; - ep = tmp_env2; - swap_env(); + gd->env_valid = 2; } else if (flag1 == flag2) { gd->env_valid = 2; - ep = tmp_env1; - current_env = 1; } else if (flag1 == 0xFF) { gd->env_valid = 2; - ep = tmp_env1; - current_env = 1; } else { /* * this differs from code in env_flash.c, but I think a sane * default path is desirable. */ gd->env_valid = 2; - ep = tmp_env2; - swap_env(); - current_env = 2; } - rc = env_import((char *)ep, 0); - if (!rc) { - error("Cannot import environment: errno = %d\n", errno); - goto out; - } + free(env_ptr); - if (current_env == 1) { - if (flag2 != OBSOLETE_FLAG) { - flag2 = OBSOLETE_FLAG; - spi_flash_write(env_flash, - env_new_offset + offsetof(env_t, flags), - sizeof(env_new.flags), &flag2); - } - if (flag1 != ACTIVE_FLAG) { - flag1 = ACTIVE_FLAG; - spi_flash_write(env_flash, - env_offset + offsetof(env_t, flags), - sizeof(env_new.flags), &flag1); - } - } else if (current_env == 2) { - if (flag1 != OBSOLETE_FLAG) { - flag1 = OBSOLETE_FLAG; - spi_flash_write(env_flash, - env_new_offset + offsetof(env_t, flags), - sizeof(env_new.flags), &flag1); - } - if (flag2 != ACTIVE_FLAG) { - flag2 = ACTIVE_FLAG; - spi_flash_write(env_flash, - env_offset + offsetof(env_t, flags), - sizeof(env_new.flags), &flag2); - } - } - if (gd->env_valid == 2) { - puts("*** Warning - some problems detected " - "reading environment; recovered successfully\n\n"); + if (gd->env_valid == 1) + ep = tmp_env1; + else + ep = tmp_env2; + + ret = env_import((char *)ep, 0); + if (!ret) { + error("Cannot import environment: errno = %d\n", errno); + set_default_env("env_import failed"); } - if (tmp_env1) - free(tmp_env1); - if (tmp_env2) - free(tmp_env2); - return; err_read: spi_flash_free(env_flash); env_flash = NULL; out: + if (tmp_env1) + free(tmp_env1); + if (tmp_env2) + free(tmp_env2); free(tmp_env1); free(tmp_env2); + + return; } #else int saveenv(void) @@ -311,10 +273,18 @@ int saveenv(void) char *saved_buffer = NULL; u32 sector = 1; int ret; + env_t env_new; + char *res; + ssize_t len; if (!env_flash) { - puts("Environment SPI flash not initialized\n"); - return 1; + env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, + CONFIG_ENV_SPI_CS, + CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); + if (!env_flash) { + set_default_env("!spi_flash_probe() failed"); + return 1; + } } /* Is the sector larger than the env (i.e. embedded) */ @@ -326,7 +296,8 @@ int saveenv(void) ret = 1; goto done; } - ret = spi_flash_read(env_flash, saved_offset, saved_size, saved_buffer); + ret = spi_flash_read(env_flash, saved_offset, + saved_size, saved_buffer); if (ret) goto done; } @@ -337,18 +308,29 @@ int saveenv(void) sector++; } + res = (char *)&env_new.data; + len = hexport('\0', &res, ENV_SIZE); + if (len < 0) { + error("Cannot export environment: errno = %d\n", errno); + goto done; + } + env_new.crc = crc32(0, env_new.data, ENV_SIZE); + puts("Erasing SPI flash..."); - ret = spi_flash_erase(env_flash, CONFIG_ENV_OFFSET, sector * CONFIG_ENV_SECT_SIZE); + ret = spi_flash_erase(env_flash, CONFIG_ENV_OFFSET, + sector * CONFIG_ENV_SECT_SIZE); if (ret) goto done; puts("Writing to SPI flash..."); - ret = spi_flash_write(env_flash, CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, env_ptr); + ret = spi_flash_write(env_flash, CONFIG_ENV_OFFSET, + CONFIG_ENV_SIZE, &env_new); if (ret) goto done; if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) { - ret = spi_flash_write(env_flash, saved_offset, saved_size, saved_buffer); + ret = spi_flash_write(env_flash, saved_offset, + saved_size, saved_buffer); if (ret) goto done; } -- 1.7.1

3 2

[U-Boot] The due on avew
by Entourage Group Inc 28 Oct '10

28 Oct '10

Fellow investors, We at Investor Clueso believe that one of the most important steps a publicly traded penny stock company should take is to be fully current with their SEC filings! That being said we have great news, AVEW Action View International Inc, has followed through and is now listed as "current" with www.otcmarkets.com AVEW has traded higher since our alert and closed today at .0083! We believe there is a whole lot more gas in the tank! The company stated in their last PR that they are going to be working with other fight companies in the USA and CANADA to bring their viewers weekly f i g h t s starting some time in November! Now is the time to take a position in this rapidly growing company! We are anxiously awaiting the announcement of the next fight as the last fight on Oct 16th was a sellout that was delayed 40 minutes due to the line of f a n s at the door looking for seats!AVEW chart is setting up nicely presenting a "Golden Cross" this is one of the most Bullish chart indicators out there! Look for more updates from the company over the next several weeks! AVEW Investor Relations "Transparency and regular communication with our shareholders is a priority for ActionView International, and we will continue to e x plore additional avenues through which this information can be delivered." -- Actionview International, Inc. Chairman Gary Nerison. Actionview International, Inc. (Stock Symbol: AVEW), our wholly owned subsidiary MatchF i g h ts LLC (MatchF i g h ts.com) and our World Championship Full Contact (WCFC.com) brand is proud to present the very latest in action sports entertainment -- AVEW Overview Full contact f i g h t ing brought to you live, over the internet in streaming high definition format. WCFC (Ticker: AVEW) is designed to appeal to a large, global audience. They have made their events faster paced, more intriguing and more fan oriented by incorporating unique features like: ~No Tap Outs ~Two Minute Rounds ~No Judges ~F a n s Vote Online For The Winner With live internet broadcast, pay-per-view product WCFC (Ticker: AVEW) events are not r e s t r i c t e d by t.v contracts or county borders. Anyone, anywhere that has an internet connection can watch an event and participate through our interactive interface. Disclaimer http://www.212stocks.com/news/unsubscribe.php?M=180658&C=8a006dcf4980681129… The disclaimer is to be read and fully understood before using our site or joining our email list. PLEASE NOTE WELL: The employees of InvestorClueso.com are not Registered as Investment Advisors in any jurisdiction whatsoever. Release of L i a b i l i t y: Through use of this website, viewing or using any of the information, you agree to hold InvestorClueso.com, its operators, owners and employees harmless and to completely release them from any and all abligation due to any and all loss (monetary or otherwise), d a m a ge (monetary or otherwise), or i n j u r y (monetary or otherwise) that you may incur. The information contained herein is based on sources which we believe to be reliable but is not guaranteed by us as being accurate and does not purport to be a complete statement or summary of the available data. Any opinions expressed are subject to change without notice. InvestorClueso.com encourages readers and investors to supplement the information in these reports with independent research and other professional advice. All information on featured companies is provided by the companies profiled or is available from public sources; Investor Clueso, LLC makes no representations, warranties or guarantees as to the accuracy or completeness of the disclosure by the profiled companies. Neither Investor Clueso, LLC nor any of its affiliates are registered investment advisors or broker dealers http://www.212stocks.com/news/unsubscribe.php?M=180658&C=8a006dcf4980681129… Entourage Group Inc. 11511 sw 81 rd Miami Fl 33156 7862669555

1 0

[U-Boot] [PATCH] arm/pxa: remove unused arch-pxa/macro.h
by Marek Vasut 28 Oct '10

28 Oct '10

From: Mikhail Kshevetskiy <mikhail.kshevetskiy(a)gmail.com> Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy(a)gmail.com> --- arch/arm/cpu/pxa/start.S | 1 - arch/arm/include/asm/arch-pxa/macro.h | 328 ----------------------------- onenand_ipl/board/vpac270/Makefile | 5 - onenand_ipl/board/vpac270/lowlevel_init.S | 34 --- 4 files changed, 0 insertions(+), 368 deletions(-) delete mode 100644 arch/arm/include/asm/arch-pxa/macro.h delete mode 100644 onenand_ipl/board/vpac270/lowlevel_init.S diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index bf8510e..f15a43a 100644 --- a/arch/arm/cpu/pxa/start.S +++ b/arch/arm/cpu/pxa/start.S @@ -33,7 +33,6 @@ #include <config.h> #include <version.h> #include <asm/arch/pxa-regs.h> -#include <asm/arch/macro.h> /* takes care the CP15 update has taken place */ .macro CPWAIT reg diff --git a/arch/arm/include/asm/arch-pxa/macro.h b/arch/arm/include/asm/arch-pxa/macro.h deleted file mode 100644 index 85958dd..0000000 --- a/arch/arm/include/asm/arch-pxa/macro.h +++ /dev/null @@ -1,328 +0,0 @@ -/* - * arch/arm/include/asm/arch-pxa/macro.h - * - * Copyright (C) 2010 Marek Vasut <marek.vasut(a)gmail.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 - */ - -#ifndef __ASM_ARCH_PXA_MACRO_H__ -#define __ASM_ARCH_PXA_MACRO_H__ -#ifdef __ASSEMBLY__ - -#include <asm/macro.h> -#include <asm/arch/pxa-regs.h> - -/* - * This macro performs a 32bit write to a memory location and makes sure the - * write operation really happened by performing a read back. - * - * Clobbered regs: r4, r5 - */ -.macro write32rb addr, data - ldr r4, =\addr - ldr r5, =\data - str r5, [r4] - ldr r5, [r4] -.endm - -/* - * This macro waits according to OSCR incrementation - * - * Clobbered regs: r4, r5, r6 - */ -.macro pxa_wait_ticks ticks - ldr r4, =OSCR - mov r5, #0 - str r5, [r4] - ldr r5, =\ticks -1: - ldr r6, [r4] - cmp r5, r6 - bgt 1b -.endm - -/* - * This macro sets up the GPIO pins of the PXA2xx/PXA3xx CPU - * - * Clobbered regs: r4, r5 - */ -.macro pxa_gpio_setup - write32 GPSR0, CONFIG_SYS_GPSR0_VAL - write32 GPSR1, CONFIG_SYS_GPSR1_VAL - write32 GPSR2, CONFIG_SYS_GPSR2_VAL -#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) - write32 GPSR3, CONFIG_SYS_GPSR3_VAL -#endif - - write32 GPCR0, CONFIG_SYS_GPCR0_VAL - write32 GPCR1, CONFIG_SYS_GPCR1_VAL - write32 GPCR2, CONFIG_SYS_GPCR2_VAL -#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) - write32 GPCR3, CONFIG_SYS_GPCR3_VAL -#endif - - write32 GPDR0, CONFIG_SYS_GPDR0_VAL - write32 GPDR1, CONFIG_SYS_GPDR1_VAL - write32 GPDR2, CONFIG_SYS_GPDR2_VAL -#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) - write32 GPDR3, CONFIG_SYS_GPDR3_VAL -#endif - - write32 GAFR0_L, CONFIG_SYS_GAFR0_L_VAL - write32 GAFR0_U, CONFIG_SYS_GAFR0_U_VAL - write32 GAFR1_L, CONFIG_SYS_GAFR1_L_VAL - write32 GAFR1_U, CONFIG_SYS_GAFR1_U_VAL - write32 GAFR2_L, CONFIG_SYS_GAFR2_L_VAL - write32 GAFR2_U, CONFIG_SYS_GAFR2_U_VAL -#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) - write32 GAFR3_L, CONFIG_SYS_GAFR3_L_VAL - write32 GAFR3_U, CONFIG_SYS_GAFR3_U_VAL -#endif - - write32 PSSR, CONFIG_SYS_PSSR_VAL -.endm - -/* - * This macro sets up the Memory controller of the PXA2xx CPU - * - * WARNING: This macro uses internally r3 and r7 regs for MEMC_BASE - * and CONFIG_SYS_MDREFR_VAL correspondingly. Please do not - * use this regs for other purpose inside this macro. - * - * Clobbered regs: r3, r4, r5, r6, r7 - */ -.macro pxa_mem_setup - /* This comes handy when setting MDREFR */ - ldr r3, =MEMC_BASE - - /* - * 1) Initialize Asynchronous static memory controller - */ - - /* MSC0: nCS(0,1) */ - write32rb (MEMC_BASE + MSC0_OFFSET), CONFIG_SYS_MSC0_VAL - /* MSC1: nCS(2,3) */ - write32rb (MEMC_BASE + MSC1_OFFSET), CONFIG_SYS_MSC1_VAL - /* MSC2: nCS(4,5) */ - write32rb (MEMC_BASE + MSC2_OFFSET), CONFIG_SYS_MSC2_VAL - - /* - * 2) Initialize Card Interface - */ - - /* MECR: Memory Expansion Card Register */ - write32rb (MEMC_BASE + MECR_OFFSET), CONFIG_SYS_MECR_VAL - /* MCMEM0: Card Interface slot 0 timing */ - write32rb (MEMC_BASE + MCMEM0_OFFSET), CONFIG_SYS_MCMEM0_VAL - /* MCMEM1: Card Interface slot 1 timing */ - write32rb (MEMC_BASE + MCMEM1_OFFSET), CONFIG_SYS_MCMEM1_VAL - /* MCATT0: Card Interface Attribute Space Timing, slot 0 */ - write32rb (MEMC_BASE + MCATT0_OFFSET), CONFIG_SYS_MCATT0_VAL - /* MCATT1: Card Interface Attribute Space Timing, slot 1 */ - write32rb (MEMC_BASE + MCATT1_OFFSET), CONFIG_SYS_MCATT1_VAL - /* MCIO0: Card Interface I/O Space Timing, slot 0 */ - write32rb (MEMC_BASE + MCIO0_OFFSET), CONFIG_SYS_MCIO0_VAL - /* MCIO1: Card Interface I/O Space Timing, slot 1 */ - write32rb (MEMC_BASE + MCIO1_OFFSET), CONFIG_SYS_MCIO1_VAL - - /* - * 3) Configure Fly-By DMA register - */ - - write32rb (MEMC_BASE + FLYCNFG_OFFSET), CONFIG_SYS_FLYCNFG_VAL - - /* - * 4) Initialize Timing for Sync Memory (SDCLK0) - */ - - /* - * Before accessing MDREFR we need a valid DRI field, so we set - * this to power on defaults + DRI field. - */ - ldr r5, [r3, #MDREFR_OFFSET] - bic r5, r5, #0x0ff - bic r5, r5, #0xf00 /* MDREFR user config with zeroed DRI */ - - ldr r4, =CONFIG_SYS_MDREFR_VAL - mov r7, r4 - lsl r4, #20 - lsr r4, #20 /* Get a valid DRI field */ - - orr r5, r5, r4 /* MDREFR user config with correct DRI */ - - orr r5, #MDREFR_K0RUN - orr r5, #MDREFR_SLFRSH - bic r5, #MDREFR_APD - bic r5, #MDREFR_E1PIN - - str r5, [r3, #MDREFR_OFFSET] - ldr r4, [r3, #MDREFR_OFFSET] - - /* - * 5) Initialize Synchronous Static Memory (Flash/Peripherals) - */ - - /* Initialize SXCNFG register. Assert the enable bits. - * - * Write SXMRS to cause an MRS command to all enabled banks of - * synchronous static memory. Note that SXLCR need not be written - * at this time. - */ - write32rb (MEMC_BASE + SXCNFG_OFFSET), CONFIG_SYS_SXCNFG_VAL - - /* - * 6) Initialize SDRAM - */ - - bic r7, #MDREFR_SLFRSH - str r7, [r3, #MDREFR_OFFSET] - ldr r4, [r3, #MDREFR_OFFSET] - - orr r7, #MDREFR_E1PIN - str r7, [r3, #MDREFR_OFFSET] - ldr r4, [r3, #MDREFR_OFFSET] - - /* - * 7) Write MDCNFG with MDCNFG:DEx deasserted (set to 0), to configure - * but not enable each SDRAM partition pair. - */ - - /* Fetch platform value of MDCNFG */ - ldr r4, =CONFIG_SYS_MDCNFG_VAL - /* Disable all sdram banks */ - bic r4, r4, #(MDCNFG_DE0|MDCNFG_DE1) - bic r4, r4, #(MDCNFG_DE2|MDCNFG_DE3) - /* Write initial value of MDCNFG, w/o enabling sdram banks */ - str r4, [r3, #MDCNFG_OFFSET] - ldr r4, [r3, #MDCNFG_OFFSET] - - /* Wait for the clock to the SDRAMs to stabilize, 100..200 usec. */ - pxa_wait_ticks 0x300 - - /* - * 8) Trigger a number (usually 8) refresh cycles by attempting - * non-burst read or write accesses to disabled SDRAM, as commonly - * specified in the power up sequence documented in SDRAM data - * sheets. The address(es) used for this purpose must not be - * cacheable. - */ - - ldr r4, =CONFIG_SYS_DRAM_BASE -.rept 9 - str r5, [r4] -.endr - - /* - * 9) Write MDCNFG with enable bits asserted (MDCNFG:DEx set to 1). - */ - - ldr r5, =CONFIG_SYS_MDCNFG_VAL - ldr r4, =(MDCNFG_DE0 | MDCNFG_DE1 | MDCNFG_DE2 | MDCNFG_DE3) - and r5, r5, r4 - ldr r4, [r3, #MDCNFG_OFFSET] - orr r4, r4, r5 - str r4, [r3, #MDCNFG_OFFSET] - ldr r4, [r3, #MDCNFG_OFFSET] - - /* - * 10) Write MDMRS. - */ - - ldr r4, =CONFIG_SYS_MDMRS_VAL - str r4, [r3, #MDMRS_OFFSET] - ldr r4, [r3, #MDMRS_OFFSET] - - /* - * 11) Enable APD - */ - - ldr r4, [r3, #MDREFR_OFFSET] - and r7, r7, #MDREFR_APD - orr r4, r4, r7 - str r4, [r3, #MDREFR_OFFSET] - ldr r4, [r3, #MDREFR_OFFSET] -.endm - -/* - * This macro tests if the CPU woke up from sleep and eventually resumes - * - * Clobbered regs: r4, r5 - */ -.macro pxa_wakeup - ldr r4, =RCSR - ldr r5, [r4] - and r5, r5, #(RCSR_GPR | RCSR_SMR | RCSR_WDR | RCSR_HWR) - str r5, [r4] - teq r5, #RCSR_SMR - - bne pxa_wakeup_exit - - ldr r4, =PSSR - mov r5, #PSSR_PH - str r5, [r4] - - ldr r4, =PSPR - ldr pc, [r4] -pxa_wakeup_exit: -.endm - -/* - * This macro disables all interupts on PXA2xx/PXA3xx CPU - * - * Clobbered regs: r4, r5 - */ -.macro pxa_intr_setup - write32 ICLR, 0 - write32 ICMR, 0 -#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) - write32 ICLR2, 0 - write32 ICMR2, 0 -#endif -.endm - -/* - * This macro configures clock on PXA2xx/PXA3xx CPU - * - * Clobbered regs: r4, r5 - */ -.macro pxa_clock_setup - /* Disable the peripheral clocks, and set the core clock frequency */ - - /* Turn Off ALL on-chip peripheral clocks for re-configuration */ - write32 CKEN, CONFIG_SYS_CKEN - - /* Write CCCR */ - write32 CCCR, CONFIG_SYS_CCCR - -#ifdef CONFIG_RTC - /* enable the 32Khz oscillator for RTC and PowerManager */ - write32 OSCC, #OSCC_OON - ldr r4, =OSCC - - /* Spin here until OSCC.OOK get set, meaning the PLL has settled. */ -2: - ldr r5, [r4] - ands r5, r5, #1 - beq 2b -#endif -.endm - -#endif /* __ASSEMBLY__ */ -#endif /* __ASM_ARCH_PXA_MACRO_H__ */ diff --git a/onenand_ipl/board/vpac270/Makefile b/onenand_ipl/board/vpac270/Makefile index a86bc00..7300692 100644 --- a/onenand_ipl/board/vpac270/Makefile +++ b/onenand_ipl/board/vpac270/Makefile @@ -8,7 +8,6 @@ AFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL CFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL OBJCFLAGS += --gap-fill=0x00 -SOBJS := lowlevel_init.o SOBJS += start.o COBJS := vpac270.o COBJS += onenand_read.o @@ -62,10 +61,6 @@ ifneq ($(OBJTREE), $(SRCTREE)) $(obj)vpac270.c: @rm -f $@ ln -s $(SRCTREE)/onenand_ipl/board/$(BOARDDIR)/vpac270.c $@ - -$(obj)lowlevel_init.S: - @rm -f $@ - ln -s $(SRCTREE)/onenand_ipl/board/$(BOARDDIR)/lowlevel_init.S $@ endif ######################################################################### diff --git a/onenand_ipl/board/vpac270/lowlevel_init.S b/onenand_ipl/board/vpac270/lowlevel_init.S deleted file mode 100644 index e79d8dd..0000000 --- a/onenand_ipl/board/vpac270/lowlevel_init.S +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Voipac PXA270 Lowlevel Hardware Initialization - * - * Copyright (C) 2010 Marek Vasut <marek.vasut(a)gmail.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 <config.h> -#include <version.h> -#include <asm/arch/pxa-regs.h> -#include <asm/arch/macro.h> - -.globl lowlevel_init -lowlevel_init: - pxa_clock_setup - mov pc, lr -- 1.7.1

1 0

[U-Boot] [PATCH] arm/pxa: remove unused arch-pxa/macro.h
by Mikhail Kshevetskiy 27 Oct '10

27 Oct '10

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy(a)gmail.com> --- arch/arm/cpu/pxa/start.S | 1 - arch/arm/include/asm/arch-pxa/macro.h | 328 ----------------------------- onenand_ipl/board/vpac270/Makefile | 5 - onenand_ipl/board/vpac270/lowlevel_init.S | 34 --- 4 files changed, 0 insertions(+), 368 deletions(-) delete mode 100644 arch/arm/include/asm/arch-pxa/macro.h delete mode 100644 onenand_ipl/board/vpac270/lowlevel_init.S diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index bf8510e..f15a43a 100644 --- a/arch/arm/cpu/pxa/start.S +++ b/arch/arm/cpu/pxa/start.S @@ -33,7 +33,6 @@ #include <config.h> #include <version.h> #include <asm/arch/pxa-regs.h> -#include <asm/arch/macro.h> /* takes care the CP15 update has taken place */ .macro CPWAIT reg diff --git a/arch/arm/include/asm/arch-pxa/macro.h b/arch/arm/include/asm/arch-pxa/macro.h deleted file mode 100644 index 85958dd..0000000 --- a/arch/arm/include/asm/arch-pxa/macro.h +++ /dev/null @@ -1,328 +0,0 @@ -/* - * arch/arm/include/asm/arch-pxa/macro.h - * - * Copyright (C) 2010 Marek Vasut <marek.vasut(a)gmail.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 - */ - -#ifndef __ASM_ARCH_PXA_MACRO_H__ -#define __ASM_ARCH_PXA_MACRO_H__ -#ifdef __ASSEMBLY__ - -#include <asm/macro.h> -#include <asm/arch/pxa-regs.h> - -/* - * This macro performs a 32bit write to a memory location and makes sure the - * write operation really happened by performing a read back. - * - * Clobbered regs: r4, r5 - */ -.macro write32rb addr, data - ldr r4, =\addr - ldr r5, =\data - str r5, [r4] - ldr r5, [r4] -.endm - -/* - * This macro waits according to OSCR incrementation - * - * Clobbered regs: r4, r5, r6 - */ -.macro pxa_wait_ticks ticks - ldr r4, =OSCR - mov r5, #0 - str r5, [r4] - ldr r5, =\ticks -1: - ldr r6, [r4] - cmp r5, r6 - bgt 1b -.endm - -/* - * This macro sets up the GPIO pins of the PXA2xx/PXA3xx CPU - * - * Clobbered regs: r4, r5 - */ -.macro pxa_gpio_setup - write32 GPSR0, CONFIG_SYS_GPSR0_VAL - write32 GPSR1, CONFIG_SYS_GPSR1_VAL - write32 GPSR2, CONFIG_SYS_GPSR2_VAL -#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) - write32 GPSR3, CONFIG_SYS_GPSR3_VAL -#endif - - write32 GPCR0, CONFIG_SYS_GPCR0_VAL - write32 GPCR1, CONFIG_SYS_GPCR1_VAL - write32 GPCR2, CONFIG_SYS_GPCR2_VAL -#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) - write32 GPCR3, CONFIG_SYS_GPCR3_VAL -#endif - - write32 GPDR0, CONFIG_SYS_GPDR0_VAL - write32 GPDR1, CONFIG_SYS_GPDR1_VAL - write32 GPDR2, CONFIG_SYS_GPDR2_VAL -#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) - write32 GPDR3, CONFIG_SYS_GPDR3_VAL -#endif - - write32 GAFR0_L, CONFIG_SYS_GAFR0_L_VAL - write32 GAFR0_U, CONFIG_SYS_GAFR0_U_VAL - write32 GAFR1_L, CONFIG_SYS_GAFR1_L_VAL - write32 GAFR1_U, CONFIG_SYS_GAFR1_U_VAL - write32 GAFR2_L, CONFIG_SYS_GAFR2_L_VAL - write32 GAFR2_U, CONFIG_SYS_GAFR2_U_VAL -#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) - write32 GAFR3_L, CONFIG_SYS_GAFR3_L_VAL - write32 GAFR3_U, CONFIG_SYS_GAFR3_U_VAL -#endif - - write32 PSSR, CONFIG_SYS_PSSR_VAL -.endm - -/* - * This macro sets up the Memory controller of the PXA2xx CPU - * - * WARNING: This macro uses internally r3 and r7 regs for MEMC_BASE - * and CONFIG_SYS_MDREFR_VAL correspondingly. Please do not - * use this regs for other purpose inside this macro. - * - * Clobbered regs: r3, r4, r5, r6, r7 - */ -.macro pxa_mem_setup - /* This comes handy when setting MDREFR */ - ldr r3, =MEMC_BASE - - /* - * 1) Initialize Asynchronous static memory controller - */ - - /* MSC0: nCS(0,1) */ - write32rb (MEMC_BASE + MSC0_OFFSET), CONFIG_SYS_MSC0_VAL - /* MSC1: nCS(2,3) */ - write32rb (MEMC_BASE + MSC1_OFFSET), CONFIG_SYS_MSC1_VAL - /* MSC2: nCS(4,5) */ - write32rb (MEMC_BASE + MSC2_OFFSET), CONFIG_SYS_MSC2_VAL - - /* - * 2) Initialize Card Interface - */ - - /* MECR: Memory Expansion Card Register */ - write32rb (MEMC_BASE + MECR_OFFSET), CONFIG_SYS_MECR_VAL - /* MCMEM0: Card Interface slot 0 timing */ - write32rb (MEMC_BASE + MCMEM0_OFFSET), CONFIG_SYS_MCMEM0_VAL - /* MCMEM1: Card Interface slot 1 timing */ - write32rb (MEMC_BASE + MCMEM1_OFFSET), CONFIG_SYS_MCMEM1_VAL - /* MCATT0: Card Interface Attribute Space Timing, slot 0 */ - write32rb (MEMC_BASE + MCATT0_OFFSET), CONFIG_SYS_MCATT0_VAL - /* MCATT1: Card Interface Attribute Space Timing, slot 1 */ - write32rb (MEMC_BASE + MCATT1_OFFSET), CONFIG_SYS_MCATT1_VAL - /* MCIO0: Card Interface I/O Space Timing, slot 0 */ - write32rb (MEMC_BASE + MCIO0_OFFSET), CONFIG_SYS_MCIO0_VAL - /* MCIO1: Card Interface I/O Space Timing, slot 1 */ - write32rb (MEMC_BASE + MCIO1_OFFSET), CONFIG_SYS_MCIO1_VAL - - /* - * 3) Configure Fly-By DMA register - */ - - write32rb (MEMC_BASE + FLYCNFG_OFFSET), CONFIG_SYS_FLYCNFG_VAL - - /* - * 4) Initialize Timing for Sync Memory (SDCLK0) - */ - - /* - * Before accessing MDREFR we need a valid DRI field, so we set - * this to power on defaults + DRI field. - */ - ldr r5, [r3, #MDREFR_OFFSET] - bic r5, r5, #0x0ff - bic r5, r5, #0xf00 /* MDREFR user config with zeroed DRI */ - - ldr r4, =CONFIG_SYS_MDREFR_VAL - mov r7, r4 - lsl r4, #20 - lsr r4, #20 /* Get a valid DRI field */ - - orr r5, r5, r4 /* MDREFR user config with correct DRI */ - - orr r5, #MDREFR_K0RUN - orr r5, #MDREFR_SLFRSH - bic r5, #MDREFR_APD - bic r5, #MDREFR_E1PIN - - str r5, [r3, #MDREFR_OFFSET] - ldr r4, [r3, #MDREFR_OFFSET] - - /* - * 5) Initialize Synchronous Static Memory (Flash/Peripherals) - */ - - /* Initialize SXCNFG register. Assert the enable bits. - * - * Write SXMRS to cause an MRS command to all enabled banks of - * synchronous static memory. Note that SXLCR need not be written - * at this time. - */ - write32rb (MEMC_BASE + SXCNFG_OFFSET), CONFIG_SYS_SXCNFG_VAL - - /* - * 6) Initialize SDRAM - */ - - bic r7, #MDREFR_SLFRSH - str r7, [r3, #MDREFR_OFFSET] - ldr r4, [r3, #MDREFR_OFFSET] - - orr r7, #MDREFR_E1PIN - str r7, [r3, #MDREFR_OFFSET] - ldr r4, [r3, #MDREFR_OFFSET] - - /* - * 7) Write MDCNFG with MDCNFG:DEx deasserted (set to 0), to configure - * but not enable each SDRAM partition pair. - */ - - /* Fetch platform value of MDCNFG */ - ldr r4, =CONFIG_SYS_MDCNFG_VAL - /* Disable all sdram banks */ - bic r4, r4, #(MDCNFG_DE0|MDCNFG_DE1) - bic r4, r4, #(MDCNFG_DE2|MDCNFG_DE3) - /* Write initial value of MDCNFG, w/o enabling sdram banks */ - str r4, [r3, #MDCNFG_OFFSET] - ldr r4, [r3, #MDCNFG_OFFSET] - - /* Wait for the clock to the SDRAMs to stabilize, 100..200 usec. */ - pxa_wait_ticks 0x300 - - /* - * 8) Trigger a number (usually 8) refresh cycles by attempting - * non-burst read or write accesses to disabled SDRAM, as commonly - * specified in the power up sequence documented in SDRAM data - * sheets. The address(es) used for this purpose must not be - * cacheable. - */ - - ldr r4, =CONFIG_SYS_DRAM_BASE -.rept 9 - str r5, [r4] -.endr - - /* - * 9) Write MDCNFG with enable bits asserted (MDCNFG:DEx set to 1). - */ - - ldr r5, =CONFIG_SYS_MDCNFG_VAL - ldr r4, =(MDCNFG_DE0 | MDCNFG_DE1 | MDCNFG_DE2 | MDCNFG_DE3) - and r5, r5, r4 - ldr r4, [r3, #MDCNFG_OFFSET] - orr r4, r4, r5 - str r4, [r3, #MDCNFG_OFFSET] - ldr r4, [r3, #MDCNFG_OFFSET] - - /* - * 10) Write MDMRS. - */ - - ldr r4, =CONFIG_SYS_MDMRS_VAL - str r4, [r3, #MDMRS_OFFSET] - ldr r4, [r3, #MDMRS_OFFSET] - - /* - * 11) Enable APD - */ - - ldr r4, [r3, #MDREFR_OFFSET] - and r7, r7, #MDREFR_APD - orr r4, r4, r7 - str r4, [r3, #MDREFR_OFFSET] - ldr r4, [r3, #MDREFR_OFFSET] -.endm - -/* - * This macro tests if the CPU woke up from sleep and eventually resumes - * - * Clobbered regs: r4, r5 - */ -.macro pxa_wakeup - ldr r4, =RCSR - ldr r5, [r4] - and r5, r5, #(RCSR_GPR | RCSR_SMR | RCSR_WDR | RCSR_HWR) - str r5, [r4] - teq r5, #RCSR_SMR - - bne pxa_wakeup_exit - - ldr r4, =PSSR - mov r5, #PSSR_PH - str r5, [r4] - - ldr r4, =PSPR - ldr pc, [r4] -pxa_wakeup_exit: -.endm - -/* - * This macro disables all interupts on PXA2xx/PXA3xx CPU - * - * Clobbered regs: r4, r5 - */ -.macro pxa_intr_setup - write32 ICLR, 0 - write32 ICMR, 0 -#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) - write32 ICLR2, 0 - write32 ICMR2, 0 -#endif -.endm - -/* - * This macro configures clock on PXA2xx/PXA3xx CPU - * - * Clobbered regs: r4, r5 - */ -.macro pxa_clock_setup - /* Disable the peripheral clocks, and set the core clock frequency */ - - /* Turn Off ALL on-chip peripheral clocks for re-configuration */ - write32 CKEN, CONFIG_SYS_CKEN - - /* Write CCCR */ - write32 CCCR, CONFIG_SYS_CCCR - -#ifdef CONFIG_RTC - /* enable the 32Khz oscillator for RTC and PowerManager */ - write32 OSCC, #OSCC_OON - ldr r4, =OSCC - - /* Spin here until OSCC.OOK get set, meaning the PLL has settled. */ -2: - ldr r5, [r4] - ands r5, r5, #1 - beq 2b -#endif -.endm - -#endif /* __ASSEMBLY__ */ -#endif /* __ASM_ARCH_PXA_MACRO_H__ */ diff --git a/onenand_ipl/board/vpac270/Makefile b/onenand_ipl/board/vpac270/Makefile index a86bc00..7300692 100644 --- a/onenand_ipl/board/vpac270/Makefile +++ b/onenand_ipl/board/vpac270/Makefile @@ -8,7 +8,6 @@ AFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL CFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL OBJCFLAGS += --gap-fill=0x00 -SOBJS := lowlevel_init.o SOBJS += start.o COBJS := vpac270.o COBJS += onenand_read.o @@ -62,10 +61,6 @@ ifneq ($(OBJTREE), $(SRCTREE)) $(obj)vpac270.c: @rm -f $@ ln -s $(SRCTREE)/onenand_ipl/board/$(BOARDDIR)/vpac270.c $@ - -$(obj)lowlevel_init.S: - @rm -f $@ - ln -s $(SRCTREE)/onenand_ipl/board/$(BOARDDIR)/lowlevel_init.S $@ endif ######################################################################### diff --git a/onenand_ipl/board/vpac270/lowlevel_init.S b/onenand_ipl/board/vpac270/lowlevel_init.S deleted file mode 100644 index e79d8dd..0000000 --- a/onenand_ipl/board/vpac270/lowlevel_init.S +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Voipac PXA270 Lowlevel Hardware Initialization - * - * Copyright (C) 2010 Marek Vasut <marek.vasut(a)gmail.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 <config.h> -#include <version.h> -#include <asm/arch/pxa-regs.h> -#include <asm/arch/macro.h> - -.globl lowlevel_init -lowlevel_init: - pxa_clock_setup - mov pc, lr -- 1.7.1

1 0

[U-Boot] [PATCH] mmc: seperate block number into small parts for multi-write cmd
by Lei Wen 27 Oct '10

27 Oct '10

As mmc host limitation, the max number of block in one go should be limited to 65535, and the max buffer size should not excceed 512k bytes. Signed-off-by: Lei Wen <leiwen(a)marvell.com> --- drivers/mmc/mmc.c | 56 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 21 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 94d1ac2..ea398a5 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -77,29 +77,16 @@ struct mmc *find_mmc_device(int dev_num) return NULL; } -static ulong -mmc_bwrite(int dev_num, ulong start, lbaint_t blkcnt, const void*src) +int mmc_write_block(struct mmc *mmc, ulong *src, ulong start, uint blocknum) { struct mmc_cmd cmd; struct mmc_data data; - int err; - int stoperr = 0; - struct mmc *mmc = find_mmc_device(dev_num); - int blklen; - - if (!mmc) - return -1; - + int blklen, err; blklen = mmc->write_bl_len; - err = mmc_set_blocklen(mmc, mmc->write_bl_len); - - if (err) { - printf("set write bl len failed\n\r"); - return err; - } - - if (blkcnt > 1) + BUG_ON(blklen * blocknum > 524288); + BUG_ON(blocknum > 65535); + if (blocknum > 1) cmd.cmdidx = MMC_CMD_WRITE_MULTIPLE_BLOCK; else cmd.cmdidx = MMC_CMD_WRITE_SINGLE_BLOCK; @@ -113,7 +100,7 @@ mmc_bwrite(int dev_num, ulong start, lbaint_t blkcnt, const void*src) cmd.flags = 0; data.src = src; - data.blocks = blkcnt; + data.blocks = blocknum; data.blocksize = blklen; data.flags = MMC_DATA_WRITE; @@ -124,14 +111,41 @@ mmc_bwrite(int dev_num, ulong start, lbaint_t blkcnt, const void*src) return err; } - if (blkcnt > 1) { + if (blocknum > 1) { cmd.cmdidx = MMC_CMD_STOP_TRANSMISSION; cmd.cmdarg = 0; cmd.resp_type = MMC_RSP_R1b; cmd.flags = 0; - stoperr = mmc_send_cmd(mmc, &cmd, NULL); + mmc_send_cmd(mmc, &cmd, NULL); } + return blocknum; +} + +static ulong +mmc_bwrite(int dev_num, ulong start, lbaint_t blkcnt, const void*src) +{ + int err; + struct mmc *mmc = find_mmc_device(dev_num); + unsigned int max; + lbaint_t tmp = blkcnt, cur; + + if (!mmc) + return -1; + + err = mmc_set_blocklen(mmc, mmc->write_bl_len); + if (err) { + printf("set write bl len failed\n\r"); + return err; + } + + max = 524288 / mmc->write_bl_len; + do { + cur = (tmp > max) ? max : tmp; + tmp -= cur; + if(mmc_write_block(mmc, src, start, cur) != cur) + return -1; + } while (tmp > 0); return blkcnt; } -- 1.7.0.4

5 29

[U-Boot] [PATCH 1/2] imx: Get fec mac address from fuse
by Jason Liu 27 Oct '10

27 Oct '10

The patch is to support getting FEC MAC address from fuse bank. Signed-off-by: Jason Liu <r64343(a)freescale.com> --- arch/arm/include/asm/arch-mx25/imx-regs.h | 10 +++------- arch/arm/include/asm/arch-mx27/imx-regs.h | 5 ++--- arch/arm/include/asm/arch-mx5/imx-regs.h | 24 ++++++++++++++++++++++++ drivers/net/fec_mxc.c | 17 +++++------------ 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/arch/arm/include/asm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h index f709bd8..35eb303 100644 --- a/arch/arm/include/asm/arch-mx25/imx-regs.h +++ b/arch/arm/include/asm/arch-mx25/imx-regs.h @@ -128,12 +128,8 @@ struct iim_regs { u32 iim_prev; u32 iim_srev; u32 iim_prog_p; - u32 res1[0x1f5]; - u32 iim_bank_area0[0x20]; - u32 res2[0xe0]; - u32 iim_bank_area1[0x20]; - u32 res3[0xe0]; - u32 iim_bank_area2[0x20]; + u32 res[0x1f5]; + u32 iim_bank_area[0x100 * 3]; }; #endif @@ -311,6 +307,6 @@ struct iim_regs { #define WCR_WDE 0x04 /* FUSE bank offsets */ -#define IIM0_MAC 0x1a +#define IIM_MAC 0x1a #endif /* _IMX_REGS_H */ diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h index 6ecddaa..429f893 100644 --- a/arch/arm/include/asm/arch-mx27/imx-regs.h +++ b/arch/arm/include/asm/arch-mx27/imx-regs.h @@ -202,8 +202,7 @@ struct iim_regs { u32 iim_scs1; u32 iim_scs2; u32 iim_scs3; - u32 res[0x1F0]; - u32 iim_bank_area0[0x100]; + u32 iim_bank_area[0x100 * 2]; }; #endif @@ -513,7 +512,7 @@ struct iim_regs { #define IIM_ERR_PARITYE (1 << 1) /* Definitions for i.MX27 TO2 */ -#define IIM0_MAC 5 +#define IIM_MAC 5 #define IIM0_SCC_KEY 11 #define IIM1_SUID 1 diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index 3ddda40..892099c 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -204,6 +204,9 @@ #define BOARD_REV_1_0 0x0 #define BOARD_REV_2_0 0x1 +#define IMX_IIM_BASE (IIM_BASE_ADDR) +#define IIM_MAC 0x109 + #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/types.h> @@ -274,6 +277,27 @@ struct src { u32 sisr; u32 simr; }; + +struct iim_regs { + u32 stat; + u32 statm; + u32 err; + u32 emask; + u32 fctl; + u32 ua; + u32 la; + u32 sdat; + u32 prev; + u32 srev; + u32 preg_p; + u32 scs0; + u32 scs1; + u32 scs2; + u32 scs3; + u32 res[0x1f1]; + u32 iim_bank_area[0x100 * 4]; +}; + #endif /* __ASSEMBLER__*/ #endif /* __ASM_ARCH_MXC_MX51_H__ */ diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 3f09c2b..e8d7b98 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -312,21 +312,17 @@ static void fec_rbd_clean(int last, struct fec_bd *pRbd) static int fec_get_hwaddr(struct eth_device *dev, unsigned char *mac) { -/* - * The MX27 can store the mac address in internal eeprom - * This mechanism is not supported now by MX51 or MX25 - */ -#if defined(CONFIG_MX51) || defined(CONFIG_MX25) - return -1; -#else + /* + * The MX27 can store the mac address in internal eeprom + * This mechanism is also supported now by MX51 or MX25 + */ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE; int i; for (i = 0; i < 6; i++) - mac[6-1-i] = readl(&iim->iim_bank_area0[IIM0_MAC + i]); + mac[6-1-i] = readl(&iim->iim_bank_area[IIM_MAC + i]); return !is_valid_ether_addr(mac); -#endif } static int fec_set_hwaddr(struct eth_device *dev) @@ -414,9 +410,6 @@ static int fec_init(struct eth_device *dev, bd_t* bd) uint32_t base; struct fec_priv *fec = (struct fec_priv *)dev->priv; - /* Initialize MAC address */ - fec_set_hwaddr(dev); - /* * reserve memory for both buffer descriptor chains at once * Datasheet forces the startaddress of each chain is 16 byte -- 1.7.0.4

5 13

[U-Boot] [PATCH 0/2] Fix onenand command after ARM relocation changes.
by Enric Balletbo i Serra 27 Oct '10

27 Oct '10

Hello, After ARM relocation support the onenand command seems broken, these patches attempt to solve this issue. The first patch fixes the usage help for onenand command when no arguments are passed. The second patch relocate the onenand command table manually, I think this is required after relocation changes but I'm not sure if this is the best solution, so comments are welcome. Tested on IGEP v2 and OMAP3 IGEP module boards. Cheers, Enric $ git diff --stat origin/master arch/arm/lib/board.c | 3 +++ common/cmd_onenand.c | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)

6 8

[U-Boot] [PATCH 0/3] Introduce asm-offsets and fix CONFIG_SYS_GBL_DATA_SIZE problems
by Wolfgang Denk 27 Oct '10

27 Oct '10

The following patch series starts some clean up of for the handling f initial data; the most important change is the replacement of a manually configured (and thus often wrong) CONFIG_SYS_GBL_DATA_SIZE by an automatically generated value. More similar clean-ups can and will be done, but this is stuff for the next merge window (or the "next" branch); here we focus on a fix for the CONFIG_SYS_GBL_DATA_SIZE problems. The changes are mostly simple and straightforward, but they are huge as they affect a lots of files. [PATCH 1/3] Rename CONFIG_SYS_INIT_RAM_END into CONFIG_SYS_INIT_RAM_SIZE CONFIG_SYS_INIT_RAM_END was a misnomer as it suggests this might be some end address; to make the meaning more clear we rename it into CONFIG_SYS_INIT_RAM_SIZE No other code changes are performed in this patch, only minor editing of white space (due to the changed length) and the comments was done, where noticed. Note that the code for the PATI and cmi_mpc5xx board configurations looks seriously broken. Last known maintainers on Cc: Signed-off-by: Wolfgang Denk <wd(a)denx.de> Cc: Denis Peter <d.peter(a)mpl.ch> Cc: Martin Winistoerfer <martinwinistoerfer(a)gmx.ch> --- README | 2 +- arch/m68k/lib/board.c | 2 +- arch/powerpc/cpu/74xx_7xx/start.S | 4 ++-- arch/powerpc/cpu/mpc83xx/start.S | 4 ++-- arch/powerpc/cpu/mpc86xx/start.S | 4 ++-- arch/powerpc/cpu/ppc4xx/start.S | 22 +++++++++++----------- board/fads/fads.h | 4 ++-- include/configs/A3000.h | 4 ++-- include/configs/ADCIOP.h | 4 ++-- include/configs/AMX860.h | 4 ++-- include/configs/AP1000.h | 4 ++-- include/configs/APC405.h | 4 ++-- include/configs/AR405.h | 4 ++-- include/configs/ASH405.h | 4 ++-- include/configs/ATUM8548.h | 4 ++-- include/configs/Adder.h | 4 ++-- include/configs/Alaska8220.h | 4 ++-- include/configs/BAB7xx.h | 4 ++-- include/configs/BC3450.h | 6 +++--- include/configs/BMW.h | 4 ++-- include/configs/CANBT.h | 4 ++-- include/configs/CATcenter.h | 4 ++-- include/configs/CMS700.h | 4 ++-- include/configs/CPC45.h | 4 ++-- include/configs/CPCI2DP.h | 4 ++-- include/configs/CPCI405.h | 4 ++-- include/configs/CPCI4052.h | 4 ++-- include/configs/CPCI405AB.h | 4 ++-- include/configs/CPCI405DT.h | 4 ++-- include/configs/CPCI750.h | 4 ++-- include/configs/CPCIISER4.h | 4 ++-- include/configs/CPU86.h | 4 ++-- include/configs/CPU87.h | 4 ++-- include/configs/CRAYL1.h | 8 ++++---- include/configs/CU824.h | 4 ++-- include/configs/DASA_SIM.h | 4 ++-- include/configs/DB64360.h | 4 ++-- include/configs/DB64460.h | 4 ++-- include/configs/DP405.h | 4 ++-- include/configs/DU405.h | 4 ++-- include/configs/DU440.h | 4 ++-- include/configs/EB+MCF-EV123.h | 8 ++++---- include/configs/ELPPC.h | 4 ++-- include/configs/ELPT860.h | 4 ++-- include/configs/EP88x.h | 4 ++-- include/configs/ERIC.h | 4 ++-- include/configs/ESTEEM192E.h | 4 ++-- include/configs/ETX094.h | 4 ++-- include/configs/EVB64260.h | 4 ++-- include/configs/EXBITGEN.h | 4 ++-- include/configs/FADS823.h | 4 ++-- include/configs/FADS850SAR.h | 4 ++-- include/configs/FLAGADM.h | 4 ++-- include/configs/FPS850L.h | 4 ++-- include/configs/FPS860L.h | 4 ++-- include/configs/G2000.h | 4 ++-- include/configs/GEN860T.h | 4 ++-- include/configs/GENIETV.h | 4 ++-- include/configs/HH405.h | 4 ++-- include/configs/HIDDEN_DRAGON.h | 8 ++++---- include/configs/HUB405.h | 4 ++-- include/configs/IAD210.h | 4 ++-- include/configs/ICU862.h | 4 ++-- include/configs/IDS8247.h | 4 ++-- include/configs/IP860.h | 4 ++-- include/configs/IPHASE4539.h | 4 ++-- include/configs/ISPAN.h | 4 ++-- include/configs/IVML24.h | 8 ++++---- include/configs/IVMS8.h | 8 ++++---- include/configs/IceCube.h | 4 ++-- include/configs/JSE.h | 4 ++-- include/configs/KAREF.h | 4 ++-- include/configs/KUP4K.h | 4 ++-- include/configs/KUP4X.h | 4 ++-- include/configs/LANTEC.h | 4 ++-- include/configs/M5208EVBE.h | 8 ++++---- include/configs/M52277EVB.h | 10 +++++----- include/configs/M5235EVB.h | 8 ++++---- include/configs/M5249EVB.h | 8 ++++---- include/configs/M5253DEMO.h | 8 ++++---- include/configs/M5253EVBE.h | 8 ++++---- include/configs/M5271EVB.h | 8 ++++---- include/configs/M5272C3.h | 8 ++++---- include/configs/M5275EVB.h | 8 ++++---- include/configs/M5282EVB.h | 8 ++++---- include/configs/M53017EVB.h | 8 ++++---- include/configs/M5329EVB.h | 8 ++++---- include/configs/M5373EVB.h | 8 ++++---- include/configs/M54451EVB.h | 10 +++++----- include/configs/M54455EVB.h | 10 +++++----- include/configs/M5475EVB.h | 10 +++++----- include/configs/M5485EVB.h | 10 +++++----- include/configs/MBX.h | 4 ++-- include/configs/MBX860T.h | 4 ++-- include/configs/METROBOX.h | 4 ++-- include/configs/MHPC.h | 4 ++-- include/configs/MIP405.h | 4 ++-- include/configs/ML2.h | 4 ++-- include/configs/MOUSSE.h | 4 ++-- include/configs/MPC8260ADS.h | 4 ++-- include/configs/MPC8266ADS.h | 4 ++-- include/configs/MPC8308RDB.h | 4 ++-- include/configs/MPC8313ERDB.h | 4 ++-- include/configs/MPC8315ERDB.h | 4 ++-- include/configs/MPC8323ERDB.h | 4 ++-- include/configs/MPC832XEMDS.h | 4 ++-- include/configs/MPC8349EMDS.h | 4 ++-- include/configs/MPC8349ITX.h | 4 ++-- include/configs/MPC8360EMDS.h | 4 ++-- include/configs/MPC8360ERDK.h | 4 ++-- include/configs/MPC837XEMDS.h | 4 ++-- include/configs/MPC837XERDB.h | 4 ++-- include/configs/MPC8536DS.h | 4 ++-- include/configs/MPC8540ADS.h | 4 ++-- include/configs/MPC8540EVAL.h | 4 ++-- include/configs/MPC8541CDS.h | 4 ++-- include/configs/MPC8544DS.h | 4 ++-- include/configs/MPC8548CDS.h | 4 ++-- include/configs/MPC8555CDS.h | 4 ++-- include/configs/MPC8560ADS.h | 4 ++-- include/configs/MPC8568MDS.h | 4 ++-- include/configs/MPC8569MDS.h | 4 ++-- include/configs/MPC8572DS.h | 4 ++-- include/configs/MPC8610HPCD.h | 4 ++-- include/configs/MPC8641HPCN.h | 4 ++-- include/configs/MUSENKI.h | 4 ++-- include/configs/MVBC_P.h | 4 ++-- include/configs/MVBLM7.h | 4 ++-- include/configs/MVBLUE.h | 4 ++-- include/configs/MVS1.h | 4 ++-- include/configs/MVSMR.h | 4 ++-- include/configs/NETPHONE.h | 4 ++-- include/configs/NETTA.h | 4 ++-- include/configs/NETTA2.h | 4 ++-- include/configs/NETVIA.h | 4 ++-- include/configs/NSCU.h | 4 ++-- include/configs/NX823.h | 4 ++-- include/configs/OCRTC.h | 4 ++-- include/configs/ORSG.h | 4 ++-- include/configs/OXC.h | 4 ++-- include/configs/P1022DS.h | 4 ++-- include/configs/P1_P2_RDB.h | 4 ++-- include/configs/P2020DS.h | 4 ++-- include/configs/P3G4.h | 4 ++-- include/configs/PATI.h | 4 ++-- include/configs/PCI405.h | 4 ++-- include/configs/PCIPPC2.h | 4 ++-- include/configs/PCIPPC6.h | 4 ++-- include/configs/PIP405.h | 4 ++-- include/configs/PLU405.h | 4 ++-- include/configs/PM520.h | 4 ++-- include/configs/PM826.h | 4 ++-- include/configs/PM828.h | 4 ++-- include/configs/PM854.h | 4 ++-- include/configs/PM856.h | 4 ++-- include/configs/PMC405.h | 4 ++-- include/configs/PMC405DE.h | 4 ++-- include/configs/PMC440.h | 4 ++-- include/configs/PN62.h | 4 ++-- include/configs/PPChameleonEVB.h | 4 ++-- include/configs/QS823.h | 4 ++-- include/configs/QS850.h | 4 ++-- include/configs/QS860T.h | 4 ++-- include/configs/R360MPI.h | 4 ++-- include/configs/RBC823.h | 4 ++-- include/configs/RPXClassic.h | 4 ++-- include/configs/RPXlite.h | 4 ++-- include/configs/RPXlite_DW.h | 4 ++-- include/configs/RPXsuper.h | 4 ++-- include/configs/RRvision.h | 4 ++-- include/configs/Rattler.h | 4 ++-- include/configs/SBC8540.h | 4 ++-- include/configs/SCM.h | 4 ++-- include/configs/SIMPC8313.h | 4 ++-- include/configs/SM850.h | 4 ++-- include/configs/SPD823TS.h | 4 ++-- include/configs/SXNI855T.h | 4 ++-- include/configs/Sandpoint8240.h | 8 ++++---- include/configs/Sandpoint8245.h | 8 ++++---- include/configs/TASREG.h | 8 ++++---- include/configs/TB5200.h | 6 +++--- include/configs/TK885D.h | 4 ++-- include/configs/TOP5200.h | 4 ++-- include/configs/TOP860.h | 4 ++-- include/configs/TQM5200.h | 6 +++--- include/configs/TQM823L.h | 4 ++-- include/configs/TQM823M.h | 4 ++-- include/configs/TQM8260.h | 4 ++-- include/configs/TQM8272.h | 4 ++-- include/configs/TQM834x.h | 4 ++-- include/configs/TQM850L.h | 4 ++-- include/configs/TQM850M.h | 4 ++-- include/configs/TQM855L.h | 4 ++-- include/configs/TQM855M.h | 4 ++-- include/configs/TQM85xx.h | 4 ++-- include/configs/TQM860L.h | 4 ++-- include/configs/TQM860M.h | 4 ++-- include/configs/TQM862L.h | 4 ++-- include/configs/TQM862M.h | 4 ++-- include/configs/TQM866M.h | 4 ++-- include/configs/TQM885D.h | 4 ++-- include/configs/Total5200.h | 4 ++-- include/configs/VOH405.h | 4 ++-- include/configs/VOM405.h | 4 ++-- include/configs/VoVPN-GW.h | 4 ++-- include/configs/W7OLMC.h | 4 ++-- include/configs/W7OLMG.h | 4 ++-- include/configs/WUH405.h | 4 ++-- include/configs/Yukon8220.h | 4 ++-- include/configs/ZPC1900.h | 4 ++-- include/configs/ZUMA.h | 4 ++-- include/configs/a4m072.h | 4 ++-- include/configs/acadia.h | 4 ++-- include/configs/aev.h | 6 +++--- include/configs/alpr.h | 4 ++-- include/configs/aria.h | 4 ++-- include/configs/astro_mcf5373l.h | 8 ++++---- include/configs/atc.h | 4 ++-- include/configs/bamboo.h | 4 ++-- include/configs/barco.h | 8 ++++---- include/configs/bluestone.h | 4 ++-- include/configs/bubinga.h | 4 ++-- include/configs/c2mon.h | 4 ++-- include/configs/ca9x4_ct_vxp.h | 4 ++-- include/configs/canmb.h | 4 ++-- include/configs/canyonlands.h | 4 ++-- include/configs/cm5200.h | 6 +++--- include/configs/cmi_mpc5xx.h | 4 ++-- include/configs/cobra5272.h | 8 ++++---- include/configs/cogent_mpc8260.h | 4 ++-- include/configs/cogent_mpc8xx.h | 4 ++-- include/configs/corenet_ds.h | 4 ++-- include/configs/cpci5200.h | 4 ++-- include/configs/csb272.h | 4 ++-- include/configs/csb472.h | 4 ++-- include/configs/debris.h | 8 ++++---- include/configs/digsy_mtc.h | 4 ++-- include/configs/dlvision.h | 4 ++-- include/configs/eXalion.h | 6 +++--- include/configs/ebony.h | 4 ++-- include/configs/ep8248.h | 4 ++-- include/configs/ep8260.h | 4 ++-- include/configs/ep82xxm.h | 4 ++-- include/configs/galaxy5200.h | 4 ++-- include/configs/gdppc440etx.h | 4 ++-- include/configs/gw8260.h | 4 ++-- include/configs/hcu4.h | 4 ++-- include/configs/hcu5.h | 4 ++-- include/configs/hermes.h | 4 ++-- include/configs/hmi1001.h | 6 +++--- include/configs/hymod.h | 4 ++-- include/configs/icon.h | 4 ++-- include/configs/idmr.h | 8 ++++---- include/configs/imx31_litekit.h | 4 ++-- include/configs/inka4x0.h | 6 +++--- include/configs/intip.h | 4 ++-- include/configs/ipek01.h | 4 ++-- include/configs/jupiter.h | 4 ++-- include/configs/katmai.h | 4 ++-- include/configs/kilauea.h | 4 ++-- include/configs/km8xx.h | 4 ++-- include/configs/kmeter1.h | 4 ++-- include/configs/korat.h | 4 ++-- include/configs/kvme080.h | 4 ++-- include/configs/linkstation.h | 4 ++-- include/configs/luan.h | 4 ++-- include/configs/lwmon.h | 4 ++-- include/configs/lwmon5.h | 4 ++-- include/configs/makalu.h | 4 ++-- include/configs/manroland/mpc5200-common.h | 6 +++--- include/configs/mcc200.h | 4 ++-- include/configs/mcu25.h | 4 ++-- include/configs/mecp5123.h | 4 ++-- include/configs/mecp5200.h | 4 ++-- include/configs/mgcoge.h | 4 ++-- include/configs/motionpro.h | 4 ++-- include/configs/mpc5121-common.h | 4 ++-- include/configs/mpc5121ads.h | 4 ++-- include/configs/mpc7448hpc2.h | 4 ++-- include/configs/mpc8308_p1m.h | 4 ++-- include/configs/muas3001.h | 4 ++-- include/configs/munices.h | 4 ++-- include/configs/neo.h | 4 ++-- include/configs/o2dnt.h | 4 ++-- include/configs/ocotea.h | 4 ++-- include/configs/p3mx.h | 4 ++-- include/configs/p3p440.h | 4 ++-- include/configs/pcm030.h | 4 ++-- include/configs/pcs440ep.h | 4 ++-- include/configs/pf5200.h | 4 ++-- include/configs/ppmc7xx.h | 6 +++--- include/configs/ppmc8260.h | 4 ++-- include/configs/qong.h | 4 ++-- include/configs/quad100hd.h | 4 ++-- include/configs/quantum.h | 4 ++-- include/configs/redwood.h | 4 ++-- include/configs/rmu.h | 4 ++-- include/configs/rsdproto.h | 4 ++-- include/configs/sacsng.h | 4 ++-- include/configs/sbc405.h | 4 ++-- include/configs/sbc8240.h | 4 ++-- include/configs/sbc8260.h | 4 ++-- include/configs/sbc8349.h | 4 ++-- include/configs/sbc8548.h | 4 ++-- include/configs/sbc8560.h | 4 ++-- include/configs/sbc8641d.h | 4 ++-- include/configs/sc3.h | 6 +++--- include/configs/sequoia.h | 4 ++-- include/configs/socrates.h | 4 ++-- include/configs/sorcery.h | 4 ++-- include/configs/spc1920.h | 4 ++-- include/configs/spieval.h | 6 +++--- include/configs/stxgp3.h | 4 ++-- include/configs/stxssa.h | 4 ++-- include/configs/stxxtc.h | 4 ++-- include/configs/svm_sc8xx.h | 4 ++-- include/configs/t3corp.h | 4 ++-- include/configs/taihu.h | 4 ++-- include/configs/taishan.h | 4 ++-- include/configs/uc100.h | 4 ++-- include/configs/utx8245.h | 6 +++--- include/configs/v37.h | 4 ++-- include/configs/v38b.h | 4 ++-- include/configs/ve8313.h | 4 ++-- include/configs/virtlab2.h | 4 ++-- include/configs/vision2.h | 4 ++-- include/configs/vme8349.h | 4 ++-- include/configs/walnut.h | 4 ++-- include/configs/xilinx-ppc.h | 4 ++-- include/configs/xpedite1000.h | 4 ++-- include/configs/xpedite517x.h | 4 ++-- include/configs/xpedite520x.h | 4 ++-- include/configs/xpedite537x.h | 4 ++-- include/configs/xpedite550x.h | 4 ++-- include/configs/yosemite.h | 4 ++-- include/configs/yucca.h | 4 ++-- include/configs/zeus.h | 4 ++-- 337 files changed, 759 insertions(+), 759 deletions(-) [PATCH 2/3] include/asm-offsets.h: automatically generate assembler constants A recurrent issue is that certain C level constructs like sizeof() or offsetof() cannot be used in assembler files, which is inconvenient when such constructs are used in the definition of macro names etc. To avoid duplication of such definitions (and thus another cause of problems), we adapt the Linux way to automatically generate the respective definitions from the respective C header files. In Linux, this is implemented in include/linux/kbuild.h, Kbuild, and arch/*/kernel/asm-offsets.c; we adapt the code from the Linux v2.6.36 kernel tree. We also copy the concept of the include/generated/ directory which can be used to hold other automatically generated files as well. We start with an architecture-independent lib/asm-offsets.c which generates include/generated/generic-asm-offsets.h (included by include/asm-offsets.h, which is what will be referred to in the actual source code). Later this may be extended by architecture-specific arch/*/lib/asm-offsets.c files that will generate a include/generated/asm-offsets.h. --- .gitignore | 3 +++ Makefile | 23 ++++++++++++++++++++--- include/asm-offsets.h | 2 ++ include/linux/kbuild.h | 20 ++++++++++++++++++++ lib/asm-offsets.c | 25 +++++++++++++++++++++++++ tools/scripts/make-asm-offsets | 27 +++++++++++++++++++++++++++ 6 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 include/asm-offsets.h create mode 100644 include/linux/kbuild.h create mode 100644 lib/asm-offsets.c create mode 100755 tools/scripts/make-asm-offsets [PATCH 3/3] Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value CONFIG_SYS_GBL_DATA_SIZE has always been just a bad workarond for not being able to use "sizeof(struct global_data)" in assembler files. Recent experience has shown that manual synchronization is not reliable enough. This patch renames CONFIG_SYS_GBL_DATA_SIZE into GENERATED_GBL_DATA_SIZE which gets automatically generated by the asm-offsets tool. In the result, all definitions of this value can be deleted from the board config files. We have to make sure that all files that reference such data include the new <asm-offsets.h> file. No other changes have been done yet, but it is obvious that similar changes / simplifications can be done for other, related macro definitions as well. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- arch/arm/cpu/arm1136/start.S | 9 +++++---- arch/arm/cpu/arm1176/start.S | 9 +++++---- arch/arm/cpu/arm720t/start.S | 8 ++++---- arch/arm/cpu/arm920t/start.S | 7 ++++--- arch/arm/cpu/arm925t/start.S | 8 ++++---- arch/arm/cpu/arm926ejs/start.S | 8 ++++---- arch/arm/cpu/arm946es/start.S | 8 ++++---- arch/arm/cpu/arm_intcm/start.S | 8 ++++---- arch/arm/cpu/armv7/start.S | 9 +++++---- arch/arm/cpu/ixp/start.S | 7 ++++--- arch/arm/cpu/lh7a40x/start.S | 9 ++++----- arch/arm/cpu/pxa/start.S | 5 +++-- arch/arm/cpu/s3c44b0/start.S | 5 ++--- arch/arm/cpu/sa1100/start.S | 9 ++++----- arch/arm/include/asm/global_data.h | 2 +- arch/arm/lib/interrupts.c | 2 +- arch/avr32/cpu/start.S | 1 + arch/avr32/include/asm/global_data.h | 2 +- arch/blackfin/include/asm/config.h | 5 ++--- arch/blackfin/include/asm/global_data.h | 2 +- arch/blackfin/lib/board.c | 4 ++-- arch/i386/include/asm/global_data.h | 2 +- arch/m68k/cpu/mcf5227x/start.S | 1 + arch/m68k/cpu/mcf523x/start.S | 1 + arch/m68k/cpu/mcf52x2/start.S | 1 + arch/m68k/cpu/mcf532x/start.S | 1 + arch/m68k/cpu/mcf5445x/start.S | 1 + arch/m68k/cpu/mcf547x_8x/start.S | 1 + arch/m68k/include/asm/global_data.h | 2 +- arch/microblaze/cpu/start.S | 1 + arch/microblaze/include/asm/global_data.h | 2 +- arch/microblaze/lib/board.c | 2 +- arch/mips/cpu/cache.S | 1 + arch/mips/cpu/start.S | 1 + arch/mips/include/asm/global_data.h | 2 +- arch/nios2/cpu/start.S | 2 +- arch/nios2/lib/board.c | 2 +- arch/powerpc/cpu/74xx_7xx/start.S | 1 + arch/powerpc/cpu/mpc512x/start.S | 1 + arch/powerpc/cpu/mpc5xx/start.S | 1 + arch/powerpc/cpu/mpc5xxx/start.S | 1 + arch/powerpc/cpu/mpc8220/start.S | 1 + arch/powerpc/cpu/mpc824x/start.S | 1 + arch/powerpc/cpu/mpc8260/start.S | 1 + arch/powerpc/cpu/mpc83xx/start.S | 1 + arch/powerpc/cpu/mpc85xx/release.S | 1 + arch/powerpc/cpu/mpc85xx/start.S | 1 + arch/powerpc/cpu/mpc86xx/start.S | 1 + arch/powerpc/cpu/mpc8xx/start.S | 1 + arch/powerpc/cpu/ppc4xx/start.S | 3 ++- arch/powerpc/include/asm/global_data.h | 2 +- arch/sh/cpu/sh2/start.S | 5 +++-- arch/sh/cpu/sh3/start.S | 5 +++-- arch/sh/cpu/sh4/start.S | 5 +++-- arch/sh/lib/board.c | 4 ++-- arch/sparc/cpu/leon2/start.S | 1 + arch/sparc/cpu/leon3/start.S | 1 + arch/sparc/include/asm/global_data.h | 2 +- arch/sparc/lib/board.c | 2 +- board/amcc/bamboo/init.S | 1 + board/amcc/bluestone/init.S | 1 + board/amcc/canyonlands/init.S | 1 + board/amcc/sequoia/init.S | 1 + board/amcc/yosemite/init.S | 1 + board/barco/early_init.S | 1 + board/esd/du440/init.S | 1 + board/esd/pmc440/init.S | 1 + board/fads/fads.h | 3 +-- board/gdsys/gdppc440etx/init.S | 1 + board/gdsys/intip/init.S | 1 + board/hidden_dragon/early_init.S | 1 + board/korat/init.S | 1 + board/lwmon5/init.S | 1 + board/pcs440ep/init.S | 1 + board/prodrive/alpr/init.S | 1 + board/sandpoint/early_init.S | 1 + board/t3corp/init.S | 1 + common/cmd_bdinfo.c | 2 +- include/asm-offsets.h | 4 ++++ include/common.h | 1 + include/configs/A3000.h | 4 +--- include/configs/ADCIOP.h | 3 +-- include/configs/AMX860.h | 3 +-- include/configs/AP1000.h | 3 +-- include/configs/APC405.h | 3 +-- include/configs/AR405.h | 3 +-- include/configs/ASH405.h | 3 +-- include/configs/ATUM8548.h | 3 +-- include/configs/Adder.h | 3 +-- include/configs/Alaska8220.h | 3 +-- include/configs/B2.h | 1 - include/configs/BAB7xx.h | 3 +-- include/configs/BC3450.h | 3 +-- include/configs/BMW.h | 3 +-- include/configs/CANBT.h | 3 +-- include/configs/CATcenter.h | 3 +-- include/configs/CMS700.h | 3 +-- include/configs/CPC45.h | 3 +-- include/configs/CPCI2DP.h | 3 +-- include/configs/CPCI405.h | 3 +-- include/configs/CPCI4052.h | 3 +-- include/configs/CPCI405AB.h | 3 +-- include/configs/CPCI405DT.h | 3 +-- include/configs/CPCI750.h | 3 +-- include/configs/CPCIISER4.h | 3 +-- include/configs/CPU86.h | 3 +-- include/configs/CPU87.h | 3 +-- include/configs/CRAYL1.h | 6 ++---- include/configs/CU824.h | 3 +-- include/configs/DASA_SIM.h | 3 +-- include/configs/DB64360.h | 3 +-- include/configs/DB64460.h | 3 +-- include/configs/DP405.h | 3 +-- include/configs/DU405.h | 3 +-- include/configs/DU440.h | 3 +-- include/configs/EB+MCF-EV123.h | 3 +-- include/configs/ELPPC.h | 3 +-- include/configs/ELPT860.h | 3 +-- include/configs/EP88x.h | 3 +-- include/configs/ERIC.h | 3 +-- include/configs/ESTEEM192E.h | 3 +-- include/configs/ETX094.h | 3 +-- include/configs/EVB64260.h | 3 +-- include/configs/EXBITGEN.h | 3 +-- include/configs/FADS823.h | 3 +-- include/configs/FADS850SAR.h | 3 +-- include/configs/FLAGADM.h | 3 +-- include/configs/FPS850L.h | 3 +-- include/configs/FPS860L.h | 3 +-- include/configs/G2000.h | 3 +-- include/configs/GENIETV.h | 3 +-- include/configs/HH405.h | 3 +-- include/configs/HIDDEN_DRAGON.h | 6 ++---- include/configs/HUB405.h | 3 +-- include/configs/IAD210.h | 3 +-- include/configs/ICU862.h | 3 +-- include/configs/IDS8247.h | 3 +-- include/configs/IP860.h | 3 +-- include/configs/IPHASE4539.h | 3 +-- include/configs/ISPAN.h | 3 +-- include/configs/IVML24.h | 3 +-- include/configs/IVMS8.h | 3 +-- include/configs/IceCube.h | 3 +-- include/configs/JSE.h | 3 +-- include/configs/KAREF.h | 3 +-- include/configs/KUP4K.h | 3 +-- include/configs/KUP4X.h | 3 +-- include/configs/LANTEC.h | 3 +-- include/configs/M5208EVBE.h | 3 +-- include/configs/M52277EVB.h | 3 +-- include/configs/M5235EVB.h | 3 +-- include/configs/M5249EVB.h | 3 +-- include/configs/M5253DEMO.h | 3 +-- include/configs/M5253EVBE.h | 3 +-- include/configs/M5271EVB.h | 3 +-- include/configs/M5272C3.h | 3 +-- include/configs/M5275EVB.h | 3 +-- include/configs/M5282EVB.h | 3 +-- include/configs/M53017EVB.h | 3 +-- include/configs/M5329EVB.h | 3 +-- include/configs/M5373EVB.h | 3 +-- include/configs/M54451EVB.h | 3 +-- include/configs/M54455EVB.h | 3 +-- include/configs/M5475EVB.h | 3 +-- include/configs/M5485EVB.h | 3 +-- include/configs/MBX.h | 3 +-- include/configs/MBX860T.h | 3 +-- include/configs/METROBOX.h | 3 +-- include/configs/MHPC.h | 3 +-- include/configs/MIP405.h | 3 +-- include/configs/ML2.h | 3 +-- include/configs/MOUSSE.h | 3 +-- include/configs/MPC8260ADS.h | 3 +-- include/configs/MPC8266ADS.h | 3 +-- include/configs/MPC8308RDB.h | 3 +-- include/configs/MPC8313ERDB.h | 3 +-- include/configs/MPC8315ERDB.h | 3 +-- include/configs/MPC8323ERDB.h | 3 +-- include/configs/MPC832XEMDS.h | 3 +-- include/configs/MPC8349EMDS.h | 3 +-- include/configs/MPC8349ITX.h | 3 +-- include/configs/MPC8360EMDS.h | 3 +-- include/configs/MPC8360ERDK.h | 3 +-- include/configs/MPC837XEMDS.h | 3 +-- include/configs/MPC837XERDB.h | 3 +-- include/configs/MPC8536DS.h | 3 +-- include/configs/MPC8540ADS.h | 3 +-- include/configs/MPC8540EVAL.h | 3 +-- include/configs/MPC8541CDS.h | 3 +-- include/configs/MPC8544DS.h | 3 +-- include/configs/MPC8548CDS.h | 3 +-- include/configs/MPC8555CDS.h | 3 +-- include/configs/MPC8560ADS.h | 3 +-- include/configs/MPC8568MDS.h | 3 +-- include/configs/MPC8569MDS.h | 3 +-- include/configs/MPC8572DS.h | 3 +-- include/configs/MPC8610HPCD.h | 3 +-- include/configs/MPC8641HPCN.h | 3 +-- include/configs/MUSENKI.h | 4 +--- include/configs/MVBC_P.h | 3 +-- include/configs/MVBLM7.h | 3 +-- include/configs/MVBLUE.h | 3 +-- include/configs/MVS1.h | 3 +-- include/configs/MVSMR.h | 3 +-- include/configs/MigoR.h | 1 - include/configs/NETPHONE.h | 3 +-- include/configs/NETTA.h | 3 +-- include/configs/NETTA2.h | 3 +-- include/configs/NETVIA.h | 3 +-- include/configs/NSCU.h | 3 +-- include/configs/NX823.h | 3 +-- include/configs/OCRTC.h | 3 +-- include/configs/ORSG.h | 3 +-- include/configs/OXC.h | 3 +-- include/configs/P1022DS.h | 3 +-- include/configs/P1_P2_RDB.h | 3 +-- include/configs/P2020DS.h | 3 +-- include/configs/P3G4.h | 3 +-- include/configs/PATI.h | 3 +-- include/configs/PCI405.h | 3 +-- include/configs/PCI5441.h | 3 +-- include/configs/PCIPPC2.h | 3 +-- include/configs/PCIPPC6.h | 3 +-- include/configs/PIP405.h | 3 +-- include/configs/PK1C20.h | 3 +-- include/configs/PLU405.h | 3 +-- include/configs/PM520.h | 3 +-- include/configs/PM826.h | 3 +-- include/configs/PM828.h | 3 +-- include/configs/PM854.h | 3 +-- include/configs/PM856.h | 3 +-- include/configs/PMC405.h | 3 +-- include/configs/PMC405DE.h | 3 +-- include/configs/PMC440.h | 3 +-- include/configs/PN62.h | 4 +--- include/configs/PPChameleonEVB.h | 3 +-- include/configs/QS823.h | 3 +-- include/configs/QS850.h | 3 +-- include/configs/QS860T.h | 3 +-- include/configs/R360MPI.h | 3 +-- include/configs/RBC823.h | 3 +-- include/configs/RPXClassic.h | 3 +-- include/configs/RPXlite.h | 3 +-- include/configs/RPXlite_DW.h | 3 +-- include/configs/RPXsuper.h | 3 +-- include/configs/RRvision.h | 3 +-- include/configs/Rattler.h | 3 +-- include/configs/SBC8540.h | 3 +-- include/configs/SCM.h | 3 +-- include/configs/SIMPC8313.h | 3 +-- include/configs/SM850.h | 3 +-- include/configs/SMN42.h | 1 - include/configs/SPD823TS.h | 3 +-- include/configs/SX1.h | 1 - include/configs/SXNI855T.h | 3 +-- include/configs/Sandpoint8240.h | 7 ++----- include/configs/Sandpoint8245.h | 7 ++----- include/configs/TASREG.h | 3 +-- include/configs/TB5200.h | 3 +-- include/configs/TK885D.h | 3 +-- include/configs/TOP5200.h | 3 +-- include/configs/TOP860.h | 3 +-- include/configs/TQM5200.h | 3 +-- include/configs/TQM823L.h | 3 +-- include/configs/TQM823M.h | 3 +-- include/configs/TQM8260.h | 3 +-- include/configs/TQM8272.h | 3 +-- include/configs/TQM834x.h | 3 +-- include/configs/TQM850L.h | 3 +-- include/configs/TQM850M.h | 3 +-- include/configs/TQM855L.h | 3 +-- include/configs/TQM855M.h | 3 +-- include/configs/TQM85xx.h | 3 +-- include/configs/TQM860L.h | 3 +-- include/configs/TQM860M.h | 3 +-- include/configs/TQM862L.h | 3 +-- include/configs/TQM862M.h | 3 +-- include/configs/TQM866M.h | 3 +-- include/configs/TQM885D.h | 3 +-- include/configs/Total5200.h | 3 +-- include/configs/VCMA9.h | 1 - include/configs/VOH405.h | 3 +-- include/configs/VOM405.h | 3 +-- include/configs/VoVPN-GW.h | 3 +-- include/configs/W7OLMC.h | 3 +-- include/configs/W7OLMG.h | 3 +-- include/configs/WUH405.h | 3 +-- include/configs/Yukon8220.h | 3 +-- include/configs/ZPC1900.h | 3 +-- include/configs/ZUMA.h | 3 +-- include/configs/a320evb.h | 1 - include/configs/a4m072.h | 3 +-- include/configs/acadia.h | 3 +-- include/configs/actux1.h | 1 - include/configs/actux2.h | 1 - include/configs/actux3.h | 1 - include/configs/actux4.h | 1 - include/configs/aev.h | 3 +-- include/configs/afeb9260.h | 1 - include/configs/alpr.h | 3 +-- include/configs/am3517_evm.h | 1 - include/configs/ap325rxa.h | 1 - include/configs/apollon.h | 1 - include/configs/aria.h | 3 +-- include/configs/armadillo.h | 1 - include/configs/assabet.h | 1 - include/configs/astro_mcf5373l.h | 3 +-- include/configs/at91cap9adk.h | 1 - include/configs/at91rm9200dk.h | 1 - include/configs/at91rm9200ek.h | 3 +-- include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9261ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/atc.h | 3 +-- include/configs/balloon3.h | 3 +-- include/configs/bamboo.h | 3 +-- include/configs/barco.h | 6 ++---- include/configs/bluestone.h | 3 +-- include/configs/bubinga.h | 3 +-- include/configs/c2mon.h | 3 +-- include/configs/ca9x4_ct_vxp.h | 3 +-- include/configs/canmb.h | 3 +-- include/configs/canyonlands.h | 3 +-- include/configs/cerf250.h | 3 +-- include/configs/cm4008.h | 1 - include/configs/cm41xx.h | 1 - include/configs/cm5200.h | 3 +-- include/configs/cmc_pu2.h | 1 - include/configs/cmi_mpc5xx.h | 3 +-- include/configs/cobra5272.h | 3 +-- include/configs/cogent_mpc8260.h | 3 +-- include/configs/cogent_mpc8xx.h | 3 +-- include/configs/colibri_pxa270.h | 3 +-- include/configs/corenet_ds.h | 3 +-- include/configs/cpci5200.h | 3 +-- include/configs/cpu9260.h | 1 - include/configs/cpuat91.h | 1 - include/configs/cradle.h | 3 +-- include/configs/csb226.h | 3 +-- include/configs/csb272.h | 3 +-- include/configs/csb472.h | 3 +-- include/configs/csb637.h | 1 - include/configs/da830evm.h | 1 - include/configs/da850evm.h | 3 +-- include/configs/davinci_dm355evm.h | 1 - include/configs/davinci_dm355leopard.h | 1 - include/configs/davinci_dm365evm.h | 1 - include/configs/davinci_dm6467evm.h | 1 - include/configs/davinci_dvevm.h | 1 - include/configs/davinci_schmoogie.h | 1 - include/configs/davinci_sffsdr.h | 1 - include/configs/davinci_sonata.h | 1 - include/configs/debris.h | 7 ++----- include/configs/devkit8000.h | 1 - include/configs/digsy_mtc.h | 3 +-- include/configs/dlvision.h | 3 +-- include/configs/dnp1110.h | 1 - include/configs/eXalion.h | 3 +-- include/configs/eb_cpux9k2.h | 1 - include/configs/ebony.h | 3 +-- include/configs/edb93xx.h | 1 - include/configs/edminiv2.h | 3 +-- include/configs/ep7312.h | 1 - include/configs/ep8248.h | 3 +-- include/configs/ep8260.h | 3 +-- include/configs/ep82xxm.h | 3 +-- include/configs/espt.h | 1 - include/configs/evb4510.h | 1 - include/configs/galaxy5200.h | 3 +-- include/configs/gcplus.h | 1 - include/configs/gdppc440etx.h | 3 +-- include/configs/gr_cpci_ax2000.h | 5 ++--- include/configs/gr_ep2s60.h | 5 ++--- include/configs/gr_xc3s_1500.h | 5 ++--- include/configs/grsim.h | 5 ++--- include/configs/grsim_leon2.h | 5 ++--- include/configs/gw8260.h | 3 +-- include/configs/hcu4.h | 3 +-- include/configs/hcu5.h | 3 +-- include/configs/hermes.h | 3 +-- include/configs/hmi1001.h | 3 +-- include/configs/hymod.h | 3 +-- include/configs/icon.h | 3 +-- include/configs/idmr.h | 3 +-- include/configs/igep0020.h | 3 +-- include/configs/igep0030.h | 3 +-- include/configs/impa7.h | 1 - include/configs/imx27lite-common.h | 3 +-- include/configs/imx31_litekit.h | 3 +-- include/configs/imx31_phycore.h | 1 - include/configs/inka4x0.h | 3 +-- include/configs/innokom.h | 3 +-- include/configs/integratorap.h | 1 - include/configs/integratorcp.h | 1 - include/configs/intip.h | 3 +-- include/configs/ipek01.h | 3 +-- include/configs/ixdp425.h | 1 - include/configs/ixdpg425.h | 1 - include/configs/jadecpu.h | 1 - include/configs/jornada.h | 1 - include/configs/jupiter.h | 3 +-- include/configs/katmai.h | 3 +-- include/configs/kb9202.h | 1 - include/configs/kilauea.h | 3 +-- include/configs/km8xx.h | 3 +-- include/configs/km_arm.h | 3 +-- include/configs/kmeter1.h | 3 +-- include/configs/korat.h | 3 +-- include/configs/kvme080.h | 3 +-- include/configs/lart.h | 1 - include/configs/linkstation.h | 3 +-- include/configs/lpc2292sodimm.h | 1 - include/configs/lpd7a400.h | 1 - include/configs/lpd7a404.h | 1 - include/configs/luan.h | 3 +-- include/configs/lubbock.h | 3 +-- include/configs/lwmon.h | 3 +-- include/configs/lwmon5.h | 3 +-- include/configs/m501sk.h | 1 - include/configs/makalu.h | 3 +-- include/configs/manroland/mpc5200-common.h | 3 +-- include/configs/mcc200.h | 3 +-- include/configs/mcu25.h | 3 +-- include/configs/mecp5123.h | 3 +-- include/configs/mecp5200.h | 3 +-- include/configs/meesc.h | 1 - include/configs/mgcoge.h | 3 +-- include/configs/microblaze-generic.h | 5 ++--- include/configs/modnet50.h | 1 - include/configs/motionpro.h | 3 +-- include/configs/mp2usb.h | 1 - include/configs/mpc5121-common.h | 3 +-- include/configs/mpc5121ads.h | 3 +-- include/configs/mpc7448hpc2.h | 3 +-- include/configs/mpc8308_p1m.h | 3 +-- include/configs/mpr2.h | 1 - include/configs/ms7720se.h | 1 - include/configs/ms7722se.h | 1 - include/configs/ms7750se.h | 1 - include/configs/muas3001.h | 3 +-- include/configs/munices.h | 3 +-- include/configs/mv-common.h | 1 - include/configs/mx1ads.h | 1 - include/configs/mx1fs2.h | 1 - include/configs/mx31ads.h | 1 - include/configs/mx31pdk.h | 1 - include/configs/mx51evk.h | 1 - include/configs/neo.h | 3 +-- include/configs/netstar.h | 1 - include/configs/nhk8815.h | 1 - include/configs/nios2-generic.h | 3 +-- include/configs/ns9750dev.h | 1 - include/configs/o2dnt.h | 3 +-- include/configs/ocotea.h | 3 +-- include/configs/omap1510inn.h | 1 - include/configs/omap1610h2.h | 1 - include/configs/omap1610inn.h | 1 - include/configs/omap2420h4.h | 1 - include/configs/omap3_beagle.h | 3 +-- include/configs/omap3_evm.h | 1 - include/configs/omap3_overo.h | 3 +-- include/configs/omap3_pandora.h | 1 - include/configs/omap3_sdp3430.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omap3_zoom2.h | 1 - include/configs/omap4_panda.h | 3 +-- include/configs/omap4_sdp4430.h | 3 +-- include/configs/omap5912osk.h | 1 - include/configs/omap730p2.h | 1 - include/configs/otc570.h | 1 - include/configs/p3mx.h | 3 +-- include/configs/p3p440.h | 3 +-- include/configs/palmld.h | 3 +-- include/configs/palmtc.h | 3 +-- include/configs/pcm030.h | 3 +-- include/configs/pcs440ep.h | 3 +-- include/configs/pdnb3.h | 1 - include/configs/pf5200.h | 3 +-- include/configs/pleb2.h | 3 +-- include/configs/pm9261.h | 1 - include/configs/pm9263.h | 1 - include/configs/pm9g45.h | 1 - include/configs/ppmc7xx.h | 5 ++--- include/configs/ppmc8260.h | 3 +-- include/configs/pxa255_idp.h | 3 +-- include/configs/qong.h | 3 +-- include/configs/quad100hd.h | 3 +-- include/configs/quantum.h | 3 +-- include/configs/r2dplus.h | 1 - include/configs/r7780mp.h | 1 - include/configs/redwood.h | 3 +-- include/configs/rmu.h | 3 +-- include/configs/rsdproto.h | 3 +-- include/configs/rsk7203.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/sacsng.h | 3 +-- include/configs/sbc2410x.h | 1 - include/configs/sbc35_a9g20.h | 1 - include/configs/sbc405.h | 3 +-- include/configs/sbc8240.h | 3 +-- include/configs/sbc8260.h | 3 +-- include/configs/sbc8349.h | 3 +-- include/configs/sbc8548.h | 3 +-- include/configs/sbc8560.h | 3 +-- include/configs/sbc8641d.h | 3 +-- include/configs/sc3.h | 3 +-- include/configs/scb9328.h | 1 - include/configs/sequoia.h | 3 +-- include/configs/sh7763rdp.h | 1 - include/configs/sh7785lcr.h | 1 - include/configs/shannon.h | 1 - include/configs/smdk2400.h | 1 - include/configs/smdk2410.h | 1 - include/configs/smdk6400.h | 1 - include/configs/smdkc100.h | 1 - include/configs/socrates.h | 3 +-- include/configs/sorcery.h | 3 +-- include/configs/spc1920.h | 3 +-- include/configs/spear-common.h | 1 - include/configs/spieval.h | 3 +-- include/configs/stxgp3.h | 3 +-- include/configs/stxssa.h | 3 +-- include/configs/stxxtc.h | 3 +-- include/configs/svm_sc8xx.h | 3 +-- include/configs/t3corp.h | 3 +-- include/configs/taihu.h | 3 +-- include/configs/taishan.h | 3 +-- include/configs/tnetv107x_evm.h | 1 - include/configs/tny_a9260.h | 1 - include/configs/trab.h | 1 - include/configs/trizepsiv.h | 3 +-- include/configs/tx25.h | 3 +-- include/configs/uc100.h | 3 +-- include/configs/utx8245.h | 3 +-- include/configs/v37.h | 3 +-- include/configs/v38b.h | 3 +-- include/configs/ve8313.h | 3 +-- include/configs/versatile.h | 1 - include/configs/virtlab2.h | 3 +-- include/configs/vision2.h | 3 +-- include/configs/vme8349.h | 3 +-- include/configs/voiceblue.h | 1 - include/configs/vpac270.h | 3 +-- include/configs/walnut.h | 3 +-- include/configs/xaeniax.h | 3 +-- include/configs/xilinx-ppc.h | 3 +-- include/configs/xm250.h | 3 +-- include/configs/xpedite1000.h | 3 +-- include/configs/xpedite517x.h | 3 +-- include/configs/xpedite520x.h | 3 +-- include/configs/xpedite537x.h | 3 +-- include/configs/xpedite550x.h | 3 +-- include/configs/yosemite.h | 3 +-- include/configs/yucca.h | 3 +-- include/configs/zeus.h | 3 +-- include/configs/zipitz2.h | 3 +-- include/configs/zylonite.h | 3 +-- lib/asm-offsets.c | 2 ++ 560 files changed, 517 insertions(+), 955 deletions(-) Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de Real programmers can write assembly code in any language. :-) - Larry Wall in <8571(a)jpl-devvax.JPL.NASA.GOV>

6 25