Add raspi4 machine to aarch64.sh, modify raspi3 addresses

Update all submodules
Update bootloader-efi
2021-05-06 15:32:04 -06:00 · 2021-05-06 13:35:20 -06:00 · 2021-05-06 13:32:12 -06:00 · 2021-05-06 13:25:45 -06:00 · 2021-05-06 13:17:06 -06:00 · 2021-05-06 11:45:10 -06:00
6 changed files with 17 additions and 9 deletions
--- a/aarch64.sh
+++ b/aarch64.sh
@ -9,9 +9,9 @@ IMAGE="build/kernel_live.uimage"
 case "${MACHINE}" in
 	raspi3)
 		U_BOOT_CONFIG=rpi_3_defconfig
-		LOAD_ADDR=0x00000000
+		LOAD_ADDR=0x04000000
-		ENTRY_ADDR=0x00001000
+		ENTRY_ADDR=0x04001000
-		IMAGE_ADDR=0x04000000
+		IMAGE_ADDR=0x08000000
 		QEMU_ARGS=(
 			-M raspi3
 			-device "loader,file=${IMAGE},addr=${IMAGE_ADDR},force-raw=on"
@ -22,6 +22,14 @@ case "${MACHINE}" in
 			-s
 		)
 		;;
 	raspi4)
 		U_BOOT_CONFIG=rpi_4_defconfig
 		LOAD_ADDR=0x40000000
 		ENTRY_ADDR=0x40001000
 		IMAGE_ADDR=0x44000000
 		# load mmc 0 0x44000000 kernel_live.uimage
 		# bootm 0x44000000 - ${fdtcontroladdr}
 		;;
 	virt)
 		U_BOOT_CONFIG=qemu_arm64_defconfig
 		LOAD_ADDR=0x40000000
@ -78,7 +86,7 @@ mkimage \
 	-C none \
 	-a "${LOAD_ADDR}" \
 	-e "${ENTRY_ADDR}" \
-	-n "Redox kernel (qemu AArch64 ${MACHINE})" \
+	-n "Redox kernel (aarch64 ${MACHINE})" \
 	-d build/kernel_live \
   	"${IMAGE}"
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e147b413eeb9eb7d01c85cfe1b6b6eea39c47a57
+Subproject commit d9f268facae3c2161da186c8a3d31f0ce9e37833
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 28d1d7e847be3f63a4a17d1ca5673a68c9242c80
+Subproject commit 2c474f98f9ef37b1cc116b11c3196fdb53d3f358
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f1b88c38c0a9b6bf9e24f82397a8a9505c9a2df2
+Subproject commit 6d9a53c956a87a5fa02a3fdf71c80d8a025bd9cf
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 3e853b3d41ad95ac0e8dffbe59ea642d3fd16a3c
+Subproject commit 602fd9fe080a0822fc63bbda2b484fbc75901c3e
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit b0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b
+Subproject commit 1b8ad819cead7020d35f6251ef0cf3f393c61e51
Author	SHA1	Message	Date
Jeremy Soller	543c5eca6f	Add raspi4 machine to aarch64.sh, modify raspi3 addresses	2021-05-06 15:32:04 -06:00
Jeremy Soller	74ae17fd1c	Update all submodules	2021-05-06 13:35:20 -06:00
Jeremy Soller	08c5c2d040	Update bootloader-efi	2021-05-06 13:32:12 -06:00
Jeremy Soller	992ae91438	Update kernel	2021-05-06 13:25:45 -06:00
Jeremy Soller	dc261ba8ce	Update kernel	2021-05-06 13:17:06 -06:00
Jeremy Soller	e42fea9c63	Update bootloader-efi	2021-05-06 11:45:10 -06:00
		`@ -1 +1 @@`
			`Subproject commit e147b413eeb9eb7d01c85cfe1b6b6eea39c47a57`				`Subproject commit d9f268facae3c2161da186c8a3d31f0ce9e37833`
		`@ -1 +1 @@`
			`Subproject commit 28d1d7e847be3f63a4a17d1ca5673a68c9242c80`				`Subproject commit 2c474f98f9ef37b1cc116b11c3196fdb53d3f358`
		`@ -1 +1 @@`
			`Subproject commit f1b88c38c0a9b6bf9e24f82397a8a9505c9a2df2`				`Subproject commit 6d9a53c956a87a5fa02a3fdf71c80d8a025bd9cf`
		`@ -1 +1 @@`
			`Subproject commit 3e853b3d41ad95ac0e8dffbe59ea642d3fd16a3c`				`Subproject commit 602fd9fe080a0822fc63bbda2b484fbc75901c3e`
		`@ -1 +1 @@`
			`Subproject commit b0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b`				`Subproject commit 1b8ad819cead7020d35f6251ef0cf3f393c61e51`