Skip to content

L
lx2160a_build
Commit 7e14203d authored by Rabeeh Khoury's avatar Rabeeh Khoury
Browse files
Options

Miscellaneous fixes 

1. Fixed u-boot build when using u-boot release LSDK-20.04-update-290520
2. Added SD1 protocol #14 (100Gbps with PCIe gen3 x4) configuration
3. Removed UEFI from this git repository; mainline edk2-platforms now
supports most of the bits for LX2 and HoneyComb. For building uefi
repository refer to SolidRun github lx2160a_uefi repo.
Signed-off-by: default avatarRabeeh Khoury <rabeeh@solid-run.com>
parent 423861ac
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 66 deletions
patches/u-boot-LSDK-20.04/0001-armv8-add-lx2160acex7-build-inclusion.patch
View file @ 7e14203d
From 94e3a159d46ffb7f3e3186486dd74293cc33326f Mon Sep 17 00:00:00 2001 From 06551215d4d3769aa2ce1b8e4c527f22e6e4467c Mon Sep 17 00:00:00 2001
From: Rabeeh Khoury <rabeeh@solid-run.com> From: Rabeeh Khoury <rabeeh@solid-run.com>
Date: Sun, 28 Jul 2019 13:26:45 +0300 Date: Wed, 28 Oct 2020 17:16:52 +0200
Subject: [PATCH 1/6] armv8: add lx2160acex7 build inclusion Subject: [PATCH] armv8: add lx2160acex7 build inclusion
Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
--- ---
...@@ -11,10 +11,10 @@ Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> ...@@ -11,10 +11,10 @@ Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
3 files changed, 16 insertions(+), 2 deletions(-) 3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 958d048971..d439d42a4a 100644 index 5d33526ae9..8615e1673f 100644
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1101,6 +1101,18 @@ config TARGET_LX2160ARDB @@ -1189,6 +1189,18 @@ config TARGET_LX2160ARDB
is a high-performance development platform that supports the is a high-performance development platform that supports the
QorIQ LX2160A/LX2120A/LX2080A Layerscape Architecture processor. QorIQ LX2160A/LX2120A/LX2080A Layerscape Architecture processor.
...@@ -33,7 +33,7 @@ index 958d048971..d439d42a4a 100644 ...@@ -33,7 +33,7 @@ index 958d048971..d439d42a4a 100644
config TARGET_LX2160AQDS config TARGET_LX2160AQDS
bool "Support lx2160aqds" bool "Support lx2160aqds"
select ARCH_LX2160A select ARCH_LX2160A
@@ -1635,6 +1647,7 @@ source "board/freescale/ls1012aqds/Kconfig" @@ -1796,6 +1808,7 @@ source "board/freescale/ls1012aqds/Kconfig"
source "board/freescale/ls1012ardb/Kconfig" source "board/freescale/ls1012ardb/Kconfig"
source "board/freescale/ls1012afrdm/Kconfig" source "board/freescale/ls1012afrdm/Kconfig"
source "board/freescale/lx2160a/Kconfig" source "board/freescale/lx2160a/Kconfig"
...@@ -55,12 +55,12 @@ index 92a2b58ed4..9df6ebdc1b 100644 ...@@ -55,12 +55,12 @@ index 92a2b58ed4..9df6ebdc1b 100644
help help
Most armv8 systems have PSCI support enabled in EL3, either through Most armv8 systems have PSCI support enabled in EL3, either through
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index b9f34113ea..c5be9a52cc 100644 index 8d7d5bee45..6d8d7fa09e 100644
--- a/arch/arm/dts/Makefile --- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile
@@ -347,7 +347,8 @@ dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \ @@ -348,7 +348,8 @@ dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \
fsl-ls1028a-rdb.dtb \ fsl-ls1028a-qds-duart.dtb \
fsl-ls1028a-qds.dtb \ fsl-ls1028a-qds-lpuart.dtb \
fsl-lx2160a-rdb.dtb \ fsl-lx2160a-rdb.dtb \
- fsl-lx2160a-qds.dtb - fsl-lx2160a-qds.dtb
+ fsl-lx2160a-qds.dtb \ + fsl-lx2160a-qds.dtb \
...@@ -69,5 +69,5 @@ index b9f34113ea..c5be9a52cc 100644 ...@@ -69,5 +69,5 @@ index b9f34113ea..c5be9a52cc 100644
fsl-ls1043a-qds-lpuart.dtb \ fsl-ls1043a-qds-lpuart.dtb \
fsl-ls1043a-rdb.dtb \ fsl-ls1043a-rdb.dtb \
-- --
2.17.1 2.25.1
patches/u-boot-LSDK-20.04/0007-lx2160a-load-dpl-into-0x80001000-instead-of-0x80d000.patch
View file @ 7e14203d
From bd927e8c93fa6fa674f0bb38b00ac0bf7dc98f44 Mon Sep 17 00:00:00 2001 From befddeefb5cd0fc85fa97a5af8e7bcae3e3d2480 Mon Sep 17 00:00:00 2001
From: Rabeeh Khoury <rabeeh@solid-run.com> From: Rabeeh Khoury <rabeeh@solid-run.com>
Date: Mon, 4 May 2020 23:09:52 +0300 Date: Wed, 28 Oct 2020 17:20:52 +0200
Subject: [PATCH] lx2160a: load dpl into 0x80001000 instead of 0x80d00000 Subject: [PATCH] lx2160a: load dpl into 0x80001000 instead of 0x80d00000
and enlarge the image size to 0x1000 blocks and enlarge the image size to 0x1000 blocks
...@@ -11,10 +11,10 @@ Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> ...@@ -11,10 +11,10 @@ Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com>
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index 43198f19f8..8983e615d1 100644 index c6a6a96ff0..5b9808b2ef 100644
--- a/include/configs/lx2160a_common.h --- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h
@@ -284,21 +284,21 @@ int select_i2c_ch_pca9547_sec(unsigned char ch); @@ -293,21 +293,21 @@ int select_i2c_ch_pca9547_sec(unsigned char ch);
#define SD_BOOTCOMMAND \ #define SD_BOOTCOMMAND \
"env exists mcinitcmd && mmcinfo; " \ "env exists mcinitcmd && mmcinfo; " \
...@@ -29,17 +29,17 @@ index 43198f19f8..8983e615d1 100644 ...@@ -29,17 +29,17 @@ index 43198f19f8..8983e615d1 100644
"env exists secureboot && esbc_halt;" "env exists secureboot && esbc_halt;"
#define SD2_BOOTCOMMAND \ #define SD2_BOOTCOMMAND \
"env exists mcinitcmd && mmcinfo; " \ "mmc dev 1; env exists mcinitcmd && mmcinfo; " \
- "mmc read 0x80d00000 0x6800 0x800; " \ - "mmc read 0x80d00000 0x6800 0x800; " \
+ "mmc read 0x80001000 0x6800 0x1000; " \ + "mmc read 0x80001000 0x6800 0x1000; " \
"env exists mcinitcmd && env exists secureboot " \ "env exists mcinitcmd && env exists secureboot " \
" && mmc read 0x80780000 0x3C00 0x20 " \ " && mmc read 0x806C0000 0x3600 0x20 " \
"&& esbc_validate 0x80780000;env exists mcinitcmd " \ "&& esbc_validate 0x806C0000;env exists mcinitcmd " \
- "&& fsl_mc lazyapply dpl 0x80d00000;" \ - "&& fsl_mc lazyapply dpl 0x80d00000;" \
+ "&& fsl_mc lazyapply dpl 0x80001000;" \ + "&& fsl_mc lazyapply dpl 0x80001000;" \
"run distro_bootcmd;run emmc_bootcmd;" \ "run distro_bootcmd;run emmc_bootcmd;" \
"env exists secureboot && esbc_halt;" "env exists secureboot && esbc_halt;"
-- --
2.17.1 2.25.1
runme.sh
View file @ 7e14203d
...@@ -29,6 +29,10 @@ export CROSS_COMPILE=aarch64-linux-gnu- ...@@ -29,6 +29,10 @@ export CROSS_COMPILE=aarch64-linux-gnu-
export ARCH=arm64 export ARCH=arm64
case "${SERDES}" in case "${SERDES}" in
2_*)
DPC=dpc-8_x_usxgmii.dtb
DPL=dpl-eth.8x10g.19.dtb
;;
8_*) 8_*)
DPC=dpc-8_x_usxgmii.dtb DPC=dpc-8_x_usxgmii.dtb
DPL=dpl-eth.8x10g.19.dtb DPL=dpl-eth.8x10g.19.dtb
...@@ -37,6 +41,10 @@ case "${SERDES}" in ...@@ -37,6 +41,10 @@ case "${SERDES}" in
DPC=dpc-dual-100g.dtb DPC=dpc-dual-100g.dtb
DPL=dpl-eth.dual-100g.19.dtb DPL=dpl-eth.dual-100g.19.dtb
;; ;;
14_*)
DPC=dpc-single-100g.dtb
DPL=dpl-eth.single-100g.19.dtb
;;
17_*) 17_*)
DPC=dpc-quad-25g.dtb DPC=dpc-quad-25g.dtb
DPL=dpl-eth.quad-25g.19.dtb DPL=dpl-eth.quad-25g.19.dtb
...@@ -118,14 +126,6 @@ for i in $QORIQ_COMPONENTS; do ...@@ -118,14 +126,6 @@ for i in $QORIQ_COMPONENTS; do
make make
./fiptool create --ddr-immem-udimm-1d ddr-phy-binary/lx2160a/ddr4_pmu_train_imem.bin --ddr-immem-udimm-2d ddr-phy-binary/lx2160a/ddr4_2d_pmu_train_imem.bin --ddr-dmmem-udimm-1d ddr-phy-binary/lx2160a/ddr4_pmu_train_dmem.bin --ddr-dmmem-udimm-2d ddr-phy-binary/lx2160a/ddr4_2d_pmu_train_dmem.bin --ddr-immem-rdimm-1d ddr-phy-binary/lx2160a/ddr4_rdimm_pmu_train_imem.bin --ddr-immem-rdimm-2d ddr-phy-binary/lx2160a/ddr4_rdimm2d_pmu_train_imem.bin --ddr-dmmem-rdimm-1d ddr-phy-binary/lx2160a/ddr4_rdimm_pmu_train_dmem.bin --ddr-dmmem-rdimm-2d ddr-phy-binary/lx2160a/ddr4_rdimm2d_pmu_train_dmem.bin fip_ddr_all.bin ./fiptool create --ddr-immem-udimm-1d ddr-phy-binary/lx2160a/ddr4_pmu_train_imem.bin --ddr-immem-udimm-2d ddr-phy-binary/lx2160a/ddr4_2d_pmu_train_imem.bin --ddr-dmmem-udimm-1d ddr-phy-binary/lx2160a/ddr4_pmu_train_dmem.bin --ddr-dmmem-udimm-2d ddr-phy-binary/lx2160a/ddr4_2d_pmu_train_dmem.bin --ddr-immem-rdimm-1d ddr-phy-binary/lx2160a/ddr4_rdimm_pmu_train_imem.bin --ddr-immem-rdimm-2d ddr-phy-binary/lx2160a/ddr4_rdimm2d_pmu_train_imem.bin --ddr-dmmem-rdimm-1d ddr-phy-binary/lx2160a/ddr4_rdimm_pmu_train_dmem.bin --ddr-dmmem-rdimm-2d ddr-phy-binary/lx2160a/ddr4_rdimm2d_pmu_train_dmem.bin fip_ddr_all.bin
fi fi
if [ "x$i" == "xuefi" ]; then
cd $ROOTDIR/build/uefi/
git clone https://source.codeaurora.org/external/qoriq/qoriq-components/edk2-platforms
cd edk2-platforms
git checkout -b $RELEASE refs/tags/$RELEASE
patch -p1 < $ROOTDIR/patches/edk2-platforms/*.diff
git am --keep-cr $ROOTDIR/patches/edk2-platforms/*.patch
fi
if [[ -d $ROOTDIR/patches/$i/ ]]; then if [[ -d $ROOTDIR/patches/$i/ ]]; then
git am $ROOTDIR/patches/$i/*.patch git am $ROOTDIR/patches/$i/*.patch
fi fi
...@@ -164,8 +164,8 @@ case "\$1" in ...@@ -164,8 +164,8 @@ case "\$1" in
mount /dev/vda /mnt mount /dev/vda /mnt
cd /mnt/ cd /mnt/
udhcpc -i eth0 udhcpc -i eth0
wget -c -P /tmp/ http://cdimage.ubuntu.com/ubuntu-base/releases/20.04/release/ubuntu-base-20.04-base-arm64.tar.gz wget -c -P /tmp/ http://cdimage.ubuntu.com/ubuntu-base/releases/20.04/release/ubuntu-base-20.04.1-base-arm64.tar.gz
tar zxf /tmp/ubuntu-base-20.04-base-arm64.tar.gz -C /mnt tar zxf /tmp/ubuntu-base-20.04.1-base-arm64.tar.gz -C /mnt
mount -o bind /proc /mnt/proc/ mount -o bind /proc /mnt/proc/
mount -o bind /sys/ /mnt/sys/ mount -o bind /sys/ /mnt/sys/
mount -o bind /dev/ /mnt/dev/ mount -o bind /dev/ /mnt/dev/
...@@ -212,48 +212,23 @@ CC=${CROSS_COMPILE}gcc DESTDIR=./install prefix=/usr make install ...@@ -212,48 +212,23 @@ CC=${CROSS_COMPILE}gcc DESTDIR=./install prefix=/usr make install
echo "Building RCW" echo "Building RCW"
cd $ROOTDIR/build/rcw/lx2160acex7 cd $ROOTDIR/build/rcw/lx2160acex7
mkdir -p RCW mkdir -p RCW
OLDIFS=$IFS
IFS="_" arr=($SERDES)
echo "#include <configs/lx2160a_defaults.rcwi>" > RCW/template.rcw echo "#include <configs/lx2160a_defaults.rcwi>" > RCW/template.rcw
echo "#include <configs/lx2160a_${SPEED}.rcwi>" >> RCW/template.rcw echo "#include <configs/lx2160a_${SPEED}.rcwi>" >> RCW/template.rcw
echo "#include <configs/lx2160a_${SERDES}.rcwi>" >> RCW/template.rcw echo "#include <configs/lx2160a_SD1_${arr[0]}.rcwi>" >> RCW/template.rcw
echo "#include <configs/lx2160a_SD2_${arr[1]}.rcwi>" >> RCW/template.rcw
echo "#include <configs/lx2160a_SD3_${arr[2]}.rcwi>" >> RCW/template.rcw
IFS=$OLDIFS
make clean make clean
make -j${PARALLEL} make -j${PARALLEL}
if [ "x$BOOT_LOADER" == "xu-boot" ]; then echo "Build u-boot"
echo "Build u-boot" cd $ROOTDIR/build/u-boot
cd $ROOTDIR/build/u-boot #make distclean
#make distclean make lx2160acex7_tfa_defconfig
make lx2160acex7_tfa_defconfig make -j${PARALLEL}
make -j${PARALLEL} export BL33=$ROOTDIR/build/u-boot/u-boot.bin
export BL33=$ROOTDIR/build/u-boot/u-boot.bin
fi
if [ "x$BOOT_LOADER" == "xuefi" ]; then
echo "Build UEFI"
cd $ROOTDIR/build/uefi
# set the aarch64-linux-gnu cross compiler to the oldie 4.9 linaro toolchain (UEFI build requirement)
PATH_SAVED=$PATH
export PATH=$ROOTDIR/build/toolchain/gcc-linaro-4.9-2016.02-x86_64_aarch64-linux-gnu/bin/:$PATH
source edksetup.sh
cd edk2-platforms/Platform/NXP
source Env.cshrc
make -C $ROOTDIR/build/uefi/BaseTools/Source/C
# ./build.sh LX2160 RDB RELEASE clean
# ./build.sh LX2160 RDB RELEASE
# export BL33=$ROOTDIR/build/uefi/Build/LX2160aRdbPkg/RELEASE_GCC49/FV/LX2160ARDB_EFI.fd
# build -p "$PACKAGES_PATH/Platform/NXP/LX2160aRdbPkg/LX2160aRdbPkg.dsc" -a AARCH64 -t GCC49 -b DEBUG
# export BL33=$ROOTDIR/build/uefi/Build/LX2160aRdbPkg/RELEASE_GCC49/FV/LX2160ARDB_EFI.fd
# export BL33=$ROOTDIR/build/uefi/Build/LX2160aRdbPkg/DEBUG_GCC49/FV/LX2160ARDB_EFI.fd
# build -p "$PACKAGES_PATH/Platform/NXP/LX2160aCex7Pkg/LX2160aCex7Pkg.dsc" -a AARCH64 -t GCC49 -b DEBUG clean
# build -p "$PACKAGES_PATH/Platform/NXP/LX2160aCex7Pkg/LX2160aCex7Pkg.dsc" -a AARCH64 -t GCC49 -b $UEFI_RELEASE clean
build -p "$PACKAGES_PATH/Platform/NXP/LX2160aCex7Pkg/LX2160aCex7Pkg.dsc" -a AARCH64 -t GCC49 -b $UEFI_RELEASE -y build.log
export BL33=$ROOTDIR/build/uefi/Build/LX2160aCex7Pkg/${UEFI_RELEASE}_GCC49/FV/LX2160ACEX7_EFI.fd
# Return to the newer linaro gcc
export PATH=$PATH_SAVED
export ARCH=arm64 # While building UEFI ARCH is unset
fi
echo "Building atf" echo "Building atf"
cd $ROOTDIR/build/atf/ cd $ROOTDIR/build/atf/
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7