| Message ID | 20230320194647.23035-1-marek.vasut+renesas@mailbox.org |
|---|---|
| State | Accepted |
| Commit | f04ef0a7a0166e91729b45b1db22f5cc3b3b2f99 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | travis-ci: Add m68k M5208EVBE machine | expand |
On Mon, Mar 20, 2023 at 08:46:47PM +0100, Marek Vasut wrote: > Add m68k M5208EVBE machine configured to test U-Boot m68k support. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> Reviewed-by: Tom Rini <trini@konsulko.com>
On Mon, 20 Mar 2023 20:46:47 +0100, Marek Vasut wrote: > Add m68k M5208EVBE machine configured to test U-Boot m68k support. > > Applied, thanks! [1/1] travis-ci: Add m68k M5208EVBE machine commit: 3f604a1b68a07e6c20f617c38fc849eb796f9af0 Best regards,
Hi Marek, On 26/03/23 4:33 PM, Tom Rini wrote: > > On Mon, 20 Mar 2023 20:46:47 +0100, Marek Vasut wrote: >> Add m68k M5208EVBE machine configured to test U-Boot m68k support. >> >> > > Applied, thanks! > > [1/1] travis-ci: Add m68k M5208EVBE machine > commit: 3f604a1b68a07e6c20f617c38fc849eb796f9af0 > > Best regards, i rebased and tested the build, i see still a python error, https://source.denx.de/u-boot/custodians/u-boot-coldfire/-/pipelines/15856 I applied 93acc7282341a294c28f50086ca1fb3d4cd66a90 travis-ci: Add m68k M5208EVBE machine 77e22d25af74c3be461b27d35805072ead63c178 CI: Add m68k target 31368868227702ad7176e4729a837e4a2183b739 arch: m68k: Add QEMU specific RAMBAR workaround f087d8873614e5bfa1093d5e3a1b6d4cf85623d1 arch: m68k: Introduce trivial PIT based timer d7ef34a0e1c500d4db2331fefaea688b1946a351 arch: m68k: Use existing CONFIG_MCFTMR instead of CFG_MCFTMR Regards, angelo
On Sun, Apr 02, 2023 at 07:37:29AM +0200, Angelo Dureghello wrote: > Hi Marek, > > On 26/03/23 4:33 PM, Tom Rini wrote: > > > > On Mon, 20 Mar 2023 20:46:47 +0100, Marek Vasut wrote: > > > Add m68k M5208EVBE machine configured to test U-Boot m68k support. > > > > > > > > > > Applied, thanks! > > > > [1/1] travis-ci: Add m68k M5208EVBE machine > > commit: 3f604a1b68a07e6c20f617c38fc849eb796f9af0 > > > > Best regards, > > i rebased and tested the build, i see still a python error, > > https://source.denx.de/u-boot/custodians/u-boot-coldfire/-/pipelines/15856 > > I applied > > 93acc7282341a294c28f50086ca1fb3d4cd66a90 > travis-ci: Add m68k M5208EVBE machine > > 77e22d25af74c3be461b27d35805072ead63c178 > CI: Add m68k target > > 31368868227702ad7176e4729a837e4a2183b739 > arch: m68k: Add QEMU specific RAMBAR workaround > > f087d8873614e5bfa1093d5e3a1b6d4cf85623d1 > arch: m68k: Introduce trivial PIT based timer > > d7ef34a0e1c500d4db2331fefaea688b1946a351 > arch: m68k: Use existing CONFIG_MCFTMR instead of CFG_MCFTMR You should rebase this all on -next at this point, where the container has qemu-system-m68k, which is why it's failing there.
Hi Tom, On 02/04/23 4:36 PM, Tom Rini wrote: > On Sun, Apr 02, 2023 at 07:37:29AM +0200, Angelo Dureghello wrote: >> Hi Marek, >> >> On 26/03/23 4:33 PM, Tom Rini wrote: >>> >>> On Mon, 20 Mar 2023 20:46:47 +0100, Marek Vasut wrote: >>>> Add m68k M5208EVBE machine configured to test U-Boot m68k support. >>>> >>>> >>> >>> Applied, thanks! >>> >>> [1/1] travis-ci: Add m68k M5208EVBE machine >>> commit: 3f604a1b68a07e6c20f617c38fc849eb796f9af0 >>> >>> Best regards, >> >> i rebased and tested the build, i see still a python error, >> >> https://source.denx.de/u-boot/custodians/u-boot-coldfire/-/pipelines/15856 >> >> I applied >> >> 93acc7282341a294c28f50086ca1fb3d4cd66a90 >> travis-ci: Add m68k M5208EVBE machine >> >> 77e22d25af74c3be461b27d35805072ead63c178 >> CI: Add m68k target >> >> 31368868227702ad7176e4729a837e4a2183b739 >> arch: m68k: Add QEMU specific RAMBAR workaround >> >> f087d8873614e5bfa1093d5e3a1b6d4cf85623d1 >> arch: m68k: Introduce trivial PIT based timer >> >> d7ef34a0e1c500d4db2331fefaea688b1946a351 >> arch: m68k: Use existing CONFIG_MCFTMR instead of CFG_MCFTMR > > You should rebase this all on -next at this point, where the container > has qemu-system-m68k, which is why it's failing there. > Ok. So i keep applied this patch serie to u-boot-coldfire master. Regards, angelo
Hi, On Tue, 4 Apr 2023 at 15:43, Angelo Dureghello <angelo@kernel-space.org> wrote: > > Hi Tom, > > On 02/04/23 4:36 PM, Tom Rini wrote: > > On Sun, Apr 02, 2023 at 07:37:29AM +0200, Angelo Dureghello wrote: > >> Hi Marek, > >> > >> On 26/03/23 4:33 PM, Tom Rini wrote: > >>> > >>> On Mon, 20 Mar 2023 20:46:47 +0100, Marek Vasut wrote: > >>>> Add m68k M5208EVBE machine configured to test U-Boot m68k support. > >>>> > >>>> > >>> > >>> Applied, thanks! > >>> > >>> [1/1] travis-ci: Add m68k M5208EVBE machine > >>> commit: 3f604a1b68a07e6c20f617c38fc849eb796f9af0 > >>> > >>> Best regards, > >> > >> i rebased and tested the build, i see still a python error, > >> > >> https://source.denx.de/u-boot/custodians/u-boot-coldfire/-/pipelines/15856 > >> > >> I applied > >> > >> 93acc7282341a294c28f50086ca1fb3d4cd66a90 > >> travis-ci: Add m68k M5208EVBE machine > >> > >> 77e22d25af74c3be461b27d35805072ead63c178 > >> CI: Add m68k target > >> > >> 31368868227702ad7176e4729a837e4a2183b739 > >> arch: m68k: Add QEMU specific RAMBAR workaround > >> > >> f087d8873614e5bfa1093d5e3a1b6d4cf85623d1 > >> arch: m68k: Introduce trivial PIT based timer > >> > >> d7ef34a0e1c500d4db2331fefaea688b1946a351 > >> arch: m68k: Use existing CONFIG_MCFTMR instead of CFG_MCFTMR > > > > You should rebase this all on -next at this point, where the container > > has qemu-system-m68k, which is why it's failing there. > > > > Ok. So i keep applied this patch serie to u-boot-coldfire master. This file has turned up in a new 'bin' directory in U-Boot. Shouldn't it be in the hoooks repo? Regards, Simon
On Thu, Jul 20, 2023 at 01:42:50PM -0600, Simon Glass wrote: > Hi, > > On Tue, 4 Apr 2023 at 15:43, Angelo Dureghello <angelo@kernel-space.org> wrote: > > > > Hi Tom, > > > > On 02/04/23 4:36 PM, Tom Rini wrote: > > > On Sun, Apr 02, 2023 at 07:37:29AM +0200, Angelo Dureghello wrote: > > >> Hi Marek, > > >> > > >> On 26/03/23 4:33 PM, Tom Rini wrote: > > >>> > > >>> On Mon, 20 Mar 2023 20:46:47 +0100, Marek Vasut wrote: > > >>>> Add m68k M5208EVBE machine configured to test U-Boot m68k support. > > >>>> > > >>>> > > >>> > > >>> Applied, thanks! > > >>> > > >>> [1/1] travis-ci: Add m68k M5208EVBE machine > > >>> commit: 3f604a1b68a07e6c20f617c38fc849eb796f9af0 > > >>> > > >>> Best regards, > > >> > > >> i rebased and tested the build, i see still a python error, > > >> > > >> https://source.denx.de/u-boot/custodians/u-boot-coldfire/-/pipelines/15856 > > >> > > >> I applied > > >> > > >> 93acc7282341a294c28f50086ca1fb3d4cd66a90 > > >> travis-ci: Add m68k M5208EVBE machine > > >> > > >> 77e22d25af74c3be461b27d35805072ead63c178 > > >> CI: Add m68k target > > >> > > >> 31368868227702ad7176e4729a837e4a2183b739 > > >> arch: m68k: Add QEMU specific RAMBAR workaround > > >> > > >> f087d8873614e5bfa1093d5e3a1b6d4cf85623d1 > > >> arch: m68k: Introduce trivial PIT based timer > > >> > > >> d7ef34a0e1c500d4db2331fefaea688b1946a351 > > >> arch: m68k: Use existing CONFIG_MCFTMR instead of CFG_MCFTMR > > > > > > You should rebase this all on -next at this point, where the container > > > has qemu-system-m68k, which is why it's failing there. > > > > > > > Ok. So i keep applied this patch serie to u-boot-coldfire master. > > This file has turned up in a new 'bin' directory in U-Boot. Shouldn't > it be in the hoooks repo? Yes, it's also in the hooks repository where it needs to be in order to work. This was committed to the main tree by accident and not noticed until now.
diff --git a/bin/travis-ci/conf.M5208EVBE_qemu b/bin/travis-ci/conf.M5208EVBE_qemu new file mode 100644 index 0000000..947f13c --- /dev/null +++ b/bin/travis-ci/conf.M5208EVBE_qemu @@ -0,0 +1,27 @@ +# Copyright (c) 2023 Marek Vasut <marek.vasut+renesas@mailbox.org> +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +console_impl=qemu +qemu_machine="mcf5208evb" +qemu_binary="qemu-system-m68k" +qemu_extra_args="-nographic -serial mon:stdio -net user,tftp=${UBOOT_TRAVIS_BUILD_DIR} -net nic,model=mcf-fec" +qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot.bin" +reset_impl=none +flash_impl=none diff --git a/py/travis-ci/u_boot_boardenv_M5208EVBE_qemu.py b/py/travis-ci/u_boot_boardenv_M5208EVBE_qemu.py new file mode 100644 index 0000000..4e100cd --- /dev/null +++ b/py/travis-ci/u_boot_boardenv_M5208EVBE_qemu.py @@ -0,0 +1,6 @@ +import os +import travis_tftp + +env__net_uses_pci = False +env__net_dhcp_server = True +env__net_tftp_readable_file = travis_tftp.file2env('u-boot')
Add m68k M5208EVBE machine configured to test U-Boot m68k support. Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> --- Cc: Angelo Dureghello <angelo@kernel-space.org> Cc: Stephen Warren <swarren@nvidia.com> Cc: Tom Rini <trini@konsulko.com> --- bin/travis-ci/conf.M5208EVBE_qemu | 27 +++++++++++++++++++ .../u_boot_boardenv_M5208EVBE_qemu.py | 6 +++++ 2 files changed, 33 insertions(+) create mode 100644 bin/travis-ci/conf.M5208EVBE_qemu create mode 100644 py/travis-ci/u_boot_boardenv_M5208EVBE_qemu.py