August 2011 - U-Boot

[U-Boot] [PATCH V2] mx5: Remove CONFIG_L2_OFF and CONFIG_SYS_L2CACHE_OFF
by Jason Liu 05 Aug '11

05 Aug '11

CONFIG_L2_OFF is obsolete after the following commit: e47f2db5371047eb9bcd115fee084e6a8a92a239 armv7: rename cache related CONFIG flags Replace the cache related CONFIG flags with more meaningful names. Following are the changes: CONFIG_L2_OFF -> CONFIG_SYS_L2CACHE_OFF Since imx5 does not provide L2 cache operations(Enable/Disable) Simply remove CONFIG_L2_OFF and CONFIG_SYS_L2CACHE_OFF Signed-off-by: Jason Liu <jason.hui(a)linaro.org> Cc:Stefano Babic <sbabic(a)denx.de> --- V2: remove config L2_OFF and CONFIG_SYS_L2CACHE_OFF stefano:not include the d-cache due to the recent d-cache fix by Aneesh --- include/configs/efikamx.h | 2 -- include/configs/mx51evk.h | 2 -- include/configs/mx53ard.h | 2 -- include/configs/mx53evk.h | 2 -- include/configs/mx53loco.h | 2 -- include/configs/mx53smd.h | 2 -- include/configs/vision2.h | 1 - 7 files changed, 0 insertions(+), 13 deletions(-) diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h index 7d3363a..b90e342 100644 --- a/include/configs/efikamx.h +++ b/include/configs/efikamx.h @@ -40,8 +40,6 @@ #define CONFIG_SYS_TEXT_BASE 0x97800000 -#define CONFIG_SYS_L2CACHE_OFF - /* * Bootloader Components Configuration */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index fd42afc..3f2aca1 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -35,8 +35,6 @@ #define CONFIG_SYS_TEXT_BASE 0x97800000 -#define CONFIG_SYS_L2CACHE_OFF - #include <asm/arch/imx-regs.h> /* * Disabled for now due to build problems under Debian and a significant diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index c872510..c0b8d6a 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -29,8 +29,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_L2_OFF - #include <asm/arch/imx-regs.h> #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 5f54035..7fb1d9a 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -29,8 +29,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_SYS_L2CACHE_OFF - #include <asm/arch/imx-regs.h> #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 544e3fb..cfb38a5 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -30,8 +30,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_L2_OFF - #include <asm/arch/imx-regs.h> #define CONFIG_CMDLINE_TAG diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 65d5e05..49f8c6e 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -29,8 +29,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_L2_OFF - #include <asm/arch/imx-regs.h> #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ diff --git a/include/configs/vision2.h b/include/configs/vision2.h index 50c920d..b5c7357 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -26,7 +26,6 @@ #define CONFIG_MX51 /* in a mx51 */ -#define CONFIG_SYS_L2CACHE_OFF #define CONFIG_SYS_TEXT_BASE 0x97800000 #include <asm/arch/imx-regs.h> -- 1.7.4.1

2 2

[U-Boot] [PULL REQUEST] u-boot-atmel/master
by Reinhard Meyer 05 Aug '11

05 Aug '11

Dear Albert, more boards are fixed. I doubt I will get fixes for at91cap9adk. MAKEALL at91: --------------------- SUMMARY ---------------------------- Boards compiled: 55 Boards with warnings or errors: 1 ( at91cap9adk ) ---------------------------------------------------------- Best Regards, Reinhard --- The following changes since commit 7a619ab30a0db64c22fb053702c41a94f05cf648: arm: auto gen asm-offsets.h for mb86r0x (2011-08-04 13:56:55 +0200) are available in the git repository at: git://git.denx.de/u-boot-atmel.git master Asen Dimov (3): pm9261: compiles with the AT91 reworked scheme make pm9263 buildable for v2011.06 release make pm9g45 buildable for v2011.06 release Matthias Fuchs (1): at91: reworked support for meesc board Reinhard Meyer (1): AT91: fix at91sam9g45.h to include USB Host defines Thomas Petazzoni (4): sbc35_a9g20: update board to the new AT91 organization tny_a9260/tny_a9g20: update board to the new AT91 organization atmel: update at91sam9m10g45 SoC support to new style atmel: Update support of board AT91SAM9M10G45-EK to new style MAKEALL | 8 +- Makefile | 46 ----- .../cpu/arm926ejs/at91/at91sam9m10g45_devices.c | 114 ++++++------ arch/arm/include/asm/arch-at91/at91sam9g45.h | 16 ++- .../arm/include/asm/arch-at91/at91sam9g45_matrix.h | 194 +++++++------------ board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 115 ++++++----- board/atmel/at91sam9m10g45ek/led.c | 6 +- board/calao/sbc35_a9g20/sbc35_a9g20.c | 88 +++++---- board/calao/tny_a9260/tny_a9260.c | 55 +++--- board/esd/meesc/config.mk | 1 - board/esd/meesc/meesc.c | 49 +++--- board/ronetix/pm9261/led.c | 9 +- board/ronetix/pm9261/pm9261.c | 38 ++-- board/ronetix/pm9263/led.c | 9 +- board/ronetix/pm9263/pm9263.c | 42 ++-- board/ronetix/pm9g45/pm9g45.c | 32 ++-- boards.cfg | 12 +- include/configs/at91sam9m10g45ek.h | 193 +++++++++---------- include/configs/meesc.h | 202 ++++++++++++-------- include/configs/pm9261.h | 18 +- include/configs/pm9263.h | 17 +- include/configs/pm9g45.h | 16 +- include/configs/sbc35_a9g20.h | 87 ++++----- include/configs/tny_a9260.h | 85 ++++---- 24 files changed, 694 insertions(+), 758 deletions(-) delete mode 100644 board/esd/meesc/config.mk

2 1

[U-Boot] [PATCH] Convert ISO-8859 files to UTF-8
by Albert ARIBAUD 05 Aug '11

05 Aug '11

There was a mix of UTF-8 and ISO-8859 files in the U-Boot source tree, which could cause issues with the patchwork review system. This commit converts all ISO-8859 files to UTF-8. Signed-off-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> --- Of course, this very patch might itself have a bad time going through patchwork without casualties. Reviewer can find the patch as a commit on branch 'utf8' of u-boot-arm git tree. MAINTAINERS | 10 ++-- arch/arm/cpu/arm1136/start.S | 4 +- arch/arm/cpu/arm720t/start.S | 4 +- arch/arm/cpu/arm920t/start.S | 4 +- arch/arm/cpu/arm925t/start.S | 4 +- arch/arm/cpu/arm926ejs/omap/reset.S | 4 +- arch/arm/cpu/arm926ejs/start.S | 4 +- arch/arm/cpu/arm926ejs/versatile/reset.S | 4 +- arch/arm/cpu/arm946es/start.S | 4 +- arch/arm/cpu/arm_intcm/start.S | 4 +- arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h | 12 ++-- arch/arm/cpu/ixp/npe/include/IxOsal.h | 6 +- arch/arm/cpu/lh7a40x/start.S | 4 +- arch/arm/cpu/sa1100/start.S | 2 +- arch/arm/include/asm/arch-s3c24x0/s3c2400.h | 2 +- arch/arm/include/asm/arch-s3c24x0/s3c2410.h | 2 +- arch/arm/include/asm/arch-s3c24x0/s3c24x0.h | 2 +- arch/powerpc/cpu/mpc8260/cpu_init.c | 2 +- arch/sparc/cpu/leon3/usb_uhci.c | 2 +- arch/x86/cpu/Makefile | 2 +- arch/x86/cpu/config.mk | 2 +- arch/x86/cpu/cpu.c | 2 +- arch/x86/cpu/interrupts.c | 4 +- arch/x86/cpu/resetvec.S | 2 +- arch/x86/cpu/sc520/Makefile | 2 +- arch/x86/cpu/sc520/sc520.c | 2 +- arch/x86/cpu/sc520/sc520_pci.c | 2 +- arch/x86/cpu/sc520/sc520_reset.c | 2 +- arch/x86/cpu/sc520/sc520_ssi.c | 2 +- arch/x86/cpu/sc520/sc520_timer.c | 2 +- arch/x86/cpu/start.S | 2 +- arch/x86/cpu/start16.S | 2 +- arch/x86/cpu/u-boot.lds | 2 +- arch/x86/include/asm/i8254.h | 2 +- arch/x86/include/asm/i8259.h | 2 +- arch/x86/include/asm/ibmpc.h | 2 +- arch/x86/include/asm/ic/pci.h | 2 +- arch/x86/include/asm/ic/sc520.h | 2 +- arch/x86/include/asm/interrupt.h | 2 +- arch/x86/include/asm/pci.h | 2 +- arch/x86/include/asm/processor.h | 2 +- arch/x86/include/asm/realmode.h | 2 +- arch/x86/include/asm/u-boot-x86.h | 2 +- arch/x86/include/asm/zimage.h | 2 +- arch/x86/lib/bios.S | 2 +- arch/x86/lib/bios.h | 2 +- arch/x86/lib/bios_pci.S | 2 +- arch/x86/lib/bios_setup.c | 2 +- arch/x86/lib/board.c | 2 +- arch/x86/lib/interrupts.c | 4 +- arch/x86/lib/pcat_interrupts.c | 2 +- arch/x86/lib/pcat_timer.c | 2 +- arch/x86/lib/pci.c | 2 +- arch/x86/lib/pci_type1.c | 2 +- arch/x86/lib/realmode.c | 2 +- arch/x86/lib/realmode_switch.S | 2 +- arch/x86/lib/timer.c | 2 +- arch/x86/lib/video.c | 2 +- arch/x86/lib/video_bios.c | 2 +- arch/x86/lib/zimage.c | 2 +- board/LEOX/elpt860/README.LEOX | 2 +- board/RPXClassic/RPXClassic.c | 2 +- board/RPXClassic/eccx.c | 2 +- board/RPXClassic/flash.c | 2 +- board/eNET/Makefile | 2 +- board/eNET/eNET_pci.c | 2 +- board/hymod/hymod.c | 2 +- board/lwmon/README.keybd | 74 +++++++++++++------------- board/lwmon/lwmon.c | 2 +- board/mpl/common/pci_parts.h | 2 +- board/netstal/hcu5/README.txt | 2 +- common/cmd_fdos.c | 2 +- doc/README.RPXClassic | 2 +- doc/README.m5373evb | 2 +- doc/README.mpc7448hpc2 | 2 +- drivers/block/sata_sil3114.c | 2 +- drivers/block/sata_sil3114.h | 2 +- drivers/misc/ali512x.c | 2 +- drivers/pcmcia/ti_pci1410a.c | 2 +- drivers/rtc/s3c24x0_rtc.c | 2 +- drivers/video/ct69000.c | 20 ++++---- drivers/video/sed13806.c | 2 +- drivers/video/sm501.c | 2 +- fs/fdos/Makefile | 2 +- fs/fdos/dev.c | 2 +- fs/fdos/dos.h | 2 +- fs/fdos/fat.c | 2 +- fs/fdos/fdos.c | 2 +- fs/fdos/fdos.h | 2 +- fs/fdos/fs.c | 2 +- fs/fdos/subdir.c | 2 +- fs/fdos/vfat.c | 2 +- include/ali512x.h | 2 +- include/configs/sc3.h | 4 +- include/fdc.h | 2 +- include/linux/mtd/mtd.h | 2 +- include/sed13806.h | 2 +- include/sm501.h | 2 +- lib/lzma/history.txt | 2 +- nand_spl/board/amcc/bamboo/sdram.c | 2 +- 100 files changed, 169 insertions(+), 169 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6e6affa..39b806f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -74,7 +74,7 @@ Joe D'Abbraccio <ljd015(a)freescale.com> MPC837xERDB MPC837x -K�ri Dav��sson <kd(a)flaga.is> +Kári Davíðsson <kd(a)flaga.is> FLAGADM MPC823 @@ -599,7 +599,7 @@ Rishi Bhattacharya <rishi(a)ti.com> omap5912osk ARM926EJS -Andreas Bie�mann <andreas.devel(a)gmail.com> +Andreas Bießmann <andreas.devel(a)gmail.com> at91rm9200ek at91rm9200 @@ -661,7 +661,7 @@ Simon Guinot <simon.guinot(a)sequanux.org> netspace_v2 ARM926EJS (Kirkwood SoC) netspace_max_v2 ARM926EJS (Kirkwood SoC) -Marius Gr�ger <mag(a)sysgo.de> +Marius Gröger <mag(a)sysgo.de> impa7 ARM720T (EP7211) ep7312 ARM720T (EP7312) @@ -749,7 +749,7 @@ Nishanth Menon <nm(a)ti.com> omap3_sdp3430 ARM ARMV7 (OMAP3xx SoC) omap3_zoom1 ARM ARMV7 (OMAP3xx SoC) -David M�ller <d.mueller(a)elsoft.ch> +David Müller <d.mueller(a)elsoft.ch> smdk2410 ARM920T VCMA9 ARM920T @@ -910,7 +910,7 @@ Richard Woodruff <r-woodruff2(a)ti.com> omap2420h4 ARM1136EJS -Alex Z�pke <azu(a)sysgo.de> +Alex Züpke <azu(a)sysgo.de> lart SA1100 dnp1110 SA1110 diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S index 200a800..05091ad 100644 --- a/arch/arm/cpu/arm1136/start.S +++ b/arch/arm/cpu/arm1136/start.S @@ -3,8 +3,8 @@ * * Copyright (c) 2004 Texas Instruments <r-woodruff2(a)ti.com> * - * Copyright (c) 2001 Marius Gr�ger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> * Copyright (c) 2002 Gary Jennejohn <garyj(a)denx.de> * Copyright (c) 2003 Richard Woodruff <r-woodruff2(a)ti.com> * Copyright (c) 2003 Kshitij <kshitij(a)ti.com> diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index e774c3f..8b69de9 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -1,8 +1,8 @@ /* * armboot - Startup Code for ARM720 CPU-core * - * Copyright (c) 2001 Marius Gr�ger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S index a7476b0..cfb57f2 100644 --- a/arch/arm/cpu/arm920t/start.S +++ b/arch/arm/cpu/arm920t/start.S @@ -1,8 +1,8 @@ /* * armboot - Startup Code for ARM920 CPU-core * - * Copyright (c) 2001 Marius Gr�ger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> * Copyright (c) 2002 Gary Jennejohn <garyj(a)denx.de> * * See file CREDITS for list of people who contributed to this diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S index 39f2e99..0640bc8 100644 --- a/arch/arm/cpu/arm925t/start.S +++ b/arch/arm/cpu/arm925t/start.S @@ -5,8 +5,8 @@ * * ----- Adapted for OMAP1510 from ARM920 code ------ * - * Copyright (c) 2001 Marius Gr�ger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> * Copyright (c) 2002 Gary Jennejohn <garyj(a)denx.de> * Copyright (c) 2003 Richard Woodruff <r-woodruff2(a)ti.com> * Copyright (c) 2003 Kshitij <kshitij(a)ti.com> diff --git a/arch/arm/cpu/arm926ejs/omap/reset.S b/arch/arm/cpu/arm926ejs/omap/reset.S index 4b20756..8321072 100644 --- a/arch/arm/cpu/arm926ejs/omap/reset.S +++ b/arch/arm/cpu/arm926ejs/omap/reset.S @@ -5,8 +5,8 @@ * * ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------ * - * Copyright (c) 2001 Marius Gr�ger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> * Copyright (c) 2002 Gary Jennejohn <garyj(a)denx.de> * Copyright (c) 2003 Richard Woodruff <r-woodruff2(a)ti.com> * Copyright (c) 2003 Kshitij <kshitij(a)ti.com> diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index 0940937..664b9ce 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -5,8 +5,8 @@ * * ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------ * - * Copyright (c) 2001 Marius Gr�ger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> * Copyright (c) 2002 Gary Jennejohn <garyj(a)denx.de> * Copyright (c) 2003 Richard Woodruff <r-woodruff2(a)ti.com> * Copyright (c) 2003 Kshitij <kshitij(a)ti.com> diff --git a/arch/arm/cpu/arm926ejs/versatile/reset.S b/arch/arm/cpu/arm926ejs/versatile/reset.S index 4b20756..8321072 100644 --- a/arch/arm/cpu/arm926ejs/versatile/reset.S +++ b/arch/arm/cpu/arm926ejs/versatile/reset.S @@ -5,8 +5,8 @@ * * ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------ * - * Copyright (c) 2001 Marius Gr�ger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> * Copyright (c) 2002 Gary Jennejohn <garyj(a)denx.de> * Copyright (c) 2003 Richard Woodruff <r-woodruff2(a)ti.com> * Copyright (c) 2003 Kshitij <kshitij(a)ti.com> diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S index 0054b22..3112a32 100644 --- a/arch/arm/cpu/arm946es/start.S +++ b/arch/arm/cpu/arm946es/start.S @@ -5,8 +5,8 @@ * * ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------ * - * Copyright (c) 2001 Marius Gr�ger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> * Copyright (c) 2002 Gary Jennejohn <garyj(a)denx.de> * Copyright (c) 2003 Richard Woodruff <r-woodruff2(a)ti.com> * Copyright (c) 2003 Kshitij <kshitij(a)ti.com> diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S index 2fd3b9a..20fcee6 100644 --- a/arch/arm/cpu/arm_intcm/start.S +++ b/arch/arm/cpu/arm_intcm/start.S @@ -5,8 +5,8 @@ * * ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------ * - * Copyright (c) 2001 Marius Gr�ger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> * Copyright (c) 2002 Gary Jennejohn <garyj(a)denx.de> * Copyright (c) 2003 Richard Woodruff <r-woodruff2(a)ti.com> * Copyright (c) 2003 Kshitij <kshitij(a)ti.com> diff --git a/arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h b/arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h index e223049..f854ee0 100644 --- a/arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h +++ b/arch/arm/cpu/ixp/npe/include/IxAtmdAccCtrl.h @@ -975,7 +975,7 @@ typedef struct * @li 1 - Generate HEC. * @li 0 - Disable HEC generation. */ - unsigned int txCOSET:1; /**< [24] If enabled the HEC is Exclusive-OR�ed with the value 0x55 before + unsigned int txCOSET:1; /**< [24] If enabled the HEC is Exclusive-ORÆed with the value 0x55 before * being presented on the Utopia bus. * @li 1 - Enable HEC ExOR with value 0x55 * @li 0 - Use generated HEC value. @@ -1302,7 +1302,7 @@ typedef struct @li 1 - HEC checking enabled @li 0 - HEC checking disabled */ - unsigned int rxCOSET:1; /**< [25] If enabled the HEC is Exclusive-OR�ed with the value 0x55 + unsigned int rxCOSET:1; /**< [25] If enabled the HEC is Exclusive-ORÆed with the value 0x55 before being tested with the received HEC. @li 1 - Enable HEC ExOR with value 0x55. @li 0 - Use generated HEC value.*/ @@ -1320,9 +1320,9 @@ typedef struct unsigned int rxHashEnbGFC:1; /**< [15] Specifies if the VPI field [11:8]/GFC field should be included in the Hash data input or if the bits should be padded - with 1�b0. + with 1Æb0. @li 1 - VPI [11:8]/GFC field valid and used in Hash residue calculation. - @li 0 - VPI [11:8]/GFC field padded with 1�b0 */ + @li 0 - VPI [11:8]/GFC field padded with 1Æb0 */ unsigned int rxPreHash:1; /**< [14] Enable Pre-hash value generation. Specifies if the incoming cell data should be pre-hashed to allow VPI/VCI header look-up @@ -1489,7 +1489,7 @@ typedef struct unsigned int invalidSizeOvrInt:1; /**< [9] Enable CBI Receive Status Condition if the InvalidSizeCount register overflows. @li 1 - CBI Receive Status Condition asserted. - @li�0 - No CBI Receive Status asserted */ + @li¸0 - No CBI Receive Status asserted */ unsigned int rxIdleOvrInt:1; /**< [8] Enable CBI Receive Status Condition if the RxIdleCount overflows. @li 1 - CBI Receive Condition asserted. @@ -1679,7 +1679,7 @@ typedef struct unsigned int txReset:1; /**< [25] Resets the Utopia Coprocessor transmit module to a known state. * @li Note: All transmit configuration and status registers will be reset * to their reset values. - * @li 0 - Normal operating mode� + * @li 0 - Normal operating mode¸ * @li 1 - Reset transmit modules */ diff --git a/arch/arm/cpu/ixp/npe/include/IxOsal.h b/arch/arm/cpu/ixp/npe/include/IxOsal.h index b2a93a5..e009895 100644 --- a/arch/arm/cpu/ixp/npe/include/IxOsal.h +++ b/arch/arm/cpu/ixp/npe/include/IxOsal.h @@ -250,7 +250,7 @@ PUBLIC void ixOsalIrqUnlock (UINT32 irqEnable); * * @brief Selectively disables interrupts * - * @param irqLevel � new interrupt level + * @param irqLevel new interrupt level * * Disables the interrupts below the specified interrupt level * @@ -269,7 +269,7 @@ PUBLIC UINT32 ixOsalIrqLevelSet (UINT32 irqLevel); * * @brief Enables an interrupt level * - * @param irqLevel � interrupt level to enable + * @param irqLevel interrupt level to enable * * Enables the specified interrupt level * @@ -285,7 +285,7 @@ PUBLIC void ixOsalIrqEnable (UINT32 irqLevel); * * @brief Disables an interrupt level * - * @param irqLevel � interrupt level to disable + * @param irqLevel interrupt level to disable * * Disables the specified interrupt level * diff --git a/arch/arm/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S index 81242b1..cde1458 100644 --- a/arch/arm/cpu/lh7a40x/start.S +++ b/arch/arm/cpu/lh7a40x/start.S @@ -1,8 +1,8 @@ /* * armboot - Startup Code for ARM920 CPU-core * - * Copyright (c) 2001 Marius Gr�ger <mag(a)sysgo.de> - * Copyright (c) 2002 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Marius Gröger <mag(a)sysgo.de> + * Copyright (c) 2002 Alex Züpke <azu(a)sysgo.de> * Copyright (c) 2002 Gary Jennejohn <garyj(a)denx.de> * * See file CREDITS for list of people who contributed to this diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S index b27e970..33422fa 100644 --- a/arch/arm/cpu/sa1100/start.S +++ b/arch/arm/cpu/sa1100/start.S @@ -4,7 +4,7 @@ * Copyright (C) 1998 Dan Malek <dmalek(a)jlc.net> * Copyright (C) 1999 Magnus Damm <kieraypc01.p.y.kie.era.ericsson.se> * Copyright (C) 2000 Wolfgang Denk <wd(a)denx.de> - * Copyright (c) 2001 Alex Z�pke <azu(a)sysgo.de> + * Copyright (c) 2001 Alex Züpke <azu(a)sysgo.de> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/arm/include/asm/arch-s3c24x0/s3c2400.h b/arch/arm/include/asm/arch-s3c24x0/s3c2400.h index 2678be1..5b905f5 100644 --- a/arch/arm/include/asm/arch-s3c24x0/s3c2400.h +++ b/arch/arm/include/asm/arch-s3c24x0/s3c2400.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2003 - * David M�ller ELSOFT AG Switzerland. d.mueller(a)elsoft.ch + * David Müller ELSOFT AG Switzerland. d.mueller(a)elsoft.ch * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/arm/include/asm/arch-s3c24x0/s3c2410.h b/arch/arm/include/asm/arch-s3c24x0/s3c2410.h index 0543fe1..4fbdf20 100644 --- a/arch/arm/include/asm/arch-s3c24x0/s3c2410.h +++ b/arch/arm/include/asm/arch-s3c24x0/s3c2410.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2003 - * David M�ller ELSOFT AG Switzerland. d.mueller(a)elsoft.ch + * David Müller ELSOFT AG Switzerland. d.mueller(a)elsoft.ch * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h index f634d11..ca978c9 100644 --- a/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h +++ b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2003 - * David M�ller ELSOFT AG Switzerland. d.mueller(a)elsoft.ch + * David Müller ELSOFT AG Switzerland. d.mueller(a)elsoft.ch * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/powerpc/cpu/mpc8260/cpu_init.c b/arch/powerpc/cpu/mpc8260/cpu_init.c index 1d52773..95d6144 100644 --- a/arch/powerpc/cpu/mpc8260/cpu_init.c +++ b/arch/powerpc/cpu/mpc8260/cpu_init.c @@ -182,7 +182,7 @@ void cpu_init_f (volatile immap_t * immr) #endif /* now restrict to preliminary range */ - /* the PS came from the HRCW, don�t change it */ + /* the PS came from the HRCW, donŽt change it */ memctl->memc_br0 = SET_VAL_MASK(memctl->memc_br0 , CONFIG_SYS_BR0_PRELIM, BRx_PS_MSK); memctl->memc_or0 = CONFIG_SYS_OR0_PRELIM; diff --git a/arch/sparc/cpu/leon3/usb_uhci.c b/arch/sparc/cpu/leon3/usb_uhci.c index 8f99e1d..ef7a20c 100644 --- a/arch/sparc/cpu/leon3/usb_uhci.c +++ b/arch/sparc/cpu/leon3/usb_uhci.c @@ -20,7 +20,7 @@ * * Adapted for U-Boot: * (C) Copyright 2001 Denis Peter, MPL AG Switzerland - * (C) Copyright 2008, Daniel Hellstr�m, daniel(a)gaisler.com + * (C) Copyright 2008, Daniel Hellström, daniel(a)gaisler.com * Added AMBA Plug&Play detection of GRUSB, modified interrupt handler. * Added cache flushes where needed. * diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index ddde83c..7f1fc18 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -3,7 +3,7 @@ # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # # (C) Copyright 2002 -# Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se. +# Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. # # See file CREDITS for list of people who contributed to this # project. diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk index d1b528a..c00f867 100644 --- a/arch/x86/cpu/config.mk +++ b/arch/x86/cpu/config.mk @@ -1,6 +1,6 @@ # # (C) Copyright 2002 -# Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se. +# Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. # # See file CREDITS for list of people who contributed to this # project. diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 0c5d7c3..cac12c0 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -3,7 +3,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/x86/cpu/interrupts.c b/arch/x86/cpu/interrupts.c index 62bcadc..c6e72ea 100644 --- a/arch/x86/cpu/interrupts.c +++ b/arch/x86/cpu/interrupts.c @@ -3,7 +3,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * Portions of this file are derived from the Linux kernel source * Copyright (C) 1991, 1992 Linus Torvalds @@ -246,7 +246,7 @@ void irq_llsr(struct irq_regs *regs) { /* * For detailed description of each exception, refer to: - * Intel� 64 and IA-32 Architectures Software Developer's Manual + * Intel® 64 and IA-32 Architectures Software Developer's Manual * Volume 1: Basic Architecture * Order Number: 253665-029US, November 2008 * Table 6-1. Exceptions and Interrupts diff --git a/arch/x86/cpu/resetvec.S b/arch/x86/cpu/resetvec.S index c690d25..44aee5f 100644 --- a/arch/x86/cpu/resetvec.S +++ b/arch/x86/cpu/resetvec.S @@ -2,7 +2,7 @@ * U-boot - x86 Startup Code * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/cpu/sc520/Makefile b/arch/x86/cpu/sc520/Makefile index 694b61e..f462264 100644 --- a/arch/x86/cpu/sc520/Makefile +++ b/arch/x86/cpu/sc520/Makefile @@ -6,7 +6,7 @@ # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # # (C) Copyright 2002 -# Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se. +# Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. # # See file CREDITS for list of people who contributed to this # project. diff --git a/arch/x86/cpu/sc520/sc520.c b/arch/x86/cpu/sc520/sc520.c index 726a325..e37c403 100644 --- a/arch/x86/cpu/sc520/sc520.c +++ b/arch/x86/cpu/sc520/sc520.c @@ -3,7 +3,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/cpu/sc520/sc520_pci.c b/arch/x86/cpu/sc520/sc520_pci.c index 8cd7ffe..32d4802 100644 --- a/arch/x86/cpu/sc520/sc520_pci.c +++ b/arch/x86/cpu/sc520/sc520_pci.c @@ -3,7 +3,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/cpu/sc520/sc520_reset.c b/arch/x86/cpu/sc520/sc520_reset.c index 79ef976..18890c3 100644 --- a/arch/x86/cpu/sc520/sc520_reset.c +++ b/arch/x86/cpu/sc520/sc520_reset.c @@ -3,7 +3,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/cpu/sc520/sc520_ssi.c b/arch/x86/cpu/sc520/sc520_ssi.c index ac58d25..47aa80b 100644 --- a/arch/x86/cpu/sc520/sc520_ssi.c +++ b/arch/x86/cpu/sc520/sc520_ssi.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/cpu/sc520/sc520_timer.c b/arch/x86/cpu/sc520/sc520_timer.c index 1bcfe67..5cccda1 100644 --- a/arch/x86/cpu/sc520/sc520_timer.c +++ b/arch/x86/cpu/sc520/sc520_timer.c @@ -3,7 +3,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 7ccc076..4ba1389 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -5,7 +5,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S index f1b9d0a..3d3017a 100644 --- a/arch/x86/cpu/start16.S +++ b/arch/x86/cpu/start16.S @@ -5,7 +5,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002,2003 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index 5597422..fe28030 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se. + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/i8254.h b/arch/x86/include/asm/i8254.h index aafdfb8..c9e9e7d 100644 --- a/arch/x86/include/asm/i8254.h +++ b/arch/x86/include/asm/i8254.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se. + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h index 774d7a3..c494ff0 100644 --- a/arch/x86/include/asm/i8259.h +++ b/arch/x86/include/asm/i8259.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se. + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/ibmpc.h b/arch/x86/include/asm/ibmpc.h index e35cbd8..cd3995e 100644 --- a/arch/x86/include/asm/ibmpc.h +++ b/arch/x86/include/asm/ibmpc.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/ic/pci.h b/arch/x86/include/asm/ic/pci.h index 2e4376b..12ba656 100644 --- a/arch/x86/include/asm/ic/pci.h +++ b/arch/x86/include/asm/ic/pci.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB <daniel(a)omicron.se>. + * Daniel Engström, Omicron Ceti AB <daniel(a)omicron.se>. * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/ic/sc520.h b/arch/x86/include/asm/ic/sc520.h index 956c1c2..5ac9bb8 100644 --- a/arch/x86/include/asm/ic/sc520.h +++ b/arch/x86/include/asm/ic/sc520.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB <daniel(a)omicron.se>. + * Daniel Engström, Omicron Ceti AB <daniel(a)omicron.se>. * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/interrupt.h b/arch/x86/include/asm/interrupt.h index be52fe4..fbd6e03 100644 --- a/arch/x86/include/asm/interrupt.h +++ b/arch/x86/include/asm/interrupt.h @@ -3,7 +3,7 @@ * Graeme Russ, graeme.russ(a)gmail.com * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 050a2bb..85f60d7 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -2,7 +2,7 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 22a1298..1e5dccd 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h index 9177e4e..c62310e 100644 --- a/arch/x86/include/asm/realmode.h +++ b/arch/x86/include/asm/realmode.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 944e1a2..c7275bf 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se. + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h index b6266e4..a02637f 100644 --- a/arch/x86/include/asm/zimage.h +++ b/arch/x86/include/asm/zimage.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/bios.S b/arch/x86/lib/bios.S index 660a244..ce8deb5 100644 --- a/arch/x86/lib/bios.S +++ b/arch/x86/lib/bios.S @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/bios.h b/arch/x86/lib/bios.h index 3c8d61a..4a9cdb5 100644 --- a/arch/x86/lib/bios.h +++ b/arch/x86/lib/bios.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/bios_pci.S b/arch/x86/lib/bios_pci.S index 9e412e5..53d2ea0 100644 --- a/arch/x86/lib/bios_pci.S +++ b/arch/x86/lib/bios_pci.S @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/bios_setup.c b/arch/x86/lib/bios_setup.c index 6949b35..9bf7e58 100644 --- a/arch/x86/lib/bios_setup.c +++ b/arch/x86/lib/bios_setup.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c index df54222..2b2dd39 100644 --- a/arch/x86/lib/board.c +++ b/arch/x86/lib/board.c @@ -3,7 +3,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, <wd(a)denx.de> diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index a2c598f..04a9c79 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -12,7 +12,7 @@ * Wolfgang Denk, DENX Software Engineering, <wd(a)denx.de> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * (C) Copyright 2001 * Josh Huber, Mission Critical Linux, Inc, <huber(a)mclx.com> @@ -43,7 +43,7 @@ * Daniel Hellstrom, Detlev Zundel, Wolfgang Denk and Josh Huber are * credited for the corresponding work on those ports. The original * interrupt handling routines for the x86 port were written by - * Daniel Engstr�m + * Daniel Engström */ #include <common.h> diff --git a/arch/x86/lib/pcat_interrupts.c b/arch/x86/lib/pcat_interrupts.c index 364c435..2caae20 100644 --- a/arch/x86/lib/pcat_interrupts.c +++ b/arch/x86/lib/pcat_interrupts.c @@ -3,7 +3,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/pcat_timer.c b/arch/x86/lib/pcat_timer.c index 1911c6c..f2a5422 100644 --- a/arch/x86/lib/pcat_timer.c +++ b/arch/x86/lib/pcat_timer.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/pci.c b/arch/x86/lib/pci.c index e791e88..593a7db 100644 --- a/arch/x86/lib/pci.c +++ b/arch/x86/lib/pci.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/pci_type1.c b/arch/x86/lib/pci_type1.c index 8ce5b33..da1d356 100644 --- a/arch/x86/lib/pci_type1.c +++ b/arch/x86/lib/pci_type1.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/realmode.c b/arch/x86/lib/realmode.c index 5be827c..c113393 100644 --- a/arch/x86/lib/realmode.c +++ b/arch/x86/lib/realmode.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/realmode_switch.S b/arch/x86/lib/realmode_switch.S index fce4ecc..7ee709a 100644 --- a/arch/x86/lib/realmode_switch.S +++ b/arch/x86/lib/realmode_switch.S @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se + * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/timer.c b/arch/x86/lib/timer.c index 8fc68cd..985f62b 100644 --- a/arch/x86/lib/timer.c +++ b/arch/x86/lib/timer.c @@ -3,7 +3,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/video.c b/arch/x86/lib/video.c index b29075c..0efcf3f 100644 --- a/arch/x86/lib/video.c +++ b/arch/x86/lib/video.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/video_bios.c b/arch/x86/lib/video_bios.c index 6bc4335..7574f77 100644 --- a/arch/x86/lib/video_bios.c +++ b/arch/x86/lib/video_bios.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index cc4b40e..6682e0d 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/board/LEOX/elpt860/README.LEOX b/board/LEOX/elpt860/README.LEOX index e8ab867..b936631 100644 --- a/board/LEOX/elpt860/README.LEOX +++ b/board/LEOX/elpt860/README.LEOX @@ -386,7 +386,7 @@ TCP: Hash tables configured (established 1024 bind 1024) IP-Config: Incomplete network configuration information. NET4: Unix domain sockets 1.0/SMP for Linux NET4.0. VFS: Mounted root (ext2 filesystem). -Freeing unused kernel memory: 44k in� +Freeing unused kernel memory: 44k iné init started: BusyBox v0.60.2 (2002.07.01-12:06+0000) multi-call Configuring hostname Configuring lo... Configuring eth0... diff --git a/board/RPXClassic/RPXClassic.c b/board/RPXClassic/RPXClassic.c index c3d5385..641cc44 100644 --- a/board/RPXClassic/RPXClassic.c +++ b/board/RPXClassic/RPXClassic.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2001 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * U-Boot port on RPXClassic LF (CLLF_BW31) board * diff --git a/board/RPXClassic/eccx.c b/board/RPXClassic/eccx.c index e1f3f9d..c6115eb 100644 --- a/board/RPXClassic/eccx.c +++ b/board/RPXClassic/eccx.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/board/RPXClassic/flash.c b/board/RPXClassic/flash.c index f07d960..da7b42c 100644 --- a/board/RPXClassic/flash.c +++ b/board/RPXClassic/flash.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2001 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * U-Boot port on RPXClassic LF (CLLF_BW31) board * diff --git a/board/eNET/Makefile b/board/eNET/Makefile index 4980787..3703ae5 100644 --- a/board/eNET/Makefile +++ b/board/eNET/Makefile @@ -6,7 +6,7 @@ # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # # (C) Copyright 2002 -# Daniel Engstr�m, Omicron Ceti AB, daniel(a)omicron.se. +# Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. # # See file CREDITS for list of people who contributed to this # project. diff --git a/board/eNET/eNET_pci.c b/board/eNET/eNET_pci.c index a03090e..d97387e 100644 --- a/board/eNET/eNET_pci.c +++ b/board/eNET/eNET_pci.c @@ -3,7 +3,7 @@ * Graeme Russ, <graeme.russ(a)gmail.com> * * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB, <daniel(a)omicron.se> + * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> * * See file CREDITS for list of people who contributed to this * project. diff --git a/board/hymod/hymod.c b/board/hymod/hymod.c index 2af3049..534f05d 100644 --- a/board/hymod/hymod.c +++ b/board/hymod/hymod.c @@ -378,7 +378,7 @@ initdram (int board_type) * * "At system reset, initialization software must set up the * programmable parameters in the memory controller banks registers - * (ORx, BRx, P/LSDMR). After all memory parameters are con�gured, + * (ORx, BRx, P/LSDMR). After all memory parameters are conÞgured, * system software should execute the following initialization sequence * for each SDRAM device. * diff --git a/board/lwmon/README.keybd b/board/lwmon/README.keybd index 54f0aeb..5e5144e 100644 --- a/board/lwmon/README.keybd +++ b/board/lwmon/README.keybd @@ -5,44 +5,44 @@ Die Implementierung / Decodierung beruht auf den Angaben aus dem Do- kument "PIC LWE-Tastatur" in der Fassung vom 9. 3. 2001, insbesonde- re Tabelle 3 im Kapitel 4.3 Tastencodes. In U-Boot werden die vom Keyboard-Controller gelesenen Daten hexadezimal codiert in der auto- -matisch angelegten Environment-Variablen "keybd" �bergeben. Ist kei- -ne Taste gedr�ckt worden, steht dort: +matisch angelegten Environment-Variablen "keybd" übergeben. Ist kei- +ne Taste gedrückt worden, steht dort: keybd=000000000000000000 Der decodierte Tastencode ("keybd") kann mit den "bootargs" an den -Linux-Kernel �bergeben und dort z. B. in einem Device-Treiber oder +Linux-Kernel übergeben und dort z. B. in einem Device-Treiber oder einer Applikation ausgewertet werden. Sonderfunktionen beim Booten: Es lassen sich eine oder mehrere (beliebig viele) Tasten oder Tasten- -kombinationen definieren, die Sonderfunktionen ausl�sen, wenn diese -Tasten beim Booten (Reset) gedr�ckt sind. +kombinationen definieren, die Sonderfunktionen auslösen, wenn diese +Tasten beim Booten (Reset) gedrückt sind. Wird eine eingestellte Taste bzw. Tastenkombination erkannt, so wird in U-Boot noch vor dem Start des "Countdown" und somit vor jedem an- deren Kommando der Inhalt einer dieser Taste bzw. Tastenkombination -zugeordneten Environment-Variablen ausf�hren. +zugeordneten Environment-Variablen ausführen. Die Environment-Variable "magic_keys" wird als Liste von Zeichen ver- -standen, die als Suffix an den Namen "key_magic" angef�gt werden und +standen, die als Suffix an den Namen "key_magic" angefügt werden und so die Namen der Environment-Variablen definieren, mit denen die Tasten (-kombinationen) festgelegt werden: Ist "magic_keys" NICHT definiert, so wird nur die in der Environment- -Variablen "key_magic" codierte Tasten (-kombination) gepr�ft, und -ggf. der Inhalt der Environment-Variablen "key_cmd" ausgef�hrt (ge- +Variablen "key_magic" codierte Tasten (-kombination) geprüft, und +ggf. der Inhalt der Environment-Variablen "key_cmd" ausgeführt (ge- nauer: der Inhalt von "key_cmd" wird der Variablen "preboot" zugewie- -sen, die ausgef�hrt wird, unmittelbar bevor die interaktive Kommando- +sen, die ausgeführt wird, unmittelbar bevor die interaktive Kommando- interpretation beginnt). -Enth�lt "magic_keys" z. B. die Zeichenkette "0123CB*", so werden -nacheinander folgende Aktionen ausgef�hrt: +Enthält "magic_keys" z. B. die Zeichenkette "0123CB*", so werden +nacheinander folgende Aktionen ausgeführt: - pr�fe Tastencode ggf. f�hre aus Kommando + prüfe Tastencode ggf. führe aus Kommando in Variable in Variable ----------------------------------- key_magic0 ==> key_cmd0 @@ -55,43 +55,43 @@ nacheinander folgende Aktionen ausgef key_magic* ==> key_cmd* Hinweis: sobald ein aktivierter Tastencode erkannt wurde, wird die -Bearbeitung abgebrochen; es wird daher h�chstens eines der definier- -ten Kommandos ausgef�hrt, wobei die Priorit�t durch die Suchreihen- +Bearbeitung abgebrochen; es wird daher höchstens eines der definier- +ten Kommandos ausgeführt, wobei die Priorität durch die Suchreihen- folge festgelegt wird, also durch die Reihenfolge der Zeichen in der Varuiablen "magic_keys". -Die Codierung der Tasten, die beim Booten gedr�ckt werden m�ssen, um -eine Funktion auszul�sen, erfolgt nach der Tastaturtabelle. +Die Codierung der Tasten, die beim Booten gedrückt werden müssen, um +eine Funktion auszulösen, erfolgt nach der Tastaturtabelle. Die Definitionen => setenv key_magic0 3a+3b => setenv key_cmd0 setenv bootdelay 30 -bedeuten dementsprechend, da� die Tasten mit den Codes 0x3A (Taste -"F1") und 0x3B (Taste "F2") gleichzeitig gedr�ckt werden m�ssen. Sie -k�nnen dort eine beliebige Tastenkombination eintragen (jeweils 2 -Zeichen f�r die Hex-Codes der Tasten, und '+' als Trennzeichen). +bedeuten dementsprechend, daß die Tasten mit den Codes 0x3A (Taste +"F1") und 0x3B (Taste "F2") gleichzeitig gedrückt werden müssen. Sie +können dort eine beliebige Tastenkombination eintragen (jeweils 2 +Zeichen für die Hex-Codes der Tasten, und '+' als Trennzeichen). Wird die eingestellte Tastenkombination erkannt, so wird in U-Boot noch vor dem Start des "Countdown" und somit vor jedem anderen Kom- -mando das angebene Kommando ausgef�hrt und somit ein langes Boot- +mando das angebene Kommando ausgeführt und somit ein langes Boot- Delay eingetragen. -Praktisch k�nnten Sie also in U-Boot "bootdelay" auf 0 setzen und -somit stets ohne jede User-Interaktion automatisch booten, au�er, -wenn die beiden Tasten "F1" und "F2" beim Booten gedr�ckt werden: -dann w�rde ein Boot-Delay von 30 Sekunden eingef�gt. +Praktisch könnten Sie also in U-Boot "bootdelay" auf 0 setzen und +somit stets ohne jede User-Interaktion automatisch booten, außer, +wenn die beiden Tasten "F1" und "F2" beim Booten gedrückt werden: +dann würde ein Boot-Delay von 30 Sekunden eingefügt. Hinweis: dem Zeichen '#' kommt innerhalb von "magic_keys" eine beson- dere Bedeutung zu: die dadurch definierte Key-Sequenz schaltet den -Monitor in den "Debug-Modus" - das bedeutet zun�chst, da� alle weite- -ren Meldungen von U-Boot �ber das LCD-Display ausgegeben werden; -au�erdem kann man durch das mit dieser Tastenkombination verkn�pfte +Monitor in den "Debug-Modus" - das bedeutet zunächst, daß alle weite- +ren Meldungen von U-Boot über das LCD-Display ausgegeben werden; +außerdem kann man durch das mit dieser Tastenkombination verknüpfte Kommando z. B. die Linux-Bootmeldungen ebenfalls auf das LCD-Display -legen, so da� der Boot-Vorgang direkt und ohne weitere Hilfsmittel +legen, so daß der Boot-Vorgang direkt und ohne weitere Hilfsmittel analysiert werden kann. Beispiel: @@ -107,20 +107,20 @@ chert: (6) => setenv bootcmd bootp\;run nfsargs\;run addip\;run addfb\;bootm Hierbei wird die Linux Commandline (in der Variablen "bootargs") im -Boot-Kommando "bootcmd" (6) schrittweise zusammengesetzt: zun�chst -werden die f�r Root-Filesystem �ber NFS erforderlichen Optionen ge- +Boot-Kommando "bootcmd" (6) schrittweise zusammengesetzt: zunächst +werden die für Root-Filesystem über NFS erforderlichen Optionen ge- setzt ("run nfsargs", vgl. (3)), dann die Netzwerkkonfiguration an- -gef�gt ("run addip", vgl. (4)), und schlie�lich die Systemconsole +gefügt ("run addip", vgl. (4)), und schließlich die Systemconsole definiert ("run addfb"). Dabei wird im Normalfall die Definition (5) verwendt; wurde aller- -dings beim Reset die entsprechende Taste gedr�ckt gehalten, so wird -diese Definition bei der Ausf�hrung des in (2) definierten Kommandos -�berschrieben, so da� Linux die Bootmeldungen auch �ber das Frame- +dings beim Reset die entsprechende Taste gedrückt gehalten, so wird +diese Definition bei der Ausführung des in (2) definierten Kommandos +überschrieben, so daß Linux die Bootmeldungen auch über das Frame- buffer-Device (=LCD-Display) ausgibt. Beachten Sie die Verdoppelung der '\'-Escapes in der Definition von "key_cmd#" - diese ist erforderlich, weil der String _zweimal_ inter- pretiert wird: das erste Mal bei der Eingabe von "key_cmd#", das -zweite Mal, wenn der String (als Inhalt von "preboot") ausgef�hrt +zweite Mal, wenn der String (als Inhalt von "preboot") ausgeführt wird. diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c index 9d6c21f..f87852c 100644 --- a/board/lwmon/lwmon.c +++ b/board/lwmon/lwmon.c @@ -365,7 +365,7 @@ int board_early_init_f (void) * * This is just a preliminary fix, intended to turn off TENA * as soon as possible to avoid noise on the network. Once - * I�C is running we will make sure the interface is + * I²C is running we will make sure the interface is * correctly initialized. */ immr->im_cpm.cp_pbpar &= ~PB_ENET_TENA; diff --git a/board/mpl/common/pci_parts.h b/board/mpl/common/pci_parts.h index 7bca961..f09503e 100644 --- a/board/mpl/common/pci_parts.h +++ b/board/mpl/common/pci_parts.h @@ -63,7 +63,7 @@ /* Mapping: * +-------------+------------+------------+--------------------------------+ - * � PCI MemAddr | PCI IOAddr | Local Addr | Device / Function | + * Š PCI MemAddr | PCI IOAddr | Local Addr | Device / Function | * +-------------+------------+------------+--------------------------------+ * | 0x00000000 | | 0xA0000000 | ISA Memory (hard wired) | * | 0x00FFFFFF | | 0xA0FFFFFF | | diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt index c5737d0..86f17bf 100644 --- a/board/netstal/hcu5/README.txt +++ b/board/netstal/hcu5/README.txt @@ -155,7 +155,7 @@ From now on our copy is in RAM and we will run from there, spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM) env_relocated misc_init_r(bd): (board/netstal/hcu5.c) - ethaddr mit serial number erg�nzen + ethaddr mit serial number ergänzen Then we will somehow go into the command loop Most of the HW specific code for the HCU5 may be found in diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c index 2af4ca0..49d5fa5 100644 --- a/common/cmd_fdos.c +++ b/common/cmd_fdos.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/doc/README.RPXClassic b/doc/README.RPXClassic index 5344cc6..e03f670 100644 --- a/doc/README.RPXClassic +++ b/doc/README.RPXClassic @@ -1,7 +1,7 @@ # Porting U-Boot onto RPXClassic LF_BW31 board # Written by Pierre AUBERT # E-Mail p.aubert(a)staubli.com -# St�ubli Faverges - <www.staubli.com> +# Stäubli Faverges - <www.staubli.com> # # Sept. 20 2001 # diff --git a/doc/README.m5373evb b/doc/README.m5373evb index e90a320..6216671 100644 --- a/doc/README.m5373evb +++ b/doc/README.m5373evb @@ -279,7 +279,7 @@ usbcore: registered new device driver usb NET: Registered protocol family 2 IP route cache hash table entries: 1024 (order: 0, 4096 bytes) TCP established hash table entries: 1024 (order: 1, 8192 bytes) TCP bind hash table entries: 1024 (order: 0, 4096 bytes) TCP: Hash tables configured (established 1024 bind 1024) TCP reno registered -JFFS2 version 2.2. (NAND) � 2001-2006 Red Hat, Inc. +JFFS2 version 2.2. (NAND) © 2001-2006 Red Hat, Inc. io scheduler noop registered io scheduler cfq registered (default) ColdFire internal UART serial driver version 1.00 ttyS0 at 0xfc060000 (irq = 90) is a builtin ColdFire UART diff --git a/doc/README.mpc7448hpc2 b/doc/README.mpc7448hpc2 index 8659e83..cbb043e 100644 --- a/doc/README.mpc7448hpc2 +++ b/doc/README.mpc7448hpc2 @@ -8,7 +8,7 @@ design, which is optimized for high speed throughput between the processor and the memory, disk drive and Ethernet port subsystems. MPC7448hpc2(Taiga) is designed to the micro-ATX chassis, allowing it to be -used in 1U or 2U rack-mount chassis��, as well as in standard ATX/Micro-ATX +used in 1U or 2U rack-mount chassis¡¯, as well as in standard ATX/Micro-ATX chassis. Building U-Boot diff --git a/drivers/block/sata_sil3114.c b/drivers/block/sata_sil3114.c index 62cc99d..d43064e 100644 --- a/drivers/block/sata_sil3114.c +++ b/drivers/block/sata_sil3114.c @@ -1,5 +1,5 @@ /* - * Copyright (C) Excito Elektronik i Sk�ne AB, All rights reserved. + * Copyright (C) Excito Elektronik i Skåne AB, All rights reserved. * Author: Tor Krill <tor(a)excito.com> * * This program is free software; you can redistribute it and/or diff --git a/drivers/block/sata_sil3114.h b/drivers/block/sata_sil3114.h index 8f2301a..f77423a 100644 --- a/drivers/block/sata_sil3114.h +++ b/drivers/block/sata_sil3114.h @@ -1,5 +1,5 @@ /* - * Copyright (C) Excito Elektronik i Sk�ne AB, All rights reserved. + * Copyright (C) Excito Elektronik i Skåne AB, All rights reserved. * Author: Tor Krill <tor(a)excito.com> * * This program is free software; you can redistribute it and/or diff --git a/drivers/misc/ali512x.c b/drivers/misc/ali512x.c index cda3b0d..39a2a6f 100644 --- a/drivers/misc/ali512x.c +++ b/drivers/misc/ali512x.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB <daniel(a)omicron.se>. + * Daniel Engström, Omicron Ceti AB <daniel(a)omicron.se>. * * See file CREDITS for list of people who contributed to this * project. diff --git a/drivers/pcmcia/ti_pci1410a.c b/drivers/pcmcia/ti_pci1410a.c index 4ac2e0f..cdb0fe3 100644 --- a/drivers/pcmcia/ti_pci1410a.c +++ b/drivers/pcmcia/ti_pci1410a.c @@ -2,7 +2,7 @@ * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB + * Daniel Engström, Omicron Ceti AB * * See file CREDITS for list of people who contributed to this * project. diff --git a/drivers/rtc/s3c24x0_rtc.c b/drivers/rtc/s3c24x0_rtc.c index 7f02f05..9667939 100644 --- a/drivers/rtc/s3c24x0_rtc.c +++ b/drivers/rtc/s3c24x0_rtc.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2003 - * David M�ller ELSOFT AG Switzerland. d.mueller(a)elsoft.ch + * David Müller ELSOFT AG Switzerland. d.mueller(a)elsoft.ch * * See file CREDITS for list of people who contributed to this * project. diff --git a/drivers/video/ct69000.c b/drivers/video/ct69000.c index ae219cc..3db614d 100644 --- a/drivers/video/ct69000.c +++ b/drivers/video/ct69000.c @@ -1,5 +1,5 @@ /* ported from ctfb.c (linux kernel): - * Created in Jan - July 2000 by Thomas H�henleitner <th(a)visuelle-maschinen.de> + * Created in Jan - July 2000 by Thomas Höhenleitner <th(a)visuelle-maschinen.de> * * Ported to U-Boot: * (C) Copyright 2002 Denis Peter, MPL AG Switzerland @@ -626,25 +626,25 @@ FindBestPQFittingMN (unsigned int p, unsigned int q, unsigned int mnmin, /* that is the hardware < 69000 we have to manage +---------+ +-------------------+ +----------------------+ +--+ - | REFCLK |__|NTSC Divisor Select|__|FVCO Reference Divisor|__|�N|__ - | 14.3MHz | |(NTSCDS) (�1, �5) | |Select (RDS) (�1, �4) | | | | + | REFCLK |__|NTSC Divisor Select|__|FVCO Reference Divisor|__|÷N|__ + | 14.3MHz | |(NTSCDS) (÷1, ÷5) | |Select (RDS) (÷1, ÷4) | | | | +---------+ +-------------------+ +----------------------+ +--+ | ___________________________________________________________________| | | fvco fout | +--------+ +------------+ +-----+ +-------------------+ +----+ +-| Phase |__|Charge Pump |__| VCO |_____|Post Divisor (PD) |___|CLK |---> - +-| Detect | |& Filter VCO| | | | |�1, 2, 4, 8, 16, 32| | | + +-| Detect | |& Filter VCO| | | | |÷1, 2, 4, 8, 16, 32| | | | +--------+ +------------+ +-----+ | +-------------------+ +----+ | | | +--+ +---------------+ | - |____|�M|___|VCO Loop Divide|__________| - | | |(VLD)(�4, �16) | + |____|÷M|___|VCO Loop Divide|__________| + | | |(VLD)(÷4, ÷16) | +--+ +---------------+ **************************************************************************** that is the hardware >= 69000 we have to manage +---------+ +--+ - | REFCLK |__|�N|__ + | REFCLK |__|÷N|__ | 14.3MHz | | | | +---------+ +--+ | __________________| @@ -652,12 +652,12 @@ FindBestPQFittingMN (unsigned int p, unsigned int q, unsigned int mnmin, | fvco fout | +--------+ +------------+ +-----+ +-------------------+ +----+ +-| Phase |__|Charge Pump |__| VCO |_____|Post Divisor (PD) |___|CLK |---> - +-| Detect | |& Filter VCO| | | | |�1, 2, 4, 8, 16, 32| | | + +-| Detect | |& Filter VCO| | | | |÷1, 2, 4, 8, 16, 32| | | | +--------+ +------------+ +-----+ | +-------------------+ +----+ | | | +--+ +---------------+ | - |____|�M|___|VCO Loop Divide|__________| - | | |(VLD)(�1, �4) | + |____|÷M|___|VCO Loop Divide|__________| + | | |(VLD)(÷1, ÷4) | +--+ +---------------+ diff --git a/drivers/video/sed13806.c b/drivers/video/sed13806.c index 9cd19b5..0bf9ba6 100644 --- a/drivers/video/sed13806.c +++ b/drivers/video/sed13806.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/drivers/video/sm501.c b/drivers/video/sm501.c index 6a1e010..42ac680 100644 --- a/drivers/video/sm501.c +++ b/drivers/video/sm501.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * (C) Copyright 2005 diff --git a/fs/fdos/Makefile b/fs/fdos/Makefile index 9cd4d91..503aa52 100644 --- a/fs/fdos/Makefile +++ b/fs/fdos/Makefile @@ -3,7 +3,7 @@ # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # # (C) Copyright 2002 -# St�ubli Faverges - <www.staubli.com> +# Stäubli Faverges - <www.staubli.com> # Pierre AUBERT p.aubert(a)staubli.com # # diff --git a/fs/fdos/dev.c b/fs/fdos/dev.c index b55b6ed..f21c7a9 100644 --- a/fs/fdos/dev.c +++ b/fs/fdos/dev.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/fs/fdos/dos.h b/fs/fdos/dos.h index 7b27b01..be1565b 100644 --- a/fs/fdos/dos.h +++ b/fs/fdos/dos.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/fs/fdos/fat.c b/fs/fdos/fat.c index 5707c19..0521d67 100644 --- a/fs/fdos/fat.c +++ b/fs/fdos/fat.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/fs/fdos/fdos.c b/fs/fdos/fdos.c index db58562..4c556df 100644 --- a/fs/fdos/fdos.c +++ b/fs/fdos/fdos.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/fs/fdos/fdos.h b/fs/fdos/fdos.h index e28c22f..0d2351a 100644 --- a/fs/fdos/fdos.h +++ b/fs/fdos/fdos.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/fs/fdos/fs.c b/fs/fdos/fs.c index 5acf123..ac10314 100644 --- a/fs/fdos/fs.c +++ b/fs/fdos/fs.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/fs/fdos/subdir.c b/fs/fdos/subdir.c index 5e96b0a..831437a 100644 --- a/fs/fdos/subdir.c +++ b/fs/fdos/subdir.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/fs/fdos/vfat.c b/fs/fdos/vfat.c index 9f357a6..d428268 100644 --- a/fs/fdos/vfat.c +++ b/fs/fdos/vfat.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/include/ali512x.h b/include/ali512x.h index 5bc1bd7..ff11426 100644 --- a/include/ali512x.h +++ b/include/ali512x.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr�m, Omicron Ceti AB <daniel(a)omicron.se>. + * Daniel Engström, Omicron Ceti AB <daniel(a)omicron.se>. * * See file CREDITS for list of people who contributed to this * project. diff --git a/include/configs/sc3.h b/include/configs/sc3.h index a254eda..852e807 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -532,9 +532,9 @@ #define CONFIG_SYS_ISA_MEM_BASE_ADDRESS 0x78000000 /* - Die Grafik-Treiber greifen �ber die Adresse in diesem Macro auf den Chip zu. + Die Grafik-Treiber greifen über die Adresse in diesem Macro auf den Chip zu. Das funktioniert bei deren Karten, weil sie eine PCI-Bridge benutzen, die - das gleiche Mapping durchf�hren kann, wie der SC520 (also Aufteilen von IO-Zugriffen + das gleiche Mapping durchführen kann, wie der SC520 (also Aufteilen von IO-Zugriffen auf ISA- und PCI-Zyklen) */ #define CONFIG_SYS_ISA_IO_BASE_ADDRESS 0xE8000000 diff --git a/include/fdc.h b/include/fdc.h index b66f202..3c4038c 100644 --- a/include/fdc.h +++ b/include/fdc.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 3b18d7d..d36d584 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -115,7 +115,7 @@ struct mtd_info { u_int32_t flags; uint64_t size; /* Total size of the MTD */ - /* "Major" erase size for the device. Na�ve users may take this + /* "Major" erase size for the device. Naïve users may take this * to be the only erase size available, or may use the more detailed * information below if they desire */ diff --git a/include/sed13806.h b/include/sed13806.h index 07f4576..5239a1d 100644 --- a/include/sed13806.h +++ b/include/sed13806.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * See file CREDITS for list of people who contributed to this diff --git a/include/sm501.h b/include/sm501.h index 3e71dbb..4e220a6 100644 --- a/include/sm501.h +++ b/include/sm501.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * St�ubli Faverges - <www.staubli.com> + * Stäubli Faverges - <www.staubli.com> * Pierre AUBERT p.aubert(a)staubli.com * * (C) Copyright 2005 diff --git a/lib/lzma/history.txt b/lib/lzma/history.txt index 624fb1d..aadf825 100644 --- a/lib/lzma/history.txt +++ b/lib/lzma/history.txt @@ -41,7 +41,7 @@ HISTORY of the LZMA SDK 4.57 2007-12-12 ------------------------- -- Speed optimizations in �++ LZMA Decoder. +- Speed optimizations in Ñ++ LZMA Decoder. - Small changes for more compatibility with some C/C++ compilers. diff --git a/nand_spl/board/amcc/bamboo/sdram.c b/nand_spl/board/amcc/bamboo/sdram.c index 504a02b..0254ed8 100644 --- a/nand_spl/board/amcc/bamboo/sdram.c +++ b/nand_spl/board/amcc/bamboo/sdram.c @@ -79,7 +79,7 @@ phys_size_t initdram(int board_type) mtsdram(SDRAM0_B0CR, 0x00082001); mtsdram(SDRAM0_TR0, 0x41094012); mtsdram(SDRAM0_TR1, 0x8080083d); /* SS=T2 SL=STAGE 3 CD=1 CT=0x00*/ - mtsdram(SDRAM0_RTR, 0x04100000); /* Interval 7.8�s @ 133MHz PLB */ + mtsdram(SDRAM0_RTR, 0x04100000); /* Interval 7.8µs @ 133MHz PLB */ mtsdram(SDRAM0_CFG1, 0x00000000); /* Self-refresh exit, disable PM*/ /* -- 1.7.4.1

3 10

[U-Boot] Pull request u-boot-marvell.git
by Prafulla Wadaskar 05 Aug '11

05 Aug '11

Hi Albert Please kindly pull The following changes since commit a3df225cd92034b03b276391a45efc516716a31a: Thomas Abraham (1): SMDKV310: Enable device tree support are available in the git repository at: u-boot-marvell.git master branch. Ajay Bhargav (2): Armada100: MFP macro naming correction Armada100: Add Board Support for Marvell GuruPlug-Display Jason Cooper (1): drivers/rtc: add Marvell Integrated RTC MAINTAINERS | 4 + arch/arm/include/asm/arch-armada100/mfp.h | 4 +- arch/arm/include/asm/arch-kirkwood/kirkwood.h | 1 + board/Marvell/gplugd/Makefile | 57 +++++++++++ board/Marvell/gplugd/gplugd.c | 62 ++++++++++++ boards.cfg | 1 + drivers/rtc/Makefile | 1 + drivers/rtc/mvrtc.c | 124 +++++++++++++++++++++++++ drivers/rtc/mvrtc.h | 65 +++++++++++++ include/configs/gplugd.h | 87 +++++++++++++++++ 10 files changed, 404 insertions(+), 2 deletions(-) create mode 100644 board/Marvell/gplugd/Makefile create mode 100644 board/Marvell/gplugd/gplugd.c create mode 100644 drivers/rtc/mvrtc.c create mode 100644 drivers/rtc/mvrtc.h create mode 100644 include/configs/gplugd.h Regards.. Prafulla . .

2 2

[U-Boot] CONFIRMATION LETTER FROM KIA
by Barnes, Annie 05 Aug '11

05 Aug '11

Attention: Lucky Winner, confirmation Approval #: KIASOULXX72/2011. We are happy to announce that you are one of our Lucky Ten (10) Star Prize Winner in this year edition of the KIA MOTORS END OF YEAR 2011 LOTTERY PROMOTION. This makes you a proud owner a KIA's brand new 2011 Soul Car and a cash sum of £550,000.00 Great British Pounds Sterling. ************************************************* Contact: Mr. ZACHARY ASHTON Email: kiaawarddeptoffice(a)yahoo.com.hk<mailto:kiaawarddeptoffice@yahoo.com.hk> Call Tel No.: (+44)07035966196 ************************************************* Provide Her with your Full Name:( )Tel:( )Sex:( )Age( ) Marital Status:( )Occupation:( )Country:( )City:( ) Alternative E-mail:( ) and Approval # (KIASOULXX72/2011). **Note: Forward All replies, Concerning your claims should be sent to kiaawarddeptoffice(a)yahoo.com.hk<mailto:kiaawarddeptoffice@yahoo.com.hk> ----------------------------------------- Confidentiality Notice: This e-mail communication and any attachments may contain confidential and privileged information for the use of the designated recipients named above. If you are not the intended recipient, you are hereby notified that you have received this communication in error and that any review, disclosure, dissemination, distribution or copying of it or its contents is prohibited. If you have received this communication in error, please notify me immediately by replying to this message and deleting it from your computer. Thank you.

1 0

Re: [U-Boot] Pull request: u-boot-arm/master -- updated
by Wolfgang Denk 05 Aug '11

05 Aug '11

Dear Albert ARIBAUD, I wrote: > Hm... current build results are shattering; building for ARM with good > old ELDK 4.2 gives this: > > --------------------- SUMMARY ---------------------------- > Boards compiled: 201 > Boards with warnings or errors: 99 ( assabet dnp1110 gcplus lart shannon ap7 ap720t armadillo B2 ep7312 evb4510 impa7 integratorap lpc2292sodimm modnet50 SMN42 ap920t ap922_XA10 ap926ejs ap946es ap966 cp920t cp922_XA10 cp926ejs cp946es cp966 edb9301 edb > 9302 edb9302a edb9307 edb9307a edb9312 edb9315 edb9315a imx27lite jadecpu lpd7a400 magnesium mx1fs2 netstar sbc2410x scb9328 smdk2400 smdk2410 spear300 spear310 spear320 spear600 VCMA9 versatile versatileab versatilepb voiceblue integratorcp cp1026 cp11 > 36 omap2420h4 apollon imx31_litekit imx31_phycore imx31_phycore_eet mx31ads mx31pdk mx31pdk_nand qong dig297 igep0020 mx51evk omap3_beagle omap3_overo omap3_evm omap3_zoom2 omap4_panda omap4_sdp4430 at91cap9adk meesc meesc_dataflash pm9261 pm9263 at91sa > m9m10g45ek pm9g45 SBC35_A9G20 TNY_A9260 TNY_A9G20 csb226 lubbock zylonite actux1_4_16 actux1_8_16 actux1_4_32 actux1_8_32 actux2 actux3 actux4 dvlhost ixdp425 ixdpg425 pdnb3 scpu ) > ---------------------------------------------------------- It's even more impressive when building on a 32 bit system: --------------------- SUMMARY ---------------------------- Boards compiled: 201 Boards with warnings or errors: 201 ( assabet dnp1110 gcplus jornada lart shannon ap7 ap720t armadillo B2 ep7312 evb4510 impa7 integratorap lpc2292sodimm modnet50 SMN42 a320evb ap920t ap922_XA10 ap926ejs ap946es ap966 aspenite cp920t cp922_XA10 cp926ejs cp946es cp966 da830evm da850evm edb9301 edb9302 edb9302a edb9307 edb9307a edb9312 edb9315 edb9315a edminiv2 guruplug imx27lite jadecpu km_kirkwood lpd7a400 magnesium mv88f6281gtw_ge mx1ads mx1fs2 netstar nhk8815 nhk8815_onenand omap1510inn omap1610h2 omap1610inn omap5912osk omap730p2 openrd_base openrd_client openrd_ultimate portl2 rd6281a sbc2410x scb9328 sheevaplug smdk2400 smdk2410 spear300 spear310 spear320 spear600 VCMA9 versatile versatileab versatilepb voiceblue davinci_dvevm davinci_schmoogie davinci_sffsdr davinci_sonata davinci_dm355evm davinci_dm355leopard davinci_dm365evm davinci_dm6467evm integratorcp cp1026 cp1136 omap2420h4 apollon imx31_litekit imx31_phycore imx31_phycore_eet mx31ads mx31pdk mx31pdk_nand qong s mdk6400 tnetv107x_evm am3517_crane am3517_evm ca9x4_ct_vxp devkit8000 dig297 igep0020 igep0030 mx51evk omap3_beagle omap3_overo omap3_evm omap3_pandora omap3_sdp3430 omap3_zoom1 omap3_zoom2 omap4_panda omap4_sdp4430 s5p_goni smdkc100 at91rm9200ek at91rm9200ek_ram eb_cpux9k2 cpuat91 cpuat91_ram afeb9260 at91cap9adk at91sam9260ek_nandflash at91sam9260ek_dataflash_cs0 at91sam9260ek_dataflash_cs1 at91sam9261ek_nandflash at91sam9261ek_dataflash_cs0 at91sam9261ek_dataflash_cs3 at91sam9263ek_nandflash at91sam9263ek_dataflash_cs0 at91sam9263ek_dataflash at91sam9263ek_norflash at91sam9263ek_norflash_boot at91sam9g10ek_nandflash at91sam9g10ek_dataflash_cs0 at91sam9g10ek_dataflash_cs3 at91sam9g20ek_nandflash at91sam9g20ek_dataflash_cs0 at91sam9g20ek_dataflash_cs1 at91sam9rlek_nandflash at91sam9rlek_dataflash at91sam9xeek_nandflash at91sam9xeek_dataflash_cs0 at91sam9xeek_dataflash_cs1 snapper9260 snapper9g20 cpu9260 cpu9260_nand cpu9260_128M cpu9260_nand_128M cpu9G20 cpu9G20_nand cpu9G2 0_128M cpu9G20_nand_128M top9000eval_xe top9000su_xe meesc meesc_dataflash otc570 otc570_dataflash pm9261 pm9263 at91sam9m10g45ek pm9g45 SBC35_A9G20 TNY_A9260 TNY_A9G20 balloon3 cerf250 colibri_pxa270 cradle csb226 innokom lubbock palmld palmtc pleb2 polaris pxa255_idp trizepsiv vpac270_nor_128 vpac270_nor_256 vpac270_ond_256 xaeniax xm250 zipitz2 zylonite actux1_4_16 actux1_8_16 actux1_4_32 actux1_8_32 actux2 actux3 actux4 dvlhost ixdp425 ixdpg425 pdnb3 scpu ) ---------------------------------------------------------- I can't say I ever have seen this before :-( 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 Making files is easy under the UNIX operating system. Therefore, users tend to create numerous files using large amounts of file space. It has been said that the only standard thing about all UNIX systems is the message-of-the-day telling users to clean up their files. - System V.2 administrator's guide

1 0

[U-Boot] [PATCH] atmel: Update support of board AT91SAM9M10G45-EK to new style
by Thomas Petazzoni 04 Aug '11

04 Aug '11

Based on earlier work by Alex Waterman <awaterman(a)dawning.com>. Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)free-electrons.com> --- MAKEALL | 1 - Makefile | 21 --- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 115 ++++++++------ board/atmel/at91sam9m10g45ek/led.c | 6 +- boards.cfg | 1 + include/configs/at91sam9m10g45ek.h | 193 ++++++++++------------- 6 files changed, 155 insertions(+), 182 deletions(-) diff --git a/MAKEALL b/MAKEALL index 7e748d6..fa92b88 100755 --- a/MAKEALL +++ b/MAKEALL @@ -444,7 +444,6 @@ LIST_ARMV7=" \ ######################################################################### LIST_at91="$(boards_by_soc at91)\ - at91sam9m10g45ek \ pm9g45 \ " diff --git a/Makefile b/Makefile index f478ec6..1c93044 100644 --- a/Makefile +++ b/Makefile @@ -802,27 +802,6 @@ M5485HFE_config : unconfig ## ARM926EJ-S Systems ######################################################################### -at91sam9m10g45ek_nandflash_config \ -at91sam9m10g45ek_dataflash_config \ -at91sam9m10g45ek_dataflash_cs0_config \ -at91sam9m10g45ek_config \ -at91sam9g45ekes_nandflash_config \ -at91sam9g45ekes_dataflash_config \ -at91sam9g45ekes_dataflash_cs0_config \ -at91sam9g45ekes_config : unconfig - @mkdir -p $(obj)include - @if [ "$(findstring 9m10,$@)" ] ; then \ - echo "#define CONFIG_AT91SAM9M10G45EK 1" >>$(obj)include/config.h ; \ - else \ - echo "#define CONFIG_AT91SAM9G45EKES 1" >>$(obj)include/config.h ; \ - fi; - @if [ "$(findstring _nandflash,$@)" ] ; then \ - echo "#define CONFIG_SYS_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ - else \ - echo "#define CONFIG_ATMEL_SPI 1" >>$(obj)include/config.h ; \ - fi; - @$(MKCONFIG) -n $@ -a at91sam9m10g45ek arm arm926ejs at91sam9m10g45ek atmel at91 - pm9g45_config : unconfig @mkdir -p $(obj)include @$(MKCONFIG) -a pm9g45 arm arm926ejs pm9g45 ronetix at91 diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c index f92b20f..24a8606 100644 --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c @@ -23,17 +23,14 @@ */ #include <common.h> -#include <asm/sizes.h> -#include <asm/arch/at91sam9g45.h> -#include <asm/arch/at91sam9_matrix.h> +#include <asm/io.h> +#include <asm/arch/at91sam9g45_matrix.h> #include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_rstc.h> -#include <asm/arch/clk.h> #include <asm/arch/gpio.h> -#include <asm/arch/io.h> -#include <asm/arch/hardware.h> +#include <asm/arch/clk.h> #include <lcd.h> #include <atmel_lcdc.h> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) @@ -49,35 +46,38 @@ DECLARE_GLOBAL_DATA_PTR; */ #ifdef CONFIG_CMD_NAND -static void at91sam9m10g45ek_nand_hw_init(void) +void at91sam9m10g45ek_nand_hw_init(void) { + struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC; + struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX; + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; unsigned long csa; /* Enable CS3 */ - csa = at91_sys_read(AT91_MATRIX_EBICSA); - at91_sys_write(AT91_MATRIX_EBICSA, - csa | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA); + csa = readl(&matrix->ebicsa); + csa |= AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA; + writel(csa, &matrix->ebicsa); /* Configure SMC CS3 for NAND/SmartMedia */ - at91_sys_write(AT91_SMC_SETUP(3), - AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) | - AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); - at91_sys_write(AT91_SMC_PULSE(3), - AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(3) | - AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(2)); - at91_sys_write(AT91_SMC_CYCLE(3), - AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(4)); - at91_sys_write(AT91_SMC_MODE(3), - AT91_SMC_READMODE | AT91_SMC_WRITEMODE | - AT91_SMC_EXNWMODE_DISABLE | + writel(AT91_SMC_SETUP_NWE(1) | AT91_SMC_SETUP_NCS_WR(0) | + AT91_SMC_SETUP_NRD(1) | AT91_SMC_SETUP_NCS_RD(0), + &smc->cs[3].setup); + writel(AT91_SMC_PULSE_NWE(4) | AT91_SMC_PULSE_NCS_WR(3) | + AT91_SMC_PULSE_NRD(3) | AT91_SMC_PULSE_NCS_RD(2), + &smc->cs[3].pulse); + writel(AT91_SMC_CYCLE_NWE(7) | AT91_SMC_CYCLE_NRD(4), + &smc->cs[3].cycle); + writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE | + AT91_SMC_MODE_EXNW_DISABLE | #ifdef CONFIG_SYS_NAND_DBW_16 - AT91_SMC_DBW_16 | + AT91_SMC_MODE_DBW_16 | #else /* CONFIG_SYS_NAND_DBW_8 */ - AT91_SMC_DBW_8 | + AT91_SMC_MODE_DBW_8 | #endif - AT91_SMC_TDF_(3)); + AT91_SMC_MODE_TDF_CYCLE(3), + &smc->cs[3].mode); - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9G45_ID_PIOC); + writel(1 << ATMEL_ID_PIOC, &pmc->pcer); /* Configure RDY/BSY */ at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); @@ -90,7 +90,9 @@ static void at91sam9m10g45ek_nand_hw_init(void) #ifdef CONFIG_CMD_USB static void at91sam9m10g45ek_usb_hw_init(void) { - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9G45_ID_PIODE); + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + + writel(1 << ATMEL_ID_PIODE, &pmc->pcer); at91_set_gpio_output(AT91_PIN_PD1, 0); at91_set_gpio_output(AT91_PIN_PD3, 0); @@ -100,47 +102,50 @@ static void at91sam9m10g45ek_usb_hw_init(void) #ifdef CONFIG_MACB static void at91sam9m10g45ek_macb_hw_init(void) { - unsigned long rstc; + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA; + struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC; + unsigned long erstl; /* Enable clock */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9G45_ID_EMAC); + writel(1 << ATMEL_ID_EMAC, &pmc->pcer); /* * Disable pull-up on: - * RXDV (PA15) => PHY normal mode (not Test mode) - * ERX0 (PA12) => PHY ADDR0 - * ERX1 (PA13) => PHY ADDR1 => PHYADDR = 0x0 + * RXDV (PA15) => PHY normal mode (not Test mode) + * ERX0 (PA12) => PHY ADDR0 + * ERX1 (PA13) => PHY ADDR1 => PHYADDR = 0x0 * * PHY has internal pull-down */ writel(pin_to_mask(AT91_PIN_PA15) | pin_to_mask(AT91_PIN_PA12) | pin_to_mask(AT91_PIN_PA13), - pin_to_controller(AT91_PIN_PA0) + PIO_PUDR); + &pioa->pudr); - rstc = at91_sys_read(AT91_RSTC_MR); + erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK; /* Need to reset PHY -> 500ms reset */ - at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | - (AT91_RSTC_ERSTL & (0x0D << 8)) | - AT91_RSTC_URSTEN); + writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(13) | + AT91_RSTC_MR_URSTEN, &rstc->mr); - at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST); + writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr); /* Wait for end hardware reset */ - while (!(at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_NRSTL)); + while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL)) + ; /* Restore NRST value */ - at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | - (rstc) | - AT91_RSTC_URSTEN); + writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN, + &rstc->mr); /* Re-enable pull-up */ writel(pin_to_mask(AT91_PIN_PA15) | pin_to_mask(AT91_PIN_PA12) | pin_to_mask(AT91_PIN_PA13), - pin_to_controller(AT91_PIN_PA0) + PIO_PUER); + &pioa->puer); + /* And the pins. */ at91_macb_hw_init(); } #endif @@ -161,7 +166,7 @@ vidinfo_t panel_info = { vl_vsync_len: 1, vl_upper_margin:40, vl_lower_margin:1, - mmio: AT91SAM9G45_LCDC_BASE, + mmio : ATMEL_BASE_LCDC, }; @@ -177,6 +182,8 @@ void lcd_disable(void) static void at91sam9m10g45ek_lcd_hw_init(void) { + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + at91_set_A_periph(AT91_PIN_PE0, 0); /* LCDDPWR */ at91_set_A_periph(AT91_PIN_PE2, 0); /* LCDCC */ at91_set_A_periph(AT91_PIN_PE3, 0); /* LCDVSYNC */ @@ -208,7 +215,7 @@ static void at91sam9m10g45ek_lcd_hw_init(void) at91_set_A_periph(AT91_PIN_PE29, 0); /* LCDD22 */ at91_set_A_periph(AT91_PIN_PE30, 0); /* LCDD23 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9G45_ID_LCDC); + writel(1 << ATMEL_ID_LCDC, &pmc->pcer); gd->fb_base = CONFIG_AT91SAM9G45_LCD_BASE; } @@ -227,7 +234,7 @@ void lcd_show_board_info(void) lcd_printf ("(C) 2008 ATMEL Corp\n"); lcd_printf ("at91support(a)atmel.com\n"); lcd_printf ("%s CPU at %s MHz\n", - CONFIG_SYS_AT91_CPU_NAME, + ATMEL_CPU_NAME, strmhz(temp, get_cpu_clk_rate())); dram_size = 0; @@ -243,6 +250,12 @@ void lcd_show_board_info(void) #endif /* CONFIG_LCD_INFO */ #endif +int board_early_init_f(void) +{ + at91_seriald_hw_init(); + return 0; +} + int board_init(void) { /* Enable Ctrlc */ @@ -254,10 +267,10 @@ int board_init(void) #elif defined CONFIG_AT91SAM9G45EKES gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G45EKES; #endif + /* adress of boot parameters */ - gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; - at91_serial_hw_init(); #ifdef CONFIG_CMD_NAND at91sam9m10g45ek_nand_hw_init(); #endif @@ -270,11 +283,9 @@ int board_init(void) #ifdef CONFIG_ATMEL_SPI at91_spi0_hw_init(1 << 4); #endif - #ifdef CONFIG_MACB at91sam9m10g45ek_macb_hw_init(); #endif - #ifdef CONFIG_LCD at91sam9m10g45ek_lcd_hw_init(); #endif @@ -283,8 +294,8 @@ int board_init(void) int dram_init(void) { - gd->bd->bi_dram[0].start = PHYS_SDRAM; - gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE; + gd->ram_size = get_ram_size((void *) CONFIG_SYS_SDRAM_BASE, + CONFIG_SYS_SDRAM_SIZE); return 0; } @@ -298,7 +309,7 @@ int board_eth_init(bd_t *bis) { int rc = 0; #ifdef CONFIG_MACB - rc = macb_eth_initialize(0, (void *)AT91SAM9G45_BASE_EMAC, 0x00); + rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x00); #endif return rc; } diff --git a/board/atmel/at91sam9m10g45ek/led.c b/board/atmel/at91sam9m10g45ek/led.c index ff59a2d..dadbd6a 100644 --- a/board/atmel/at91sam9m10g45ek/led.c +++ b/board/atmel/at91sam9m10g45ek/led.c @@ -23,15 +23,17 @@ */ #include <common.h> +#include <asm/io.h> #include <asm/arch/at91sam9g45.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/gpio.h> -#include <asm/arch/io.h> void coloured_LED_init(void) { + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + /* Enable clock */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9G45_ID_PIODE); + writel(1 << ATMEL_ID_PIODE, &pmc->pcer); at91_set_gpio_output(CONFIG_RED_LED, 1); at91_set_gpio_output(CONFIG_GREEN_LED, 1); diff --git a/boards.cfg b/boards.cfg index 4d08cfd..dc64dc5 100644 --- a/boards.cfg +++ b/boards.cfg @@ -94,6 +94,7 @@ at91sam9g10ek_dataflash_cs3 arm arm926ejs at91sam9261ek atmel at91sam9g20ek_nandflash arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH at91sam9g20ek_dataflash_cs0 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS0 at91sam9g20ek_dataflash_cs1 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS1 +at91sam9m10g45ek_nandflash arm arm926ejs at91sam9m10g45ek atmel at91 at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH at91sam9rlek_nandflash arm arm926ejs at91sam9rlek atmel at91 at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH at91sam9rlek_dataflash arm arm926ejs at91sam9rlek atmel at91 at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH at91sam9xeek_nandflash arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9XE,SYS_USE_NANDFLASH diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index de74dcf..b08cbf2 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -27,48 +27,60 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <asm/hardware.h> + #define CONFIG_AT91_LEGACY +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ /* ARM asynchronous clock */ -#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ -#define CONFIG_SYS_HZ 1000 - -#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ -#ifdef CONFIG_AT91SAM9M10G45EK -#define CONFIG_AT91SAM9M10G45 1 /* It's an Atmel AT91SAM9M10G45 SoC*/ -#else -#define CONFIG_AT91SAM9G45 1 /* It's an Atmel AT91SAM9G45 SoC*/ -#endif +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 +#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ +#define CONFIG_SYS_HZ 1000 + +#define CONFIG_AT91SAM9M10G45EK +#define CONFIG_AT91FAMILY #define CONFIG_ARCH_CPU_INIT #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 - +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_DISPLAY_CPUINFO + +/* general purpose I/O */ +#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ +#define CONFIG_AT91_GPIO +#define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ + +/* serial console */ +#define CONFIG_ATMEL_USART +#define CONFIG_USART_BASE ATMEL_BASE_DBGU +#define CONFIG_USART_ID ATMEL_ID_SYS + +/* + * This needs to be defined for the OHCI code to work but it is defined as + * ATMEL_ID_UHPHS in the CPU specific header files. + */ +#define ATMEL_ID_UHP ATMEL_ID_UHPHS /* - * Hardware drivers + * Specify the clock enable bit in the PMC_SCER register. */ -#define CONFIG_AT91_GPIO 1 -#define CONFIG_ATMEL_USART 1 -#undef CONFIG_USART0 -#undef CONFIG_USART1 -#undef CONFIG_USART2 -#define CONFIG_USART3 1 /* USART 3 is DBGU */ +#define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP /* LCD */ -#define CONFIG_LCD 1 +#define CONFIG_LCD #define LCD_BPP LCD_COLOR8 -#define CONFIG_LCD_LOGO 1 +#define CONFIG_LCD_LOGO #undef LCD_TEST_PATTERN -#define CONFIG_LCD_INFO 1 -#define CONFIG_LCD_INFO_BELOW_LOGO 1 -#define CONFIG_SYS_WHITE_ON_BLACK 1 -#define CONFIG_ATMEL_LCD 1 -#define CONFIG_ATMEL_LCD_RGB565 1 -#define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 +#define CONFIG_LCD_INFO +#define CONFIG_LCD_INFO_BELOW_LOGO +#define CONFIG_SYS_WHITE_ON_BLACK +#define CONFIG_ATMEL_LCD +#define CONFIG_ATMEL_LCD_RGB565 +#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* board specific(not enough SRAM) */ #define CONFIG_AT91SAM9G45_LCD_BASE 0x73E00000 @@ -82,10 +94,10 @@ /* * BOOTP options */ -#define CONFIG_BOOTP_BOOTFILESIZE 1 -#define CONFIG_BOOTP_BOOTPATH 1 -#define CONFIG_BOOTP_GATEWAY 1 -#define CONFIG_BOOTP_HOSTNAME 1 +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME /* * Command line configuration. @@ -98,44 +110,29 @@ #undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_LOADS -#define CONFIG_CMD_PING 1 -#define CONFIG_CMD_DHCP 1 -#define CONFIG_CMD_NAND 1 -#define CONFIG_CMD_USB 1 +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NAND +#define CONFIG_CMD_USB /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 -#define PHYS_SDRAM 0x70000000 -#define PHYS_SDRAM_SIZE 0x08000000 /* 128 megs */ - -/* DataFlash */ -#ifdef CONFIG_ATMEL_SPI -#define CONFIG_CMD_SF -#define CONFIG_CMD_SPI -#define CONFIG_SPI_FLASH 1 -#define CONFIG_SPI_FLASH_ATMEL 1 -#define CONFIG_SYS_MAX_DATAFLASH_BANKS 1 -#endif +#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 +#define CONFIG_SYS_SDRAM_SIZE 0x08000000 -/* NOR flash, if populated */ -#ifndef CONFIG_CMD_NAND -#define CONFIG_SYS_NO_FLASH 1 -#else -#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 -#define PHYS_FLASH_1 0x10000000 -#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 -#define CONFIG_SYS_MAX_FLASH_SECT 256 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#endif +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE) + +/* No NOR flash */ +#define CONFIG_SYS_NO_FLASH /* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_NAND_MAX_CHIPS 1 #define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE 0x40000000 -#define CONFIG_SYS_NAND_DBW_8 1 +#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 +#define CONFIG_SYS_NAND_DBW_8 /* our ALE is AD21 */ #define CONFIG_SYS_NAND_MASK_ALE (1 << 21) /* our CLE is AD22 */ @@ -146,68 +143,52 @@ #endif /* Ethernet */ -#define CONFIG_MACB 1 -#define CONFIG_RMII 1 -#define CONFIG_NET_MULTI 1 +#define CONFIG_MACB +#define CONFIG_RMII +#define CONFIG_NET_MULTI #define CONFIG_NET_RETRY_COUNT 20 -#define CONFIG_RESET_PHY_R 1 +#define CONFIG_RESET_PHY_R /* USB */ #define CONFIG_USB_ATMEL -#define CONFIG_USB_OHCI_NEW 1 -#define CONFIG_DOS_PARTITION 1 -#define CONFIG_SYS_USB_OHCI_CPU_INIT 1 -#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00700000 /* AT91SAM9G45_UHP_OHCI_BASE */ -#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9g45" +#define CONFIG_USB_OHCI_NEW +#define CONFIG_DOS_PARTITION +#define CONFIG_SYS_USB_OHCI_CPU_INIT +#define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_BASE_HCI +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9g45" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE 1 - -#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ - -#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM -#define CONFIG_SYS_MEMTEST_END 0x23e00000 +#define CONFIG_USB_STORAGE -#ifdef CONFIG_SYS_USE_DATAFLASH +#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ -#define CONFIG_ENV_IS_IN_SPI_FLASH 1 -#define CONFIG_SYS_MONITOR_BASE (0xC0000000 + 0x8400) -#define CONFIG_ENV_OFFSET 0x4200 -#define CONFIG_ENV_ADDR (0xC0000000 + CONFIG_ENV_OFFSET) -#define CONFIG_ENV_SIZE 0x4200 -#define CONFIG_ENV_SECT_SIZE 0x10000 -#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock0 " \ - "mtdparts=atmel_nand:-(root) "\ - "rw rootfstype=jffs2" +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END 0x23e00000 -#else /* CONFIG_SYS_USE_NANDFLASH */ - -/* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_IS_IN_NAND 1 +/* bootstrap + u-boot + env in nandflash */ +#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x60000 #define CONFIG_ENV_OFFSET_REDUND 0x80000 -#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ -#define CONFIG_BOOTCOMMAND "nand read 0x72000000 0x200000 0x200000; bootm" -#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ - "root=/dev/mtdblock5 " \ - "mtdparts=atmel_nand:128k(bootstrap)ro, \ - 256k(uboot)ro,128k(env1)ro,128k(env2)ro, \ - 2M(linux),-(root) " \ - "rw rootfstype=jffs2" - -#endif - -#define CONFIG_BAUDRATE 115200 +#define CONFIG_ENV_SIZE 0x20000 + +#define CONFIG_BOOTCOMMAND "nand read 0x70000000 0x100000 0x200000;" \ + "bootm 0x70000000" +#define CONFIG_BOOTARGS \ + "console=ttyS0,115200 earlyprintk " \ + "root=/dev/mtdblock5 " \ + "mtdparts=atmel_nand:128k(bootstrap)ro," \ + "256k(uboot)ro,128k(env1)ro,128k(env2)ro," \ + "2M@1M(linux),-(root) " \ + "rw rootfstype=jffs2" + +#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } #define CONFIG_SYS_PROMPT "U-Boot> " #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_LONGHELP 1 -#define CONFIG_CMDLINE_EDITING 1 +#define CONFIG_SYS_LONGHELP +#define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -- 1.7.4.1

2 1

[U-Boot] [PATCH] mpc5200: digsy_mtc: fix extension board EEPROM I2C address for rev5
by Anatolij Gustschin 04 Aug '11

04 Aug '11

On newer rev5 hardware the extension board EEPROM I2C address has been changed to 0x54. Make this I2C address configurable depending on CONFIG_DIGSY_REV5 so that extention board presence detection works correctly on newer hardware. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- board/intercontrol/digsy_mtc/digsy_mtc.c | 5 +---- include/configs/digsy_mtc.h | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/board/intercontrol/digsy_mtc/digsy_mtc.c b/board/intercontrol/digsy_mtc/digsy_mtc.c index 784ba2a..4d6b33d 100644 --- a/board/intercontrol/digsy_mtc/digsy_mtc.c +++ b/board/intercontrol/digsy_mtc/digsy_mtc.c @@ -220,9 +220,6 @@ int checkboard(void) #define GPT_GPIO_ON 0x00000034 /* GPT as simple GPIO, high */ -/* ExBo I2C Addresses */ -#define EXBO_EE_I2C_ADDRESS 0x56 - static void exbo_hw_init(void) { struct mpc5xxx_gpt *gpt = (struct mpc5xxx_gpt *)MPC5XXX_GPT; @@ -232,7 +229,7 @@ static void exbo_hw_init(void) unsigned char val; /* 1st, check if extension board is present */ - if (i2c_read(EXBO_EE_I2C_ADDRESS, 0, 1, &val, 1)) + if (i2c_read(CONFIG_SYS_EXBO_EE_I2C_ADDRESS, 0, 1, &val, 1)) return; /* configure IrDA pins (PSC6 port) as gpios */ diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 40ab631..1e52299 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -293,6 +293,13 @@ #define CONFIG_SYS_DS1339_TCR_VAL 0xAB /* diode + 4k resistor */ #endif +/* ExBo I2C Addresses */ +#if defined(CONFIG_DIGSY_REV5) +#define CONFIG_SYS_EXBO_EE_I2C_ADDRESS 0x54 +#else +#define CONFIG_SYS_EXBO_EE_I2C_ADDRESS 0x56 +#endif + /* * Flash configuration */ -- 1.7.1

2 1

[U-Boot] [PATCH][NEXT] hwmon: do not init sensors on startup
by Heiko Schocher 04 Aug '11

04 Aug '11

The U-Boot Design Principles[1] clearly say: Initialize devices only when they are needed within U-Boot, i.e. don't initialize the Ethernet interface(s) unless U-Boot performs a download over Ethernet; don't initialize any IDE or USB devices unless U-Boot actually tries to load files from these, etc. (and don't forget to shut down these devices after using them - otherwise nasty things may happen when you try to boot your OS). So, do not initialize and read the sensors on startup. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- arch/powerpc/lib/board.c | 3 --- common/cmd_dtt.c | 14 ++++++++++++-- drivers/hwmon/adm1021.c | 27 +++------------------------ drivers/hwmon/adt7460.c | 2 +- drivers/hwmon/ds1621.c | 19 +------------------ drivers/hwmon/ds1775.c | 19 +------------------ drivers/hwmon/lm63.c | 19 +------------------ drivers/hwmon/lm73.c | 20 ++------------------ drivers/hwmon/lm75.c | 29 ++--------------------------- drivers/hwmon/lm81.c | 21 ++------------------- include/dtt.h | 2 +- 11 files changed, 26 insertions(+), 149 deletions(-) diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index b21c1d6..f9412a9 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -917,9 +917,6 @@ void board_init_r (gd_t *id, ulong dest_addr) WATCHDOG_RESET (); -#if defined(CONFIG_DTT) /* Digital Thermometers and Thermostats */ - dtt_init (); -#endif #if defined(CONFIG_CMD_SCSI) WATCHDOG_RESET (); puts ("SCSI: "); diff --git a/common/cmd_dtt.c b/common/cmd_dtt.c index 3388e43..37ce4df 100644 --- a/common/cmd_dtt.c +++ b/common/cmd_dtt.c @@ -28,6 +28,8 @@ #include <dtt.h> #include <i2c.h> +static unsigned long sensors_init_done = 0; + int do_dtt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) { int i; @@ -42,8 +44,16 @@ int do_dtt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) * Loop through sensors, read * temperature, and output it. */ - for (i = 0; i < sizeof (sensors); i++) - printf ("DTT%d: %i C\n", i + 1, dtt_get_temp (sensors[i])); + for (i = 0; i < sizeof (sensors); i++) { + if ((sensors_init_done & (1 << i)) != (1 << i)) { + if (dtt_init_one(sensors[i]) == 0) + sensors_init_done |= (1 << i); + else + printf("DTT%d: Failed init!\n", i); + } + if ((sensors_init_done & (1 << i)) == (1 << i)) + printf ("DTT%d: %i C\n", i + 1, dtt_get_temp(sensors[i])); + } /* switch back to original I2C bus */ I2C_SET_BUS(old_bus); diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c index d753e9a..3ef80af 100644 --- a/drivers/hwmon/adm1021.c +++ b/drivers/hwmon/adm1021.c @@ -109,8 +109,8 @@ dtt_write (int sensor, int reg, int val) return 0; } /* dtt_write() */ -static int -_dtt_init (int sensor) +int +dtt_init_one (int sensor) { dtt_cfg_t *dcp = &dttcfg[sensor >> 1]; int reg, val; @@ -164,28 +164,7 @@ _dtt_init (int sensor) return 1; return 0; -} /* _dtt_init() */ - -int -dtt_init (void) -{ - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - const char *const header = "DTT: "; - - /* switch to correct I2C bus */ - I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM); - - for (i = 0; i < sizeof(sensors); i++) { - if (_dtt_init(sensors[i]) != 0) - printf ("%s%d FAILED INIT\n", header, i+1); - else - printf ("%s%d is %i C\n", header, i+1, - dtt_get_temp(sensors[i])); - } - - return (0); -} /* dtt_init() */ +} /* dtt_init_one() */ int dtt_get_temp (int sensor) diff --git a/drivers/hwmon/adt7460.c b/drivers/hwmon/adt7460.c index caef70a..b7e36fe 100644 --- a/drivers/hwmon/adt7460.c +++ b/drivers/hwmon/adt7460.c @@ -50,7 +50,7 @@ int dtt_write(int sensor, int reg, int val) return 0; } -int dtt_init(void) +int dtt_init_one(int sensor) { printf("ADT7460 at I2C address 0x%2x\n", ADT7460_ADDRESS); diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c index 5a2ea62..4e1db6d 100644 --- a/drivers/hwmon/ds1621.c +++ b/drivers/hwmon/ds1621.c @@ -126,7 +126,7 @@ int dtt_write(int sensor, int reg, int val) } -static int _dtt_init(int sensor) +int dtt_init_one(int sensor) { int val; @@ -155,23 +155,6 @@ static int _dtt_init(int sensor) return 0; } - -int dtt_init (void) -{ - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - - for (i = 0; i < sizeof(sensors); i++) { - if (_dtt_init(sensors[i]) != 0) - printf("DTT%d: FAILED\n", i + 1); - else - printf("DTT%d: %i C\n", i + 1, dtt_get_temp(sensors[i])); - } - - return (0); -} - - int dtt_get_temp(int sensor) { int i; diff --git a/drivers/hwmon/ds1775.c b/drivers/hwmon/ds1775.c index 80fb26f..feabdf2 100644 --- a/drivers/hwmon/ds1775.c +++ b/drivers/hwmon/ds1775.c @@ -98,7 +98,7 @@ int dtt_write(int sensor, int reg, int val) } -static int _dtt_init(int sensor) +int dtt_init_one(int sensor) { int val; @@ -133,23 +133,6 @@ static int _dtt_init(int sensor) return 0; } - -int dtt_init (void) -{ - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - - for (i = 0; i < sizeof(sensors); i++) { - if (_dtt_init(sensors[i]) != 0) - printf("DTT%d: FAILED\n", i+1); - else - printf("DTT%d: %i C\n", i+1, dtt_get_temp(sensors[i])); - } - - return (0); -} - - int dtt_get_temp(int sensor) { return (dtt_read(sensor, DTT_READ_TEMP) / 256); diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c index 03616e1..2e49258 100644 --- a/drivers/hwmon/lm63.c +++ b/drivers/hwmon/lm63.c @@ -93,7 +93,7 @@ int dtt_write(int sensor, int reg, int val) return 0; } /* dtt_write() */ -static int _dtt_init(int sensor) +int dtt_init_one(int sensor) { int i; int val; @@ -155,20 +155,3 @@ int dtt_get_temp(int sensor) /* Ignore LSB for now, U-Boot only prints natural numbers */ return temp >> 8; } - -int dtt_init(void) -{ - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - const char *const header = "DTT: "; - - for (i = 0; i < sizeof(sensors); i++) { - if (_dtt_init(sensors[i]) != 0) - printf("%s%d FAILED INIT\n", header, i + 1); - else - printf("%s%d is %i C\n", header, i + 1, - dtt_get_temp(sensors[i])); - } - - return 0; -} diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c index 7b5d893..45cc6db 100644 --- a/drivers/hwmon/lm73.c +++ b/drivers/hwmon/lm73.c @@ -112,7 +112,7 @@ int dtt_write(int const sensor, int const reg, int const val) dlen); } /* dtt_write() */ -static int _dtt_init(int const sensor) +int dtt_init_one(int const sensor) { int val; @@ -148,23 +148,7 @@ static int _dtt_init(int const sensor) dtt_read(sensor, DTT_CONTROL); /* clear temperature flags */ return 0; -} /* _dtt_init() */ - -int dtt_init(void) -{ - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - const char *const header = "DTT: "; - - for (i = 0; i < sizeof(sensors); i++) { - if (0 != _dtt_init(sensors[i])) - printf("%s%d FAILED INIT\n", header, i + 1); - else - printf("%s%d is %i C\n", header, i + 1, - dtt_get_temp(sensors[i])); - } - return 0; -} /* dtt_init() */ +} /* dtt_init_one() */ int dtt_get_temp(int const sensor) { diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 8119821..29c1a39 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -119,7 +119,7 @@ int dtt_write(int sensor, int reg, int val) } /* dtt_write() */ -static int _dtt_init(int sensor) +int dtt_init_one(int sensor) { int val; @@ -145,32 +145,7 @@ static int _dtt_init(int sensor) return 1; return 0; -} /* _dtt_init() */ - - -int dtt_init (void) -{ - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - const char *const header = "DTT: "; - int old_bus; - - /* switch to correct I2C bus */ - old_bus = I2C_GET_BUS(); - I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM); - - for (i = 0; i < sizeof(sensors); i++) { - if (_dtt_init(sensors[i]) != 0) - printf("%s%d FAILED INIT\n", header, i+1); - else - printf("%s%d is %i C\n", header, i+1, - dtt_get_temp(sensors[i])); - } - /* switch back to original I2C bus */ - I2C_SET_BUS(old_bus); - - return (0); -} /* dtt_init() */ +} /* dtt_init_one() */ int dtt_get_temp(int sensor) { diff --git a/drivers/hwmon/lm81.c b/drivers/hwmon/lm81.c index afe5b0d..f1572ba 100644 --- a/drivers/hwmon/lm81.c +++ b/drivers/hwmon/lm81.c @@ -89,7 +89,7 @@ int dtt_write(int sensor, int reg, int val) #define DTT_CONFIG 0x40 #define DTT_ADR 0x48 -static int _dtt_init(int sensor) +int dtt_init_one(int sensor) { int man; int adr; @@ -111,26 +111,9 @@ static int _dtt_init(int sensor) debug ("DTT: Found LM81@%x Rev: %d\n", adr, rev); return 0; -} /* _dtt_init() */ +} /* dtt_init_one() */ -int dtt_init (void) -{ - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - const char *const header = "DTT: "; - - for (i = 0; i < sizeof(sensors); i++) { - if (_dtt_init(sensors[i]) != 0) - printf("%s%d FAILED INIT\n", header, i+1); - else - printf("%s%d is %i C\n", header, i+1, - dtt_get_temp(sensors[i])); - } - - return (0); -} /* dtt_init() */ - #define TEMP_FROM_REG(temp) \ ((temp)<256?((((temp)&0x1fe) >> 1) * 10) + ((temp) & 1) * 5: \ ((((temp)&0x1fe) >> 1) -255) * 10 - ((temp) & 1) * 5) \ diff --git a/include/dtt.h b/include/dtt.h index 399b64a..bbaa033 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -52,7 +52,7 @@ #endif #endif /* CONFIG_DTT_ADM1021 */ -extern int dtt_init (void); +extern int dtt_init_one (int); extern int dtt_read(int sensor, int reg); extern int dtt_write(int sensor, int reg, int val); extern int dtt_get_temp(int sensor); -- 1.7.2.3

3 20

[U-Boot] [PATCH v2] arm/kirkwood: print speeds with cpu info.
by Jason Cooper 04 Aug '11

04 Aug '11

If CONFIG_DISPLAY_CPUINFO is enabled on kirkwood SoCs, this will print the speeds of the various components. Signed-off-by: Jason Cooper <u-boot(a)lakedaemon.net> --- Changes since v1: - optimized macros to remove one-timers - reduced switch/case to if/else since it operates on one bit. - remove RFC arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 41 ++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-kirkwood/cpu.h | 1 + 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index b4a4c04..818c82f 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -270,11 +270,28 @@ static void kw_sysrst_check(void) } #if defined(CONFIG_DISPLAY_CPUINFO) +#define MSAR_CPUCLCK_EXTRACT(X) (((X & 0x2) >> 1) | ((X & 0x400000) >> 21) | \ + ((X & 0x18) >> 1)) +#define MSAR_L2CLCK_EXTRACT(X) (((X & 0x600) >> 9) | ((X & 0x80000) >> 17)) +#define MSAR_DDRCLCK_RTIO_MASK (0xf << 5) + +/* + * TCCLK bit: + * 1 = 166 MHz + * 0 = 200 MHz + */ +#define MSAR_TCLCK_MASK 0x00200000 +#define MV_BOARD_TCLK_166MHZ 166666667 +#define MV_BOARD_TCLK_200MHZ 200000000 + int print_cpuinfo(void) { char *rev; u16 devid = (readl(KW_REG_PCIE_DEVID) >> 16) & 0xffff; u8 revid = readl(KW_REG_PCIE_REVID) & 0xff; + u32 cpu_clk, t_clk, tmp; + u32 sys_clk, l2_clk; + u32 l2_ratio, ddr_ratio; if ((readl(KW_REG_DEVICE_ID) & 0x03) > 2) { printf("Error.. %s:Unsupported Kirkwood SoC 88F%04x\n", __FUNCTION__, devid); @@ -297,6 +314,30 @@ int print_cpuinfo(void) } printf("SoC: Kirkwood 88F%04x_%s\n", devid, rev); + + tmp = readl(MPP_SAMPLE_AT_RESET); + cpu_clk = MSAR_CPUCLCK_EXTRACT(tmp); + if (cpu_clk == 0x9) + cpu_clk = 1200; + + l2_ratio = MSAR_L2CLCK_EXTRACT(tmp); + l2_clk = cpu_clk / l2_ratio; + + ddr_ratio = tmp & MSAR_DDRCLCK_RTIO_MASK; + ddr_ratio = ddr_ratio >> 5; + if (ddr_ratio == 4) + sys_clk = 400; + + if (tmp & MSAR_TCLCK_MASK) + t_clk = MV_BOARD_TCLK_166MHZ; + else + t_clk = MV_BOARD_TCLK_200MHZ; + + printf("CPU running @ %dMHz L2 running @ %dMHz\n", + cpu_clk, l2_clk); + printf("SysClock = %dMHz, TClock = %dMHz\n", + sys_clk, t_clk / 1000000); + return 0; } #endif /* CONFIG_DISPLAY_CPUINFO */ diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h index d28c51a..28ddd25 100644 --- a/arch/arm/include/asm/arch-kirkwood/cpu.h +++ b/arch/arm/include/asm/arch-kirkwood/cpu.h @@ -41,6 +41,7 @@ #define KW_REG_SYSRST_CNT (KW_MPP_BASE + 0x50) #define SYSRST_CNT_1SEC_VAL (25*1000000) #define KW_REG_MPP_OUT_DRV_REG (KW_MPP_BASE + 0xE0) +#define MPP_SAMPLE_AT_RESET (KW_MPP_BASE + 0x30) enum memory_bank { BANK0, -- 1.7.0.4

5 10