{device,drivers}: Include <cpu/cpu.h> instead of <arch/cpu.h>

Also sort includes.

Change-Id: I1727bf56b4090d040aab413006dec7aca0587d44
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69038
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
diff --git a/src/drivers/amd/agesa/romstage.c b/src/drivers/amd/agesa/romstage.c
index f60239a..5c3d904 100644
--- a/src/drivers/amd/agesa/romstage.c
+++ b/src/drivers/amd/agesa/romstage.c
@@ -1,21 +1,21 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <amdblocks/biosram.h>
 #include <acpi/acpi.h>
-#include <arch/cpu.h>
+#include <amdblocks/biosram.h>
 #include <arch/romstage.h>
 #include <cbmem.h>
 #include <console/console.h>
+#include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <halt.h>
+#include <northbridge/amd/agesa/agesa_helper.h>
+#include <northbridge/amd/agesa/state_machine.h>
 #include <program_loading.h>
+#include <romstage_common.h>
 #include <romstage_handoff.h>
 #include <smp/node.h>
 #include <string.h>
 #include <timestamp.h>
-#include <romstage_common.h>
-#include <northbridge/amd/agesa/agesa_helper.h>
-#include <northbridge/amd/agesa/state_machine.h>
 
 void __weak board_BeforeAgesa(struct sysinfo *cb) { }