diff mbox series

[U-Boot] sunxi: Pine64: temporarily remove extra Pine64 non-plus DT

Message ID 20180127005222.10594-1-andre.przywara@arm.com
State Rejected
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series [U-Boot] sunxi: Pine64: temporarily remove extra Pine64 non-plus DT | expand

Commit Message

Andre Przywara Jan. 27, 2018, 12:52 a.m. UTC
With the merge of the new u-boot.itb size check now the build for
pine64_plus_defconfig breaks, as this file gets too large:

Comments

Maxime Ripard Jan. 29, 2018, 10:37 a.m. UTC | #1
On Sat, Jan 27, 2018 at 12:52:22AM +0000, Andre Przywara wrote:
> With the merge of the new u-boot.itb size check now the build for
> pine64_plus_defconfig breaks, as this file gets too large:
> =============
> u-boot.itb exceeds file size limit:
>   limit:  516096 bytes
>   actual: 521852 bytes
>   excess: 5756 bytes
> make: *** [u-boot.itb] Error 1
> =============
> One easily fixable reason is that we actually have two .dtbs in our FIT
> image, one for the regular Pine64+ board, and one for the non-plus version.
> The only difference U-Boot cares about is the 100Mbit Ethernet PHY used
> on the non-plus version, however Ethernet isn't enabled in the non-plus
> DT anyway.
> So we could avoid the non-plus special handling, and remove that extra
> .dtb from the FIT image, which saves a few KBs and brings us back below the
> limit. The Pine64 would boot with a Pine64+ .dtb, and would fail to
> enable Ethernet. Given that it didn't work in the first place, this is not
> a regression.
> Once we switch to a non-MMC environment, we can bring this back, then
> with a proper .dtb and hopefully working Ethernet.
> 
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>

That works for me, but we have other ways ot address this as well, see
the other thread :)

Maxime
diff mbox series

Patch

=============
u-boot.itb exceeds file size limit:
  limit:  516096 bytes
  actual: 521852 bytes
  excess: 5756 bytes
make: *** [u-boot.itb] Error 1
=============
One easily fixable reason is that we actually have two .dtbs in our FIT
image, one for the regular Pine64+ board, and one for the non-plus version.
The only difference U-Boot cares about is the 100Mbit Ethernet PHY used
on the non-plus version, however Ethernet isn't enabled in the non-plus
DT anyway.
So we could avoid the non-plus special handling, and remove that extra
.dtb from the FIT image, which saves a few KBs and brings us back below the
limit. The Pine64 would boot with a Pine64+ .dtb, and would fail to
enable Ethernet. Given that it didn't work in the first place, this is not
a regression.
Once we switch to a non-MMC environment, we can bring this back, then
with a proper .dtb and hopefully working Ethernet.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
Hi,

cowardly picking this low hanging fruit to fix the build ;-)
Alternatively we can create a separate defconfig for the non-plus version,
but I am not sure this is worth the effort.
And merging in the DTs from Linux breaks the limit again, oh well ...

Cheers,
Andre.

 configs/pine64_plus_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig
index 01ed23844b..45b445646d 100644
--- a/configs/pine64_plus_defconfig
+++ b/configs/pine64_plus_defconfig
@@ -10,7 +10,6 @@  CONFIG_SPL=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_OF_LIST="sun50i-a64-pine64 sun50i-a64-pine64-plus"
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y