wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RK3566 updates, and boots from fresh flash (but with some hiccups)

Browse source
This commit is contained in:
sydarn 2024-01-23 10:19:29 +01:00
parent a53feb4f00
commit e682c4a467
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
projects/Rockchip/bootloader/mkimage
View file

@ -52,16 +52,16 @@ case "${PKG_SOC}" in
;;
esac
#Create boot.scr
#Create boot.ini
if [ "${BOOT_INI}" == true ]
then
echo "boot: create boot.ini..."
if [ -e "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.ini" ]
then
cp -f ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/boot.ini ${LE_TMP}/boot.ini
sed -i "s~@UUID_SYSTEM@~${UUID_SYSTEM}~g" ${INSTALL}/usr/share/bootloader/boot.ini
sed -i "s~@UUID_STORAGE@~${UUID_STORAGE}~g" ${INSTALL}/usr/share/bootloader/boot.ini
sed -i "s~@EXTRA_CMDLINE@~${EXTRA_CMDLINE}~g" ${INSTALL}/usr/share/bootloader/boot.ini
sed -i "s~@UUID_SYSTEM@~${UUID_SYSTEM}~g" ${LE_TMP}/boot.ini
sed -i "s~@UUID_STORAGE@~${UUID_STORAGE}~g" ${LE_TMP}/boot.ini
sed -i "s~@EXTRA_CMDLINE@~${EXTRA_CMDLINE}~g" ${LE_TMP}/boot.ini
mcopy -so "${LE_TMP}/boot.ini" ::
else
echo "ERROR: No boot.ini found in ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/boot/."

4
projects/Rockchip/bootloader/release
View file

@ -33,6 +33,10 @@ if [ -n "${UBOOT_CONFIG}" ]; then
esac
fi
if [ -f ${INSTALL}/usr/share/bootloader/boot.ini ]; then
cp -a ${INSTALL}/usr/share/bootloader/boot.ini ${RELEASE_DIR}/3rdparty/bootloader
fi
if [ -f ${INSTALL}/usr/share/bootloader/boot.scr ]; then
cp -a ${INSTALL}/usr/share/bootloader/boot.scr ${RELEASE_DIR}/3rdparty/bootloader
fi

17
projects/Rockchip/packages/u-boot/package.mk
View file

@ -7,7 +7,7 @@ PKG_NAME="u-boot"
PKG_ARCH="arm aarch64"
PKG_SITE="https://github.com/JustEnoughLinuxOS"
PKG_LICENSE="GPL"
PKG_DEPENDS_TARGET="toolchain swig:host rkbin glibc pyelftools:host"
PKG_DEPENDS_TARGET="toolchain Python3 swig:host rkbin glibc pyelftools:host"
PKG_LONGDESC="Rockchip U-Boot is a bootloader for embedded systems."
PKG_PATCH_DIRS+="${DEVICE}"
@ -52,7 +52,8 @@ post_patch() {
}
make_target() {
setup_pkg_config_host
export PKG_RKBIN="$(get_build_dir rkbin)"
setup_pkg_config_host
. ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options
if [ -z "${UBOOT_CONFIG}" ]; then
echo "UBOOT_CONFIG must be set to build an image"
@ -70,11 +71,17 @@ setup_pkg_config_host
then
PKG_LOADER="$(get_build_dir rkbin)/${PKG_LOADER}"
fi
if [[ "${PKG_SOC}" =~ "rk35" ]]
if [[ "${PKG_SOC}" =~ rk35* ]]
then
echo "Building for GPT (${UBOOT_DTB})..."
echo "toolchain (${TOOLCHAIN})"
export BL31="${PKG_BL31}"
export ROCKCHIP_TPL="${PKG_DATAFILE}"
DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 make mrproper
DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 make ${UBOOT_CONFIG} BL31=${PKG_BL31} ${PKG_LOADER} u-boot.dtb u-boot.itb CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc"
DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make HOSTCC="${HOST_CC}" HOSTLDFLAGS="-L${TOOLCHAIN}/lib" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc"
echo "begin make"
DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="--lssl -lcrypto" ARCH=arm64 make ${UBOOT_CONFIG} ${PKG_LOADER} u-boot.dtb u-boot.img tools HOSTCC="${HOST_CC}" HOSTLDFLAGS="-L${TOOLCHAIN}/lib" HOSTCFLAGS="-I${TOOLCHAIN}/include"
echo "end make"
DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make HOSTCC="${HOST_CC}" HOSTLDFLAGS="-L${TOOLCHAIN}/lib" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc"
else
echo "Building for MBR (${UBOOT_DTB})..."
if [[ "${ATF_PLATFORM}" =~ "rk3399" ]]; then