diff --git a/root/target/linux/brcm2708/image/Makefile b/root/target/linux/brcm2708/image/Makefile index 0f92ebfe..bae08fa0 100644 --- a/root/target/linux/brcm2708/image/Makefile +++ b/root/target/linux/brcm2708/image/Makefile @@ -30,12 +30,12 @@ define Build/boot-common mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG) $(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::;) mmd -i $@.boot ::/overlays - mcopy -i $@.boot cmdline.txt :: mcopy -i $@.boot $(DTS_DIR)/overlays/*.dtbo ::/overlays/ mcopy -i $@.boot $(DTS_DIR)/overlays/README ::/overlays/ endef define Build/boot-not4 + mcopy -i $@.boot cmdline.txt :: mcopy -i $@.boot config.txt :: endef @@ -58,6 +58,7 @@ define Build/boot-2711 endef define Build/boot-2711-64 + mcopy -i $@.boot cmdline64.txt ::cmdline.txt mcopy -i $@.boot config64.txt ::config.txt endef diff --git a/root/target/linux/brcm2708/patches-4.19/962-limit-DMA-zone-for-arm64.patch b/root/target/linux/brcm2708/patches-4.19/962-limit-DMA-zone-for-arm64.patch deleted file mode 100644 index 977b99da..00000000 --- a/root/target/linux/brcm2708/patches-4.19/962-limit-DMA-zone-for-arm64.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e6bef7f1fafb6b0f69c2194821d93b3244dd5c0a Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan -Date: Tue, 16 Jul 2019 13:28:22 +0100 -Subject: [PATCH] arm64/mm: Limit the DMA zone for arm64 - -On RaspberryPi, only the first 1Gb can be used for DMA[1]. - -[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2019-July/665986.html - -Signed-off-by: Andrei Gherzan ---- - arch/arm64/mm/init.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 774c3e17c7982..75006fa076a01 100644 ---- a/arch/arm64/mm/init.c -+++ b/arch/arm64/mm/init.c -@@ -475,7 +475,7 @@ void __init arm64_memblock_init(void) - - /* 4GB maximum for 32-bit only capable devices */ - if (IS_ENABLED(CONFIG_ZONE_DMA32)) -- arm64_dma_phys_limit = max_zone_dma_phys(); -+ arm64_dma_phys_limit = 0x40000000; - else - arm64_dma_phys_limit = PHYS_MASK + 1; -