From af68daf739c8a34a341f96753fb7d08c9a75f47e Mon Sep 17 00:00:00 2001 From: lsartory Date: Mon, 27 Apr 2020 19:30:13 +0200 Subject: [PATCH] Fix the 2GB 2CS Espressobin bootloader config (#1925) The 2 CS 2 GB image was compiled with the same DDR topology parameter as the 2 CS 1 GB image (DDR_TOPOLOGY=2). This prevented the system from accessing more than 1 GB of memory. See https://forum.armbian.com/topic/13672-espressobin-only-1-gb-ram-detected-on-a-2-gb-board/ for the whole history. --- config/sources/families/mvebu64.conf | 3 ++- .../espressobin/{DDR_TOPOLOGY_2-1g.txt => DDR_TOPOLOGY_2.txt} | 0 .../espressobin/{DDR_TOPOLOGY_2-2g.txt => DDR_TOPOLOGY_7.txt} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename packages/blobs/espressobin/{DDR_TOPOLOGY_2-1g.txt => DDR_TOPOLOGY_2.txt} (100%) rename packages/blobs/espressobin/{DDR_TOPOLOGY_2-2g.txt => DDR_TOPOLOGY_7.txt} (100%) diff --git a/config/sources/families/mvebu64.conf b/config/sources/families/mvebu64.conf index e3ef52b8d8..ddcf00675d 100644 --- a/config/sources/families/mvebu64.conf +++ b/config/sources/families/mvebu64.conf @@ -81,6 +81,7 @@ atf_custom_postprocess() export ATF2=$(find_toolchain "arm-linux-gnueabi-" "> 7.0")/arm-linux-gnueabi- export BL33=$ubootdir"/u-boot.bin" # copy extra DDR topology + sed -i "s@^CUST | \[0-6\])@CUST | [0-7])@" $SRC/cache/sources/marvell-tools/scripts/buildtim.sh || true cp $SRC/packages/blobs/espressobin/DDR* $SRC/cache/sources/marvell-tools/tim/ddr/ } @@ -103,7 +104,7 @@ uboot_custom_postprocess() cp build/a80x0_mcbin/release/flash-image.bin $ubootdir/$FILENAME else clocks=( 600_600 800_800 1000_800 1200_750 ) - topology=( 512m_1cs_0 512m_2cs_0 1g_2cs_2 1g_1cs_4 2g_2cs_2 1g_1cs_5 2g_2cs_6 ) + topology=( 512m_1cs_0 512m_2cs_0 1g_2cs_2 1g_1cs_4 2g_2cs_7 1g_1cs_5 2g_2cs_6 ) for i in "${clocks[@]}" do for j in "${topology[@]}" diff --git a/packages/blobs/espressobin/DDR_TOPOLOGY_2-1g.txt b/packages/blobs/espressobin/DDR_TOPOLOGY_2.txt similarity index 100% rename from packages/blobs/espressobin/DDR_TOPOLOGY_2-1g.txt rename to packages/blobs/espressobin/DDR_TOPOLOGY_2.txt diff --git a/packages/blobs/espressobin/DDR_TOPOLOGY_2-2g.txt b/packages/blobs/espressobin/DDR_TOPOLOGY_7.txt similarity index 100% rename from packages/blobs/espressobin/DDR_TOPOLOGY_2-2g.txt rename to packages/blobs/espressobin/DDR_TOPOLOGY_7.txt