aarch64.sh

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

kernel

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