Compare commits

..

3 Commits

Author SHA1 Message Date
Jeremy Soller
7f07f00204
Document UART locations 2021-05-06 21:28:19 -06:00
Jeremy Soller
1eff3d7cc6
Update kernel 2021-05-06 21:27:47 -06:00
Jeremy Soller
786b4a19be
Set ARMV8_SWITCH_TO_EL1 option in u-boot 2021-05-06 19:36:27 -06:00
2 changed files with 8 additions and 1 deletions

View File

@ -8,6 +8,7 @@ U_BOOT="build/u-boot/${MACHINE}.bin"
IMAGE="build/kernel_live.uimage" IMAGE="build/kernel_live.uimage"
case "${MACHINE}" in case "${MACHINE}" in
raspi3) raspi3)
# UART at 0x3F201000
U_BOOT_CONFIG=rpi_3_defconfig U_BOOT_CONFIG=rpi_3_defconfig
LOAD_ADDR=0x04000000 LOAD_ADDR=0x04000000
ENTRY_ADDR=0x04001000 ENTRY_ADDR=0x04001000
@ -23,6 +24,7 @@ case "${MACHINE}" in
) )
;; ;;
raspi4) raspi4)
# UART at 0xFE201000
U_BOOT_CONFIG=rpi_4_defconfig U_BOOT_CONFIG=rpi_4_defconfig
LOAD_ADDR=0x40000000 LOAD_ADDR=0x40000000
ENTRY_ADDR=0x40001000 ENTRY_ADDR=0x40001000
@ -31,6 +33,7 @@ case "${MACHINE}" in
# bootm 0x44000000 - ${fdtcontroladdr} # bootm 0x44000000 - ${fdtcontroladdr}
;; ;;
virt) virt)
# UART at 0x9000000
U_BOOT_CONFIG=qemu_arm64_defconfig U_BOOT_CONFIG=qemu_arm64_defconfig
LOAD_ADDR=0x40000000 LOAD_ADDR=0x40000000
ENTRY_ADDR=0x40001000 ENTRY_ADDR=0x40001000
@ -59,6 +62,10 @@ then
's/^CONFIG_BOOTCOMMAND=.*$/CONFIG_BOOTCOMMAND="bootm '"${IMAGE_ADDR}"' - ${fdtcontroladdr}"/' \ 's/^CONFIG_BOOTCOMMAND=.*$/CONFIG_BOOTCOMMAND="bootm '"${IMAGE_ADDR}"' - ${fdtcontroladdr}"/' \
u-boot/.config u-boot/.config
sed -i \
's/^CONFIG_SYS_EXTRA_OPTIONS=""/CONFIG_SYS_EXTRA_OPTIONS="ARMV8_SWITCH_TO_EL1"/' \
u-boot/.config
TARGET=aarch64-unknown-redox TARGET=aarch64-unknown-redox
env CROSS_COMPILE="${TARGET}-" \ env CROSS_COMPILE="${TARGET}-" \
PATH="${PWD}/prefix/${TARGET}/relibc-install/bin/:${PATH}" \ PATH="${PWD}/prefix/${TARGET}/relibc-install/bin/:${PATH}" \

2
kernel

@ -1 +1 @@
Subproject commit 2c474f98f9ef37b1cc116b11c3196fdb53d3f358 Subproject commit 38f7884e219e38690cba75137b02a54b936b080f