From 8d37815914b457c2bc097977a19cfbe49dcc132b Mon Sep 17 00:00:00 2001 From: Sateallia Date: Mon, 23 Oct 2023 04:11:09 +0300 Subject: [PATCH] Remove unnecessary u-boot patch (fixes #12) I don't know why we even needed this but apparently now we don't. --- Makefile | 4 ---- arch/aarch64/res/bootm.patch | 4 ---- 2 files changed, 8 deletions(-) delete mode 100644 arch/aarch64/res/bootm.patch diff --git a/Makefile b/Makefile index c6d95eb..cc83292 100644 --- a/Makefile +++ b/Makefile @@ -12,12 +12,8 @@ run: $(IMAGE_NAME).img uboot: git clone https://github.com/u-boot/u-boot.git --branch=v2023.10 --depth=1 2>/dev/null | true - cp u-boot/arch/arm/lib/bootm.c u-boot/arch/arm/lib/bootm.c.bak - patch u-boot/arch/arm/lib/bootm.c < arch/aarch64/res/bootm.patch $(MAKE) -C u-boot rpi_3_defconfig ARCH=arm CROSS_COMPILE=aarch64-none-elf- $(MAKE) -C u-boot all ARCH=arm CROSS_COMPILE=aarch64-none-elf- - rm u-boot/arch/arm/lib/bootm.c - mv u-boot/arch/arm/lib/bootm.c.bak u-boot/arch/arm/lib/bootm.c override CFLAGS += \ -Iarch/$(ARCH) \ diff --git a/arch/aarch64/res/bootm.patch b/arch/aarch64/res/bootm.patch deleted file mode 100644 index 23c9f7b..0000000 --- a/arch/aarch64/res/bootm.patch +++ /dev/null @@ -1,4 +0,0 @@ -237c237 -< panic("FDT and ATAGS support not compiled in\n"); ---- -> debug("FDT and ATAGS support not compiled in but continuing anyway\n");