[U-Boot] [x86] Pull request

Wolfgang Denk wd at denx.de
Wed Apr 13 22:02:29 CEST 2011


Dear Graeme Russ,

In message <1302696226-3912-1-git-send-email-graeme.russ at gmail.com> you wrote:
> Dear Wolfgang,
> 
> The following changes since commit b16aadf411280fc426d7488ddd8a5b2038b7194d:
> 
>   disk/part.c: fix potential stack overflow bug (2011-04-12 22:58:35 +0200)
> 
> are available in the git repository at:
>   git://git.denx.de/u-boot-x86 master
> 
> Graeme Russ (8):
>       eNET: Fix undefined reference to `monitor_flash_len'
>       eNET: Fix saveenv crash
>       eNET: Remove config.mk
>       x86: Code cleanup
>       x86: Rename i386 to x86
>       sc520: Move reset to stand-alone file
>       x86: Update MAINTAINERS and delete README files
>       Merge branch 'master' of git://git.denx.de/u-boot-x86
> 
>  MAINTAINERS                                        |    4 +-
>  MAKEALL                                            |    4 +-
>  Makefile                                           |    4 +-
>  README                                             |    2 +-
>  arch/{i386 => x86}/config.mk                       |    0
>  arch/{i386 => x86}/cpu/Makefile                    |    0
>  arch/{i386 => x86}/cpu/config.mk                   |    2 +-
>  arch/{i386 => x86}/cpu/cpu.c                       |   33 ++++-----
>  arch/{i386 => x86}/cpu/interrupts.c                |    8 +-
>  arch/{i386 => x86}/cpu/resetvec.S                  |    5 +-
>  arch/{i386 => x86}/cpu/sc520/Makefile              |    1 +
>  arch/{i386 => x86}/cpu/sc520/sc520.c               |   18 +----
>  arch/{i386 => x86}/cpu/sc520/sc520_car.S           |    5 +-
>  arch/{i386 => x86}/cpu/sc520/sc520_pci.c           |   14 ++--
>  .../processor.h => x86/cpu/sc520/sc520_reset.c}    |   24 ++++--
>  arch/{i386 => x86}/cpu/sc520/sc520_sdram.c         |    4 +-
>  arch/{i386 => x86}/cpu/sc520/sc520_ssi.c           |    5 +-
>  arch/{i386 => x86}/cpu/sc520/sc520_timer.c         |    7 +-
>  arch/{i386 => x86}/cpu/start.S                     |   34 ++++-----
>  arch/{i386 => x86}/cpu/start16.S                   |    8 ++-
>  arch/{i386 => x86}/cpu/u-boot.lds                  |    5 +-
>  arch/{i386 => x86}/include/asm/bitops.h            |    0
>  arch/{i386 => x86}/include/asm/bootparam.h         |    0
>  arch/{i386 => x86}/include/asm/byteorder.h         |    0
>  arch/{i386 => x86}/include/asm/config.h            |    0
>  arch/{i386 => x86}/include/asm/e820.h              |    0
>  arch/{i386 => x86}/include/asm/errno.h             |    0
>  arch/{i386 => x86}/include/asm/global_data.h       |    0
>  arch/{i386 => x86}/include/asm/i8254.h             |    0
>  arch/{i386 => x86}/include/asm/i8259.h             |    0
>  arch/{i386 => x86}/include/asm/ibmpc.h             |    0
>  arch/{i386 => x86}/include/asm/ic/pci.h            |    0
>  arch/{i386 => x86}/include/asm/ic/sc520.h          |    0
>  arch/{i386 => x86}/include/asm/ic/ssi.h            |    0
>  arch/{i386 => x86}/include/asm/interrupt.h         |    4 +-
>  arch/{i386 => x86}/include/asm/io.h                |    0
>  arch/{i386 => x86}/include/asm/ioctl.h             |    0
>  arch/{i386 => x86}/include/asm/ist.h               |    0
>  arch/{i386 => x86}/include/asm/pci.h               |    0
>  arch/{i386 => x86}/include/asm/posix_types.h       |    0
>  arch/{i386 => x86}/include/asm/processor-flags.h   |    0
>  arch/{i386 => x86}/include/asm/processor.h         |    0
>  arch/{i386 => x86}/include/asm/ptrace.h            |    0
>  arch/{i386 => x86}/include/asm/realmode.h          |    0
>  arch/{i386 => x86}/include/asm/string.h            |    0
>  arch/{i386 => x86}/include/asm/types.h             |    0
>  .../u-boot-i386.h => x86/include/asm/u-boot-x86.h} |    4 +-
>  arch/{i386 => x86}/include/asm/u-boot.h            |    0
>  arch/{i386 => x86}/include/asm/unaligned.h         |    0
>  arch/{i386 => x86}/include/asm/video/edid.h        |    0
>  arch/{i386 => x86}/include/asm/zimage.h            |    0
>  arch/{i386 => x86}/lib/Makefile                    |    0
>  arch/{i386 => x86}/lib/bios.S                      |    3 +-
>  arch/{i386 => x86}/lib/bios.h                      |   44 ++++++------
>  arch/{i386 => x86}/lib/bios_pci.S                  |    0
>  arch/{i386 => x86}/lib/bios_setup.c                |    3 +-
>  arch/{i386 => x86}/lib/board.c                     |   23 +++----
>  arch/{i386 => x86}/lib/bootm.c                     |   15 +++--
>  arch/{i386 => x86}/lib/interrupts.c                |   16 ++--
>  arch/{i386 => x86}/lib/pcat_interrupts.c           |    4 +-
>  arch/{i386 => x86}/lib/pcat_timer.c                |    2 +-
>  arch/{i386 => x86}/lib/pci.c                       |   18 ++---
>  arch/{i386 => x86}/lib/pci_type1.c                 |   27 ++++++--
>  arch/{i386 => x86}/lib/realmode.c                  |   10 +--
>  arch/{i386 => x86}/lib/realmode_switch.S           |    1 -
>  arch/{i386 => x86}/lib/timer.c                     |    5 +-
>  arch/{i386 => x86}/lib/video.c                     |   48 +++++--------
>  arch/{i386 => x86}/lib/video_bios.c                |    2 +-
>  arch/{i386 => x86}/lib/zimage.c                    |    4 +-
>  board/eNET/config.mk                               |   24 ------
>  board/eNET/eNET.c                                  |    2 +
>  board/eNET/eNET_pci.c                              |    7 +-
>  boards.cfg                                         |    4 +-
>  common/exports.c                                   |    2 +-
>  doc/README-i386                                    |   74 --------------------
>  doc/TODO-i386                                      |   29 --------
>  examples/standalone/stubs.c                        |    4 +-
>  include/common.h                                   |    6 +-
>  include/configs/eNET.h                             |   24 +++++--
>  include/exports.h                                  |    2 +-
>  80 files changed, 237 insertions(+), 361 deletions(-)
>  rename arch/{i386 => x86}/config.mk (100%)
>  rename arch/{i386 => x86}/cpu/Makefile (100%)
>  rename arch/{i386 => x86}/cpu/config.mk (94%)
>  rename arch/{i386 => x86}/cpu/cpu.c (89%)
>  rename arch/{i386 => x86}/cpu/interrupts.c (99%)
>  rename arch/{i386 => x86}/cpu/resetvec.S (89%)
>  rename arch/{i386 => x86}/cpu/sc520/Makefile (96%)
>  rename arch/{i386 => x86}/cpu/sc520/sc520.c (82%)
>  rename arch/{i386 => x86}/cpu/sc520/sc520_car.S (97%)
>  rename arch/{i386 => x86}/cpu/sc520/sc520_pci.c (94%)
>  copy arch/{i386/include/asm/processor.h => x86/cpu/sc520/sc520_reset.c} (67%)
>  rename arch/{i386 => x86}/cpu/sc520/sc520_sdram.c (99%)
>  rename arch/{i386 => x86}/cpu/sc520/sc520_ssi.c (94%)
>  rename arch/{i386 => x86}/cpu/sc520/sc520_timer.c (94%)
>  rename arch/{i386 => x86}/cpu/start.S (84%)
>  rename arch/{i386 => x86}/cpu/start16.S (93%)
>  rename arch/{i386 => x86}/cpu/u-boot.lds (90%)
>  rename arch/{i386 => x86}/include/asm/bitops.h (100%)
>  rename arch/{i386 => x86}/include/asm/bootparam.h (100%)
>  rename arch/{i386 => x86}/include/asm/byteorder.h (100%)
>  rename arch/{i386 => x86}/include/asm/config.h (100%)
>  rename arch/{i386 => x86}/include/asm/e820.h (100%)
>  rename arch/{i386 => x86}/include/asm/errno.h (100%)
>  rename arch/{i386 => x86}/include/asm/global_data.h (100%)
>  rename arch/{i386 => x86}/include/asm/i8254.h (100%)
>  rename arch/{i386 => x86}/include/asm/i8259.h (100%)
>  rename arch/{i386 => x86}/include/asm/ibmpc.h (100%)
>  rename arch/{i386 => x86}/include/asm/ic/pci.h (100%)
>  rename arch/{i386 => x86}/include/asm/ic/sc520.h (100%)
>  rename arch/{i386 => x86}/include/asm/ic/ssi.h (100%)
>  rename arch/{i386 => x86}/include/asm/interrupt.h (95%)
>  rename arch/{i386 => x86}/include/asm/io.h (100%)
>  rename arch/{i386 => x86}/include/asm/ioctl.h (100%)
>  rename arch/{i386 => x86}/include/asm/ist.h (100%)
>  rename arch/{i386 => x86}/include/asm/pci.h (100%)
>  rename arch/{i386 => x86}/include/asm/posix_types.h (100%)
>  rename arch/{i386 => x86}/include/asm/processor-flags.h (100%)
>  rename arch/{i386 => x86}/include/asm/processor.h (100%)
>  rename arch/{i386 => x86}/include/asm/ptrace.h (100%)
>  rename arch/{i386 => x86}/include/asm/realmode.h (100%)
>  rename arch/{i386 => x86}/include/asm/string.h (100%)
>  rename arch/{i386 => x86}/include/asm/types.h (100%)
>  rename arch/{i386/include/asm/u-boot-i386.h => x86/include/asm/u-boot-x86.h} (93%)
>  rename arch/{i386 => x86}/include/asm/u-boot.h (100%)
>  rename arch/{i386 => x86}/include/asm/unaligned.h (100%)
>  rename arch/{i386 => x86}/include/asm/video/edid.h (100%)
>  rename arch/{i386 => x86}/include/asm/zimage.h (100%)
>  rename arch/{i386 => x86}/lib/Makefile (100%)
>  rename arch/{i386 => x86}/lib/bios.S (99%)
>  rename arch/{i386 => x86}/lib/bios.h (81%)
>  rename arch/{i386 => x86}/lib/bios_pci.S (100%)
>  rename arch/{i386 => x86}/lib/bios_setup.c (99%)
>  rename arch/{i386 => x86}/lib/board.c (95%)
>  rename arch/{i386 => x86}/lib/bootm.c (86%)
>  rename arch/{i386 => x86}/lib/interrupts.c (88%)
>  rename arch/{i386 => x86}/lib/pcat_interrupts.c (96%)
>  rename arch/{i386 => x86}/lib/pcat_timer.c (97%)
>  rename arch/{i386 => x86}/lib/pci.c (94%)
>  rename arch/{i386 => x86}/lib/pci_type1.c (61%)
>  rename arch/{i386 => x86}/lib/realmode.c (95%)
>  rename arch/{i386 => x86}/lib/realmode_switch.S (99%)
>  rename arch/{i386 => x86}/lib/timer.c (94%)
>  rename arch/{i386 => x86}/lib/video.c (86%)
>  rename arch/{i386 => x86}/lib/video_bios.c (99%)
>  rename arch/{i386 => x86}/lib/zimage.c (98%)
>  delete mode 100644 board/eNET/config.mk
>  delete mode 100644 doc/README-i386
>  delete mode 100644 doc/TODO-i386

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"355/113 -- Not the famous irrational number PI,  but  an  incredible
simulation!"


More information about the U-Boot mailing list