diff --git a/01_bareminimum/Makefile b/01_bareminimum/Makefile index f41f3f07..78e825ce 100644 --- a/01_bareminimum/Makefile +++ b/01_bareminimum/Makefile @@ -25,7 +25,8 @@ TARGET = aarch64-raspi3-none-elf CROSS_CONTAINER = ./dockcross-linux-aarch64 -CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy +CROSS_CONTAINER_ROOT = /usr/xcc/aarch64-unknown-linux-gnueabi/bin +CROSS_CONTAINER_OBJCOPY = $(CROSS_CONTAINER_ROOT)/aarch64-unknown-linux-gnueabi-objcopy UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work diff --git a/02_multicore_rust/Makefile b/02_multicore_rust/Makefile index dfe15d5b..005949a3 100644 --- a/02_multicore_rust/Makefile +++ b/02_multicore_rust/Makefile @@ -25,7 +25,8 @@ TARGET = aarch64-raspi3-none-elf CROSS_CONTAINER = ./dockcross-linux-aarch64 -CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy +CROSS_CONTAINER_ROOT = /usr/xcc/aarch64-unknown-linux-gnueabi/bin +CROSS_CONTAINER_OBJCOPY = $(CROSS_CONTAINER_ROOT)/aarch64-unknown-linux-gnueabi-objcopy UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work diff --git a/03_uart1/Makefile b/03_uart1/Makefile index ed1730c6..4179291c 100644 --- a/03_uart1/Makefile +++ b/03_uart1/Makefile @@ -25,7 +25,8 @@ TARGET = aarch64-raspi3-none-elf CROSS_CONTAINER = ./dockcross-linux-aarch64 -CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy +CROSS_CONTAINER_ROOT = /usr/xcc/aarch64-unknown-linux-gnueabi/bin +CROSS_CONTAINER_OBJCOPY = $(CROSS_CONTAINER_ROOT)/aarch64-unknown-linux-gnueabi-objcopy UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work diff --git a/04_mailboxes/Makefile b/04_mailboxes/Makefile index ed1730c6..4179291c 100644 --- a/04_mailboxes/Makefile +++ b/04_mailboxes/Makefile @@ -25,7 +25,8 @@ TARGET = aarch64-raspi3-none-elf CROSS_CONTAINER = ./dockcross-linux-aarch64 -CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy +CROSS_CONTAINER_ROOT = /usr/xcc/aarch64-unknown-linux-gnueabi/bin +CROSS_CONTAINER_OBJCOPY = $(CROSS_CONTAINER_ROOT)/aarch64-unknown-linux-gnueabi-objcopy UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work diff --git a/05_uart0/Makefile b/05_uart0/Makefile index ed1730c6..4179291c 100644 --- a/05_uart0/Makefile +++ b/05_uart0/Makefile @@ -25,7 +25,8 @@ TARGET = aarch64-raspi3-none-elf CROSS_CONTAINER = ./dockcross-linux-aarch64 -CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy +CROSS_CONTAINER_ROOT = /usr/xcc/aarch64-unknown-linux-gnueabi/bin +CROSS_CONTAINER_OBJCOPY = $(CROSS_CONTAINER_ROOT)/aarch64-unknown-linux-gnueabi-objcopy UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work diff --git a/06_raspbootin64/Makefile b/06_raspbootin64/Makefile index ed1730c6..4179291c 100644 --- a/06_raspbootin64/Makefile +++ b/06_raspbootin64/Makefile @@ -25,7 +25,8 @@ TARGET = aarch64-raspi3-none-elf CROSS_CONTAINER = ./dockcross-linux-aarch64 -CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy +CROSS_CONTAINER_ROOT = /usr/xcc/aarch64-unknown-linux-gnueabi/bin +CROSS_CONTAINER_OBJCOPY = $(CROSS_CONTAINER_ROOT)/aarch64-unknown-linux-gnueabi-objcopy UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work diff --git a/07_abstraction/Makefile b/07_abstraction/Makefile index 5c95cb2a..aa519562 100644 --- a/07_abstraction/Makefile +++ b/07_abstraction/Makefile @@ -25,7 +25,8 @@ TARGET = aarch64-raspi3-none-elf CROSS_CONTAINER = ./dockcross-linux-aarch64 -CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy +CROSS_CONTAINER_ROOT = /usr/xcc/aarch64-unknown-linux-gnueabi/bin +CROSS_CONTAINER_OBJCOPY = $(CROSS_CONTAINER_ROOT)/aarch64-unknown-linux-gnueabi-objcopy UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work diff --git a/08_random/Makefile b/08_random/Makefile index 5c95cb2a..aa519562 100644 --- a/08_random/Makefile +++ b/08_random/Makefile @@ -25,7 +25,8 @@ TARGET = aarch64-raspi3-none-elf CROSS_CONTAINER = ./dockcross-linux-aarch64 -CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy +CROSS_CONTAINER_ROOT = /usr/xcc/aarch64-unknown-linux-gnueabi/bin +CROSS_CONTAINER_OBJCOPY = $(CROSS_CONTAINER_ROOT)/aarch64-unknown-linux-gnueabi-objcopy UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work diff --git a/09_delays/Makefile b/09_delays/Makefile index 5c95cb2a..aa519562 100644 --- a/09_delays/Makefile +++ b/09_delays/Makefile @@ -25,7 +25,8 @@ TARGET = aarch64-raspi3-none-elf CROSS_CONTAINER = ./dockcross-linux-aarch64 -CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy +CROSS_CONTAINER_ROOT = /usr/xcc/aarch64-unknown-linux-gnueabi/bin +CROSS_CONTAINER_OBJCOPY = $(CROSS_CONTAINER_ROOT)/aarch64-unknown-linux-gnueabi-objcopy UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work diff --git a/0A_power/Makefile b/0A_power/Makefile index 5c95cb2a..aa519562 100644 --- a/0A_power/Makefile +++ b/0A_power/Makefile @@ -25,7 +25,8 @@ TARGET = aarch64-raspi3-none-elf CROSS_CONTAINER = ./dockcross-linux-aarch64 -CROSS_CONTAINER_OBJCOPY = /usr/bin/aarch64-unknown-linux-gnueabi/bin/aarch64-unknown-linux-gnueabi-objcopy +CROSS_CONTAINER_ROOT = /usr/xcc/aarch64-unknown-linux-gnueabi/bin +CROSS_CONTAINER_OBJCOPY = $(CROSS_CONTAINER_ROOT)/aarch64-unknown-linux-gnueabi-objcopy UTILS_CONTAINER = andrerichter/raspi3-utils DOCKER_CMD = docker run -it --rm -v $(shell pwd):/work -w /work diff --git a/0A_power/kernel8.img b/0A_power/kernel8.img index b664b4dc..3295c99d 100755 Binary files a/0A_power/kernel8.img and b/0A_power/kernel8.img differ diff --git a/utils/make_all.rb b/utils/make_all.rb index b0f93d05..0eb0bf77 100644 --- a/utils/make_all.rb +++ b/utils/make_all.rb @@ -3,8 +3,9 @@ crates = Dir["**/Cargo.toml"] crates.each do |x| - x = File.dirname(x) + next if x.include?('raspi3_glue') + x = File.dirname(x) puts "\n\n" + x.to_s + "\n\n" Dir.chdir(x) do `make`