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

Bin Meng bmeng.cn at gmail.com
Tue Oct 8 08:28:33 UTC 2019


Hi Tom,

This PR includes the following changes for v2020.01:

- Rename existing FSP code to fsp1
- Add fsp2 directory in preparation to support FSP 2.0
- Various x86 platform codes update
- Various bug fixes and updates in dm core, sandbox and spl

GitLab CI passed
https://gitlab.denx.de/u-boot/custodians/u-boot-x86/pipelines/867

The following changes since commit 61ba1244b548463dbfb3c5285b6b22e7c772c5bd:

  Prepare v2019.10 (2019-10-07 17:14:02 -0400)

are available in the git repository at:

  https://gitlab.denx.de/u-boot/custodians/u-boot-x86

for you to fetch changes up to cc2d27dcdc3e1c76d09d54015e3992380bd7e0fa:

  x86: Use mtrr_commit() with FSP2 (2019-10-08 13:57:49 +0800)

----------------------------------------------------------------
Simon Glass (95):
      x86: Rename existing FSP code to fsp1
      x86: Move fsp_azalia.h to the generic fsp directory
      x86: Create a new fsp_arch.h header
      x86: Move fsp_api.h inclusion out of fsp_support.h
      x86: Move fsp_types.h to the generic fsp directory
      x86: Move fsp_fv.h to the generic fsp directory
      x86: Move fsp_hob.h to the generic fsp directory
      x86: Move fsp_infoheader.h to the generic fsp directory
      x86: Move fsp_bootmode.h to the generic fsp directory
      x86: Move fsp_ffs.h include to fsp_arch.h
      binman: Pass the toolpath to binman from the main Makefile
      binman: Allow selection of logging verbosity
      mtd: spi: Add 'struct spi_flash {' to the code
      serial: ns16550: Allow serial to enabled/disabled in SPL
      spl: Avoid checking for Ctrl-C in SPL with print_buffer()
      spl: handoff: Correct Kconfig condition for SPL and TPL
      spl: Add an arch-specific hook for writing to SPL handoff
      spl: Set up the bloblist in board_init_r()
      spl: Add a function to determine the U-Boot phase
      x86: sysreset: Allow reset driver to be included in SPL/TPL
      x86: Rename some FSP functions to have an fsp_ prefix
      x86: fsp: Create a common fsp_support.h header
      x86: fsp: Use if() instead of #ifdef
      x86: fsp: Tidy up comment style a little
      x86: fsp: Move common dram functions into a common file
      x86: Move common fsp functions into a common file
      x86: fsp: Move common support functions into a common file
      efi: Move inline functions to unconditional part of header
      x86: fsp: Add a few more definitions for FSP2
      x86: fsp: Add access to variable MRC data
      x86: Move common Intel CPU info code into a function
      x86: Add binman symbols to the image
      x86: pci: Add a function to clear and set PCI config regs
      x86: spl: Use hang() instead of a while() loop
      x86: spl: Reduce priority of the basic SPL image loader
      x86: spl: Move broadwell-specific code out of generic x86 spl
      x86: fsp: Save usable RAM and hob_list in the handoff area
      x86: Change condition for using CAR
      x86: Add more comments to the start-up code
      x86: Add various MTRR indexes and values
      x86: Rename turbo ratio MSR to MSR_TURBO_RATIO_LIMIT
      dm: core: Use U-Boot logging instead of pr_debug()
      dm: core: Drop a few early returns
      dm: core: Add documentation on how to debug driver model
      dm: test: Fix running of multiple test from command line
      dm: test: Don't fail when tests are skipped due to build
      dm: core: Call ofdata_to_platdata() with of-platdata
      dm: core: Correct the return value for uclass_find_first_device()
      dm: core: Add device_foreach_child()
      dm: test: Correct a stray backslash in dm_test_destroy()
      sandbox: spmi: Add ranges property for address translation
      sandbox: mmc: Fix up MMC emulator for valgrind
      sandbox: Rename PCI ID for swap_case to be more specific
      sandbox: Add support for clrsetio_32() and friends
      sandbox: swap_case: Use statics where possible
      sandbox: pci: Drop the get_devfn() method
      sandbox: pci: Move pci_offset_to_barnum() to pci.h
      sandbox: Add a -T flag to use the test device tree
      sandbox: pci: Increase the memory space
      sandbox: Allow use of real I/O with readl(), etc.
      pci: sandbox: Move the emulators into their own node
      pci: sandbox: Probe PCI emulation devices when used
      pci: Show the result of binding a device
      pci: Disable autoconfig in SPL
      pci: Correct 'specifified' and 'Plese' typos
      pci: Add more debug detail when resources are exhausted
      pci: Show a message if PCI autoconfig fails
      dm: pci: Add a function to read a PCI BAR
      serial: ns16550: Add a PCI device/function field
      binman: Allow verbose output with all commands
      binman: Add a base implementation of Entry.ReadChildData()
      binman: Handle reading data for end-at-4gb sections
      binman: Take account of skip-at-start with image-header
      log: Add log_nop() to avoid unused-variable warnings
      cros_ec: Add MEC_EMI_BASE and size to the header file
      iod: Enhance to support display of multiple values
      arm: mxs: Correct CONFIG_SPL_NO_CPU_SUPPORT option
      spl: Allow tiny printf() to be controlled in SPL and TPL
      spl: Convert CONFIG_SPL_SIZE_LIMIT to hex
      spl: Allow distinguishing between two phases in U-Boot
      x86: Move acpi_s3.h to a common location
      x86: pci: Drop the first parameter in pci_x86_r/w_config()
      x86: Use a common definition of MSR_IA32_PERF_CTL
      x86: Add a common function to set CPU thermal target
      x86: Use a common bus clock for Intel CPUs
      x86: Add common functions for TDP and perf control
      x86: Tidy up some duplicate MSR defines
      x86: Add new common CPU functions for turbo/burst mode
      dm: core: Drop fdtdec_get_pci_addr()
      sandbox: pci: Create a new sandbox_pci_read_bar() function
      x86: Allow the PCH and LPC uclasses to work with of-platdata
      x86: Refactor mtrr_commit() to allow for shared code
      x86: Add a function to set variable MTRRs
      x86: cpu: Don't include the cpu driver in TPL
      x86: Use mtrr_commit() with FSP2

 Makefile                                                  |  14 +++++---
 arch/arm/Kconfig                                          |   2 +-
 arch/arm/cpu/arm926ejs/Makefile                           |   2 +-
 arch/arm/mach-omap2/Kconfig                               |   6 ++--
 arch/arm/mach-rmobile/Kconfig                             |   2 +-
 arch/arm/mach-rmobile/Kconfig.32                          |  14 ++++----
 arch/arm/mach-socfpga/Kconfig                             |   6 ++--
 arch/arm/mach-uniphier/pinctrl-glue.c                     |   4 +--
 arch/sandbox/cpu/cpu.c                                    |  52
+++++++++++++++++++++++++++
 arch/sandbox/cpu/spl.c                                    |   7 ++++
 arch/sandbox/cpu/start.c                                  |  25 +++++++++++++
 arch/sandbox/dts/sandbox.dtsi                             |  11 ++++--
 arch/sandbox/dts/test.dts                                 |  49
+++++++++++++++++---------
 arch/sandbox/include/asm/io.h                             |  70
++++++++++++++++++++++++++++--------
 arch/sandbox/include/asm/state.h                          |   1 +
 arch/sandbox/include/asm/test.h                           |  17 ++++++++-
 arch/sandbox/lib/pci_io.c                                 |  12 +++----
 arch/x86/Kconfig                                          |  33
++++++++++++++++-
 arch/x86/cpu/Makefile                                     |   5 ++-
 arch/x86/cpu/baytrail/acpi.c                              |   4 +--
 arch/x86/cpu/baytrail/cpu.c                               |   6 ++--
 arch/x86/cpu/baytrail/fsp_configs.c                       |   4 +--
 arch/x86/cpu/braswell/fsp_configs.c                       |   4 +--
 arch/x86/cpu/broadwell/cpu.c                              |  23 ++++++------
 arch/x86/cpu/broadwell/cpu_full.c                         |  57
++++++++----------------------
 arch/x86/cpu/cpu.c                                        |   2 +-
 arch/x86/cpu/intel_common/cpu.c                           | 116
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 arch/x86/cpu/intel_common/cpu_from_spl.c                  |   6 ++++
 arch/x86/cpu/ivybridge/cpu.c                              |   3 +-
 arch/x86/cpu/ivybridge/fsp_configs.c                      |   4 +--
 arch/x86/cpu/ivybridge/model_206ax.c                      |  60
++++++++-----------------------
 arch/x86/cpu/ivybridge/northbridge.c                      |   2 +-
 arch/x86/cpu/mtrr.c                                       |  57
++++++++++++++++++++++++++----
 arch/x86/cpu/pci.c                                        |  23 +++++++++---
 arch/x86/cpu/queensbay/fsp_configs.c                      |   4 +--
 arch/x86/cpu/queensbay/tnc.c                              |   2 +-
 arch/x86/cpu/start.S                                      |  16 +++++++--
 arch/x86/cpu/start_from_spl.S                             |   5 +--
 arch/x86/cpu/start_from_tpl.S                             |   3 +-
 arch/x86/cpu/turbo.c                                      |  10 +++---
 arch/x86/cpu/u-boot-spl.lds                               |   6 ++++
 arch/x86/cpu/wakeup.S                                     |   2 +-
 arch/x86/include/asm/arch-broadwell/cpu.h                 |   3 --
 arch/x86/include/asm/arch-broadwell/pch.h                 |   3 --
 arch/x86/include/asm/arch-ivybridge/model_206ax.h         |   5 +--
 arch/x86/include/asm/cpu_common.h                         |  99
++++++++++++++++++++++++++++++++++++++++++++++++++-
 arch/x86/include/asm/fsp/fsp_hob.h                        |   4 +++
 arch/x86/include/asm/fsp/fsp_infoheader.h                 |  15 +++++++-
 arch/x86/include/asm/fsp/fsp_support.h                    | 141
++++++++++++++++++++++++++++++-------------------------------------------
 arch/x86/include/asm/{fsp => fsp1}/fsp_api.h              |   0
 arch/x86/include/asm/{fsp => fsp1}/fsp_ffs.h              |   0
 arch/x86/include/asm/fsp1/fsp_support.h                   |  72
+++++++++++++++++++++++++++++++++++++
 arch/x86/include/asm/fsp_arch.h                           |  22 ++++++++++++
 arch/x86/include/asm/handoff.h                            |   8 +++++
 arch/x86/include/asm/hob.h                                |  18 +++++-----
 arch/x86/include/asm/msr-index.h                          | 131
++++++++++++++++++++++++++++++++++----------------------------------
 arch/x86/include/asm/mtrr.h                               |  13 +++++++
 arch/x86/include/asm/pci.h                                |  45
+++++++++++++++++++++---
 arch/x86/include/asm/spl.h                                |   3 +-
 arch/x86/include/asm/u-boot-x86.h                         |   2 +-
 arch/x86/lib/Makefile                                     |   2 ++
 arch/x86/lib/acpi_s3.c                                    |   2 +-
 arch/x86/lib/coreboot_table.c                             |   2 +-
 arch/x86/lib/fsp/Makefile                                 |   4 +--
 arch/x86/lib/fsp/fsp_common.c                             |  65
++--------------------------------
 arch/x86/lib/fsp/fsp_dram.c                               |  38
++++++++------------
 arch/x86/lib/fsp/fsp_support.c                            | 203
++++++---------------------------------------------------------------------------------------------------
 arch/x86/lib/fsp1/Makefile                                |   9 +++++
 arch/x86/lib/{fsp => fsp1}/fsp_car.S                      |  10 +++---
 arch/x86/lib/fsp1/fsp_common.c                            |  77
++++++++++++++++++++++++++++++++++++++++
 arch/x86/lib/fsp1/fsp_dram.c                              |  36
+++++++++++++++++++
 arch/x86/lib/{fsp => fsp1}/fsp_graphics.c                 |   2 +-
 arch/x86/lib/fsp1/fsp_support.c                           | 199
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 arch/x86/lib/hob.c                                        |   8 ++---
 arch/x86/lib/init_helpers.c                               |  22 ++++++++----
 arch/x86/lib/lpc-uclass.c                                 |   2 ++
 arch/x86/lib/spl.c                                        |  13 +++----
 arch/x86/lib/tpl.c                                        |   7 ++--
 board/advantech/som-db5800-som-6867/som-db5800-som-6867.c |   2 +-
 board/intel/cherryhill/cherryhill.c                       |   2 +-
 cmd/io.c                                                  |  85
++++++++++++++++++++++++++++++++++----------
 cmd/x86/fsp.c                                             |   4 +--
 common/spl/Kconfig                                        |   8 ++---
 common/spl/spl.c                                          |  47
++++++++++++++-----------
 common/xyzModem.c                                         |   2 +-
 configs/am335x_pdu001_defconfig                           |   2 +-
 configs/evb-rk3288_defconfig                              |   2 +-
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig             |   2 +-
 configs/ls1043ardb_nand_defconfig                         |   2 +-
 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig           |   2 +-
 configs/ls1043ardb_sdcard_defconfig                       |   2 +-
 configs/sandbox_spl_defconfig                             |   2 +-
 configs/slimbootloader_defconfig                          |   1 +
 configs/tinker-rk3288_defconfig                           |   2 +-
 doc/arch/sandbox.rst                                      |   9 +++++
 doc/driver-model/debugging.rst                            |  62
++++++++++++++++++++++++++++++++
 doc/driver-model/index.rst                                |   1 +
 doc/driver-model/pci-info.rst                             |  25 ++++++-------
 drivers/block/blk-uclass.c                                |   4 +--
 drivers/core/device.c                                     |   3 +-
 drivers/core/fdtaddr.c                                    |  30
++++++++++++++++
 drivers/core/lists.c                                      |  20 ++++++-----
 drivers/core/read.c                                       |  11 ++++++
 drivers/core/uclass.c                                     |  16 ++++++---
 drivers/gpio/gpio-uclass.c                                |   4 +--
 drivers/gpio/pm8916_gpio.c                                |  12 +++----
 drivers/misc/Makefile                                     |   2 +-
 drivers/misc/swap_case.c                                  |  48
+++++++------------------
 drivers/mmc/mmc.c                                         |   2 +-
 drivers/mmc/sandbox_mmc.c                                 |   4 +++
 drivers/mtd/spi/sf-uclass.c                               |   2 +-
 drivers/pch/pch-uclass.c                                  |   2 ++
 drivers/pci/pci-emul-uclass.c                             |  55
+++++++++++++++++++++++++----
 drivers/pci/pci-uclass.c                                  |   5 +--
 drivers/pci/pci_auto.c                                    |  12 +++++--
 drivers/pci/pci_auto_common.c                             |   4 ++-
 drivers/pci/pci_rom.c                                     |   2 +-
 drivers/pci/pci_x86.c                                     |  16 +++++++--
 drivers/serial/ns16550.c                                  |  37
+++----------------
 drivers/serial/sandbox.c                                  |   2 ++
 drivers/sysreset/Kconfig                                  |  12 +++++++
 drivers/sysreset/Makefile                                 |   2 +-
 drivers/sysreset/sysreset_x86.c                           |   2 +-
 {arch/x86/include/asm => include}/acpi_s3.h               |   0
 include/configs/mxs.h                                     |   2 +-
 include/dm/device.h                                       |   9 +++++
 include/dm/fdtaddr.h                                      |   8 +++++
 include/dm/read.h                                         |  25 +++++++++++++
 include/dm/uclass-id.h                                    |   1 +
 include/dm/uclass-internal.h                              |   4 +--
 include/ec_commands.h                                     |   4 +++
 include/efi_loader.h                                      |  10 +++---
 include/fdtdec.h                                          |  17 ---------
 include/handoff.h                                         |  13 +++++++
 include/linux/mtd/spi-nor.h                               |   8 ++++-
 include/log.h                                             |  33
+++++++++++++----
 include/ns16550.h                                         |   4 +++
 include/pci.h                                             |  13 +++----
 include/spl.h                                             |  66
++++++++++++++++++++++++++++++++++
 lib/Kconfig                                               |  20 ++++++++---
 lib/Makefile                                              |   2 +-
 lib/display_options.c                                     |   2 ++
 lib/fdtdec.c                                              |  54
----------------------------
 scripts/config_whitelist.txt                              |   1 -
 test/dm/core.c                                            |   3 +-
 test/dm/pci.c                                             |  51
+++++++++++++++++++++++++--
 test/dm/test-main.c                                       |  16 +++++----
 tools/binman/README                                       |   6 ++++
 tools/binman/control.py                                   |  36
++++++++-----------
 tools/binman/entry.py                                     |  18 ++++++++++
 tools/binman/etype/image_header.py                        |   1 +
 tools/binman/etype/section.py                             |  16 +++------
 tools/binman/image.py                                     |   2 ++
 153 files changed, 2036 insertions(+), 1018 deletions(-)
 rename arch/x86/include/asm/{fsp => fsp1}/fsp_api.h (100%)
 rename arch/x86/include/asm/{fsp => fsp1}/fsp_ffs.h (100%)
 create mode 100644 arch/x86/include/asm/fsp1/fsp_support.h
 create mode 100644 arch/x86/include/asm/fsp_arch.h
 create mode 100644 arch/x86/lib/fsp1/Makefile
 rename arch/x86/lib/{fsp => fsp1}/fsp_car.S (94%)
 create mode 100644 arch/x86/lib/fsp1/fsp_common.c
 create mode 100644 arch/x86/lib/fsp1/fsp_dram.c
 rename arch/x86/lib/{fsp => fsp1}/fsp_graphics.c (98%)
 create mode 100644 arch/x86/lib/fsp1/fsp_support.c
 create mode 100644 doc/driver-model/debugging.rst
 rename {arch/x86/include/asm => include}/acpi_s3.h (100%)

Regards,
Bin


More information about the U-Boot mailing list