soc/intel: Include <cpu/cpu.h> instead of <arch/cpu.h>

Also sort includes.

Change-Id: I7da9c672ee230dfaebd943247639b78d675957e4
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69032
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>

src/soc/intel/quark/include/soc/ramstage.h

@@ -3,7 +3,7 @@
 #ifndef _SOC_RAMSTAGE_H_
 #define _SOC_RAMSTAGE_H_
 
-#include <arch/cpu.h>
+#include <cpu/cpu.h>
 #include <device/device.h>
 #include <soc/QuarkNcSocId.h>
 

src/soc/intel/quark/romstage/report_platform.c

@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <arch/cpu.h>
 #include <console/console.h>
+#include <cpu/cpu.h>
 #include <device/pci.h>
-#include <device/pci_ops.h>
 #include <device/pci_def.h>
+#include <device/pci_ops.h>
 #include <soc/cpu.h>
 #include <soc/pci_devs.h>
 #include <soc/romstage.h>