From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH v2] i.MX HABv4 rework and HABv3 support
Date: Tue, 2 Feb 2016 15:47:43 +0100 [thread overview]
Message-ID: <1454424497-7157-1-git-send-email-s.hauer@pengutronix.de> (raw)
This series reworks the i.MX HABv4 support and adds support for HABv3 as
found on i.MX25, i.MX35 and i.MX51.
HABv4 support was implemented using a relatively complicated makefile
in images/Makefile.imxhabv4. Since the makefiles in images/ are
complicated enough already this is changed in this series. We now
call CST directly from imx-image. With this we can configure CST
from the imx-image configuration file. No additional Makefile changes
are needed, so we can remove Makefile.imxhabv4.
This series also adds HABv3 support. This is slightly different from
HABv4 support. For HABv3 the CSF needs the certificates in DER format
rather than PEM format. Also the super root key hash is not included
in the CSF but in the flash header.
This series has been tested on an i.MX25 for HABv3 and an i.MX6 for
HABv4.
Sascha
Changes since v1:
- create a common include directory for commonly used defines
- Add an option to imx-image to create images suitable for USB upload
----------------------------------------------------------------
Sascha Hauer (34):
scripts: Add common header files for tools
scripts/include: Add ARRAY_SIZE
scripts: Add scripts/include to host compiler includes
scripts: imx: Use Kernel includes
scripts: mxs: Use Kernel includes
ARM: i.MX: Add HABv3 Kconfig variables
imx: hab: rename driver dir to hab/
hab: Add HABv3 status report function
scripts: imx-usb-loader: Make readonly arguments const
scripts: imx-usb-loader: Move definitions up
scripts: imx-image: Allow dcd offset 0x0
scripts: imx-usb-loader: fully read images into memory
scripts: imx-usb-loader: Move load_file up
scripts: imx: Consolidate flash headers in imx tools
scripts: imx-image: Add context struct to config parsers
scripts: imx-image: move write_mem to context data
scripts: imx-image: move check to context data
scripts: imx: move config file parser to separate file
scripts: imx: make libusb variables global
scripts: imx-usb-loader: Add -s and -i options
scripts: imx: Drop double check
scripts: imx-image: move more variables to context data
scripts: imx-image: pass config data to add_header_*
scripts: imx-image: Support adding a Super Root Key to the image
scripts: imx: Create CSF files from imx config file
scripts: imx: Allow to create signed images
scripts: imx: Generate signed images with imx-image
scripts: imx-usb-loader: Use dcd len to invalidate dcd data
scripts: imx-image: Factor out a read_file function
scripts: imx-image: Allow to create HAB signed images suitable for USB upload
Make: i.MX: Allow to pass config file to cmd_imx_image
images: imx: Add targets for signed images and signed usb images
scripts: imx-usb-loader: Do not zero out boot_data_ptr
imx: hab: Make hab status functions SoC specific
arch/arm/mach-imx/Kconfig | 34 +
.../arm/mach-imx/include/mach/habv3-imx25-gencsf.h | 43 ++
arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h | 44 ++
drivers/Makefile | 2 +-
drivers/hab/Makefile | 2 +
drivers/hab/habv3.c | 78 ++
drivers/{habv4 => hab}/habv4.c | 48 +-
drivers/habv4/Makefile | 1 -
images/Makefile | 4 +-
images/Makefile.imx | 10 +-
images/Makefile.imxhabv4 | 48 --
include/{habv4.h => hab.h} | 18 +-
scripts/Makefile | 1 +
scripts/Makefile.lib | 4 +-
scripts/habv4/gencsf.sh | 47 --
scripts/habv4/habv4-imx28.csf.in | 33 -
scripts/habv4/habv4-imx6.csf.in | 37 -
scripts/imx/Makefile | 8 +-
scripts/imx/imx-image.c | 826 ++++++++++-----------
scripts/imx/imx-usb-loader.c | 671 +++++++----------
scripts/imx/imx.c | 444 +++++++++++
scripts/imx/imx.h | 72 ++
scripts/include/asm-generic/atomic-gcc.h | 63 ++
scripts/include/asm-generic/barrier.h | 44 ++
scripts/include/asm-generic/bitops.h | 29 +
scripts/include/asm-generic/bitops/__ffs.h | 43 ++
scripts/include/asm-generic/bitops/__fls.h | 1 +
scripts/include/asm-generic/bitops/arch_hweight.h | 1 +
scripts/include/asm-generic/bitops/atomic.h | 22 +
scripts/include/asm-generic/bitops/const_hweight.h | 1 +
scripts/include/asm-generic/bitops/find.h | 33 +
scripts/include/asm-generic/bitops/fls.h | 1 +
scripts/include/asm-generic/bitops/fls64.h | 1 +
scripts/include/asm-generic/bitops/hweight.h | 7 +
scripts/include/asm/atomic.h | 10 +
scripts/include/asm/barrier.h | 27 +
scripts/include/asm/bug.h | 25 +
scripts/include/linux/atomic.h | 6 +
scripts/include/linux/bitmap.h | 68 ++
scripts/include/linux/bitops.h | 58 ++
scripts/include/linux/compiler.h | 118 +++
scripts/include/linux/err.h | 49 ++
scripts/include/linux/export.h | 10 +
scripts/include/linux/kernel.h | 109 +++
scripts/include/linux/list.h | 771 +++++++++++++++++++
scripts/include/linux/log2.h | 185 +++++
scripts/include/linux/poison.h | 1 +
scripts/include/linux/string.h | 15 +
scripts/include/linux/types.h | 83 +++
scripts/include/tools/be_byteshift.h | 70 ++
scripts/include/tools/endian.h | 56 ++
scripts/include/tools/le_byteshift.h | 70 ++
scripts/mxsimage.c | 4 +-
53 files changed, 3442 insertions(+), 1014 deletions(-)
create mode 100644 arch/arm/mach-imx/include/mach/habv3-imx25-gencsf.h
create mode 100644 arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h
create mode 100644 drivers/hab/Makefile
create mode 100644 drivers/hab/habv3.c
rename drivers/{habv4 => hab}/habv4.c (92%)
delete mode 100644 drivers/habv4/Makefile
delete mode 100644 images/Makefile.imxhabv4
rename include/{habv4.h => hab.h} (71%)
delete mode 100755 scripts/habv4/gencsf.sh
delete mode 100644 scripts/habv4/habv4-imx28.csf.in
delete mode 100644 scripts/habv4/habv4-imx6.csf.in
create mode 100644 scripts/imx/imx.c
create mode 100644 scripts/imx/imx.h
create mode 100644 scripts/include/asm-generic/atomic-gcc.h
create mode 100644 scripts/include/asm-generic/barrier.h
create mode 100644 scripts/include/asm-generic/bitops.h
create mode 100644 scripts/include/asm-generic/bitops/__ffs.h
create mode 100644 scripts/include/asm-generic/bitops/__fls.h
create mode 100644 scripts/include/asm-generic/bitops/arch_hweight.h
create mode 100644 scripts/include/asm-generic/bitops/atomic.h
create mode 100644 scripts/include/asm-generic/bitops/const_hweight.h
create mode 100644 scripts/include/asm-generic/bitops/find.h
create mode 100644 scripts/include/asm-generic/bitops/fls.h
create mode 100644 scripts/include/asm-generic/bitops/fls64.h
create mode 100644 scripts/include/asm-generic/bitops/hweight.h
create mode 100644 scripts/include/asm/atomic.h
create mode 100644 scripts/include/asm/barrier.h
create mode 100644 scripts/include/asm/bug.h
create mode 100644 scripts/include/linux/atomic.h
create mode 100644 scripts/include/linux/bitmap.h
create mode 100644 scripts/include/linux/bitops.h
create mode 100644 scripts/include/linux/compiler.h
create mode 100644 scripts/include/linux/err.h
create mode 100644 scripts/include/linux/export.h
create mode 100644 scripts/include/linux/kernel.h
create mode 100644 scripts/include/linux/list.h
create mode 100644 scripts/include/linux/log2.h
create mode 100644 scripts/include/linux/poison.h
create mode 100644 scripts/include/linux/string.h
create mode 100644 scripts/include/linux/types.h
create mode 100644 scripts/include/tools/be_byteshift.h
create mode 100644 scripts/include/tools/endian.h
create mode 100644 scripts/include/tools/le_byteshift.h
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2016-02-02 14:48 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-02 14:47 Sascha Hauer [this message]
2016-02-02 14:47 ` [PATCH 01/34] scripts: Add common header files for tools Sascha Hauer
2016-02-02 14:47 ` [PATCH 02/34] scripts/include: Add ARRAY_SIZE Sascha Hauer
2016-02-02 14:47 ` [PATCH 03/34] scripts: Add scripts/include to host compiler includes Sascha Hauer
2016-02-02 14:47 ` [PATCH 04/34] scripts: imx: Use Kernel includes Sascha Hauer
2016-02-02 14:47 ` [PATCH 05/34] scripts: mxs: " Sascha Hauer
2016-02-02 14:47 ` [PATCH 06/34] ARM: i.MX: Add HABv3 Kconfig variables Sascha Hauer
2016-02-02 14:47 ` [PATCH 07/34] imx: hab: rename driver dir to hab/ Sascha Hauer
2016-02-02 14:47 ` [PATCH 08/34] hab: Add HABv3 status report function Sascha Hauer
2016-02-02 14:47 ` [PATCH 09/34] scripts: imx-usb-loader: Make readonly arguments const Sascha Hauer
2016-02-02 14:47 ` [PATCH 10/34] scripts: imx-usb-loader: Move definitions up Sascha Hauer
2016-02-02 14:47 ` [PATCH 11/34] scripts: imx-image: Allow dcd offset 0x0 Sascha Hauer
2016-02-02 14:47 ` [PATCH 12/34] scripts: imx-usb-loader: fully read images into memory Sascha Hauer
2016-02-02 14:47 ` [PATCH 13/34] scripts: imx-usb-loader: Move load_file up Sascha Hauer
2016-02-02 14:47 ` [PATCH 14/34] scripts: imx: Consolidate flash headers in imx tools Sascha Hauer
2016-02-02 14:47 ` [PATCH 15/34] scripts: imx-image: Add context struct to config parsers Sascha Hauer
2016-02-02 14:47 ` [PATCH 16/34] scripts: imx-image: move write_mem to context data Sascha Hauer
2016-02-02 14:48 ` [PATCH 17/34] scripts: imx-image: move check " Sascha Hauer
2016-02-02 14:48 ` [PATCH 18/34] scripts: imx: move config file parser to separate file Sascha Hauer
2016-02-02 14:48 ` [PATCH 19/34] scripts: imx: make libusb variables global Sascha Hauer
2016-02-02 14:48 ` [PATCH 20/34] scripts: imx-usb-loader: Add -s and -i options Sascha Hauer
2016-02-02 14:48 ` [PATCH 21/34] scripts: imx: Drop double check Sascha Hauer
2016-02-02 14:48 ` [PATCH 22/34] scripts: imx-image: move more variables to context data Sascha Hauer
2016-02-02 14:48 ` [PATCH 23/34] scripts: imx-image: pass config data to add_header_* Sascha Hauer
2016-02-02 14:48 ` [PATCH 24/34] scripts: imx-image: Support adding a Super Root Key to the image Sascha Hauer
2016-02-02 14:48 ` [PATCH 25/34] scripts: imx: Create CSF files from imx config file Sascha Hauer
2016-02-02 14:48 ` [PATCH 26/34] scripts: imx: Allow to create signed images Sascha Hauer
2016-02-02 14:48 ` [PATCH 27/34] scripts: imx: Generate signed images with imx-image Sascha Hauer
2016-02-02 14:48 ` [PATCH 28/34] scripts: imx-usb-loader: Use dcd len to invalidate dcd data Sascha Hauer
2016-02-02 14:48 ` [PATCH 29/34] scripts: imx-image: Factor out a read_file function Sascha Hauer
2016-02-02 14:48 ` [PATCH 30/34] scripts: imx-image: Allow to create HAB signed images suitable for USB upload Sascha Hauer
2016-02-02 14:48 ` [PATCH 31/34] Make: i.MX: Allow to pass config file to cmd_imx_image Sascha Hauer
2016-02-02 14:48 ` [PATCH 32/34] images: imx: Add targets for signed images and signed usb images Sascha Hauer
2016-02-02 14:48 ` [PATCH 33/34] scripts: imx-usb-loader: Do not zero out boot_data_ptr Sascha Hauer
2016-02-02 14:48 ` [PATCH 34/34] imx: hab: Make hab status functions SoC specific Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454424497-7157-1-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox