mbox

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

Message ID CAPnjgZ1hqEiSYovA1MQGiSCyxOAjZqR+BRcVTw-MPSGyZiDwmw@mail.gmail.com
State Accepted, archived
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-x86.git master

Message

Simon Glass Dec. 1, 2012, 2:38 p.m. UTC
The following changes since commit b8715d8def240014da5614a4f940130ec06d9ebf:

  Merge branch 'master' of git://git.denx.de/u-boot-fdt (2012-11-29
06:41:56 -0700)

are available in the git repository at:

  git://git.denx.de/u-boot-x86.git master

Gabe Black (6):
      x86: Allow compiling out realmode/bios code
      x86: Add an fdt pointer to the global data structure
      x86: Add a minimal device tree for alex x86
      x86: Add a default implementation for cleanup_before_linux()
      x86: Add a dummy implementation for timer_get_us
      x86: Include types.h explicitly in the i386 version of io.h

Simon Glass (4):
      x86: coreboot: Decode additional coreboot sysinfo tags
      x86: Select stdio devices for coreboot
      x86: Remove coreboot start16 code
      x86: Define CONFIG_SYS_VSNPRINTF for coreboot

Stefan Reinauer (4):
      x86: coreboot: Drop sysinfo.c
      x86: video: Add coreboot framebuffer support
      x86: Fix typo in pcat_timer.c
      x86: Don't spam POST80 codes with slow IO functions

Vadim Bendebury (2):
      x86: Add CBMEM console driver for coreboot
      x86: Add console command to display CBMEM console buffer

 README                                           |    6 +
 arch/x86/cpu/Makefile                            |    2 +-
 arch/x86/cpu/coreboot/Makefile                   |    1 -
 arch/x86/cpu/coreboot/sysinfo.c                  |   39 -------
 arch/x86/cpu/coreboot/tables.c                   |  117 ++++++++++++++++++----
 arch/x86/cpu/cpu.c                               |    5 +
 arch/x86/cpu/timer.c                             |   17 +++
 arch/x86/include/asm/arch-coreboot/sysinfo.h     |   34 +++++--
 arch/x86/include/asm/arch-coreboot/tables.h      |   74 ++++++++++++++
 arch/x86/include/asm/global_data.h               |    1 +
 arch/x86/include/asm/io.h                        |    4 +-
 arch/x86/include/asm/u-boot-x86.h                |    1 +
 arch/x86/lib/Makefile                            |    9 +-
 arch/x86/lib/pcat_timer.c                        |    2 +-
 arch/x86/lib/video.c                             |    2 +
 arch/x86/lib/zimage.c                            |    4 +-
 board/chromebook-x86/coreboot/Makefile           |    1 -
 board/chromebook-x86/coreboot/coreboot_start16.S |   33 ------
 board/chromebook-x86/dts/x86-alex.dts            |   30 ++++++
 common/stdio.c                                   |    4 +-
 drivers/misc/Makefile                            |    1 +
 drivers/misc/cbmem_console.c                     |   67 ++++++++++++
 drivers/video/Makefile                           |    1 +
 drivers/video/coreboot_fb.c                      |  101 +++++++++++++++++++
 include/configs/coreboot.h                       |   13 +++
 include/stdio_dev.h                              |    3 +
 26 files changed, 460 insertions(+), 112 deletions(-)
 delete mode 100644 arch/x86/cpu/coreboot/sysinfo.c
 create mode 100644 arch/x86/cpu/timer.c
 delete mode 100644 board/chromebook-x86/coreboot/coreboot_start16.S
 create mode 100644 board/chromebook-x86/dts/x86-alex.dts
 create mode 100644 drivers/misc/cbmem_console.c
 create mode 100644 drivers/video/coreboot_fb.c

Comments

Tom Rini Dec. 1, 2012, 6:32 p.m. UTC | #1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12/01/12 09:38, Simon Glass wrote:
> The following changes since commit 
> b8715d8def240014da5614a4f940130ec06d9ebf:
> 
> Merge branch 'master' of git://git.denx.de/u-boot-fdt (2012-11-29 
> 06:41:56 -0700)
> 
> are available in the git repository at:
> 
> git://git.denx.de/u-boot-x86.git master
> 
> Gabe Black (6): x86: Allow compiling out realmode/bios code x86: 
> Add an fdt pointer to the global data structure x86: Add a minimal
>  device tree for alex x86 x86: Add a default implementation for 
> cleanup_before_linux() x86: Add a dummy implementation for 
> timer_get_us x86: Include types.h explicitly in the i386 version of
> io.h
> 
> Simon Glass (4): x86: coreboot: Decode additional coreboot sysinfo
>  tags x86: Select stdio devices for coreboot x86: Remove coreboot 
> start16 code x86: Define CONFIG_SYS_VSNPRINTF for coreboot
> 
> Stefan Reinauer (4): x86: coreboot: Drop sysinfo.c x86: video: Add
>  coreboot framebuffer support x86: Fix typo in pcat_timer.c x86: 
> Don't spam POST80 codes with slow IO functions
> 
> Vadim Bendebury (2): x86: Add CBMEM console driver for coreboot 
> x86: Add console command to display CBMEM console buffer

I know there's outstanding x86 work, but was all of this in some
series that was posted before the merge window closed?  Thanks!

- -- 
Tom

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQuk0gAAoJENk4IS6UOR1WhSQQAIrj9V6WFTYTGP2I4/1KvTIZ
9MDou2S1okgYXkr0xIiNQdas9QFRTd3Z2xEVOlb5gPJhY8llDqs0TUrzTVlRoomd
bb1Aaq4C+CKmVqNH2LdH4zWCJhSAmZPXigLu8UsUXZcMquzz7CPKmlYyid5psdYF
78OmAihoqsZEpYM/YdBg5koJ2dqi72Wud7IGeXGl3XwWGrMNKtuylCLIRLiuslAp
3u0Bet/lNQ/5fVXxmsPDVMrSr5Kd9To7zCVSXownrlGZVLKr3GV3H4plPdbqcqr5
kI4ZZhZLULMLFcMsbl9BN800Ud5Rv53O4ltW/WTtFRdxpdJeXuzZ2L9ooiRyHEPa
E7YPXF3Ty1ovZZqMZR3zeLTbZS3fy6Kf7K/Kcw6+VFnf+XOvkbjaGuRr4LqHnKHw
eIg/w9qUvafbxSno6OVzvx5AJypGI6h+jTg/hPiBiwKBRpiXTWaXxtv5X9NmGb9+
2XcL9c3EMTf1UL2TFtdgQs+0qRn+nHQEyP45wEbnPzPcAynZBeOHxsT7NUtINNIX
PFJ6G4w1UON8tV8gm3CytE/mTDAK2uQZzlrXxEXKCmOanyvMZjjT6IrxUMaexy1N
+c5f8V9fMxjO91agt7qJXUSzbny4QdeLxZuwNs41xXhKa8/OIjXy0TJ6V5shsD8V
7mjKkkpLUCizvae3DNyU
=h6IE
-----END PGP SIGNATURE-----
Simon Glass Dec. 1, 2012, 7:42 p.m. UTC | #2
Hi Tom,

On Sat, Dec 1, 2012 at 10:32 AM, Tom Rini <trini@ti.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 12/01/12 09:38, Simon Glass wrote:
>> The following changes since commit
>> b8715d8def240014da5614a4f940130ec06d9ebf:
>>
>> Merge branch 'master' of git://git.denx.de/u-boot-fdt (2012-11-29
>> 06:41:56 -0700)
>>
>> are available in the git repository at:
>>
>> git://git.denx.de/u-boot-x86.git master
>>
>> Gabe Black (6): x86: Allow compiling out realmode/bios code x86:
>> Add an fdt pointer to the global data structure x86: Add a minimal
>>  device tree for alex x86 x86: Add a default implementation for
>> cleanup_before_linux() x86: Add a dummy implementation for
>> timer_get_us x86: Include types.h explicitly in the i386 version of
>> io.h
>>
>> Simon Glass (4): x86: coreboot: Decode additional coreboot sysinfo
>>  tags x86: Select stdio devices for coreboot x86: Remove coreboot
>> start16 code x86: Define CONFIG_SYS_VSNPRINTF for coreboot
>>
>> Stefan Reinauer (4): x86: coreboot: Drop sysinfo.c x86: video: Add
>>  coreboot framebuffer support x86: Fix typo in pcat_timer.c x86:
>> Don't spam POST80 codes with slow IO functions
>>
>> Vadim Bendebury (2): x86: Add CBMEM console driver for coreboot
>> x86: Add console command to display CBMEM console buffer
>
> I know there's outstanding x86 work, but was all of this in some
> series that was posted before the merge window closed?  Thanks!

This set of patches was posted between 13th and 20th October. I
actually have more patches in my todo list on patchwork (mostly newer
ones to 3 November, but a few very old like 4 of those in the first
pull request this week).

I took over as maintainer right near the end of the merge window and
sorted out repo access 10 days ago, so I am definitely playing catch
up. All going well I should work through the rest next week.

While talking about patches I see that the patman patches are assigned
to me. I will of course review them, but what should I do after that,
as they are not x86? Also they are outside the merge window for this
release, but will you accept 'next' pull requests at some point?

Regards,
Simon
Otavio Salvador Dec. 3, 2012, 12:12 p.m. UTC | #3
On Sat, Dec 1, 2012 at 5:42 PM, Simon Glass <sjg@chromium.org> wrote:

> Hi Tom,
>
> On Sat, Dec 1, 2012 at 10:32 AM, Tom Rini <trini@ti.com> wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > On 12/01/12 09:38, Simon Glass wrote:
> >> The following changes since commit
> >> b8715d8def240014da5614a4f940130ec06d9ebf:
> >>
> >> Merge branch 'master' of git://git.denx.de/u-boot-fdt (2012-11-29
> >> 06:41:56 -0700)
> >>
> >> are available in the git repository at:
> >>
> >> git://git.denx.de/u-boot-x86.git master
> >>
> >> Gabe Black (6): x86: Allow compiling out realmode/bios code x86:
> >> Add an fdt pointer to the global data structure x86: Add a minimal
> >>  device tree for alex x86 x86: Add a default implementation for
> >> cleanup_before_linux() x86: Add a dummy implementation for
> >> timer_get_us x86: Include types.h explicitly in the i386 version of
> >> io.h
> >>
> >> Simon Glass (4): x86: coreboot: Decode additional coreboot sysinfo
> >>  tags x86: Select stdio devices for coreboot x86: Remove coreboot
> >> start16 code x86: Define CONFIG_SYS_VSNPRINTF for coreboot
> >>
> >> Stefan Reinauer (4): x86: coreboot: Drop sysinfo.c x86: video: Add
> >>  coreboot framebuffer support x86: Fix typo in pcat_timer.c x86:
> >> Don't spam POST80 codes with slow IO functions
> >>
> >> Vadim Bendebury (2): x86: Add CBMEM console driver for coreboot
> >> x86: Add console command to display CBMEM console buffer
> >
> > I know there's outstanding x86 work, but was all of this in some
> > series that was posted before the merge window closed?  Thanks!
>
> This set of patches was posted between 13th and 20th October. I
> actually have more patches in my todo list on patchwork (mostly newer
> ones to 3 November, but a few very old like 4 of those in the first
> pull request this week).
>
> I took over as maintainer right near the end of the merge window and
> sorted out repo access 10 days ago, so I am definitely playing catch
> up. All going well I should work through the rest next week.
>
> While talking about patches I see that the patman patches are assigned
> to me. I will of course review them, but what should I do after that,
> as they are not x86? Also they are outside the merge window for this
> release, but will you accept 'next' pull requests at some point?
>

Maybe it is the time to move patman to another git repository?

patman is nice for many projects so maybe it could live outside U-Boot git?
Simon Glass Dec. 3, 2012, 12:27 p.m. UTC | #4
Hi Otavio,

On Mon, Dec 3, 2012 at 4:12 AM, Otavio Salvador <otavio@ossystems.com.br> wrote:
>[snip]

> Maybe it is the time to move patman to another git repository?
>
> patman is nice for many projects so maybe it could live outside U-Boot git?

Maybe one day, but we still have a number of things to sort out - e.g.
the threading issue Wolfgang raised. Also I don't think patman is
widely used even in U-Boot, and having it here promotes its use. What
other projects actually use it at this stage? (yes I see Doug's
patches aimed at supporting Linux better).

Regards,
Simon

>
> --
> Otavio Salvador                             O.S. Systems
> E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
> Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
>
Tom Rini Dec. 3, 2012, 2:03 p.m. UTC | #5
On Sat, Dec 01, 2012 at 06:38:43AM -0800, Simon Glass wrote:

> The following changes since commit b8715d8def240014da5614a4f940130ec06d9ebf:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-fdt (2012-11-29
> 06:41:56 -0700)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-x86.git master
> 
> Gabe Black (6):
>       x86: Allow compiling out realmode/bios code
>       x86: Add an fdt pointer to the global data structure
>       x86: Add a minimal device tree for alex x86
>       x86: Add a default implementation for cleanup_before_linux()
>       x86: Add a dummy implementation for timer_get_us
>       x86: Include types.h explicitly in the i386 version of io.h
> 
> Simon Glass (4):
>       x86: coreboot: Decode additional coreboot sysinfo tags
>       x86: Select stdio devices for coreboot
>       x86: Remove coreboot start16 code
>       x86: Define CONFIG_SYS_VSNPRINTF for coreboot
> 
> Stefan Reinauer (4):
>       x86: coreboot: Drop sysinfo.c
>       x86: video: Add coreboot framebuffer support
>       x86: Fix typo in pcat_timer.c
>       x86: Don't spam POST80 codes with slow IO functions
> 
> Vadim Bendebury (2):
>       x86: Add CBMEM console driver for coreboot
>       x86: Add console command to display CBMEM console buffer
> 
>  README                                           |    6 +
>  arch/x86/cpu/Makefile                            |    2 +-
>  arch/x86/cpu/coreboot/Makefile                   |    1 -
>  arch/x86/cpu/coreboot/sysinfo.c                  |   39 -------
>  arch/x86/cpu/coreboot/tables.c                   |  117 ++++++++++++++++++----
>  arch/x86/cpu/cpu.c                               |    5 +
>  arch/x86/cpu/timer.c                             |   17 +++
>  arch/x86/include/asm/arch-coreboot/sysinfo.h     |   34 +++++--
>  arch/x86/include/asm/arch-coreboot/tables.h      |   74 ++++++++++++++
>  arch/x86/include/asm/global_data.h               |    1 +
>  arch/x86/include/asm/io.h                        |    4 +-
>  arch/x86/include/asm/u-boot-x86.h                |    1 +
>  arch/x86/lib/Makefile                            |    9 +-
>  arch/x86/lib/pcat_timer.c                        |    2 +-
>  arch/x86/lib/video.c                             |    2 +
>  arch/x86/lib/zimage.c                            |    4 +-
>  board/chromebook-x86/coreboot/Makefile           |    1 -
>  board/chromebook-x86/coreboot/coreboot_start16.S |   33 ------
>  board/chromebook-x86/dts/x86-alex.dts            |   30 ++++++
>  common/stdio.c                                   |    4 +-
>  drivers/misc/Makefile                            |    1 +
>  drivers/misc/cbmem_console.c                     |   67 ++++++++++++
>  drivers/video/Makefile                           |    1 +
>  drivers/video/coreboot_fb.c                      |  101 +++++++++++++++++++
>  include/configs/coreboot.h                       |   13 +++
>  include/stdio_dev.h                              |    3 +
>  26 files changed, 460 insertions(+), 112 deletions(-)
>  delete mode 100644 arch/x86/cpu/coreboot/sysinfo.c
>  create mode 100644 arch/x86/cpu/timer.c
>  delete mode 100644 board/chromebook-x86/coreboot/coreboot_start16.S
>  create mode 100644 board/chromebook-x86/dts/x86-alex.dts
>  create mode 100644 drivers/misc/cbmem_console.c
>  create mode 100644 drivers/video/coreboot_fb.c

Applied to u-boot/master, thanks!
Otavio Salvador Dec. 3, 2012, 2:24 p.m. UTC | #6
On Mon, Dec 3, 2012 at 10:27 AM, Simon Glass <sjg@chromium.org> wrote:

> Hi Otavio,
>
> On Mon, Dec 3, 2012 at 4:12 AM, Otavio Salvador <otavio@ossystems.com.br>
> wrote:
> >[snip]
>
> > Maybe it is the time to move patman to another git repository?
> >
> > patman is nice for many projects so maybe it could live outside U-Boot
> git?
>
> Maybe one day, but we still have a number of things to sort out - e.g.
> the threading issue Wolfgang raised. Also I don't think patman is
> widely used even in U-Boot, and having it here promotes its use. What
> other projects actually use it at this stage? (yes I see Doug's
> patches aimed at supporting Linux better).
>

I've been using it a lot! It is your call about moving it outside U-Boot
git or not but I do believe it would be easier to find users (specially
among other projects) if it were in a standalone tree. It would also allow
for independent release cycle (which would be good).

(this is my point of view)
Tom Rini Dec. 3, 2012, 2:31 p.m. UTC | #7
On Sat, Dec 01, 2012 at 11:42:28AM -0800, Simon Glass wrote:
> Hi Tom,
> 
> On Sat, Dec 1, 2012 at 10:32 AM, Tom Rini <trini@ti.com> wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > On 12/01/12 09:38, Simon Glass wrote:
> >> The following changes since commit
> >> b8715d8def240014da5614a4f940130ec06d9ebf:
> >>
> >> Merge branch 'master' of git://git.denx.de/u-boot-fdt (2012-11-29
> >> 06:41:56 -0700)
> >>
> >> are available in the git repository at:
> >>
> >> git://git.denx.de/u-boot-x86.git master
> >>
> >> Gabe Black (6): x86: Allow compiling out realmode/bios code x86:
> >> Add an fdt pointer to the global data structure x86: Add a minimal
> >>  device tree for alex x86 x86: Add a default implementation for
> >> cleanup_before_linux() x86: Add a dummy implementation for
> >> timer_get_us x86: Include types.h explicitly in the i386 version of
> >> io.h
> >>
> >> Simon Glass (4): x86: coreboot: Decode additional coreboot sysinfo
> >>  tags x86: Select stdio devices for coreboot x86: Remove coreboot
> >> start16 code x86: Define CONFIG_SYS_VSNPRINTF for coreboot
> >>
> >> Stefan Reinauer (4): x86: coreboot: Drop sysinfo.c x86: video: Add
> >>  coreboot framebuffer support x86: Fix typo in pcat_timer.c x86:
> >> Don't spam POST80 codes with slow IO functions
> >>
> >> Vadim Bendebury (2): x86: Add CBMEM console driver for coreboot
> >> x86: Add console command to display CBMEM console buffer
> >
> > I know there's outstanding x86 work, but was all of this in some
> > series that was posted before the merge window closed?  Thanks!
> 
> This set of patches was posted between 13th and 20th October. I
> actually have more patches in my todo list on patchwork (mostly newer
> ones to 3 November, but a few very old like 4 of those in the first
> pull request this week).
> 
> I took over as maintainer right near the end of the merge window and
> sorted out repo access 10 days ago, so I am definitely playing catch
> up. All going well I should work through the rest next week.

OK, thanks.

> While talking about patches I see that the patman patches are assigned
> to me. I will of course review them, but what should I do after that,
> as they are not x86? Also they are outside the merge window for this
> release, but will you accept 'next' pull requests at some point?

For patman patches that you didn't author/post, I think I assigned them
to you to review and then pass back to me to pickup.

For the next branch, I would like to see custodians take things in that
they're happy with, but came in post merge window.  How it gets into the
main tree, I'm still thinking about.  Having a lot of people using a
rebased tree was shown to be a pain last time around.  I'm tempted to
say we should try something more Linux Kernel like and say put patches
that are ready into a branch against what they're tested / posted
against, and send pull requests once the merge window opens.  But I know
there's a lot of nuance to the process there too.