* [Buildroot] [PATCH 1/4] meson-tools: new Package
@ 2020-07-17 16:46 Dagg Stompler
2020-07-17 16:46 ` [Buildroot] [PATCH 2/4] odroidc2_atf: " Dagg Stompler
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Dagg Stompler @ 2020-07-17 16:46 UTC (permalink / raw)
To: buildroot
add meson-tools for handling of amlogic boards boot firmware signatures
Signed-off-by: Dagg Stompler <daggs@gmx.com>
---
DEVELOPERS | 3 +++
package/Config.in.host | 1 +
package/meson-tools/Config.in.host | 9 +++++++++
package/meson-tools/meson-tools.hash | 2 ++
package/meson-tools/meson-tools.mk | 24 ++++++++++++++++++++++++
5 files changed, 39 insertions(+)
create mode 100644 package/meson-tools/Config.in.host
create mode 100644 package/meson-tools/meson-tools.hash
create mode 100644 package/meson-tools/meson-tools.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index f91314a13a..64af92dd2f 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -620,6 +620,9 @@ N: Cyril Bur <cyrilbur@gmail.com>
F: arch/Config.in.powerpc
F: package/kvm-unit-tests
+N: Dagg Stompler <daggs@gmx.com>
+F: package/meson-tools/
+
N: Daniel J. Leach <dleach@belcan.com>
F: package/dacapo/
diff --git a/package/Config.in.host b/package/Config.in.host
index 647fc24841..e222e7e448 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -43,6 +43,7 @@ menu "Host utilities"
source "package/lpc3250loader/Config.in.host"
source "package/lttng-babeltrace/Config.in.host"
source "package/mender-artifact/Config.in.host"
+ source "package/meson-tools/Config.in.host"
source "package/mfgtools/Config.in.host"
source "package/mkpasswd/Config.in.host"
source "package/mtd/Config.in.host"
diff --git a/package/meson-tools/Config.in.host b/package/meson-tools/Config.in.host
new file mode 100644
index 0000000000..d90be61aeb
--- /dev/null
+++ b/package/meson-tools/Config.in.host
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_HOST_MESON_TOOLS
+ bool "host meson-tools"
+ help
+ meson-tools is a collection of tools for use with
+ the Amlogic Meson family of ARM based SoCs.
+ it allows management of signatures which are required
+ for booting amlogic based boards with u-boot.
+
+ https://github.com/afaerber/meson-tools
diff --git a/package/meson-tools/meson-tools.hash b/package/meson-tools/meson-tools.hash
new file mode 100644
index 0000000000..f10f5d8590
--- /dev/null
+++ b/package/meson-tools/meson-tools.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 10d707b2f741df03ff5000f2a82c6f577036ce1cd34d9278b22b92cb616b6fce meson-tools-0a02e2d34413f4bf9b15946352bc8c8ee13a5843.tar.gz
diff --git a/package/meson-tools/meson-tools.mk b/package/meson-tools/meson-tools.mk
new file mode 100644
index 0000000000..7fe115c6dd
--- /dev/null
+++ b/package/meson-tools/meson-tools.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# meson-tools
+#
+################################################################################
+
+HOST_MESON_TOOLS_VERSION = 0a02e2d34413f4bf9b15946352bc8c8ee13a5843
+HOST_MESON_TOOLS_SITE = $(call github,afaerber,meson-tools,$(HOST_MESON_TOOLS_VERSION))
+HOST_MESON_TOOLS_LICENSE = GPL-2.0+
+HOST_MESON_TOOLS_LICENSE_FILES = COPYING README.md
+HOST_MESON_TOOLS_DEPENDENCIES = host-openssl
+
+HOST_MESON_TOOLS_PROGS = amlbootsig unamlbootsig amlinfo
+
+define HOST_MESON_TOOLS_BUILD_CMDS
+ $(MAKE) -C $(@D) CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS) -lssl -lcrypto"
+endef
+
+define HOST_MESON_TOOLS_INSTALL_CMDS
+ $(foreach f,$(HOST_MESON_TOOLS_PROGS),
+ $(INSTALL) -D -m 0755 $(@D)/$(f) $(HOST_DIR)/bin/$(f))
+endef
+
+$(eval $(host-generic-package))
--
2.27.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 2/4] odroidc2_atf: new Package
2020-07-17 16:46 [Buildroot] [PATCH 1/4] meson-tools: new Package Dagg Stompler
@ 2020-07-17 16:46 ` Dagg Stompler
2020-09-03 18:50 ` Thomas Petazzoni
2020-07-17 16:46 ` [Buildroot] [PATCH 3/4] board/odroidc2: add board Dagg Stompler
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Dagg Stompler @ 2020-07-17 16:46 UTC (permalink / raw)
To: buildroot
introduce a package that holds the ATF for AmLogic's Odroid C2 boards
Signed-off-by: Dagg Stompler <daggs@gmx.com>
---
DEVELOPERS | 1 +
package/Config.in.host | 1 +
package/odroidc2_atf/Config.in.host | 8 ++++++++
package/odroidc2_atf/odroidc2_atf.hash | 2 ++
package/odroidc2_atf/odroidc2_atf.mk | 26 ++++++++++++++++++++++++++
5 files changed, 38 insertions(+)
create mode 100644 package/odroidc2_atf/Config.in.host
create mode 100644 package/odroidc2_atf/odroidc2_atf.hash
create mode 100644 package/odroidc2_atf/odroidc2_atf.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 64af92dd2f..82044605b7 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -622,6 +622,7 @@ F: package/kvm-unit-tests
N: Dagg Stompler <daggs@gmx.com>
F: package/meson-tools/
+F: package/odroidc2_atf/
N: Daniel J. Leach <dleach@belcan.com>
F: package/dacapo/
diff --git a/package/Config.in.host b/package/Config.in.host
index e222e7e448..964ab00aec 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -50,6 +50,7 @@ menu "Host utilities"
source "package/mtools/Config.in.host"
source "package/mxsldr/Config.in.host"
source "package/odb/Config.in.host"
+ source "package/odroidc2_atf/Config.in.host"
source "package/omap-u-boot-utils/Config.in.host"
source "package/openocd/Config.in.host"
source "package/opkg-utils/Config.in.host"
diff --git a/package/odroidc2_atf/Config.in.host b/package/odroidc2_atf/Config.in.host
new file mode 100644
index 0000000000..b5307fb05d
--- /dev/null
+++ b/package/odroidc2_atf/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_ODROIDC2_ATF
+ bool "host odroidc2_atf"
+ help
+ odroidc2_atf is a package that holst the minimal file needed for the ATF (ARM Trusted Firmware) from hardkernel's
+ uboot repository and uses it to allow safe boot of mainline u-boot kernels.
+ the files were taken without chaning from https://github.com/hardkernel/u-boot/tree/odroidc2-v2015.01
+
+ https://github.com/daggs1/odroidc2_atf
diff --git a/package/odroidc2_atf/odroidc2_atf.hash b/package/odroidc2_atf/odroidc2_atf.hash
new file mode 100644
index 0000000000..41ea3a6ba5
--- /dev/null
+++ b/package/odroidc2_atf/odroidc2_atf.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 991fb15908410c6c8a6ef2e0da368ca8e2b813d123382f0e8958814ad0aead97 odroidc2_atf-13a8560b2884cb5fa13537e1aa193e3cb7b2d996.tar.gz
diff --git a/package/odroidc2_atf/odroidc2_atf.mk b/package/odroidc2_atf/odroidc2_atf.mk
new file mode 100644
index 0000000000..ee2f9e85b3
--- /dev/null
+++ b/package/odroidc2_atf/odroidc2_atf.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# Odroidc2ATF
+#
+################################################################################
+
+HOST_ODROIDC2_ATF_VERSION = 13a8560b2884cb5fa13537e1aa193e3cb7b2d996
+HOST_ODROIDC2_ATF_SITE = $(call github,daggs1,OdroidC2ATF,$(HOST_ODROIDC2_ATF_VERSION))
+HOST_ODROIDC2_ATF_LICENSE = GPL-2.0
+HOST_ODROIDC2_ATF_LICENSE_FILES = COPYING COPYING.txt README
+HOST_ODROIDC2_ATF_FIRMWARE_FOLDER = $(HOST_DIR)/usr/share/odroidc2_atf
+HOST_ODROIDC2_ATF_FIRMWARE_FILES = bins/bl1.bin.hardkernel bins/bl30.bin bins/bl301.bin bins/bl31.bin bins/bl2.package
+
+define HOST_ODROIDC2_ATF_BUILD_CMDS
+ $(MAKE) -C $(@D)/fip_create CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)"
+endef
+
+define HOST_ODROIDC2_ATF_INSTALL_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/fip_create/fip_create $(HOST_DIR)/bin
+ mkdir -p $(HOST_ODROIDC2_ATF_FIRMWARE_FOLDER)
+ $(foreach f,$(HOST_ODROIDC2_ATF_FIRMWARE_FILES),
+ $(INSTALL) -D -m 0644 $(@D)/$(f) $(HOST_ODROIDC2_ATF_FIRMWARE_FOLDER)/
+ )
+endef
+
+$(eval $(host-generic-package))
--
2.27.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 3/4] board/odroidc2: add board
2020-07-17 16:46 [Buildroot] [PATCH 1/4] meson-tools: new Package Dagg Stompler
2020-07-17 16:46 ` [Buildroot] [PATCH 2/4] odroidc2_atf: " Dagg Stompler
@ 2020-07-17 16:46 ` Dagg Stompler
2020-09-03 18:53 ` Thomas Petazzoni
2020-07-17 16:46 ` [Buildroot] [PATCH 4/4] configs/odroidc2: add defconfig Dagg Stompler
2020-08-29 22:12 ` [Buildroot] [PATCH 1/4] meson-tools: new Package Thomas Petazzoni
3 siblings, 1 reply; 7+ messages in thread
From: Dagg Stompler @ 2020-07-17 16:46 UTC (permalink / raw)
To: buildroot
re add the odroidc2 board to buildroot.
- uses latest uboot.
- uses kernel 5.6
Signed-off-by: Dagg Stompler <daggs@gmx.com>
---
board/hardkernel/odroidc2/boot.cmd | 11 ++++
board/hardkernel/odroidc2/genimage.cfg | 33 +++++++++++
board/hardkernel/odroidc2/post-build.sh | 8 +++
board/hardkernel/odroidc2/post-image.sh | 29 ++++++++++
board/hardkernel/odroidc2/readme.txt | 57 +++++++++++++++++++
.../rootfs_overlay/etc/init.d/S09modload | 23 ++++++++
6 files changed, 161 insertions(+)
create mode 100644 board/hardkernel/odroidc2/boot.cmd
create mode 100644 board/hardkernel/odroidc2/genimage.cfg
create mode 100755 board/hardkernel/odroidc2/post-build.sh
create mode 100755 board/hardkernel/odroidc2/post-image.sh
create mode 100644 board/hardkernel/odroidc2/readme.txt
create mode 100755 board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload
diff --git a/board/hardkernel/odroidc2/boot.cmd b/board/hardkernel/odroidc2/boot.cmd
new file mode 100644
index 0000000000..d800a6d44b
--- /dev/null
+++ b/board/hardkernel/odroidc2/boot.cmd
@@ -0,0 +1,11 @@
+setenv kernel_filename "Image"
+setenv fdt_filename "meson-gxbb-odroidc2.dtb"
+setenv bootargs "console=ttyAML0,115200n8 earlyprintk root=/dev/mmcblk1p2 rootwait rw"
+
+echo > Loading Kernel...
+fatload mmc 0:1 ${kernel_addr_r} ${kernel_filename}
+echo > Loading FDT...
+fatload mmc 0:1 ${fdt_addr_r} ${fdt_filename}
+
+echo > Booting System...
+booti ${kernel_addr_r} - ${fdt_addr_r}
diff --git a/board/hardkernel/odroidc2/genimage.cfg b/board/hardkernel/odroidc2/genimage.cfg
new file mode 100644
index 0000000000..a36b924b08
--- /dev/null
+++ b/board/hardkernel/odroidc2/genimage.cfg
@@ -0,0 +1,33 @@
+image boot.vfat {
+ vfat {
+ files = {
+ "Image",
+ "meson-gxbb-odroidc2.dtb",
+ "boot.scr"
+ }
+ }
+ size = 64M
+}
+
+image sdcard.img {
+ hdimage {
+ }
+
+ partition u-boot {
+ in-partition-table = "no"
+ image = "uboot-odc2.img"
+ offset = 49664
+ }
+
+ partition boot {
+ partition-type = 0xC
+ bootable = "true"
+ image = "boot.vfat"
+ }
+
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
+ size = 512M
+ }
+}
diff --git a/board/hardkernel/odroidc2/post-build.sh b/board/hardkernel/odroidc2/post-build.sh
new file mode 100755
index 0000000000..745fb2a724
--- /dev/null
+++ b/board/hardkernel/odroidc2/post-build.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# post-build.sh for Odroid C2 taken from CubieBoard's post-build.sh
+# 2013, Carlo Caione <carlo.caione@gmail.com>
+
+BOARD_DIR="$(dirname $0)"
+MKIMAGE=$HOST_DIR/bin/mkimage
+
+${MKIMAGE} -A arm64 -O linux -T script -C none -n "Boot script" -d "${BOARD_DIR}/boot.cmd" ${BINARIES_DIR}/boot.scr
diff --git a/board/hardkernel/odroidc2/post-image.sh b/board/hardkernel/odroidc2/post-image.sh
new file mode 100755
index 0000000000..3783a65a1c
--- /dev/null
+++ b/board/hardkernel/odroidc2/post-image.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+SIGNED_UBOOT_IMG="${BINARIES_DIR}/uboot-odc2.img"
+ODRODIDC2_ATF_FOLDER="${HOST_DIR}/usr/share/odroidc2_atf"
+IM_FILE="${ODRODIDC2_ATF_FOLDER}/bl1.bin.hardkernel"
+
+${HOST_DIR}/bin/fip_create --bl30 ${ODRODIDC2_ATF_FOLDER}/bl30.bin --bl301 ${ODRODIDC2_ATF_FOLDER}/bl301.bin --bl31 ${ODRODIDC2_ATF_FOLDER}/bl31.bin --bl33 ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/fip.bin
+${HOST_DIR}/bin/fip_create --dump ${BINARIES_DIR}/fip.bin
+cat ${ODRODIDC2_ATF_FOLDER}/bl2.package ${BINARIES_DIR}/fip.bin > ${BINARIES_DIR}/boot_new.bin
+${HOST_DIR}/bin/amlbootsig ${BINARIES_DIR}/boot_new.bin ${BINARIES_DIR}/u-boot.img
+
+dd if=${BINARIES_DIR}/u-boot.img of=${SIGNED_UBOOT_IMG} bs=512 skip=96
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage \
+ --rootpath "${TARGET_DIR}" \
+ --tmppath "${GENIMAGE_TMP}" \
+ --inputpath "${BINARIES_DIR}" \
+ --outputpath "${BINARIES_DIR}" \
+ --config "${GENIMAGE_CFG}"
+
+dd if=${IM_FILE} of=${BINARIES_DIR}/sdcard.img bs=1 count=442 conv=sync,notrunc
+dd if=${IM_FILE} of=${BINARIES_DIR}/sdcard.img bs=512 skip=1 seek=1 conv=fsync,notrunc
+
+rm -rf ${BINARIES_DIR}/fip.bin ${BINARIES_DIR}/boot_new.bin ${BINARIES_DIR}/u-boot.img
diff --git a/board/hardkernel/odroidc2/readme.txt b/board/hardkernel/odroidc2/readme.txt
new file mode 100644
index 0000000000..ef5a91d453
--- /dev/null
+++ b/board/hardkernel/odroidc2/readme.txt
@@ -0,0 +1,57 @@
+ODROID-C2
+
+Intro
+=====
+To be able to use ODROID-C2 board with the images generated by
+Buildroot, you have to prepare the SDCard or eMMC.
+
+How to build it
+===============
+
+ $ make odroidc2_defconfig
+
+Then you can edit the build options using
+
+ $ make menuconfig
+
+Compile all and build rootfs image:
+
+ $ make
+
+Note: you will need to have access to the network, since Buildroot will
+download the packages' sources.
+
+Result of the build
+-------------------
+
+After building, you should obtain this tree:
+
+ output/images/
+ +-- Image
+ +-- uImage [2]
+ +-- boot.scr [1]
+ +-- boot.vfat
+ +-- meson-gxbb-odroidc2.dtb
+ +-- rootfs.ext2
+ +-- rootfs.ext4
+ +-- rootfs.tar
+ +-- sdcard.img
+ +-- uboot-odc2.img [3]
+ `-- u-boot.bin
+
+[1] This is the ODROID-C2 configuration file used in u-boot.
+[2] This is the ODROID-C2 kernel image file which will be booted.
+[3] This is the ODROID-C2 signed u-boot image which will be used.
+
+How to write the SD card or eMMC
+================================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card or eMMC with "dd":
+
+ $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+
+Insert the SDcard into your ODROID-C2, and power it up. Your new system
+should come up now.
diff --git a/board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload b/board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload
new file mode 100755
index 0000000000..8d694a7331
--- /dev/null
+++ b/board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+
+load_drivers()
+{
+ echo "Loading needed modules..."
+ for file in $(echo "dwmac_generic dwmac-meson8b meson_dw_hdmi meson_gxbb_wdt"); do
+ modprobe ${file}
+ done
+}
+
+case "$1" in
+ start)
+ load_drivers
+ ;;
+ stop)
+ ;;
+ restart|reload)
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+esac
--
2.27.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 4/4] configs/odroidc2: add defconfig
2020-07-17 16:46 [Buildroot] [PATCH 1/4] meson-tools: new Package Dagg Stompler
2020-07-17 16:46 ` [Buildroot] [PATCH 2/4] odroidc2_atf: " Dagg Stompler
2020-07-17 16:46 ` [Buildroot] [PATCH 3/4] board/odroidc2: add board Dagg Stompler
@ 2020-07-17 16:46 ` Dagg Stompler
2020-08-29 22:12 ` [Buildroot] [PATCH 1/4] meson-tools: new Package Thomas Petazzoni
3 siblings, 0 replies; 7+ messages in thread
From: Dagg Stompler @ 2020-07-17 16:46 UTC (permalink / raw)
To: buildroot
add config to buildroot which allows building an image which
can run on Hardkernel's Odroid C2 board.
features summery:
- kernel 5.7
- uboot 2020.07
- hdmi should work but not tested
- needed modules are loaded
Signed-off-by: Dagg Stompler <daggs@gmx.com>
---
DEVELOPERS | 1 +
configs/odroidc2_defconfig | 40 ++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 configs/odroidc2_defconfig
diff --git a/DEVELOPERS b/DEVELOPERS
index 82044605b7..f055bebb70 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -621,6 +621,7 @@ F: arch/Config.in.powerpc
F: package/kvm-unit-tests
N: Dagg Stompler <daggs@gmx.com>
+F: board/odroidc2/
F: package/meson-tools/
F: package/odroidc2_atf/
diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig
new file mode 100644
index 0000000000..8b854e2c4f
--- /dev/null
+++ b/configs/odroidc2_defconfig
@@ -0,0 +1,40 @@
+# Architecture
+BR2_aarch64=y
+
+# Toolchain
+BR2_GCC_VERSION_9_X=y
+
+# System
+BR2_TARGET_GENERIC_HOSTNAME="odroidc2"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAML0"
+BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_ROOTFS_OVERLAY="board/hardkernel/odroidc2/rootfs_overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/hardkernel/odroidc2/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/hardkernel/odroidc2/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="yes"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-odroidc2"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+
+# U-Boot
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y
+BR2_TARGET_UBOOT_BOARDNAME="odroid-c2"
+BR2_TARGET_UBOOT_CUSTOM_VERSION="2020.07"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/hardkernel/odroidc2/boot.cmd"
+
+# Required tools to create the SD image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MESON_TOOLS=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_ODROIDC2_ATF=y
--
2.27.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/4] meson-tools: new Package
2020-07-17 16:46 [Buildroot] [PATCH 1/4] meson-tools: new Package Dagg Stompler
` (2 preceding siblings ...)
2020-07-17 16:46 ` [Buildroot] [PATCH 4/4] configs/odroidc2: add defconfig Dagg Stompler
@ 2020-08-29 22:12 ` Thomas Petazzoni
3 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2020-08-29 22:12 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 17 Jul 2020 19:46:40 +0300
Dagg Stompler <daggs@gmx.com> wrote:
> add meson-tools for handling of amlogic boards boot firmware signatures
>
> Signed-off-by: Dagg Stompler <daggs@gmx.com>
Thanks, I have applied your patch to our next branch, with a few
changes.
First, the commit title was changed to:
package/meson-tools: new package
> diff --git a/package/meson-tools/meson-tools.hash b/package/meson-tools/meson-tools.hash
> new file mode 100644
> index 0000000000..f10f5d8590
> --- /dev/null
> +++ b/package/meson-tools/meson-tools.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256 10d707b2f741df03ff5000f2a82c6f577036ce1cd34d9278b22b92cb616b6fce meson-tools-0a02e2d34413f4bf9b15946352bc8c8ee13a5843.tar.gz
I've added the hash of the license file here, and use 2 spaces as a
separator, which is our convention.
> diff --git a/package/meson-tools/meson-tools.mk b/package/meson-tools/meson-tools.mk
> new file mode 100644
> index 0000000000..7fe115c6dd
> --- /dev/null
> +++ b/package/meson-tools/meson-tools.mk
> @@ -0,0 +1,24 @@
> +################################################################################
> +#
> +# meson-tools
> +#
> +################################################################################
> +
> +HOST_MESON_TOOLS_VERSION = 0a02e2d34413f4bf9b15946352bc8c8ee13a5843
> +HOST_MESON_TOOLS_SITE = $(call github,afaerber,meson-tools,$(HOST_MESON_TOOLS_VERSION))
> +HOST_MESON_TOOLS_LICENSE = GPL-2.0+
> +HOST_MESON_TOOLS_LICENSE_FILES = COPYING README.md
I've dropped README.md here, it doesn't contain any license details.
> +HOST_MESON_TOOLS_DEPENDENCIES = host-openssl
> +
> +HOST_MESON_TOOLS_PROGS = amlbootsig unamlbootsig amlinfo
> +
> +define HOST_MESON_TOOLS_BUILD_CMDS
> + $(MAKE) -C $(@D) CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS) -lssl -lcrypto"
I've used $(HOST_CONFIGURE_OPTS) here instead of passing CC/CFLAGS
manually.
As said: applied with those changes. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 2/4] odroidc2_atf: new Package
2020-07-17 16:46 ` [Buildroot] [PATCH 2/4] odroidc2_atf: " Dagg Stompler
@ 2020-09-03 18:50 ` Thomas Petazzoni
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2020-09-03 18:50 UTC (permalink / raw)
To: buildroot
Hello Dagg,
On Fri, 17 Jul 2020 19:46:41 +0300
Dagg Stompler <daggs@gmx.com> wrote:
> introduce a package that holds the ATF for AmLogic's Odroid C2 boards
>
> Signed-off-by: Dagg Stompler <daggs@gmx.com>
So I applied this patch, but after doing significant rework:
- Instead of using your own custom repository, I used the Hardkernel
U-Boot repository as a source.
- I changed to a target package instead of a host package. I agree it
builds a host tool, but it also installs a bunch of firmware files
for the target, and that felt more "important" to me than the host
tool. Of course, this can be a never-ending discussion, as it's
difficult to draw the line.
- Renamed to odroidc2-firmware.
See the final commit at:
https://git.buildroot.org/buildroot/commit/?id=f0de62b7066c58a88207f0edf98ae49a23649421
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 3/4] board/odroidc2: add board
2020-07-17 16:46 ` [Buildroot] [PATCH 3/4] board/odroidc2: add board Dagg Stompler
@ 2020-09-03 18:53 ` Thomas Petazzoni
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2020-09-03 18:53 UTC (permalink / raw)
To: buildroot
Hello Dagg,
On Fri, 17 Jul 2020 19:46:42 +0300
Dagg Stompler <daggs@gmx.com> wrote:
> re add the odroidc2 board to buildroot.
> - uses latest uboot.
> - uses kernel 5.6
This patch and the next one should have been one single patch. And in
fact you're using Linux 5.7, not 5.6.
> diff --git a/board/hardkernel/odroidc2/genimage.cfg b/board/hardkernel/odroidc2/genimage.cfg
> new file mode 100644
> index 0000000000..a36b924b08
> --- /dev/null
> +++ b/board/hardkernel/odroidc2/genimage.cfg
> @@ -0,0 +1,33 @@
> +image boot.vfat {
> + vfat {
> + files = {
> + "Image",
> + "meson-gxbb-odroidc2.dtb",
> + "boot.scr"
> + }
> + }
> + size = 64M
> +}
> +
> +image sdcard.img {
> + hdimage {
> + }
I've added here an entry to flash the bl1.bin.hardkernel into the
sdcard.img file instead of doing it manually in the post-image script.
> +
> + partition u-boot {
> + in-partition-table = "no"
> + image = "uboot-odc2.img"
> + offset = 49664
> + }
> +
> + partition boot {
> + partition-type = 0xC
> + bootable = "true"
> + image = "boot.vfat"
> + }
> +
> + partition rootfs {
> + partition-type = 0x83
> + image = "rootfs.ext4"
> + size = 512M
> + }
> +}
> diff --git a/board/hardkernel/odroidc2/post-build.sh b/board/hardkernel/odroidc2/post-build.sh
> new file mode 100755
> index 0000000000..745fb2a724
> --- /dev/null
> +++ b/board/hardkernel/odroidc2/post-build.sh
> @@ -0,0 +1,8 @@
> +#!/bin/sh
> +# post-build.sh for Odroid C2 taken from CubieBoard's post-build.sh
> +# 2013, Carlo Caione <carlo.caione@gmail.com>
> +
> +BOARD_DIR="$(dirname $0)"
> +MKIMAGE=$HOST_DIR/bin/mkimage
> +
> +${MKIMAGE} -A arm64 -O linux -T script -C none -n "Boot script" -d "${BOARD_DIR}/boot.cmd" ${BINARIES_DIR}/boot.scr
This was not useful, as this is already done by:
BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/hardkernel/odroidc2/boot.cmd"
so I've dropped the post-build script entirely.
> diff --git a/board/hardkernel/odroidc2/post-image.sh b/board/hardkernel/odroidc2/post-image.sh
> new file mode 100755
> index 0000000000..3783a65a1c
> --- /dev/null
> +++ b/board/hardkernel/odroidc2/post-image.sh
> @@ -0,0 +1,29 @@
> +#!/bin/sh
> +
> +BOARD_DIR="$(dirname $0)"
> +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
> +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
> +SIGNED_UBOOT_IMG="${BINARIES_DIR}/uboot-odc2.img"
> +ODRODIDC2_ATF_FOLDER="${HOST_DIR}/usr/share/odroidc2_atf"
> +IM_FILE="${ODRODIDC2_ATF_FOLDER}/bl1.bin.hardkernel"
> +
> +${HOST_DIR}/bin/fip_create --bl30 ${ODRODIDC2_ATF_FOLDER}/bl30.bin --bl301 ${ODRODIDC2_ATF_FOLDER}/bl301.bin --bl31 ${ODRODIDC2_ATF_FOLDER}/bl31.bin --bl33 ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/fip.bin
> +${HOST_DIR}/bin/fip_create --dump ${BINARIES_DIR}/fip.bin
> +cat ${ODRODIDC2_ATF_FOLDER}/bl2.package ${BINARIES_DIR}/fip.bin > ${BINARIES_DIR}/boot_new.bin
> +${HOST_DIR}/bin/amlbootsig ${BINARIES_DIR}/boot_new.bin ${BINARIES_DIR}/u-boot.img
> +
> +dd if=${BINARIES_DIR}/u-boot.img of=${SIGNED_UBOOT_IMG} bs=512 skip=96
> +
> +rm -rf "${GENIMAGE_TMP}"
> +
> +genimage \
> + --rootpath "${TARGET_DIR}" \
> + --tmppath "${GENIMAGE_TMP}" \
> + --inputpath "${BINARIES_DIR}" \
> + --outputpath "${BINARIES_DIR}" \
> + --config "${GENIMAGE_CFG}"
I've simplified this by using support/scripts/genimage.sh.
> +dd if=${IM_FILE} of=${BINARIES_DIR}/sdcard.img bs=1 count=442 conv=sync,notrunc
> +dd if=${IM_FILE} of=${BINARIES_DIR}/sdcard.img bs=512 skip=1 seek=1 conv=fsync,notrunc
This was no longer needed as bl1.bin.hardkernel is now taken care of by
genimage directly.
> +rm -rf ${BINARIES_DIR}/fip.bin ${BINARIES_DIR}/boot_new.bin ${BINARIES_DIR}/u-boot.img
It's not necessary to clean things up this way.
Overall, this allowed to simplify the post-image script quite a bit.
See the final commit at:
https://git.buildroot.org/buildroot/commit/?id=c8ee85ecd91c0b36be8694224b80846a276a849e
Could you check if it works for you, on the hardware platform ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-03 18:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-17 16:46 [Buildroot] [PATCH 1/4] meson-tools: new Package Dagg Stompler
2020-07-17 16:46 ` [Buildroot] [PATCH 2/4] odroidc2_atf: " Dagg Stompler
2020-09-03 18:50 ` Thomas Petazzoni
2020-07-17 16:46 ` [Buildroot] [PATCH 3/4] board/odroidc2: add board Dagg Stompler
2020-09-03 18:53 ` Thomas Petazzoni
2020-07-17 16:46 ` [Buildroot] [PATCH 4/4] configs/odroidc2: add defconfig Dagg Stompler
2020-08-29 22:12 ` [Buildroot] [PATCH 1/4] meson-tools: new Package Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox