October 2010 - U-Boot

[U-Boot] [PATCH] MPC832XEMDS: fix pci.c build warning
by Wolfgang Denk 18 Oct '10

18 Oct '10

Doubled use of DECLARE_GLOBAL_DATA_PTR caused compile warning: pci.c:71: warning: register used for two global register variables Signed-off-by: Wolfgang Denk <wd(a)denx.de> Cc: Kim Phillips <kim.phillips(a)freescale.com> --- board/freescale/mpc832xemds/pci.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c index a84b479..8cab771 100644 --- a/board/freescale/mpc832xemds/pci.c +++ b/board/freescale/mpc832xemds/pci.c @@ -68,9 +68,6 @@ static struct pci_region pci2_regions[] = { }; #endif -DECLARE_GLOBAL_DATA_PTR; - - void pci_init_board(void) #ifdef CONFIG_PCISLAVE { -- 1.7.2.3

1 1

[U-Boot] [PATCH] schmoogie: fix build error due to removal of forceenv()
by Wolfgang Denk 18 Oct '10

18 Oct '10

commit 6d014adf dropped support for the forceenv() function, but failed to remove references to it from board/davinci/schmoogie/schmoogie.c Replace forceenv() by setenv() and set CONFIG_ENV_OVERWRITE instead in the board config file to allow overwriting the serial number. Signed-off-by: Wolfgang Denk <wd(a)denx.de> Cc: Sergey Kubushyn <ksi(a)koi8.net> --- board/davinci/schmoogie/schmoogie.c | 8 ++++---- include/configs/davinci-schmoogie.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/board/davinci/schmoogie/schmoogie.c b/board/davinci/schmoogie/schmoogie.c index 19c9580..80a0f9f 100644 --- a/board/davinci/schmoogie/schmoogie.c +++ b/board/davinci/schmoogie/schmoogie.c @@ -107,12 +107,12 @@ int misc_init_r(void) /* Set serial number from UID chip */ if (i2c_read(CONFIG_SYS_UID_ADDR, 0, 1, buf, 8)) { printf("\nUID @ 0x%02x read FAILED!!!\n", CONFIG_SYS_UID_ADDR); - forceenv("serial#", "FAILED"); + setenv("serial#", "FAILED"); } else { if (buf[0] != 0x70) { /* Device Family Code */ printf("\nUID @ 0x%02x read FAILED!!!\n", CONFIG_SYS_UID_ADDR); - forceenv("serial#", "FAILED"); + setenv("serial#", "FAILED"); } } /* Now check CRC */ @@ -122,12 +122,12 @@ int misc_init_r(void) if (tmp[0] != 0) { printf("\nUID @ 0x%02x - BAD CRC!!!\n", CONFIG_SYS_UID_ADDR); - forceenv("serial#", "FAILED"); + setenv("serial#", "FAILED"); } else { /* CRC OK, set "serial" env variable */ sprintf((char *)&tmp[0], "%02x%02x%02x%02x%02x%02x", buf[6], buf[5], buf[4], buf[3], buf[2], buf[1]); - forceenv("serial#", (char *)&tmp[0]); + setenv("serial#", (char *)&tmp[0]); } return(0); diff --git a/include/configs/davinci-schmoogie.h b/include/configs/davinci-schmoogie.h index 04cdc21..5b140fc 100644 --- a/include/configs/davinci-schmoogie.h +++ b/include/configs/davinci-schmoogie.h @@ -83,6 +83,7 @@ /*=====================*/ #undef CONFIG_ENV_IS_IN_FLASH #define CONFIG_SYS_NO_FLASH +#define CONFIG_ENV_OVERWRITE /* instead if obsoleted forceenv() */ #define CONFIG_NAND_DAVINCI #define CONFIG_SYS_NAND_CS 2 #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ -- 1.7.2.3

3 3

[U-Boot] PXA patches
by Marek Vasut 18 Oct '10

18 Oct '10

Hi, these are the patches I have prepared for u-boot-testing.git/Makefile-cleanup.

2 25

[U-Boot] [PATCH 0/2] Use generic mmc driver on IGEP boards.
by Enric Balletbo i Serra 18 Oct '10

18 Oct '10

Hello, This patch series switches from the legacy mmc driver to the new generic mmc driver on IGEP boards. board/isee/igep0020/igep0020.c | 9 +++++++++ board/isee/igep0030/igep0030.c | 9 +++++++++ include/configs/igep0020.h | 3 ++- include/configs/igep0030.h | 3 ++- 4 files changed, 22 insertions(+), 2 deletions(-) Cheers, Enric

1 2

[U-Boot] MPC8377: SVR wrong ?
by André Schwarz 18 Oct '10

18 Oct '10

Kim, Timur, after spending some more hours there's some success in MPC8377 based board bring up. After using I2C for HRCW boot sequencing it is working fine now. BDI setup is also up and running, i.e. DDR and Flash are working fine. U-Boot is starting properly and hangs after relocation, but having a look at the relocated address in RAM everything looks fine. Having a look at the DDR-Bus it is working fine and signal integrity is quite good. What worries me is that the CPU doesn't get recognized properly : The BGA package shows "MPC8377CVRALG" ... which is what we've ordered. After looking at the Manual I'd expect SVR = 80C7_0021 Unfortunately BDI tells "SVR is 0x80C30021" indicating a MPC8379 :-( U-Boot comes up with : CPU: e300c4, MPC8379, Rev: 2.1 at ... Of course this would lead to disaster regarding PCIe/SATA port config since they're different. I have configured my board with 2x PCIe + 2x SATA .... Any ideas ? Regards, André MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler Registergericht: Amtsgericht Stuttgart, HRB 271090 Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner

2 2

[U-Boot] HelpDesk
by Porter, Wayne 18 Oct '10

18 Oct '10

Your mailbox has exceeded the storage limit which is 20GB as set by your administrator. You are currently running on the 20.9GB,you may not be able to send or receive mail until you re-validate your mailbox. To re-validate your mail box you are to please click the link as below, Click Here <http://actquss.tk/> Thanks HelpDesk

1 0

Re: [U-Boot] Fwd: Help with replacing u-boot and kernel on a released HW...
by Naresh Mehta 18 Oct '10

18 Oct '10

Hi Detlev/All, I am not able to attach the u-boot source because of the size limit. I though have the URL in the email below. It would be very helpful if you can get the code directly from the URL and help me with the questions. BR; Naresh On Mon, Oct 18, 2010 at 11:49 AM, Naresh Mehta <nareshtechs(a)gmail.com> wrote: > Hi Detlev, > > Thanks for the reply. Garmin-Asus had released a LBS phone known as > G60 back in 2009. It runs MontaVista flavor of Linux with kenel 2.6.21 > and a proprietary/closed UI. The device is based on OMAP 2430 and most > of the components are not changed from the 2430 SDP (at least thats > what I get skimming through the sources). > > The source is available at [1] > > Source folder structure is a bit complex since the source is divided > into top level license folders and then a tar.bz2 of the open source > SW used. For example: U-boot source is located at /GPL/u-boot-1.1.4/. > There are 2 files in the folder u-boot-1.1.4.diff.tar.bz2 and > u-boot-1.1.4.orig.tar.bz2. The logic is to have the unmodified > original source in the orig tarball and the diffs in the diff tarball. > The diff in this particular case is only a PGP key patch. > > I was a bit surprised but took the info at face value. After your > email, I downloaded 1.1.4 and did a diff with the .orig.bz2 and did in > fact find a lot of differences. Ideally they should have been provided > as patches in the .diff.bz2 tarball. So the montana config and > associated changes are not in the 1.1.4 master. I am pretty sure that > the montana_config has been used since a FLASHTOOL_KERNEL_CMD_LINE has > been used in the main.c which is unique to montana board. The main has > been modified to look for key events. All other options are disabled > in the release build except for the region update. And the region > update uses tffs to load tffs_load 3 0x80007FC0;bootm 0x80007FC0 > something at 0x80007FC0 and probably start bootm from there. > > It would be great if someone can help me and look into tffs_load call > and tell me how I should deceive the device to update the included > u-boot and kernel with a modified one. My client is gmail and that > sends attachments in base64 encoding. I am attaching the source code > for u-boot as distributed by Garmin for G60 APAC v2.43. It is also > available at the source at [1]. > > Thanks for your time and efforts. > > [1] http://developer.garmin.com/linux-software/nuvifoneg60apac/nuvifone-g60-apa… > -- > > BR; Naresh > > visit me at: > http://www.naresh.se/ >

1 0

[U-Boot] attn
by john galvan 18 Oct '10

18 Oct '10

Hello I am Mr. John Galvan, I have a very urgent business proposal worth (£15,500,000.00 Pounds Sterlings) from private offshore bank (AIG Private Bank). Please email me at(johngalvan72(a)yahoo.com.hk)for details Best Regards, Mr. John Galvan

1 0

[U-Boot] [PATCH V3 1/1] MX5: rename mx51 to mx5
by Jason Liu 18 Oct '10

18 Oct '10

Rename mx51 to mx5 in order to support more mx51 like-style SOCs such as MX53 and the followings. Signed-off-by: Jason Liu <r64343(a)freescale.com> --- Changes for v2: Address the comments from Stefano Babic: - rebase - remove CONFIG_CPU_TYPE - remove copyright change - change vision2 board config Changes for v3: Address the comments from Wolfgang Denk: - Change CONFIG_HCLK_FREQ to CONFIG_SYS_MX5_HCLK - Change CONFIG_CLK32 to CONFIG_SYS_MX5_CLK32 - Add "mx5" resp. "MX5" to the new identifier names. --- Signed-off-by: Jason Liu <r64343(a)freescale.com> --- arch/arm/cpu/armv7/{mx51 => mx5}/Makefile | 0 arch/arm/cpu/armv7/{mx51 => mx5}/clock.c | 42 ++++++++++---------- arch/arm/cpu/armv7/{mx51 => mx5}/iomux.c | 2 +- arch/arm/cpu/armv7/{mx51 => mx5}/lowlevel_init.S | 0 arch/arm/cpu/armv7/{mx51 => mx5}/soc.c | 28 ++++++++----- arch/arm/cpu/armv7/{mx51 => mx5}/speed.c | 0 arch/arm/cpu/armv7/{mx51 => mx5}/timer.c | 8 ++-- arch/arm/cpu/armv7/{mx51 => mx5}/u-boot.lds | 0 .../asm/{arch-mx51 => arch-mx5}/asm-offsets.h | 0 .../include/asm/{arch-mx51 => arch-mx5}/clock.h | 0 .../include/asm/{arch-mx51 => arch-mx5}/crm_regs.h | 0 .../include/asm/{arch-mx51 => arch-mx5}/imx-regs.h | 0 .../include/asm/{arch-mx51 => arch-mx5}/iomux.h | 8 ++-- .../mx51_pins.h => arch-mx5/mx5x_pins.h} | 6 +- .../asm/{arch-mx51 => arch-mx5}/sys_proto.h | 4 +- board/freescale/mx51evk/mx51evk.c | 2 +- board/ttcontrol/vision2/vision2.c | 2 +- boards.cfg | 4 +- include/configs/mx51evk.h | 4 +- include/configs/vision2.h | 4 +- 20 files changed, 61 insertions(+), 53 deletions(-) diff --git a/arch/arm/cpu/armv7/mx51/Makefile b/arch/arm/cpu/armv7/mx5/Makefile similarity index 100% rename from arch/arm/cpu/armv7/mx51/Makefile rename to arch/arm/cpu/armv7/mx5/Makefile diff --git a/arch/arm/cpu/armv7/mx51/clock.c b/arch/arm/cpu/armv7/mx5/clock.c similarity index 85% rename from arch/arm/cpu/armv7/mx51/clock.c rename to arch/arm/cpu/armv7/mx5/clock.c index a27227d..00f649c 100644 --- a/arch/arm/cpu/armv7/mx51/clock.c +++ b/arch/arm/cpu/armv7/mx5/clock.c @@ -71,7 +71,7 @@ u32 get_mcu_main_clk(void) reg = (__raw_readl(&mxc_ccm->cacrr) & MXC_CCM_CACRR_ARM_PODF_MASK) >> MXC_CCM_CACRR_ARM_PODF_OFFSET; - freq = decode_pll(mxc_plls[PLL1_CLOCK], CONFIG_MX51_HCLK_FREQ); + freq = decode_pll(mxc_plls[PLL1_CLOCK], CONFIG_SYS_MX5_HCLK); return freq / (reg + 1); } @@ -84,14 +84,14 @@ static u32 get_periph_clk(void) reg = __raw_readl(&mxc_ccm->cbcdr); if (!(reg & MXC_CCM_CBCDR_PERIPH_CLK_SEL)) - return decode_pll(mxc_plls[PLL2_CLOCK], CONFIG_MX51_HCLK_FREQ); + return decode_pll(mxc_plls[PLL2_CLOCK], CONFIG_SYS_MX5_HCLK); reg = __raw_readl(&mxc_ccm->cbcmr); switch ((reg & MXC_CCM_CBCMR_PERIPH_CLK_SEL_MASK) >> MXC_CCM_CBCMR_PERIPH_CLK_SEL_OFFSET) { case 0: - return decode_pll(mxc_plls[PLL1_CLOCK], CONFIG_MX51_HCLK_FREQ); + return decode_pll(mxc_plls[PLL1_CLOCK], CONFIG_SYS_MX5_HCLK); case 1: - return decode_pll(mxc_plls[PLL3_CLOCK], CONFIG_MX51_HCLK_FREQ); + return decode_pll(mxc_plls[PLL3_CLOCK], CONFIG_SYS_MX5_HCLK); default: return 0; } @@ -146,15 +146,15 @@ static u32 get_uart_clk(void) MXC_CCM_CSCMR1_UART_CLK_SEL_OFFSET) { case 0x0: freq = decode_pll(mxc_plls[PLL1_CLOCK], - CONFIG_MX51_HCLK_FREQ); + CONFIG_SYS_MX5_HCLK); break; case 0x1: freq = decode_pll(mxc_plls[PLL2_CLOCK], - CONFIG_MX51_HCLK_FREQ); + CONFIG_SYS_MX5_HCLK); break; case 0x2: freq = decode_pll(mxc_plls[PLL3_CLOCK], - CONFIG_MX51_HCLK_FREQ); + CONFIG_SYS_MX5_HCLK); break; default: return 66500000; @@ -181,7 +181,7 @@ u32 get_lp_apm(void) u32 ccsr = __raw_readl(&mxc_ccm->ccsr); if (((ccsr >> 9) & 1) == 0) - ret_val = CONFIG_MX51_HCLK_FREQ; + ret_val = CONFIG_SYS_MX5_HCLK; else ret_val = ((32768 * 1024)); @@ -207,17 +207,17 @@ u32 imx_get_cspiclk(void) switch (clk_sel) { case 0: ret_val = decode_pll(mxc_plls[PLL1_CLOCK], - CONFIG_MX51_HCLK_FREQ) / + CONFIG_SYS_MX5_HCLK) / ((pre_pdf + 1) * (pdf + 1)); break; case 1: ret_val = decode_pll(mxc_plls[PLL2_CLOCK], - CONFIG_MX51_HCLK_FREQ) / + CONFIG_SYS_MX5_HCLK) / ((pre_pdf + 1) * (pdf + 1)); break; case 2: ret_val = decode_pll(mxc_plls[PLL3_CLOCK], - CONFIG_MX51_HCLK_FREQ) / + CONFIG_SYS_MX5_HCLK) / ((pre_pdf + 1) * (pdf + 1)); break; default: @@ -248,7 +248,7 @@ unsigned int mxc_get_clock(enum mxc_clock clk) return imx_get_cspiclk(); case MXC_FEC_CLK: return decode_pll(mxc_plls[PLL1_CLOCK], - CONFIG_MX51_HCLK_FREQ); + CONFIG_SYS_MX5_HCLK); default: break; } @@ -269,16 +269,16 @@ u32 imx_get_fecclk(void) /* * Dump some core clockes. */ -int do_mx51_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_mx5_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { u32 freq; - freq = decode_pll(mxc_plls[PLL1_CLOCK], CONFIG_MX51_HCLK_FREQ); - printf("mx51 pll1: %dMHz\n", freq / 1000000); - freq = decode_pll(mxc_plls[PLL2_CLOCK], CONFIG_MX51_HCLK_FREQ); - printf("mx51 pll2: %dMHz\n", freq / 1000000); - freq = decode_pll(mxc_plls[PLL3_CLOCK], CONFIG_MX51_HCLK_FREQ); - printf("mx51 pll3: %dMHz\n", freq / 1000000); + freq = decode_pll(mxc_plls[PLL1_CLOCK], CONFIG_SYS_MX5_HCLK); + printf("pll1: %dMHz\n", freq / 1000000); + freq = decode_pll(mxc_plls[PLL2_CLOCK], CONFIG_SYS_MX5_HCLK); + printf("pll2: %dMHz\n", freq / 1000000); + freq = decode_pll(mxc_plls[PLL3_CLOCK], CONFIG_SYS_MX5_HCLK); + printf("pll3: %dMHz\n", freq / 1000000); printf("ipg clock : %dHz\n", mxc_get_clock(MXC_IPG_CLK)); printf("ipg per clock : %dHz\n", mxc_get_clock(MXC_IPG_PERCLK)); @@ -288,7 +288,7 @@ int do_mx51_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] /***************************************************/ U_BOOT_CMD( - clockinfo, CONFIG_SYS_MAXARGS, 1, do_mx51_showclocks, - "display mx51 clocks\n", + clockinfo, CONFIG_SYS_MAXARGS, 1, do_mx5_showclocks, + "display clocks\n", "" ); diff --git a/arch/arm/cpu/armv7/mx51/iomux.c b/arch/arm/cpu/armv7/mx5/iomux.c similarity index 99% rename from arch/arm/cpu/armv7/mx51/iomux.c rename to arch/arm/cpu/armv7/mx5/iomux.c index 62b2954..e8928d5 100644 --- a/arch/arm/cpu/armv7/mx51/iomux.c +++ b/arch/arm/cpu/armv7/mx5/iomux.c @@ -23,7 +23,7 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/mx51_pins.h> +#include <asm/arch/mx5x_pins.h> #include <asm/arch/iomux.h> #include <asm/arch/sys_proto.h> diff --git a/arch/arm/cpu/armv7/mx51/lowlevel_init.S b/arch/arm/cpu/armv7/mx5/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/armv7/mx51/lowlevel_init.S rename to arch/arm/cpu/armv7/mx5/lowlevel_init.S diff --git a/arch/arm/cpu/armv7/mx51/soc.c b/arch/arm/cpu/armv7/mx5/soc.c similarity index 82% rename from arch/arm/cpu/armv7/mx51/soc.c rename to arch/arm/cpu/armv7/mx5/soc.c index f22ebe9..ad14001 100644 --- a/arch/arm/cpu/armv7/mx51/soc.c +++ b/arch/arm/cpu/armv7/mx5/soc.c @@ -33,28 +33,33 @@ #include <fsl_esdhc.h> #endif +#if defined(CONFIG_MX51) +#define CPU_TYPE 0x51000 +#else +#error "CPU_TYPE not defined" +#endif + u32 get_cpu_rev(void) { - int reg; - int system_rev; + int system_rev = CPU_TYPE; + int reg = __raw_readl(ROM_SI_REV); - reg = __raw_readl(ROM_SI_REV); switch (reg) { case 0x02: - system_rev = 0x51000 | CHIP_REV_1_1; + system_rev |= CHIP_REV_1_1; break; case 0x10: if ((__raw_readl(GPIO1_BASE_ADDR + 0x0) & (0x1 << 22)) == 0) - system_rev = 0x51000 | CHIP_REV_2_5; + system_rev |= CHIP_REV_2_5; else - system_rev = 0x51000 | CHIP_REV_2_0; + system_rev |= CHIP_REV_2_0; break; case 0x20: - system_rev = 0x51000 | CHIP_REV_3_0; + system_rev |= CHIP_REV_3_0; break; return system_rev; default: - system_rev = 0x51000 | CHIP_REV_1_0; + system_rev |= CHIP_REV_1_0; break; } return system_rev; @@ -67,9 +72,10 @@ int print_cpuinfo(void) u32 cpurev; cpurev = get_cpu_rev(); - printf("CPU: Freescale i.MX51 family rev%d.%d at %d MHz\n", - (cpurev & 0xF0) >> 4, - (cpurev & 0x0F) >> 4, + printf("CPU: Freescale i.MX%x family rev%d.%d at %d MHz\n", + (cpurev & 0xFF00) >> 12, + (cpurev & 0x00F0) >> 4, + (cpurev & 0x000F) >> 4, mxc_get_clock(MXC_ARM_CLK) / 1000000); return 0; } diff --git a/arch/arm/cpu/armv7/mx51/speed.c b/arch/arm/cpu/armv7/mx5/speed.c similarity index 100% rename from arch/arm/cpu/armv7/mx51/speed.c rename to arch/arm/cpu/armv7/mx5/speed.c diff --git a/arch/arm/cpu/armv7/mx51/timer.c b/arch/arm/cpu/armv7/mx5/timer.c similarity index 92% rename from arch/arm/cpu/armv7/mx51/timer.c rename to arch/arm/cpu/armv7/mx5/timer.c index 110edbf..3044fcf 100644 --- a/arch/arm/cpu/armv7/mx51/timer.c +++ b/arch/arm/cpu/armv7/mx5/timer.c @@ -75,18 +75,18 @@ void reset_timer(void) void reset_timer_masked(void) { ulong val = __raw_readl(&cur_gpt->counter); - lastinc = val / (CONFIG_MX51_CLK32 / CONFIG_SYS_HZ); + lastinc = val / (CONFIG_SYS_MX5_CLK32 / CONFIG_SYS_HZ); timestamp = 0; } ulong get_timer_masked(void) { ulong val = __raw_readl(&cur_gpt->counter); - val /= (CONFIG_MX51_CLK32 / CONFIG_SYS_HZ); + val /= (CONFIG_SYS_MX5_CLK32 / CONFIG_SYS_HZ); if (val >= lastinc) timestamp += (val - lastinc); else - timestamp += ((0xFFFFFFFF / (CONFIG_MX51_CLK32 / CONFIG_SYS_HZ)) + timestamp += ((0xFFFFFFFF / (CONFIG_SYS_MX5_CLK32 / CONFIG_SYS_HZ)) - lastinc) + val; lastinc = val; return timestamp; @@ -106,7 +106,7 @@ void set_timer(ulong t) void __udelay(unsigned long usec) { unsigned long now, start, tmo; - tmo = usec * (CONFIG_MX51_CLK32 / 1000) / 1000; + tmo = usec * (CONFIG_SYS_MX5_CLK32 / 1000) / 1000; if (!tmo) tmo = 1; diff --git a/arch/arm/cpu/armv7/mx51/u-boot.lds b/arch/arm/cpu/armv7/mx5/u-boot.lds similarity index 100% rename from arch/arm/cpu/armv7/mx51/u-boot.lds rename to arch/arm/cpu/armv7/mx5/u-boot.lds diff --git a/arch/arm/include/asm/arch-mx51/asm-offsets.h b/arch/arm/include/asm/arch-mx5/asm-offsets.h similarity index 100% rename from arch/arm/include/asm/arch-mx51/asm-offsets.h rename to arch/arm/include/asm/arch-mx5/asm-offsets.h diff --git a/arch/arm/include/asm/arch-mx51/clock.h b/arch/arm/include/asm/arch-mx5/clock.h similarity index 100% rename from arch/arm/include/asm/arch-mx51/clock.h rename to arch/arm/include/asm/arch-mx5/clock.h diff --git a/arch/arm/include/asm/arch-mx51/crm_regs.h b/arch/arm/include/asm/arch-mx5/crm_regs.h similarity index 100% rename from arch/arm/include/asm/arch-mx51/crm_regs.h rename to arch/arm/include/asm/arch-mx5/crm_regs.h diff --git a/arch/arm/include/asm/arch-mx51/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h similarity index 100% rename from arch/arm/include/asm/arch-mx51/imx-regs.h rename to arch/arm/include/asm/arch-mx5/imx-regs.h diff --git a/arch/arm/include/asm/arch-mx51/iomux.h b/arch/arm/include/asm/arch-mx5/iomux.h similarity index 98% rename from arch/arm/include/asm/arch-mx51/iomux.h rename to arch/arm/include/asm/arch-mx5/iomux.h index a41c387..0d91a24 100644 --- a/arch/arm/include/asm/arch-mx51/iomux.h +++ b/arch/arm/include/asm/arch-mx5/iomux.h @@ -20,13 +20,13 @@ * MA 02111-1307 USA */ -#ifndef __MACH_MX51_IOMUX_H__ -#define __MACH_MX51_IOMUX_H__ +#ifndef __MACH_MX5_IOMUX_H__ +#define __MACH_MX5_IOMUX_H__ #include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/mx51_pins.h> +#include <asm/arch/mx5x_pins.h> typedef unsigned int iomux_pin_name_t; @@ -190,4 +190,4 @@ void mxc_iomux_set_pad(iomux_pin_name_t pin, u32 config); unsigned int mxc_iomux_get_pad(iomux_pin_name_t pin); void mxc_iomux_set_input(iomux_input_select_t input, u32 config); -#endif /* __MACH_MX51_IOMUX_H__ */ +#endif /* __MACH_MX5_IOMUX_H__ */ diff --git a/arch/arm/include/asm/arch-mx51/mx51_pins.h b/arch/arm/include/asm/arch-mx5/mx5x_pins.h similarity index 99% rename from arch/arm/include/asm/arch-mx51/mx51_pins.h rename to arch/arm/include/asm/arch-mx5/mx5x_pins.h index b44ff25..a564fce 100644 --- a/arch/arm/include/asm/arch-mx51/mx51_pins.h +++ b/arch/arm/include/asm/arch-mx5/mx5x_pins.h @@ -20,8 +20,8 @@ * MA 02111-1307 USA */ -#ifndef __ASM_ARCH_MXC_MX51_PINS_H__ -#define __ASM_ARCH_MXC_MX51_PINS_H__ +#ifndef __ASM_ARCH_MX5_MX5X_PINS_H__ +#define __ASM_ARCH_MX5_MX5X_PINS_H__ #ifndef __ASSEMBLY__ @@ -415,4 +415,4 @@ enum iomux_pins { }; #endif /* __ASSEMBLY__ */ -#endif /* __ASM_ARCH_MXC_MX51_PINS_H__ */ +#endif /* __ASM_ARCH_MX5_MX5X_PINS_H__ */ diff --git a/arch/arm/include/asm/arch-mx51/sys_proto.h b/arch/arm/include/asm/arch-mx5/sys_proto.h similarity index 93% rename from arch/arm/include/asm/arch-mx51/sys_proto.h rename to arch/arm/include/asm/arch-mx5/sys_proto.h index f687503..83613ab 100644 --- a/arch/arm/include/asm/arch-mx51/sys_proto.h +++ b/arch/arm/include/asm/arch-mx5/sys_proto.h @@ -24,8 +24,10 @@ #ifndef _SYS_PROTO_H_ #define _SYS_PROTO_H_ -u32 get_cpu_rev(void); #define is_soc_rev(rev) ((get_cpu_rev() & 0xFF) - rev) +#define is_soc_type(rev)((((get_cpu_rev() & 0xFF00)) >> 8) - rev) + void sdelay(unsigned long); +u32 get_cpu_rev(void); #endif diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index 84386e6..c8d7d39 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -23,7 +23,7 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/mx51_pins.h> +#include <asm/arch/mx5x_pins.h> #include <asm/arch/iomux.h> #include <asm/errno.h> #include <asm/arch/sys_proto.h> diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c index c991ee2..ce4cb78 100644 --- a/board/ttcontrol/vision2/vision2.c +++ b/board/ttcontrol/vision2/vision2.c @@ -26,7 +26,7 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/mx51_pins.h> +#include <asm/arch/mx5x_pins.h> #include <asm/arch/crm_regs.h> #include <asm/arch/iomux.h> #include <mxc_gpio.h> diff --git a/boards.cfg b/boards.cfg index 132d178..9afba88 100644 --- a/boards.cfg +++ b/boards.cfg @@ -46,8 +46,8 @@ pm9263 arm arm926ejs - ronetix at91 jadecpu arm arm926ejs jadecpu syteco mb86r0x suen3 arm arm926ejs km_arm keymile kirkwood rd6281a arm arm926ejs - Marvell kirkwood -mx51evk arm armv7 mx51evk freescale mx51 -vision2 arm armv7 vision2 ttcontrol mx51 +mx51evk arm armv7 mx51evk freescale mx5 +vision2 arm armv7 vision2 ttcontrol mx5 actux1 arm ixp actux2 arm ixp actux3 arm ixp diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 8864f3a..6165473 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -30,8 +30,8 @@ #define CONFIG_MX51 /* in a mx51 */ #define CONFIG_SKIP_RELOCATE_UBOOT -#define CONFIG_MX51_HCLK_FREQ 24000000 /* RedBoot says 26MHz */ -#define CONFIG_MX51_CLK32 32768 +#define CONFIG_SYS_MX5_HCLK 24000000 +#define CONFIG_SYS_MX5_CLK32 32768 #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/vision2.h b/include/configs/vision2.h index 44a6f8b..a2ecbe5 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -29,8 +29,8 @@ #define CONFIG_MX51 /* in a mx51 */ #define CONFIG_L2_OFF -#define CONFIG_MX51_HCLK_FREQ 24000000 -#define CONFIG_MX51_CLK32 32768 +#define CONFIG_SYS_MX5_HCLK 24000000 +#define CONFIG_SYS_MX5_CLK32 32768 #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -- 1.7.0.4

3 2

[U-Boot] Congatulations! Contact Rev. Dr.Alvan Kurtis
by Joan B. Kroc Foundation 18 Oct '10

18 Oct '10

Dear Beneficiary, The Joan B. Kroc Foundation would like to notify you that you have been chosen by the board of trustees as one of the final recipients of a cash Grant/Donation for your own personal, educational, and business development. The Joan B. Kroc Foundation, established 1963 by the Multi-Million group and now supported by the Economic Community for West African States (ECOWAS), United Nations Organization (UNO) and the European Union (EU) Untied States Government USA was conceived with the objective of human growth, educational, and community development. In conjunction with the ECOWAS, UNO and the EU,US, We are giving out a yearly donation of £600,000.00 (Six hundred thousand great British pounds sterling only) each to 5 lucky recipients selected globally. THE MISSION:Granting Fund and Donation fostering peace, cultivating justice, and creating a safer world.Through education, research, and peacemaking activities, the Joan B. Kroc Institute for Peace & Justice offers programs that advance scholarship and practice in conflict resolution and human rights. The Institute for Peace & Justice at the University of San Diego draws upon Catholic social teaching that sees peace as inseparable from justice and acts to prevent and resolve conflicts that threaten local, national and international peace. “We must not only teach peace, but make peace.”Joan B. Kroc 1st. 2 £600,000.00 pounds each 2nd. 8 £570,000.00 pounds each 3rd. 55 £400,000.00 pounds each 4th. 34 £350,000.00 pounds each 5th. 11 £200,000.00 pounds each These specific Donations/Grants is awarded to only five(5) lucky international recipients worldwide in different categories. Based on the random selection exercise of internet websites and millions of supermarket cash invoices worldwide, you were selected at the second round, the lucky recipients to receive the award sum of £570,000.00 as Grant/Donation. HOW TO CLAIM GRANT: ======================= You are required to email or fax your full Names, and contact information directly to the regional secretary, Joan B. Kroc Foundation Host Headquarters in Abuja, Nigeria. Request your grant application claims form. F5.CONTACT THE SECRETARY FOR MORE INFORMATION ON YOUR CLAIMS AT sec2-joanb(a)w.cn or call Tel: (+234)-703 7556 956, Please endeavor to send a copy of this notification to the regional secretary and also quote your qualification number (JBF-3132-6633-93323) in all discussions. 1. FULL NAMES :..................................... 2. RESIDENTIAL ADDRESS:..................... 3. DATE AND PLACE OF BIRTH:............... 4. PHONE/FAX NUMBERS:....................... 5. SEX:................................................... 6. OCCUPATION:.................................... 7. MARITAL STATUS:............................... 8. WINNING EMAIL:................................ 9. AMOUNT WON:................................... 10. NATIONALITY:................................... 11. NEXT OF KIN..................................... 12. MONTHLY INCOME ........................... CONTACT INFORMATION: ================= Rev. Dr.Alvan Kurtis (Regional Secretary) 12 Foundation road, Garik Abuja,FCT Abuja, Nigeria Email: legalclaims(a)rocketmail.com E-mail: sec-joanb(a)blumail.org Tel: (+234)-812-463-1565 Office Hours Monday~Friday (7.30am~6.30pm) Saturday (9.00am~2.00pm) JOAN B KROC PROFILE http://en.wikipedia.org/wiki/Joan_Kroc http://www.nndb.com/people/894/000112558/ http://www.netglimse.com/celebs/pages/joan_b._kroc/index.shtml http://www.city-data.com/businesses/252391131-joan-b-kroc-theatre-san-diego… Please note that these donations/grants are strictly administered by the EU, ECOWAS, UNO US. You are by all means hereby advised to keep this qualification information confidential until you been able to collect your donation. Note: Anybody under the age of 18 is automatically disqualified. Please note in order to avoid unnecessary delays and complications please remember to quote your reference number and batch numbers in all correspondence. Furthermore, should there be any change of address do inform our agent as soon as possible. Congratulations once more from our members of staff and thank you for being part of our promotional program.On behalf of the board kindly accept our warmest congratulations. Regards, Mrs.Rita Igweh Joan B. Kroc Foundation (Grant/Donation Co-ordinator) Joan B. Kroc Foundation ======================= UNITED KINGDOM OFFICE JOAN B. KROC FOUNDATION REGISTERED IN ENGLAND & WALES (NO. 2826074) 15 HIGH STREET, LONDON, NW8 7NG (UK) UNITED KINGDOM TEL/FAX: +44 (0)704-572-6516 ======================== UNITED STATES OFFICE JOAN B. KROC FOUNDATION USA OFFICE (HEAD OFFICE):- 2435 CALIFORNIA AVE. SEATTLE WASHINGTON 98116 USA. PHONE: +1-206-337-4781 ======================== Copyright © 2008 Joan B. Kroc Foundation All rights reserved

1 0