diff -Nru u-boot-2020.10+dfsg/debian/changelog u-boot-2020.10+dfsg/debian/changelog --- u-boot-2020.10+dfsg/debian/changelog 2020-10-06 03:18:18.000000000 +0000 +++ u-boot-2020.10+dfsg/debian/changelog 2021-01-08 15:51:00.000000000 +0000 @@ -1,3 +1,14 @@ +u-boot (2020.10+dfsg-1ubuntu0~18.04.2) bionic; urgency=medium + + * SRU of changes through to 2020.10+dfsg-1ubuntu6 to fix Pi4-8GB & CM4 support: + + * Add d/p/rpi-8gb-pci.patch for Pi400 and Pi4-8Gb support (LP: #1906552) + * Add d/p/rpi-cm4-sdhci.patch for CM4 eMMC support + * Add d/p/rpi-maxargs.patch for new Core 18 boot-env (LP: #1910094) + * Remove redundant d/targets entries + + -- Dave Jones Fri, 08 Jan 2021 15:51:00 +0000 + u-boot (2020.10+dfsg-1ubuntu0~18.04.1) bionic; urgency=low * SRU of 2020.10+dfsg-1 to support Raspberry Pi 4 (LP: #1903054), and diff -Nru u-boot-2020.10+dfsg/debian/patches/rpi-8gb-pci.patch u-boot-2020.10+dfsg/debian/patches/rpi-8gb-pci.patch --- u-boot-2020.10+dfsg/debian/patches/rpi-8gb-pci.patch 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2020.10+dfsg/debian/patches/rpi-8gb-pci.patch 2021-01-08 15:50:58.000000000 +0000 @@ -0,0 +1,34 @@ +Author: Dave Jones +Forwarded: no +Description: Disable Broadcom PCI driver + The Broadcom PCI driver seems to break u-boot when booting on a Pi 4B with + 8Gb of RAM, when no monitor is attached. This is a brute-force and ignorance + patch and further (upstream) investigation is warranted to discover why this + is the case. Commit 3113c84ba25ec3ceae072cc5ad450c4238425939 (a merge, + annoyingly) is the first bad commit in the u-boot repository when bisecting + this issue. + +Index: u-boot/configs/rpi_4_32b_defconfig +=================================================================== +--- u-boot.orig/configs/rpi_4_32b_defconfig ++++ u-boot/configs/rpi_4_32b_defconfig +@@ -31,7 +31,6 @@ CONFIG_DM_ETH=y + CONFIG_BCMGENET=y + CONFIG_PCI=y + CONFIG_DM_PCI=y +-CONFIG_PCI_BRCMSTB=y + CONFIG_PINCTRL=y + # CONFIG_PINCTRL_GENERIC is not set + CONFIG_DM_RESET=y +Index: u-boot/configs/rpi_4_defconfig +=================================================================== +--- u-boot.orig/configs/rpi_4_defconfig ++++ u-boot/configs/rpi_4_defconfig +@@ -31,7 +31,6 @@ CONFIG_DM_ETH=y + CONFIG_BCMGENET=y + CONFIG_PCI=y + CONFIG_DM_PCI=y +-CONFIG_PCI_BRCMSTB=y + CONFIG_PINCTRL=y + # CONFIG_PINCTRL_GENERIC is not set + CONFIG_DM_RESET=y diff -Nru u-boot-2020.10+dfsg/debian/patches/rpi-cm4-sdhci.patch u-boot-2020.10+dfsg/debian/patches/rpi-cm4-sdhci.patch --- u-boot-2020.10+dfsg/debian/patches/rpi-cm4-sdhci.patch 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2020.10+dfsg/debian/patches/rpi-cm4-sdhci.patch 2021-01-08 15:50:58.000000000 +0000 @@ -0,0 +1,26 @@ +Author: Dave Jones +Forwarded: no +Description: Revert commit c6b9fbf7566f84a807a5c116288648085fa529df + This commit adds SDHCI DMA support which works happily with the SD card + interface, but breaks eMMC support on the CM4 + +--- a/configs/rpi_4_32b_defconfig ++++ b/configs/rpi_4_32b_defconfig +@@ -26,7 +26,6 @@ + CONFIG_DM_KEYBOARD=y + CONFIG_DM_MMC=y + CONFIG_MMC_SDHCI=y +-CONFIG_MMC_SDHCI_SDMA=y + CONFIG_MMC_SDHCI_BCM2835=y + CONFIG_DM_ETH=y + CONFIG_BCMGENET=y +--- a/configs/rpi_4_defconfig ++++ b/configs/rpi_4_defconfig +@@ -26,7 +26,6 @@ + CONFIG_DM_KEYBOARD=y + CONFIG_DM_MMC=y + CONFIG_MMC_SDHCI=y +-CONFIG_MMC_SDHCI_SDMA=y + CONFIG_MMC_SDHCI_BCM2835=y + CONFIG_DM_ETH=y + CONFIG_BCMGENET=y diff -Nru u-boot-2020.10+dfsg/debian/patches/rpi-maxargs.patch u-boot-2020.10+dfsg/debian/patches/rpi-maxargs.patch --- u-boot-2020.10+dfsg/debian/patches/rpi-maxargs.patch 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2020.10+dfsg/debian/patches/rpi-maxargs.patch 2021-01-08 15:50:58.000000000 +0000 @@ -0,0 +1,17 @@ +Author: Dave Jones +Forwarded: no +Description: Allow more than 16 args for a command for LP: #1910094 + The default u-boot command line configuration only permits a maximum of + 16 arguments per command. Unfortunately, the fix for LP: #1900879 demands + considerably more than this. + +--- a/include/configs/rpi.h ++++ b/include/configs/rpi.h +@@ -93,6 +93,7 @@ + + /* Console configuration */ + #define CONFIG_SYS_CBSIZE 1024 ++#define CONFIG_SYS_MAXARGS 64 + + /* Environment */ + #define CONFIG_SYS_LOAD_ADDR 0x1000000 diff -Nru u-boot-2020.10+dfsg/debian/patches/series u-boot-2020.10+dfsg/debian/patches/series --- u-boot-2020.10+dfsg/debian/patches/series 2020-10-06 03:18:18.000000000 +0000 +++ u-boot-2020.10+dfsg/debian/patches/series 2021-01-08 15:50:58.000000000 +0000 @@ -22,3 +22,6 @@ ubuntu-hardening-limit-keynames-to-keydir.patch ubuntu-nitrogen6q2g-config-tweaks.patch rpi-board-dt.patch +rpi-cm4-sdhci.patch +rpi-8gb-pci.patch +rpi-maxargs.patch diff -Nru u-boot-2020.10+dfsg/debian/targets u-boot-2020.10+dfsg/debian/targets --- u-boot-2020.10+dfsg/debian/targets 2020-10-06 03:18:18.000000000 +0000 +++ u-boot-2020.10+dfsg/debian/targets 2021-01-08 15:51:00.000000000 +0000 @@ -271,7 +271,3 @@ all:powerpc qemu qemu-ppce500 u-boot.bin all:riscv64 qemu qemu-riscv64 u-boot.bin all:riscv64 qemu qemu-riscv64_smode u-boot.bin - -# Dave Jones -armhf rpi rpi_4_32b u-boot.bin -arm64 rpi rpi_4 u-boot.bin