Pull request: u-boot-x86/master

Wolfgang,

I believe I missed the 2011.03 merge window - I'm happy for these to go into 2011.06

The following changes since commit d1a79b71f7c5fd9e277e0feb35f049289df1ed0e:

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2011-02-11 21:23:33 +0100)

are available in the git repository at:

git://git.denx.de/u-boot-x86.git master

Graeme Russ (32):
x86: Fix definition of global_data struct for asm-offsets.c
x86: Align config.mk and linker scripts with other arches
eNET: Create distinct board configurations
x86: Parametize values used in linker script
sc520: Sort Makefile
x86: Fix mangled umlauts
x86: Add stack dump to register dump
x86: Move Global Descriptor Table defines to processor.h
x86: Add processor flags header from linux
x86: Call early_board_init when warm booting
x86: Make cpu init functions weak
sc520: Define MMCR address in include file
sc520: Move board specific settings to board init function
sc520: Remove printf calls from cpu_init_f
eNET: Fix eNET Interrupt Setup for Linux
eNET: Add RTC support to eNET
eNET: Define MMCR values in config.h
eNET: Rearrange PAR assignments
eNET: General code cleanup
x86: Move initial gd to fixed location
x86: Use Cache-As-RAM for initial stack
sc520: Move RAM sizing code from asm to C
x86: Defer setup of final stack
x86: Move call to dram_init_f into board_init_f
x86: Move test for cold boot into init functions
x86: Move console initialisation into board_init_f
x86: Fix incorrect usage of relocation offset
x86: Split board_init_f() into init_fnc_t compatible functions
x86: Rearrange function calls in board_init_f
x86: Convert board_init_f to use an init_sequence
sc520: Release CAR and enable caching
eNET: Move initial Global Data into CAR

 arch/i386/config.mk                      |   15 +-
 arch/i386/cpu/config.mk                  |   10 +-
 arch/i386/cpu/cpu.c                      |   35 +-
 arch/i386/cpu/interrupts.c               |   19 +-
 arch/i386/cpu/sc520/Makefile             |    5 +-
 arch/i386/cpu/sc520/sc520.c              |  148 +------
 arch/i386/cpu/sc520/sc520_asm.S          |  615 ---------------------------
 arch/i386/cpu/sc520/sc520_car.S          |   94 ++++
 arch/i386/cpu/sc520/sc520_sdram.c        |  532 +++++++++++++++++++++++
 arch/i386/cpu/start.S                    |  107 +++---
 arch/i386/cpu/start16.S                  |    5 +-
 {board/eNET => arch/i386/cpu}/u-boot.lds |   24 +-
 arch/i386/include/asm/global_data.h      |   21 +-
 arch/i386/include/asm/ic/sc520.h         |   93 ++++-
 arch/i386/include/asm/processor-flags.h  |  100 +++++
 arch/i386/include/asm/processor.h        |    9 +-
 arch/i386/include/asm/u-boot-i386.h      |    3 +
 arch/i386/lib/board.c                    |  146 ++++---
 arch/i386/lib/realmode.c                 |    8 +-
 board/eNET/config.mk                     |    6 +-
 board/eNET/eNET.c                        |  192 +++++----
 board/eNET/eNET_start.S                  |    7 -
 board/eNET/eNET_start16.S                |   15 +-
 boards.cfg                               |    3 +-

 drivers/rtc/mc146818.c                   |    6 +
 include/configs/eNET.h                   |  679 ++++++++++++++++++++++-------
 26 files changed, 1699 insertions(+), 1198 deletions(-)
 delete mode 100644 arch/i386/cpu/sc520/sc520_asm.S
 create mode 100644 arch/i386/cpu/sc520/sc520_car.S
 create mode 100644 arch/i386/cpu/sc520/sc520_sdram.c
 rename {board/eNET => arch/i386/cpu}/u-boot.lds (75%)
 create mode 100644 arch/i386/include/asm/processor-flags.h

I believe I missed the 2011.03 merge window - I'm happy for these to go into 2011.06

The following changes since commit d1a79b71f7c5fd9e277e0feb35f049289df1ed0e:

?Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2011-02-11 21:23:33 +0100)

are available in the git repository at:

?git://git.denx.de/u-boot-x86.git master

Graeme Russ (32):
? ? ?x86: Fix definition of global_data struct for asm-offsets.c ? ? ?x86: Align config.mk and linker scripts with other arches ? ? ?eNET: Create distinct board configurations
? ? ?x86: Parametize values used in linker script
? ? ?sc520: Sort Makefile
? ? ?x86: Fix mangled umlauts
? ? ?x86: Add stack dump to register dump
? ? ?x86: Move Global Descriptor Table defines to processor.h ? ? ?x86: Add processor flags header from linux
? ? ?x86: Call early_board_init when warm booting
? ? ?x86: Make cpu init functions weak
? ? ?sc520: Define MMCR address in include file
? ? ?sc520: Move board specific settings to board init function ? ? ?sc520: Remove printf calls from cpu_init_f
? ? ?eNET: Fix eNET Interrupt Setup for Linux
? ? ?eNET: Add RTC support to eNET
? ? ?eNET: Define MMCR values in config.h
? ? ?eNET: Rearrange PAR assignments
? ? ?eNET: General code cleanup
? ? ?x86: Move initial gd to fixed location
? ? ?x86: Use Cache-As-RAM for initial stack
? ? ?sc520: Move RAM sizing code from asm to C
? ? ?x86: Defer setup of final stack
? ? ?x86: Move call to dram_init_f into board_init_f

? ? ?x86: Move test for cold boot into init functions
? ? ?x86: Move console initialisation into board_init_f ? ? ?x86: Fix incorrect usage of relocation offset
? ? ?x86: Split board_init_f() into init_fnc_t compatible functions ? ? ?x86: Rearrange function calls in board_init_f
? ? ?x86: Convert board_init_f to use an init_sequence
? ? ?sc520: Release CAR and enable caching
? ? ?eNET: Move initial Global Data into CAR

Quoted 11 lines · Graeme Russ

I believe I missed the 2011.03 merge window - I'm happy for these to go into 2011.06

The following changes since commit d1a79b71f7c5fd9e277e0feb35f049289df1ed0e:

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2011-02-11 21:23:33 +0100)

are available in the git repository at:

git://git.denx.de/u-boot-x86.git master

Graeme Russ (32):

seems that all these commits are missing your s-o-b. please watch for that a bit more in the future.
-mike