* re: [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header
@ 2018-06-11 6:39 Alexander Kurz
2018-06-11 6:55 ` Sascha Hauer
2018-06-11 17:40 ` Andrey Smirnov
0 siblings, 2 replies; 4+ messages in thread
From: Alexander Kurz @ 2018-06-11 6:39 UTC (permalink / raw)
To: Andrey Smirnov <andrew.smirnov@gmail.com>; +Cc: barebox
Hi Andrey,
there's something wrong with this patch,
when generating e.g. the kindle3 image (imx35 / kindle3_defconfig)
with this patch, the generated imximage differs and the device wont
boot. "Share the code to ..." should not change the program behaviour.
Regards, Alexander
--- barebox.imximg_x4_1 2018-06-11 08:27:31.660011787 +0200
+++ barebox.imximg_x4_2 2018-06-11 08:27:26.676011669 +0200
@@ -1,6 +1,6 @@
000000 ea0003fe eafffffe eafffffe eafffffe
000010 eafffffe eafffffe eafffffe eafffffe
-000020 65726162 00786f62 00000000 00022000
+000020 65726162 00786f62 00000000 00000000
000030 55555555 55555555 55555555 55555555
*
000050 00000000 00000000 00000000 00000000
@@ -25,12 +25,8 @@
000510 00000000 00022000 00000000 00000000
000520 00000000 00000000 00000000 00000000
*
-001000 ea0003fe eafffffe eafffffe eafffffe
-001010 eafffffe eafffffe eafffffe eafffffe
-001020 65726162 00786f62 00000000 00022000
-001030 55555555 55555555 55555555 55555555
-*
-001050 00000000 00000000 00000000 00000000
+001020 00000000 00000000 00000000 00022000
+001030 00000000 00000000 00000000 00000000
*
001400 87f00400 000000b1 00000000 87eff814
001410 00000000 87eff81c 87eff400 b17219e9
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header
2018-06-11 6:39 [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header Alexander Kurz
@ 2018-06-11 6:55 ` Sascha Hauer
2018-06-11 17:40 ` Andrey Smirnov
1 sibling, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2018-06-11 6:55 UTC (permalink / raw)
To: Alexander Kurz; +Cc: barebox
On Mon, Jun 11, 2018 at 06:39:32AM +0000, Alexander Kurz wrote:
> Hi Andrey,
> there's something wrong with this patch,
> when generating e.g. the kindle3 image (imx35 / kindle3_defconfig)
> with this patch, the generated imximage differs and the device wont
> boot. "Share the code to ..." should not change the program behaviour.
This patch is still not in master. I dropped it (and the one adding
imx-image support for i.MX8) for now until this is resolved.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header
2018-06-11 6:39 [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header Alexander Kurz
2018-06-11 6:55 ` Sascha Hauer
@ 2018-06-11 17:40 ` Andrey Smirnov
1 sibling, 0 replies; 4+ messages in thread
From: Andrey Smirnov @ 2018-06-11 17:40 UTC (permalink / raw)
To: Alexander Kurz; +Cc: Barebox List
On Sun, Jun 10, 2018 at 11:46 PM Alexander Kurz <akurz@blala.de> wrote:
>
> Hi Andrey,
> there's something wrong with this patch,
> when generating e.g. the kindle3 image (imx35 / kindle3_defconfig)
> with this patch, the generated imximage differs and the device wont
> boot.
My bad, thanks for testing and noticing this! I'll work on fixing this
in v4 of the patchset.
> "Share the code to ..." should not change the program behaviour.
Yes, agreed.
Thanks,
Andrey Smirnov
>
> Regards, Alexander
>
> --- barebox.imximg_x4_1 2018-06-11 08:27:31.660011787 +0200
> +++ barebox.imximg_x4_2 2018-06-11 08:27:26.676011669 +0200
> @@ -1,6 +1,6 @@
> 000000 ea0003fe eafffffe eafffffe eafffffe
> 000010 eafffffe eafffffe eafffffe eafffffe
> -000020 65726162 00786f62 00000000 00022000
> +000020 65726162 00786f62 00000000 00000000
> 000030 55555555 55555555 55555555 55555555
> *
> 000050 00000000 00000000 00000000 00000000
> @@ -25,12 +25,8 @@
> 000510 00000000 00022000 00000000 00000000
> 000520 00000000 00000000 00000000 00000000
> *
> -001000 ea0003fe eafffffe eafffffe eafffffe
> -001010 eafffffe eafffffe eafffffe eafffffe
> -001020 65726162 00786f62 00000000 00022000
> -001030 55555555 55555555 55555555 55555555
> -*
> -001050 00000000 00000000 00000000 00000000
> +001020 00000000 00000000 00000000 00022000
> +001030 00000000 00000000 00000000 00000000
> *
> 001400 87f00400 000000b1 00000000 87eff814
> 001410 00000000 87eff81c 87eff400 b17219e9
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* [RESEND v3 00/52] ARM: i.MX8MQ and EVK support
@ 2018-06-07 13:00 Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header Andrey Smirnov
0 siblings, 1 reply; 4+ messages in thread
From: Andrey Smirnov @ 2018-06-07 13:00 UTC (permalink / raw)
To: barebox; +Cc: Andrey Smirnov
RESEND to include ALL of the patches in the series (not just first 38)
Everyone:
Picking up where Sascha left off, this is the next version of the
patchset that adds support for i.MX8MQ EVK board.
This patchest is also availible at:
https://github.com/ndreys/barebox/tree/imx8m-support-v3
Changes since [v2]:
- i.MX8 specific eSDHC bootstrap code code fixed to function
correctly with high capacity SD cards
- DDR PHY firmware converted to use Sascha's firmware framework and
be SoC specific (can be shared among different boards)
- DDR register definitions moved to imx8-ddrc.h as well as cleaned
up to contain only constants that are being used
- Incorporated imx-image i.MX8 work done by Sascha as well as extend
it to create valid AArch64 header
- Patchset is rebase on latest 'next' branch to accomodate recent
OCOTP changes
Changes since [v1]:
- The patchset now allows building 1st stage bootloader that can be
progammed on SD card and booted standalone
Currently out of scope of this patch (not tested or documented, will
be coming in a follow up series):
- Integration of ARM Trusted Firmware
- Booting Linux kernel
Current assumptions (all subject to change, but listed below to be
explicit):
- DDR initialization code is auto-generated by i.MX8M DDR Tool and
used as close to as-is as possible.
Feedback is wellcome!
Thanks,
Andrey Smirnov
[v1] http://lists.infradead.org/pipermail/barebox/2018-March/032386.html
[v2] http://lists.infradead.org/pipermail/barebox/2018-May/033149.html
Andrey Smirnov (35):
net: fec_imx: Make use of IS_ALIGNED
ARM: i.MX: Split shared CCM code into a separate file
ARM: i.MX: Add IOMUX pad constants for i.MX8
ARM: i.MX: Add basic CCM constants for i.MX8
ARM: Add constants and helpers for system counter interface
clocksource: armv8-timer: Convert explicit assembly into helpers
ARM: i.MX8: Initialize system counter
ARM: i.MX: boot: Fix address casting on 64-bit platforms
ARM: boot: Add trivial i.MX8 support
ARM: i.MX: xload-esdhc: Rework to make code be less i.MX6-specific
ARM: i.MX: xload-esdhc: Allow custom buffer address, device offset
ARM: i.MX: xload-esdhc: Add support for i.MX8
pinctrl: i.MX: Add support for i.MX8
Documentation: imx: Change block size for 'dd' to 1024
Documentation: i.MX: Add missing <soctype>
clocksource: armv8-timer: Make armv8_clocksource_read() static
clocksource: armv8-timer: Make use of postcore_platform_driver()
Port <linux/iopoll.h> from U-Boot
common/clock: Move delay and timeout functions to clock.h
clock: Use udelay() to implement mdelay()
ARM: i.MX8: Add DDRC PHY and DDR CTL base addresses
ARM: i.MX8: Add DDRC PHY support code
ARM: Specify HAVE_PBL_IMAGE for CPU_64
ARM: lib64: Make string functions aware of MMU configuration
ARM: mmu: Make use of dsb() and isb() helpers
ARM: cache: Remove unused cache ops struct
ARM: no-mmu: Disable building for ARMv8
ARM: interrupts64: Include ESR value in exception traceback
ARM: mmu64: Trivial code simplification
ARM: mmu64: Make use of create_table()
ARM: mmu64: Convert flags in arch_remap_range()
ARM: include: dma: Add missing no-MMU stubs
scripts: imx-image: Drop error return from write_dcd()
scripts: imx-image: Limit v2 header size to HEADER_LEN
scripts: imx-image: Share the code to write barebox header
Sascha Hauer (17):
ARM: i.MX: xload: Fix compiler warning
ARM: i.MX: compile arm32 specific errata only for CPU32
ARM: Add i.MX8 support
aarch64: Add i.MX8 debug UART support
Include our own include/dt-bindings
mci: imx-esdhc: use dma mapping functions
net: fec_imx: remove unnecessary DMA sync ops
net: fec_imx: Use dma mapping functions
clock: Add i.MX8MQ clock driver
serial: i.MX: Add i.MX8 support
mmc: i.MX esdhc: Add i.MX8 support
gpio: i.MX: Add i.MX8mq support
ARM: i.MX: ocotp: Add i.MX8MQ support
Kbuild: Add $(quote)
Add builtin firmware support
scripts: imx-image: Add i.MX8MQ support
ARM: i.MX8: Add i.MX8mq EVK support
Documentation/boards/imx.rst | 15 +-
Documentation/boards/imx/nxp-imx8mq-evk.rst | 116 ++
Makefile | 2 +-
arch/arm/Kconfig | 8 +
arch/arm/boards/Makefile | 1 +
arch/arm/boards/nxp-imx8mq-evk/.gitignore | 1 +
arch/arm/boards/nxp-imx8mq-evk/Makefile | 4 +
arch/arm/boards/nxp-imx8mq-evk/board.c | 44 +
arch/arm/boards/nxp-imx8mq-evk/ddr.h | 28 +
arch/arm/boards/nxp-imx8mq-evk/ddr_init.c | 223 ++++
arch/arm/boards/nxp-imx8mq-evk/ddrphy_train.c | 1026 +++++++++++++++++
.../flash-header-imx8mq-evk.imxcfg | 4 +
arch/arm/boards/nxp-imx8mq-evk/lowlevel.c | 81 ++
arch/arm/cpu/Kconfig | 1 +
arch/arm/cpu/Makefile | 2 +-
arch/arm/cpu/cache.c | 1 -
arch/arm/cpu/interrupts_64.c | 3 +-
arch/arm/cpu/mmu_64.c | 25 +-
arch/arm/cpu/mmu_64.h | 4 +-
arch/arm/dts/Makefile | 1 +
arch/arm/dts/imx8mq-evk.dts | 444 +++++++
arch/arm/dts/imx8mq-pinfunc.h | 623 ++++++++++
arch/arm/dts/imx8mq.dtsi | 624 ++++++++++
arch/arm/include/asm/dma.h | 11 +
arch/arm/include/asm/syscounter.h | 24 +
arch/arm/include/asm/system.h | 24 +
arch/arm/lib64/Makefile | 2 +-
arch/arm/lib64/memcpy.S | 6 +-
arch/arm/lib64/memset.S | 4 +-
arch/arm/lib64/string.c | 22 +
arch/arm/mach-imx/Kconfig | 14 +
arch/arm/mach-imx/Makefile | 2 +
arch/arm/mach-imx/boot.c | 8 +-
arch/arm/mach-imx/cpu_init.c | 2 +
arch/arm/mach-imx/imx.c | 4 +
arch/arm/mach-imx/imx8-ddrc.c | 114 ++
arch/arm/mach-imx/imx8mq.c | 85 ++
arch/arm/mach-imx/include/mach/ccm.h | 20 +
arch/arm/mach-imx/include/mach/debug_ll.h | 11 +
arch/arm/mach-imx/include/mach/generic.h | 15 +
.../arm/mach-imx/include/mach/imx7-ccm-regs.h | 16 +-
.../arm/mach-imx/include/mach/imx8-ccm-regs.h | 15 +
arch/arm/mach-imx/include/mach/imx8-ddrc.h | 66 ++
arch/arm/mach-imx/include/mach/imx8mq-regs.h | 123 ++
.../arm/mach-imx/include/mach/imx_cpu_types.h | 1 +
arch/arm/mach-imx/include/mach/iomux-mx8.h | 645 +++++++++++
arch/arm/mach-imx/include/mach/iomux-v3.h | 9 +
arch/arm/mach-imx/include/mach/xload.h | 2 +-
arch/arm/mach-imx/xload-esdhc.c | 121 +-
arch/mips/dts/include/dt-bindings | 1 -
common/Kconfig | 8 +
common/clock.c | 52 -
drivers/clk/imx/Makefile | 3 +
drivers/clk/imx/clk-frac-pll.c | 226 ++++
drivers/clk/imx/clk-imx8mq.c | 580 ++++++++++
drivers/clk/imx/clk-sccg-pll.c | 242 ++++
drivers/clk/imx/clk.h | 27 +
drivers/clocksource/armv8-timer.c | 21 +-
drivers/gpio/gpio-imx.c | 3 +
drivers/mci/imx-esdhc.c | 54 +-
drivers/net/fec_imx.c | 19 +-
drivers/net/fec_imx.h | 1 +
drivers/nvmem/Kconfig | 2 +-
drivers/nvmem/ocotp.c | 10 +
drivers/pinctrl/imx-iomux-v3.c | 56 +-
drivers/serial/serial_imx.c | 5 +-
firmware/Kconfig | 10 +
firmware/Makefile | 61 +
images/Makefile.imx | 7 +
include/clock.h | 68 +-
include/dt-bindings/clock/imx8mq-clock.h | 629 ++++++++++
include/firmware.h | 8 +
include/linux/iopoll.h | 69 ++
include/serial/imx-uart.h | 5 +
include/string.h | 3 +
lib/string.c | 18 +-
scripts/Kbuild.include | 1 +
scripts/Makefile.lib | 1 +
scripts/imx/imx-image.c | 106 +-
scripts/imx/imx.c | 23 +-
scripts/imx/imx.h | 2 +
81 files changed, 6720 insertions(+), 248 deletions(-)
create mode 100644 Documentation/boards/imx/nxp-imx8mq-evk.rst
create mode 100644 arch/arm/boards/nxp-imx8mq-evk/.gitignore
create mode 100644 arch/arm/boards/nxp-imx8mq-evk/Makefile
create mode 100644 arch/arm/boards/nxp-imx8mq-evk/board.c
create mode 100644 arch/arm/boards/nxp-imx8mq-evk/ddr.h
create mode 100644 arch/arm/boards/nxp-imx8mq-evk/ddr_init.c
create mode 100644 arch/arm/boards/nxp-imx8mq-evk/ddrphy_train.c
create mode 100644 arch/arm/boards/nxp-imx8mq-evk/flash-header-imx8mq-evk.imxcfg
create mode 100644 arch/arm/boards/nxp-imx8mq-evk/lowlevel.c
create mode 100644 arch/arm/dts/imx8mq-evk.dts
create mode 100644 arch/arm/dts/imx8mq-pinfunc.h
create mode 100644 arch/arm/dts/imx8mq.dtsi
create mode 100644 arch/arm/include/asm/syscounter.h
create mode 100644 arch/arm/lib64/string.c
create mode 100644 arch/arm/mach-imx/imx8-ddrc.c
create mode 100644 arch/arm/mach-imx/imx8mq.c
create mode 100644 arch/arm/mach-imx/include/mach/ccm.h
create mode 100644 arch/arm/mach-imx/include/mach/imx8-ccm-regs.h
create mode 100644 arch/arm/mach-imx/include/mach/imx8-ddrc.h
create mode 100644 arch/arm/mach-imx/include/mach/imx8mq-regs.h
create mode 100644 arch/arm/mach-imx/include/mach/iomux-mx8.h
delete mode 120000 arch/mips/dts/include/dt-bindings
create mode 100644 drivers/clk/imx/clk-frac-pll.c
create mode 100644 drivers/clk/imx/clk-imx8mq.c
create mode 100644 drivers/clk/imx/clk-sccg-pll.c
create mode 100644 firmware/Kconfig
create mode 100644 firmware/Makefile
create mode 100644 include/dt-bindings/clock/imx8mq-clock.h
create mode 100644 include/linux/iopoll.h
--
2.17.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread* [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header
2018-06-07 13:00 [RESEND v3 00/52] ARM: i.MX8MQ and EVK support Andrey Smirnov
@ 2018-06-07 13:01 ` Andrey Smirnov
0 siblings, 0 replies; 4+ messages in thread
From: Andrey Smirnov @ 2018-06-07 13:01 UTC (permalink / raw)
To: barebox; +Cc: Andrey Smirnov
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
scripts/imx/imx-image.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index 294f51a90..09686f69c 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -216,9 +216,6 @@ static int add_header_v1(struct config_data *data, void *buf)
uint32_t loadaddr = data->image_load_addr;
uint32_t imagesize = data->load_size;
- if (add_barebox_header)
- memcpy(buf, bb_header, sizeof(bb_header));
-
buf += offset;
hdr = buf;
@@ -292,9 +289,6 @@ static int add_header_v2(const struct config_data *data, void *buf)
uint32_t loadaddr = data->image_load_addr;
uint32_t imagesize = data->load_size;
- if (add_barebox_header)
- memcpy(buf, bb_header, sizeof(bb_header));
-
buf += offset;
hdr = buf;
@@ -824,7 +818,15 @@ int main(int argc, char *argv[])
exit(1);
}
- ret = xwrite(outfd, buf, HEADER_LEN);
+ ret = xwrite(outfd, add_barebox_header ? bb_header : buf,
+ sizeof(bb_header));
+ if (ret < 0) {
+ perror("write");
+ exit(1);
+ }
+
+ ret = xwrite(outfd, buf + sizeof(bb_header),
+ HEADER_LEN - sizeof(bb_header));
if (ret < 0) {
perror("write");
exit(1);
--
2.17.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-06-11 17:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-11 6:39 [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header Alexander Kurz
2018-06-11 6:55 ` Sascha Hauer
2018-06-11 17:40 ` Andrey Smirnov
-- strict thread matches above, loose matches on Subject: below --
2018-06-07 13:00 [RESEND v3 00/52] ARM: i.MX8MQ and EVK support Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header Andrey Smirnov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox