From ad7b2e23ab5954f150a4b2f62378f1e7133e56c9 Mon Sep 17 00:00:00 2001
From: Sam Lewis <sam.vr.lewis@gmail.com>
Date: Mon, 3 Aug 2020 20:18:29 +1000
Subject: cpu/ti/am335x: Move from cpu to soc in tree

The AM335X is a SoC, so should be in the soc tree.

This moves all the existing am335x code to soc/ and updates any
references. It also adds a soc.c file as required for the ramstage.

Change-Id: Ic1ccb0e9b9c24a8b211b723b5f4cc26cdd0eaaab
Signed-off-by: Sam Lewis <sam.vr.lewis@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44378
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
---
 src/mainboard/ti/beaglebone/Kconfig       | 2 +-
 src/mainboard/ti/beaglebone/bootblock.c   | 6 +++---
 src/mainboard/ti/beaglebone/devicetree.cb | 2 +-
 src/mainboard/ti/beaglebone/leds.c        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/mainboard/ti/beaglebone')

diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig
index 7399f22693..5be310cf80 100644
--- a/src/mainboard/ti/beaglebone/Kconfig
+++ b/src/mainboard/ti/beaglebone/Kconfig
@@ -4,7 +4,7 @@ if BOARD_TI_BEAGLEBONE
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select CPU_TI_AM335X
+	select SOC_TI_AM335X
 	select BOARD_ROMSIZE_KB_4096
 	select MISSING_BOARD_RESET
 
diff --git a/src/mainboard/ti/beaglebone/bootblock.c b/src/mainboard/ti/beaglebone/bootblock.c
index 6e9538b229..ca1a39060d 100644
--- a/src/mainboard/ti/beaglebone/bootblock.c
+++ b/src/mainboard/ti/beaglebone/bootblock.c
@@ -3,9 +3,9 @@
 #include <device/mmio.h>
 #include <bootblock_common.h>
 #include <console/uart.h>
-#include <cpu/ti/am335x/clock.h>
-#include <cpu/ti/am335x/gpio.h>
-#include <cpu/ti/am335x/pinmux.h>
+#include <soc/ti/am335x/clock.h>
+#include <soc/ti/am335x/gpio.h>
+#include <soc/ti/am335x/pinmux.h>
 
 #include "leds.h"
 
diff --git a/src/mainboard/ti/beaglebone/devicetree.cb b/src/mainboard/ti/beaglebone/devicetree.cb
index dd999b4870..217a20175b 100644
--- a/src/mainboard/ti/beaglebone/devicetree.cb
+++ b/src/mainboard/ti/beaglebone/devicetree.cb
@@ -1,5 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-chip cpu/ti/am335x
+chip soc/ti/am335x
 	device cpu_cluster 0 on end
 end
diff --git a/src/mainboard/ti/beaglebone/leds.c b/src/mainboard/ti/beaglebone/leds.c
index 99ae6d934a..df58feaa1b 100644
--- a/src/mainboard/ti/beaglebone/leds.c
+++ b/src/mainboard/ti/beaglebone/leds.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <assert.h>
-#include <cpu/ti/am335x/gpio.h>
+#include <soc/ti/am335x/gpio.h>
 
 #include "leds.h"
 
-- 
cgit v1.2.3