Merge branch 'master' of git://git.denx.de/u-boot-x86

diff --combined Makefile
index 76bae8b,eea69b1..6da4215
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -729,8 -729,9 +729,9 @@@ ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGE
  endif
  ALL-$(CONFIG_REMAKE_ELF) += u-boot.elf
  
- # We can't do this yet due to the need for binary blobs
- # ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom
+ ifneq ($(BUILD_ROM),)
+ ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom
+ endif
  
  # enable combined SPL/u-boot/dtb rules for tegra
  ifneq ($(CONFIG_TEGRA),)
@@@ -856,18 -857,12 +857,18 @@@ MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -
  MKIMAGEFLAGS_u-boot.kwb = -n $(srctree)/$(CONFIG_SYS_KWD_CONFIG:"%"=%) \
        -T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
  
 +MKIMAGEFLAGS_u-boot-spl.kwb = -n $(srctree)/$(CONFIG_SYS_KWD_CONFIG:"%"=%) \
 +      -T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
 +
  MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
                -R $(srctree)/$(CONFIG_SYS_FSL_PBL_PBI:"%"=%) -T pblimage
  
  u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
        $(call if_changed,mkimage)
  
 +u-boot-spl.kwb: u-boot.img spl/u-boot-spl.bin FORCE
 +      $(call if_changed,mkimage)
 +
  MKIMAGEFLAGS_u-boot-dtb.img = $(MKIMAGEFLAGS_u-boot.img)
  
  u-boot-dtb.img: u-boot-dtb.bin FORCE

diff --combined arch/x86/include/asm/u-boot-x86.h
index c24846b,5d7dff5..c743efd
--- 1/arch/x86/include/asm/u-boot-x86.h
--- 2/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@@ -26,9 -26,15 +26,9 @@@ unsigned long get_tbclk_mhz(void)
  void timer_set_base(uint64_t base);
  int pcat_timer_init(void);
  
 -/* Architecture specific DRAM init */
 -int dram_init(void);
 -
  /* cpu/.../interrupts.c */
  int cpu_init_interrupts(void);
  
 -/* board/.../... */
 -int dram_init(void);
 -
  int cleanup_before_linux(void);
  int x86_cleanup_before_linux(void);
  void x86_enable_caches(void);
@@@ -39,6 -45,9 +39,9 @@@ ulong board_get_usable_ram_top(ulong to
  void dram_init_banksize(void);
  int default_print_cpuinfo(void);
  
+ /* Set up a UART which can be used with printch(), printhex8(), etc. */
+ int setup_early_uart(void);
+ 
  void setup_pcat_compatibility(void);
  
  void isa_unmap_rom(u32 addr);