| Message ID | CAEUhbmWzbR3v9BhzAnPQbUyyj2sejfkcFAugqx96=OzBy93RHA@mail.gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [U-Boot] Please pull u-boot-x86 | expand |
On Mon, Apr 16, 2018 at 05:17:30PM +0800, Bin Meng wrote: > Hi Tom, > > This includes some fixes and enhancements to VxWorks booting support, > as well as some mods to x86 I/O functions. > > The following changes since commit ebca902aeb3af3eaedd2787928184ad84a86b98f: > > Merge git://git.denx.de/u-boot-imx (2018-04-15 08:43:50 -0400) > > are available in the git repository at: > > git://git.denx.de/u-boot-x86.git > > for you to fetch changes up to 699b8a1386255252293d743a0b196232641167f3: > > x86: Rename coreboot-x86 to coreboot (2018-04-16 16:54:51 +0800) > NAK. This breaks most non-x86 as follows: m68k: + M5485BFE +(M5485BFE) ../cmd/elf.c: In function ?do_bootvx?: +(M5485BFE) ../cmd/elf.c:346:15: error: ?base? undeclared (first use in this function) +(M5485BFE) bootaddr = base + X86_BOOT_LINE_OFFSET; +(M5485BFE) ^~~~ +(M5485BFE) ../cmd/elf.c:346:15: note: each undeclared identifier is reported only once for each function it appears in +(M5485BFE) make[2]: *** [cmd/elf.o] Error 1 +(M5485BFE) make[1]: *** [cmd] Error 2 +(M5485BFE) make: *** [sub-make] Error 2
Hi Tom, On Mon, Apr 16, 2018 at 8:31 PM, Tom Rini <trini@konsulko.com> wrote: > On Mon, Apr 16, 2018 at 05:17:30PM +0800, Bin Meng wrote: > >> Hi Tom, >> >> This includes some fixes and enhancements to VxWorks booting support, >> as well as some mods to x86 I/O functions. >> >> The following changes since commit ebca902aeb3af3eaedd2787928184ad84a86b98f: >> >> Merge git://git.denx.de/u-boot-imx (2018-04-15 08:43:50 -0400) >> >> are available in the git repository at: >> >> git://git.denx.de/u-boot-x86.git >> >> for you to fetch changes up to 699b8a1386255252293d743a0b196232641167f3: >> >> x86: Rename coreboot-x86 to coreboot (2018-04-16 16:54:51 +0800) >> > > NAK. This breaks most non-x86 as follows: > m68k: + M5485BFE > +(M5485BFE) ../cmd/elf.c: In function ?do_bootvx?: > +(M5485BFE) ../cmd/elf.c:346:15: error: ?base? undeclared (first use in this function) > +(M5485BFE) bootaddr = base + X86_BOOT_LINE_OFFSET; > +(M5485BFE) ^~~~ > +(M5485BFE) ../cmd/elf.c:346:15: note: each undeclared identifier is reported only once for each function it appears in > +(M5485BFE) make[2]: *** [cmd/elf.o] Error 1 > +(M5485BFE) make[1]: *** [cmd] Error 2 > +(M5485BFE) make: *** [sub-make] Error 2 Sorry about this. I will send v2 pull request. Regards, Bin
Hi Tom, This includes some fixes and enhancements to VxWorks booting support, as well as some mods to x86 I/O functions. The following changes since commit ebca902aeb3af3eaedd2787928184ad84a86b98f: Merge git://git.denx.de/u-boot-imx (2018-04-15 08:43:50 -0400) are available in the git repository at: git://git.denx.de/u-boot-x86.git for you to fetch changes up to 699b8a1386255252293d743a0b196232641167f3: x86: Rename coreboot-x86 to coreboot (2018-04-16 16:54:51 +0800) ---------------------------------------------------------------- Bin Meng (18): doc: vxworks: Minor update for clarity bootvx: x86: Prepare e820 related stuff from the given kernel memory base address bootvx: x86: Explicitly clear the bootloader image size vxworks: x86: Rename e820info to e820_info x86: Use 'unsigned int' in install_e820_map() functions x86: Rename e820entry to e820_entry elf: Clean up the ELF header file elf: Add ELF64 related structure defines elf: Add a very simple ELF64 loader bios: vesa: Guard setting vesa mode with CONFIG_FRAMEBUFFER_SET_VESA_MODE video: vesa: Change default FRAMEBUFFER_VESA_MODE x86: Change default FRAMEBUFFER_VESA_MODE of some boards pci: video: Only print out when everything is OK bootvx: x86: Make VxWorks EFI console driver happy bootvx: Refactor the bootline copy codes a little bit bootvx: Exit if bootline address is not specified bootvx: x86: Assign bootaddr based on kernel memory base doc: vxworks: Update x86 specific instructions Ivan Gorinov (1): x86: Add 64-bit memory-mapped I/O functions Lukasz Majewski (1): x86: Update the io.h file to use {out|in}_{be|le}X macros Simon Glass (1): x86: Rename coreboot-x86 to coreboot arch/x86/cpu/coreboot/sdram.c | 7 ++- arch/x86/cpu/qemu/e820.c | 3 +- arch/x86/cpu/tangier/sdram.c | 6 +- arch/x86/include/asm/bootparam.h | 2 +- arch/x86/include/asm/e820.h | 5 +- arch/x86/include/asm/io.h | 38 +++++++------ arch/x86/lib/bios.c | 4 ++ arch/x86/lib/coreboot_table.c | 2 +- arch/x86/lib/e820.c | 4 +- arch/x86/lib/fsp/fsp_dram.c | 5 +- board/coreboot/coreboot/MAINTAINERS | 2 +- cmd/elf.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++---------------------------- configs/bayleybay_defconfig | 2 +- configs/{coreboot-x86_defconfig => coreboot_defconfig} | 0 configs/minnowmax_defconfig | 2 +- configs/qemu-x86_64_defconfig | 2 +- configs/qemu-x86_defconfig | 2 +- configs/qemu-x86_efi_payload32_defconfig | 2 +- configs/qemu-x86_efi_payload64_defconfig | 2 +- doc/README.vxworks | 51 ++++++++++------- doc/README.x86 | 2 +- drivers/bios_emulator/atibios.c | 4 ++ drivers/pci/pci_rom.c | 4 +- drivers/video/Kconfig | 2 +- include/elf.h | 327 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------- include/vxworks.h | 52 +++++++++++++++-- 26 files changed, 466 insertions(+), 299 deletions(-) rename configs/{coreboot-x86_defconfig => coreboot_defconfig} (100%) Regards, Bin