[U-Boot] Please pull u-boot-x86

Hi Tom,
The following changes since commit f5fd45ff64e28a73499548358e3d1ceda0de7daf:
Merge branch 'master' of git://www.denx.de/git/u-boot-imx (2016-10-08 09:33:37 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-x86.git master
for you to fetch changes up to 00bcaedd5c4063c677d16af264bbcb991fb9675c:
x86: Clean up unused macros in the configuration headers (2016-10-12 10:58:24 +0800)
---------------------------------------------------------------- Bin Meng (11): x86: doc: Document coreboot framebuffer driver issue on QEMU dm: video: Add driver for VESA-compatible device dm: video: Output verbose information in vbe_setup_video() x86: Convert to use DM VESA video driver x86: doc: Correct qfw command example vbe: Make vbe_setup_video_priv() public dm: video: Add driver for coreboot framebuffer device dm: video: Don't do anything in alloc_fb() when plat->size is zero x86: coreboot: Convert to use DM coreboot video driver video: Remove legacy VESA and coreboot framebuffer drivers x86: Clean up unused macros in the configuration headers
Simon Glass (28): Revert "x86: broadwell: gpio: Remove the codes to set up pin control" x86: Add an accelerated memmove() function Fix return value in trailing_strtoln() list: Add list_last_entry() to find the last entry dm: core: Add a function to get a uclass name x86: video: Fix typo in broadwell Kconfig dm: stdio: Allow lazy probing of video devices dm: video: Add driver-model support to vesa graphics dm: x86: video: Add a driver-model driver for ivybridge graphics x86: Adjust config to support DM_VIDEO dm: x86: Move samus to use new driver model support dm: x86: Move link to use driver model for video Add _image_binary_end section declaration bios_emulator: Fix cast for 64-bit compilation board_f: Drop the extra fdtdec_prepare_fdt() elf: Add the Elf64_Rela type rtc: Use CONFIG_X86 instead of __I386__ tpm: Tidy up use of size_t usb: pci: Fix cast for 64-bit compilation x86: Allow interrupts to be disabled in 64-bit mode x86: Correct address casts in cpu code x86: Correct address casts in interrupt code x86: i2c: Fix cast of address to 32-bit value x86: Don't export interrupt handlers with x86_64 x86: ivybridge: Fix PCH power setup x86: ivybridge: Tidy up enable_clock_gating() for 64-bit x86: Drop unused init_helper functions x86: mrccache: Fix error handling in mrccache_get_region()
Stefan Roese (3): x86: conga-qeval20-qa3: Add README to explain the console UART options x86: baytrail: Add 2nd eMMC controller to the PCI probe list x86: Fix Linux v4.7+ zimage booting (update bootparam.h)
arch/x86/cpu/baytrail/valleyview.c | 5 ++-- arch/x86/cpu/broadwell/sdram.c | 1 - arch/x86/cpu/coreboot/Kconfig | 4 --- arch/x86/cpu/cpu.c | 10 +++---- arch/x86/cpu/interrupts.c | 9 ++++-- arch/x86/cpu/ivybridge/Makefile | 1 - arch/x86/cpu/ivybridge/bd82x6x.c | 12 -------- arch/x86/cpu/ivybridge/early_me.c | 1 - arch/x86/cpu/ivybridge/gma.h | 156 -------------------------------------------------------------------------------------------------- arch/x86/cpu/ivybridge/lpc.c | 16 +++++------ arch/x86/cpu/ivybridge/model_206ax.c | 1 - arch/x86/cpu/ivybridge/sata.c | 1 - arch/x86/dts/bayleybay.dts | 1 + arch/x86/dts/broadwell_som-6896.dts | 1 + arch/x86/dts/chromebook_link.dts | 1 + arch/x86/dts/chromebook_samus.dts | 1 + arch/x86/dts/chromebox_panther.dts | 1 + arch/x86/dts/coreboot_fb.dtsi | 5 ++++ arch/x86/dts/minnowmax.dts | 1 + arch/x86/include/asm/arch-ivybridge/bd82x6x.h | 12 -------- arch/x86/include/asm/bootparam.h | 3 ++ arch/x86/include/asm/cpu.h | 1 - arch/x86/include/asm/init_helpers.h | 2 -- arch/x86/include/asm/string.h | 2 +- arch/x86/lib/init_helpers.c | 10 ------- arch/x86/lib/mrccache.c | 8 ++++-- arch/x86/lib/string.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/congatec/conga-qeval20-qa3-e3845/README | 23 +++++++++++++++ common/board_f.c | 3 -- common/stdio.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- configs/bayleybay_defconfig | 1 + configs/chromebook_link_defconfig | 2 ++ configs/chromebox_panther_defconfig | 1 + configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + configs/conga-qeval20-qa3-e3845_defconfig | 1 + configs/coreboot-x86_defconfig | 2 ++ configs/crownbay_defconfig | 1 + configs/dfi-bt700-q7x-151_defconfig | 1 + configs/minnowmax_defconfig | 1 + configs/qemu-x86_defconfig | 1 + configs/qemu-x86_efi_payload32_defconfig | 1 + configs/qemu-x86_efi_payload64_defconfig | 1 + configs/som-db5800-som-6867_defconfig | 1 + configs/theadorable-x86-dfi-bt700_defconfig | 1 + doc/README.x86 | 9 +++++- drivers/bios_emulator/atibios.c | 2 +- drivers/core/uclass.c | 9 ++++++ drivers/gpio/intel_broadwell_gpio.c | 7 +++++ drivers/i2c/intel_i2c.c | 6 ++-- drivers/pci/pci_rom.c | 62 +++++++++++++++++++++++++++++++++++++++ drivers/rtc/mc146818.c | 2 +- drivers/tpm/tpm_tis_lpc.c | 4 +-- drivers/usb/host/ehci-pci.c | 4 +-- drivers/video/Kconfig | 23 ++++++++++++++- drivers/video/Makefile | 5 ++-- drivers/video/broadwell_igd.c | 39 +++++-------------------- drivers/video/coreboot.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/video/coreboot_fb.c | 108 -------------------------------------------------------------------- arch/x86/cpu/ivybridge/gma.c => drivers/video/ivybridge_igd.c | 77 ++++++++++++++++++++++--------------------------- drivers/video/vesa.c | 34 ++++++++++++++++++++++ drivers/video/vesa_fb.c | 63 ---------------------------------------- drivers/video/video-uclass.c | 3 ++ include/_exports.h | 2 +- include/asm-generic/sections.h | 1 + include/configs/bayleybay.h | 6 ++-- include/configs/cougarcanyon2.h | 4 --- include/configs/crownbay.h | 4 +-- include/configs/efi-x86.h | 2 -- include/configs/galileo.h | 4 --- include/configs/minnowmax.h | 6 ++-- include/configs/qemu-x86.h | 4 +-- include/configs/som-6896.h | 6 ++-- include/configs/som-db5800-som-6867.h | 6 ++-- include/configs/x86-chromebook.h | 6 ++-- include/configs/x86-common.h | 5 ---- include/dm/uclass.h | 8 ++++++ include/elf.h | 6 ++++ include/linux/list.h | 11 +++++++ include/pci_ids.h | 5 ++-- include/vbe.h | 6 ++++ lib/strto.c | 8 ++++-- 81 files changed, 662 insertions(+), 530 deletions(-) delete mode 100644 arch/x86/cpu/ivybridge/gma.h create mode 100644 arch/x86/dts/coreboot_fb.dtsi delete mode 100644 arch/x86/include/asm/arch-ivybridge/bd82x6x.h create mode 100644 board/congatec/conga-qeval20-qa3-e3845/README create mode 100644 drivers/video/coreboot.c delete mode 100644 drivers/video/coreboot_fb.c rename arch/x86/cpu/ivybridge/gma.c => drivers/video/ivybridge_igd.c (94%) create mode 100644 drivers/video/vesa.c delete mode 100644 drivers/video/vesa_fb.c
Regards, Bin

On Wed, Oct 12, 2016 at 11:04:12AM +0800, Bin Meng wrote:
Hi Tom,
The following changes since commit f5fd45ff64e28a73499548358e3d1ceda0de7daf:
Merge branch 'master' of git://www.denx.de/git/u-boot-imx (2016-10-08 09:33:37 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-x86.git master
for you to fetch changes up to 00bcaedd5c4063c677d16af264bbcb991fb9675c:
x86: Clean up unused macros in the configuration headers (2016-10-12 10:58:24 +0800)
Applied to u-boot/master, thanks!
participants (2)
-
Bin Meng
-
Tom Rini