From 73f170091b302d68f908e00628fb27c69aa44ce7 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Sat, 3 Feb 2024 14:10:28 +0100 Subject: update kernel branch --- .gitmodules | 5 +++-- kernel | 2 +- makefile | 13 +++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index b2f8062..e060bcd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,7 @@ shallow = true [submodule "kernel"] path = kernel - url = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git -# url = https://github.com/beagleboard/linux + # url = https://openbeagle.org/beagleboard/linux.git + url = https://github.com/beagleboard/linux + branch = v6.1.69-ti-rt-arm64-r23 shallow = true diff --git a/kernel b/kernel index 6764c31..723e5b5 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 6764c317b6bb91bd806ef79adf6d9c0e428b191e +Subproject commit 723e5b5fdef612167f7bd1088f37a9b04b398edc diff --git a/makefile b/makefile index c08c30f..ed5359e 100644 --- a/makefile +++ b/makefile @@ -13,8 +13,10 @@ GIT := git CTR_IMG_TAG := avans-linux CTRIZE := $(CTR) run --rm --interactive --tty +CTRIZE += --volume /tmp:/tmp:rw CTRIZE += --volume .:/workdir:rw CTRIZE += --env-file ./env +CTRIZE += --env MAKE* CTRIZE += $(CTR_IMG_TAG) export @@ -39,8 +41,7 @@ state/container_img: Containerfile touch $@ state/submodules: - $(GIT) submodule init - $(GIT) submodule update + $(GIT) submodule update --init touch $@ state/sdcard_part: @@ -56,15 +57,15 @@ BOOTLOADER_FILES += bootloader/MLO BOOTLOADER_FILES += bootloader/u-boot.img BOOTLOADER_FILES += bootloader/u-boot.dtb bootloader/.config: state/submodules - $(CTRIZE) $(MAKE) -$(MAKEFLAGS) -C bootloader am335x_evm_config + +$(CTRIZE) $(MAKE) -C bootloader am335x_evm_config $(BOOTLOADER_FILES): bootloader/.config - $(CTRIZE) $(MAKE) -$(MAKEFLAGS) -C bootloader + +$(CTRIZE) $(MAKE) -C bootloader KERNEL_FILES += kernel/ kernel/.config: state/submodules - $(CTRIZE) $(MAKE) -$(MAKEFLAGS) -C kernel omap2plus_defconfig + +$(CTRIZE) $(MAKE) -C kernel bb.org_defconfig $(KERNEL_FILES): kernel/.config - $(CTRIZE) $(MAKE) -$(MAKEFLAGS) -C kernel + +$(CTRIZE) $(MAKE) -C kernel .PHONY: load_bootloader load_bootloader: $(BOOTLOADER_FILES) -- cgit v1.2.3