Commit e98692a9 authored by Guido Gunther's avatar Guido Gunther

Merge branch 'new-uboot' into 'master'

build_uboot.sh : add devkit u-boot with M4 code interaction

See merge request Librem5/image-builder!71
parents 548d2180 b87543b4
Pipeline #3218 passed with stage
in 17 seconds
...@@ -24,6 +24,21 @@ So to build an image with all the latest software you'd use: ...@@ -24,6 +24,21 @@ So to build an image with all the latest software you'd use:
./build-image -T latest -b devkit -d buster+ci ./build-image -T latest -b devkit -d buster+ci
# Build u-boot
The build_uboot.sh script can build u-boots for a number of targets
* *devkit-recovery*: This is to boot the [Librem 5 Devkit][0] via SDP
* *devkit*: The [Librem 5 Devkit][0]
* *ec-som*: Emcraft's [i.MX 8M SOM Starter Kit][1]
* *imx8*: [NXPs IMX8M Evaluation Kit][2]
* *imx6*: The Bounday Devices [Nit6QP_MAX][3]
From the build directory invoke build_uboot.sh
cd build
./build_uboot.sh -b devkit
# Creating a bootable SD card # Creating a bootable SD card
This is only relevant for SD card booting on e.g. the Nitrogen or NXP This is only relevant for SD card booting on e.g. the Nitrogen or NXP
......
...@@ -20,7 +20,7 @@ CWD=`pwd` ...@@ -20,7 +20,7 @@ CWD=`pwd`
usage() { usage() {
echo "Usage : $1 " echo "Usage : $1 "
echo " -h Display this help message." echo " -h Display this help message."
echo " -b [imx6|imx8|ec-som|devkit-recovery] select the board type." echo " -b [imx6|imx8|ec-som|devkit-recovery|devkit] select the board type."
echo " -c don't make clean." echo " -c don't make clean."
} }
...@@ -118,7 +118,7 @@ function combine_uboot_bins() ...@@ -118,7 +118,7 @@ function combine_uboot_bins()
set +e set +e
case ${pureos_board} in case ${pureos_board} in
ec-som|devkit-recovery) ec-som|devkit*)
patch -N -p1 < ${CWD}/files/imx-atf-disable-lpddr4-init.patch patch -N -p1 < ${CWD}/files/imx-atf-disable-lpddr4-init.patch
;; ;;
esac esac
...@@ -250,7 +250,7 @@ case ${pureos_board} in ...@@ -250,7 +250,7 @@ case ${pureos_board} in
ARCH=arm ARCH=arm
COPY_UBOOT=copy_uboot COPY_UBOOT=copy_uboot
;; ;;
devkit-recovery) devkit*)
ATF_REPO=https://source.codeaurora.org/external/imx/imx-atf ATF_REPO=https://source.codeaurora.org/external/imx/imx-atf
ATF_BRANCH=imx_4.9.51_imx8m_ga ATF_BRANCH=imx_4.9.51_imx8m_ga
ATF_PLAT=imx8mq ATF_PLAT=imx8mq
...@@ -258,7 +258,14 @@ case ${pureos_board} in ...@@ -258,7 +258,14 @@ case ${pureos_board} in
MKIMAGE_REPO=https://source.codeaurora.org/external/imx/imx-mkimage MKIMAGE_REPO=https://source.codeaurora.org/external/imx/imx-mkimage
MKIMAGE_BRANCH=imx_4.9.51_imx8m_ga MKIMAGE_BRANCH=imx_4.9.51_imx8m_ga
UBOOT_REPO=https://source.puri.sm/Librem5/uboot-imx.git UBOOT_REPO=https://source.puri.sm/Librem5/uboot-imx.git
HW_DEFCONFIG=imx8m_lpddr4_3gb_som_defconfig case ${pureos_board} in
devkit)
HW_DEFCONFIG=librem5_devkit_defconfig
;;
devkit-recovery)
HW_DEFCONFIG=librem5_devkit_base_defconfig
;;
esac
CROSS_COMPILER=aarch64-linux-gnu- CROSS_COMPILER=aarch64-linux-gnu-
UBOOT_BRANCH=devkit-wip UBOOT_BRANCH=devkit-wip
UBOOT_BIN=iMX8M/flash.bin UBOOT_BIN=iMX8M/flash.bin
...@@ -279,7 +286,7 @@ build_uboot ${pureos_board} ${ARCH} ${CROSS_COMPILER} ${HW_DEFCONFIG} ${make_cle ...@@ -279,7 +286,7 @@ build_uboot ${pureos_board} ${ARCH} ${CROSS_COMPILER} ${HW_DEFCONFIG} ${make_cle
cd ${CWD} cd ${CWD}
case ${pureos_board} in case ${pureos_board} in
imx8|ec-som|devkit-recovery) imx8|ec-som|devkit*)
build_cortex_m4 ${UBOOT_OUTPUT} build_cortex_m4 ${UBOOT_OUTPUT}
combine_uboot_bins ${pureos_board} combine_uboot_bins ${pureos_board}
cd imx-mkimage cd imx-mkimage
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment