summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Soller <jeremy@system76.com>2021-05-06 15:32:04 -0600
committerJeremy Soller <jeremy@system76.com>2021-05-06 15:32:04 -0600
commit543c5eca6fdb35a2299bd7842eb92bee7c5b5082 (patch)
treea92971005cb703a14f302c713df6302a22c0e68c
parent74ae17fd1c51049a4807c1764665220006ecbe53 (diff)
Add raspi4 machine to aarch64.sh, modify raspi3 addresses
-rwxr-xr-xaarch64.sh16
1 files changed, 12 insertions, 4 deletions
diff --git a/aarch64.sh b/aarch64.sh
index a420700..18276c7 100755
--- 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
- ENTRY_ADDR=0x00001000
- IMAGE_ADDR=0x04000000
+ LOAD_ADDR=0x04000000
+ ENTRY_ADDR=0x04001000
+ 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}"