[U-Boot] Pull request for u-boot-x86

Hi Wolfgang,
Please note that I had to do a force push into u-boot-x86 to delete a commit that I munged the importing of (Ondrej's patch) and didn't realise until I have pushed it (the patch title was all wrong)
I don't think this should cause any trouble to you though as everything in u-boot-x86 on the denx server looks up to date (i.e. no dropped commits)
The following changes since commit ce5207e191c59b3135303fd03b98dd2ac3701ba2:
e1000: Allow direct access to the E1000 SPI EEPROM device (2011-10-28 00:37:01 +0200)
are available in the git repository at: git://git.denx.de/u-boot-x86.git master
Gabe Black (2): x86: Remove the prototype for the unused function board_init x86: Fix a compiler warning in arch/x86/lib/realmode.c
Graeme Russ (1): x86: Rename include/asm/ic to include/asm/arch-sc520
Ondrej Kupka (1): x86: turn off cache: set control register properly
arch/x86/cpu/sc520/sc520.c | 2 +- arch/x86/cpu/sc520/sc520_car.S | 2 +- arch/x86/cpu/sc520/sc520_pci.c | 4 ++-- arch/x86/cpu/sc520/sc520_reset.c | 2 +- arch/x86/cpu/sc520/sc520_sdram.c | 2 +- arch/x86/cpu/sc520/sc520_ssi.c | 4 ++-- arch/x86/cpu/sc520/sc520_timer.c | 2 +- arch/x86/cpu/start16.S | 2 +- arch/x86/include/asm/{ic => arch-sc520}/pci.h | 0 arch/x86/include/asm/{ic => arch-sc520}/sc520.h | 0 arch/x86/include/asm/{ic => arch-sc520}/ssi.h | 0 arch/x86/include/asm/u-boot-x86.h | 1 - arch/x86/lib/realmode.c | 2 +- arch/x86/lib/zimage.c | 1 - board/eNET/eNET.c | 2 +- board/eNET/eNET_pci.c | 2 +- board/eNET/eNET_start16.S | 4 +--- 17 files changed, 14 insertions(+), 18 deletions(-) rename arch/x86/include/asm/{ic => arch-sc520}/pci.h (100%) rename arch/x86/include/asm/{ic => arch-sc520}/sc520.h (100%) rename arch/x86/include/asm/{ic => arch-sc520}/ssi.h (100%)

Dear Graeme Russ,
In message 4EB122B8.6000801@gmail.com you wrote:
Hi Wolfgang,
Please note that I had to do a force push into u-boot-x86 to delete a commit that I munged the importing of (Ondrej's patch) and didn't realise until I have pushed it (the patch title was all wrong)
I don't think this should cause any trouble to you though as everything in u-boot-x86 on the denx server looks up to date (i.e. no dropped commits)
The following changes since commit ce5207e191c59b3135303fd03b98dd2ac3701ba2:
e1000: Allow direct access to the E1000 SPI EEPROM device (2011-10-28 00:37:01 +0200)
are available in the git repository at: git://git.denx.de/u-boot-x86.git master
Gabe Black (2): x86: Remove the prototype for the unused function board_init x86: Fix a compiler warning in arch/x86/lib/realmode.c
Graeme Russ (1): x86: Rename include/asm/ic to include/asm/arch-sc520
Ondrej Kupka (1): x86: turn off cache: set control register properly
arch/x86/cpu/sc520/sc520.c | 2 +- arch/x86/cpu/sc520/sc520_car.S | 2 +- arch/x86/cpu/sc520/sc520_pci.c | 4 ++-- arch/x86/cpu/sc520/sc520_reset.c | 2 +- arch/x86/cpu/sc520/sc520_sdram.c | 2 +- arch/x86/cpu/sc520/sc520_ssi.c | 4 ++-- arch/x86/cpu/sc520/sc520_timer.c | 2 +- arch/x86/cpu/start16.S | 2 +- arch/x86/include/asm/{ic => arch-sc520}/pci.h | 0 arch/x86/include/asm/{ic => arch-sc520}/sc520.h | 0 arch/x86/include/asm/{ic => arch-sc520}/ssi.h | 0 arch/x86/include/asm/u-boot-x86.h | 1 - arch/x86/lib/realmode.c | 2 +- arch/x86/lib/zimage.c | 1 - board/eNET/eNET.c | 2 +- board/eNET/eNET_pci.c | 2 +- board/eNET/eNET_start16.S | 4 +--- 17 files changed, 14 insertions(+), 18 deletions(-) rename arch/x86/include/asm/{ic => arch-sc520}/pci.h (100%) rename arch/x86/include/asm/{ic => arch-sc520}/sc520.h (100%) rename arch/x86/include/asm/{ic => arch-sc520}/ssi.h (100%)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Graeme Russ
-
Wolfgang Denk