From 99f4dc24b342dff6b16df69e6fdf56a4327c5ede Mon Sep 17 00:00:00 2001
From: Andre Richter <andre.o.richter@gmail.com>
Date: Sun, 17 Jun 2018 13:14:03 +0200
Subject: [PATCH] Change dockcross path to newest upstream release

---
 01_bareminimum/Makefile    |   3 ++-
 02_multicore_rust/Makefile |   3 ++-
 03_uart1/Makefile          |   3 ++-
 04_mailboxes/Makefile      |   3 ++-
 05_uart0/Makefile          |   3 ++-
 06_raspbootin64/Makefile   |   3 ++-
 07_abstraction/Makefile    |   3 ++-
 08_random/Makefile         |   3 ++-
 09_delays/Makefile         |   3 ++-
 0A_power/Makefile          |   3 ++-
 0A_power/kernel8.img       | Bin 1824 -> 1808 bytes
 utils/make_all.rb          |   3 ++-
 12 files changed, 22 insertions(+), 11 deletions(-)

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 b664b4dcee4912ff62407082c74c58e9011e2dca..3295c99dc7d8a220d29301da1c6cf730244f32bf 100755
GIT binary patch
delta 182
zcmZ3$H-T@045Ri&+1ZRj*BBV4a4;}T-~?iZg$HdFmrg##n8uhm*^p@l(*dc;r<s&E
zS01z#21*xmP5#ETPVfPDgY7qEHqHO_?3$d+4m&$1?`8Jp<X~kGly_t(d^}l@rCf5u
z|Nr8QKrIg*Gfh-nB0X^tQ$x_xfB&bin!J$3LbTEOr)I13PkTm=*M}GwLO@n)woZP>
aBE_h%nUl4iaq<MV1_1$fptFDgMgst4kvQZ4

delta 220
zcmbQhw}5Yg45RKw+1ZRjHy9YEa4;}T-~?iZr3Y;lS57{~n8vtpvLVw9CI;!rr<s&E
z*B-PL21*xuP5#ETPVyx)gV6)-2HS7SY?}Y;*)_SC9d^E8=G5w%yp`FTQ{IuGkW;lo
z>hNSvmU78;|No0K0<}JP%rsH)iS)!pObtPg|NWo7V)9HD3xiJQpPIeSKkXSgULRs$
z2mv_(%y(tj0TMg>|9{9oe)%5{nB`YJ1Y)_(jI8yHK*vJB<Oa3|0R?slA4UTJ^O#1B

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`