On Wed, Oct 22, 2014 at 10:29:09AM -0600, Simon Glass wrote:
Hi Tom,
These changes come before driver model. I'll have at least one more x86 pull request after more driver model stuff is applied.
The following changes since commit a84c8107d9b050fe8a31220d28588abfc2d99aee:
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2014-10-20 18:17:26 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-x86.git
for you to fetch changes up to 35d4fed320d577a4446531d7b9350ce40065c4b0:
x86: Fix GDT limit in start16.S (2014-10-22 09:03:07 -0600)
Bin Meng (2): x86: Fix rom version build with CONFIG_X86_RESET_VECTOR x86: Fix GDT limit in start16.S
Simon Glass (6): x86: Enable LMB and RAMDISK_HIGH by default x86: Rewrite bootm.c to make it similar to ARM x86: Allow cmdline setup in setup_zimage() to be optional sandbox: bootm: Don't fail the architecture check doc: Tidy up and update part of the FIT documentation x86: Support loading kernel setup from a FIT
arch/x86/cpu/Makefile | 4 +- arch/x86/cpu/start16.S | 2 +- arch/x86/include/asm/bootm.h | 12 +++ arch/x86/include/asm/config.h | 3 + arch/x86/lib/bootm.c | 151 +++++++++++++++++++++++++++-------- arch/x86/lib/zimage.c | 41 ++++------ common/bootm.c | 23 +++++- common/cmd_bootm.c | 1 + common/image-fit.c | 24 +++++- common/image.c | 11 +++ doc/uImage.FIT/kernel.its | 50 ++++++++++++ doc/uImage.FIT/source_file_format.txt | 19 +++-- doc/uImage.FIT/x86-fit-boot.txt | 276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/bootstage.h | 3 + include/image.h | 13 +++ 15 files changed, 557 insertions(+), 76 deletions(-) create mode 100644 arch/x86/include/asm/bootm.h create mode 100644 doc/uImage.FIT/x86-fit-boot.txt
Applied to u-boot/master, thanks!