* [U-Boot] Please pull u-boot-x86 branch 'sandbox'
@ 2015-04-19 13:23 Simon Glass
2015-04-19 18:28 ` Tom Rini
0 siblings, 1 reply; 6+ messages in thread
From: Simon Glass @ 2015-04-19 13:23 UTC (permalink / raw)
To: u-boot
Hi Tom,
Here are the queued sandbox changes, to allow sandbox to use the
distro booting feature.
The following changes since commit 5ab83ec1a13601c4f76ce009afe0d1ee51f1ad9c:
sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig (2015-04-13
20:53:47 -0600)
are available in the git repository at:
http://git.denx.de/u-boot-x86.git
for you to fetch changes up to 71beb9b91d691a045220b3092f3363b1f0cf833a:
sandbox: add config_distro_defaults and config_distro_bootcmd
(2015-04-18 16:27:13 -0600)
----------------------------------------------------------------
Sjoerd Simons (9):
sandbox: only do sandboxfs for hostfs interface
sandbox: Split bootm code out into lib/bootm
sandbox: Add support for bootz
sandbox: Renamed sb command to host
sandbox: Implement host dev [device]
config_distro_bootcmd.h: Add shared block definition for the
host interface
pxe: Ensure all memory access is to mapped memory
config: Add default client arch defines for intel architectures
sandbox: add config_distro_defaults and config_distro_bootcmd
arch/sandbox/cpu/cpu.c | 12 -----
arch/sandbox/lib/Makefile | 1 +
arch/sandbox/lib/bootm.c | 63 ++++++++++++++++++++++++
common/Makefile | 2 +-
common/cmd_host.c | 175
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/cmd_pxe.c | 86 +++++++++++++++++++++-----------
common/cmd_sandbox.c | 126
-----------------------------------------------
fs/sandbox/sandboxfs.c | 6 ++-
include/config_distro_bootcmd.h | 13 +++++
include/config_distro_defaults.h | 4 ++
include/configs/sandbox.h | 31 +++++++++---
11 files changed, 341 insertions(+), 178 deletions(-)
create mode 100644 arch/sandbox/lib/bootm.c
create mode 100644 common/cmd_host.c
delete mode 100644 common/cmd_sandbox.c
Regards,
Simon
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] Please pull u-boot-x86 branch 'sandbox'
2015-04-19 13:23 [U-Boot] Please pull u-boot-x86 branch 'sandbox' Simon Glass
@ 2015-04-19 18:28 ` Tom Rini
2015-04-19 20:19 ` Simon Glass
0 siblings, 1 reply; 6+ messages in thread
From: Tom Rini @ 2015-04-19 18:28 UTC (permalink / raw)
To: u-boot
On Sun, Apr 19, 2015 at 07:23:08AM -0600, Simon Glass wrote:
> Hi Tom,
>
> Here are the queued sandbox changes, to allow sandbox to use the
> distro booting feature.
>
>
> The following changes since commit 5ab83ec1a13601c4f76ce009afe0d1ee51f1ad9c:
>
> sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig (2015-04-13
> 20:53:47 -0600)
>
> are available in the git repository at:
>
> http://git.denx.de/u-boot-x86.git
>
> for you to fetch changes up to 71beb9b91d691a045220b3092f3363b1f0cf833a:
>
> sandbox: add config_distro_defaults and config_distro_bootcmd
> (2015-04-18 16:27:13 -0600)
>
This conflicts pretty badly now for some reason:
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: Makefile
# both modified: arch/arm/dts/exynos5420-peach-pit.dts
# both modified: arch/arm/dts/exynos5800-peach-pi.dts
# both modified: arch/arm/mach-bcm283x/Kconfig
# both modified: arch/sandbox/cpu/cpu.c
# both modified: arch/sandbox/lib/Makefile
# both modified: common/usb.c
# both modified: common/usb_storage.c
# both modified: drivers/usb/host/ehci-hcd.c
# both modified: include/configs/sandbox.h
Can you please rebase and resend? Thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150419/65b4b0b6/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] Please pull u-boot-x86 branch 'sandbox'
2015-04-19 18:28 ` Tom Rini
@ 2015-04-19 20:19 ` Simon Glass
2015-04-19 20:32 ` Tom Rini
0 siblings, 1 reply; 6+ messages in thread
From: Simon Glass @ 2015-04-19 20:19 UTC (permalink / raw)
To: u-boot
Hi Tom,
On 19 April 2015 at 12:28, Tom Rini <trini@konsulko.com> wrote:
> On Sun, Apr 19, 2015 at 07:23:08AM -0600, Simon Glass wrote:
>
>> Hi Tom,
>>
>> Here are the queued sandbox changes, to allow sandbox to use the
>> distro booting feature.
>>
>>
>> The following changes since commit 5ab83ec1a13601c4f76ce009afe0d1ee51f1ad9c:
>>
>> sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig (2015-04-13
>> 20:53:47 -0600)
>>
>> are available in the git repository at:
>>
>> http://git.denx.de/u-boot-x86.git
>>
>> for you to fetch changes up to 71beb9b91d691a045220b3092f3363b1f0cf833a:
>>
>> sandbox: add config_distro_defaults and config_distro_bootcmd
>> (2015-04-18 16:27:13 -0600)
>>
>
> This conflicts pretty badly now for some reason:
> # Unmerged paths:
> # (use "git add/rm <file>..." as appropriate to mark resolution)
> #
> # both modified: Makefile
> # both modified: arch/arm/dts/exynos5420-peach-pit.dts
> # both modified: arch/arm/dts/exynos5800-peach-pi.dts
> # both modified: arch/arm/mach-bcm283x/Kconfig
> # both modified: arch/sandbox/cpu/cpu.c
> # both modified: arch/sandbox/lib/Makefile
> # both modified: common/usb.c
> # both modified: common/usb_storage.c
> # both modified: drivers/usb/host/ehci-hcd.c
> # both modified: include/configs/sandbox.h
>
> Can you please rebase and resend? Thanks!
Will do - I'll wait until master is updated.
Regards,
Simon
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] Please pull u-boot-x86 branch 'sandbox'
2015-04-19 20:19 ` Simon Glass
@ 2015-04-19 20:32 ` Tom Rini
2015-04-19 20:57 ` Simon Glass
0 siblings, 1 reply; 6+ messages in thread
From: Tom Rini @ 2015-04-19 20:32 UTC (permalink / raw)
To: u-boot
On Sun, Apr 19, 2015 at 02:19:41PM -0600, Simon Glass wrote:
> Hi Tom,
>
> On 19 April 2015 at 12:28, Tom Rini <trini@konsulko.com> wrote:
> > On Sun, Apr 19, 2015 at 07:23:08AM -0600, Simon Glass wrote:
> >
> >> Hi Tom,
> >>
> >> Here are the queued sandbox changes, to allow sandbox to use the
> >> distro booting feature.
> >>
> >>
> >> The following changes since commit 5ab83ec1a13601c4f76ce009afe0d1ee51f1ad9c:
> >>
> >> sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig (2015-04-13
> >> 20:53:47 -0600)
> >>
> >> are available in the git repository at:
> >>
> >> http://git.denx.de/u-boot-x86.git
> >>
> >> for you to fetch changes up to 71beb9b91d691a045220b3092f3363b1f0cf833a:
> >>
> >> sandbox: add config_distro_defaults and config_distro_bootcmd
> >> (2015-04-18 16:27:13 -0600)
> >>
> >
> > This conflicts pretty badly now for some reason:
> > # Unmerged paths:
> > # (use "git add/rm <file>..." as appropriate to mark resolution)
> > #
> > # both modified: Makefile
> > # both modified: arch/arm/dts/exynos5420-peach-pit.dts
> > # both modified: arch/arm/dts/exynos5800-peach-pi.dts
> > # both modified: arch/arm/mach-bcm283x/Kconfig
> > # both modified: arch/sandbox/cpu/cpu.c
> > # both modified: arch/sandbox/lib/Makefile
> > # both modified: common/usb.c
> > # both modified: common/usb_storage.c
> > # both modified: drivers/usb/host/ehci-hcd.c
> > # both modified: include/configs/sandbox.h
> >
> > Can you please rebase and resend? Thanks!
>
> Will do - I'll wait until master is updated.
OK thanks. Note that https://github.com/u-boot/u-boot gets updated when
I push (along with my personal github) even if it's technically a mirror
of the main site.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150419/0fa80730/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] Please pull u-boot-x86 branch 'sandbox'
2015-04-19 20:32 ` Tom Rini
@ 2015-04-19 20:57 ` Simon Glass
2015-04-19 21:44 ` Tom Rini
0 siblings, 1 reply; 6+ messages in thread
From: Simon Glass @ 2015-04-19 20:57 UTC (permalink / raw)
To: u-boot
Hi Tom,
On 19 April 2015 at 14:32, Tom Rini <trini@konsulko.com> wrote:
> On Sun, Apr 19, 2015 at 02:19:41PM -0600, Simon Glass wrote:
>> Hi Tom,
>>
>> On 19 April 2015 at 12:28, Tom Rini <trini@konsulko.com> wrote:
>> > On Sun, Apr 19, 2015 at 07:23:08AM -0600, Simon Glass wrote:
>> >
>> >> Hi Tom,
>> >>
>> >> Here are the queued sandbox changes, to allow sandbox to use the
>> >> distro booting feature.
>> >>
>> >>
>> >> The following changes since commit 5ab83ec1a13601c4f76ce009afe0d1ee51f1ad9c:
>> >>
>> >> sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig (2015-04-13
>> >> 20:53:47 -0600)
>> >>
>> >> are available in the git repository at:
>> >>
>> >> http://git.denx.de/u-boot-x86.git
>> >>
>> >> for you to fetch changes up to 71beb9b91d691a045220b3092f3363b1f0cf833a:
>> >>
>> >> sandbox: add config_distro_defaults and config_distro_bootcmd
>> >> (2015-04-18 16:27:13 -0600)
>> >>
>> >
>> > This conflicts pretty badly now for some reason:
>> > # Unmerged paths:
>> > # (use "git add/rm <file>..." as appropriate to mark resolution)
>> > #
>> > # both modified: Makefile
>> > # both modified: arch/arm/dts/exynos5420-peach-pit.dts
>> > # both modified: arch/arm/dts/exynos5800-peach-pi.dts
>> > # both modified: arch/arm/mach-bcm283x/Kconfig
>> > # both modified: arch/sandbox/cpu/cpu.c
>> > # both modified: arch/sandbox/lib/Makefile
>> > # both modified: common/usb.c
>> > # both modified: common/usb_storage.c
>> > # both modified: drivers/usb/host/ehci-hcd.c
>> > # both modified: include/configs/sandbox.h
>> >
>> > Can you please rebase and resend? Thanks!
>>
>> Will do - I'll wait until master is updated.
>
> OK thanks. Note that https://github.com/u-boot/u-boot gets updated when
> I push (along with my personal github) even if it's technically a mirror
> of the main site.
I wonder why that updates faster? It looks like the problem is the
rebase I did on dm/master when merging in your fixes. I just now
dropped everything but the last 9 patches in a 'git rebase -i' and it
looks OK. But I'll run it through buildman again before sending since
the rebase could have caused problems.
Regards,
Simon
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] Please pull u-boot-x86 branch 'sandbox'
2015-04-19 20:57 ` Simon Glass
@ 2015-04-19 21:44 ` Tom Rini
0 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2015-04-19 21:44 UTC (permalink / raw)
To: u-boot
On Sun, Apr 19, 2015 at 02:57:21PM -0600, Simon Glass wrote:
> Hi Tom,
>
> On 19 April 2015 at 14:32, Tom Rini <trini@konsulko.com> wrote:
> > On Sun, Apr 19, 2015 at 02:19:41PM -0600, Simon Glass wrote:
> >> Hi Tom,
> >>
> >> On 19 April 2015 at 12:28, Tom Rini <trini@konsulko.com> wrote:
> >> > On Sun, Apr 19, 2015 at 07:23:08AM -0600, Simon Glass wrote:
> >> >
> >> >> Hi Tom,
> >> >>
> >> >> Here are the queued sandbox changes, to allow sandbox to use the
> >> >> distro booting feature.
> >> >>
> >> >>
> >> >> The following changes since commit 5ab83ec1a13601c4f76ce009afe0d1ee51f1ad9c:
> >> >>
> >> >> sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig (2015-04-13
> >> >> 20:53:47 -0600)
> >> >>
> >> >> are available in the git repository at:
> >> >>
> >> >> http://git.denx.de/u-boot-x86.git
> >> >>
> >> >> for you to fetch changes up to 71beb9b91d691a045220b3092f3363b1f0cf833a:
> >> >>
> >> >> sandbox: add config_distro_defaults and config_distro_bootcmd
> >> >> (2015-04-18 16:27:13 -0600)
> >> >>
> >> >
> >> > This conflicts pretty badly now for some reason:
> >> > # Unmerged paths:
> >> > # (use "git add/rm <file>..." as appropriate to mark resolution)
> >> > #
> >> > # both modified: Makefile
> >> > # both modified: arch/arm/dts/exynos5420-peach-pit.dts
> >> > # both modified: arch/arm/dts/exynos5800-peach-pi.dts
> >> > # both modified: arch/arm/mach-bcm283x/Kconfig
> >> > # both modified: arch/sandbox/cpu/cpu.c
> >> > # both modified: arch/sandbox/lib/Makefile
> >> > # both modified: common/usb.c
> >> > # both modified: common/usb_storage.c
> >> > # both modified: drivers/usb/host/ehci-hcd.c
> >> > # both modified: include/configs/sandbox.h
> >> >
> >> > Can you please rebase and resend? Thanks!
> >>
> >> Will do - I'll wait until master is updated.
> >
> > OK thanks. Note that https://github.com/u-boot/u-boot gets updated when
> > I push (along with my personal github) even if it's technically a mirror
> > of the main site.
>
> I wonder why that updates faster? It looks like the problem is the
Because I configured git to have 3 write URIs for when I push :)
> rebase I did on dm/master when merging in your fixes. I just now
> dropped everything but the last 9 patches in a 'git rebase -i' and it
> looks OK. But I'll run it through buildman again before sending since
> the rebase could have caused problems.
That's what I suspected.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150419/6d5b7fcf/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-04-19 21:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-19 13:23 [U-Boot] Please pull u-boot-x86 branch 'sandbox' Simon Glass
2015-04-19 18:28 ` Tom Rini
2015-04-19 20:19 ` Simon Glass
2015-04-19 20:32 ` Tom Rini
2015-04-19 20:57 ` Simon Glass
2015-04-19 21:44 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.