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>
This commit is contained in:
Sam Lewis 2020-08-03 20:18:29 +10:00 committed by Patrick Georgi
parent cb287987a1
commit ad7b2e23ab
30 changed files with 36 additions and 26 deletions

View File

@ -550,7 +550,7 @@ F: src/vendorcode/intel/fsp/fsp2_0/copperlake_sp
ORPHANED ARM SOCS ORPHANED ARM SOCS
S: Orphaned S: Orphaned
F: src/cpu/armltd/ F: src/cpu/armltd/
F: src/cpu/ti/ F: src/soc/ti/
F: src/soc/qualcomm/ F: src/soc/qualcomm/
F: src/soc/samsung/ F: src/soc/samsung/
F: util/exynos/ F: util/exynos/

View File

@ -1 +0,0 @@
source "src/cpu/ti/am335x/Kconfig"

View File

@ -1 +0,0 @@
subdirs-$(CONFIG_CPU_TI_AM335X) += am335x

View File

@ -4,7 +4,7 @@ if BOARD_TI_BEAGLEBONE
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select CPU_TI_AM335X select SOC_TI_AM335X
select BOARD_ROMSIZE_KB_4096 select BOARD_ROMSIZE_KB_4096
select MISSING_BOARD_RESET select MISSING_BOARD_RESET

View File

@ -3,9 +3,9 @@
#include <device/mmio.h> #include <device/mmio.h>
#include <bootblock_common.h> #include <bootblock_common.h>
#include <console/uart.h> #include <console/uart.h>
#include <cpu/ti/am335x/clock.h> #include <soc/ti/am335x/clock.h>
#include <cpu/ti/am335x/gpio.h> #include <soc/ti/am335x/gpio.h>
#include <cpu/ti/am335x/pinmux.h> #include <soc/ti/am335x/pinmux.h>
#include "leds.h" #include "leds.h"

View File

@ -1,5 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only ## SPDX-License-Identifier: GPL-2.0-only
chip cpu/ti/am335x chip soc/ti/am335x
device cpu_cluster 0 on end device cpu_cluster 0 on end
end end

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <assert.h> #include <assert.h>
#include <cpu/ti/am335x/gpio.h> #include <soc/ti/am335x/gpio.h>
#include "leds.h" #include "leds.h"

1
src/soc/ti/Kconfig Normal file
View File

@ -0,0 +1 @@
source "src/soc/ti/am335x/Kconfig"

1
src/soc/ti/Makefile.inc Normal file
View File

@ -0,0 +1 @@
subdirs-$(CONFIG_SOC_TI_AM335X) += am335x

View File

@ -1,4 +1,4 @@
config CPU_TI_AM335X config SOC_TI_AM335X
select ARCH_BOOTBLOCK_ARMV7 select ARCH_BOOTBLOCK_ARMV7
select ARCH_VERSTAGE_ARMV7 select ARCH_VERSTAGE_ARMV7
select ARCH_ROMSTAGE_ARMV7 select ARCH_ROMSTAGE_ARMV7
@ -9,10 +9,10 @@ config CPU_TI_AM335X
bool bool
default n default n
if CPU_TI_AM335X if SOC_TI_AM335X
config MEMLAYOUT_LD_FILE config MEMLAYOUT_LD_FILE
string string
default "src/cpu/ti/am335x/memlayout.ld" default "src/soc/ti/am335x/memlayout.ld"
endif endif

View File

@ -1,3 +1,4 @@
ifeq ($(CONFIG_SOC_TI_AM335X),y)
bootblock-y += bootblock.c bootblock-y += bootblock.c
bootblock-y += bootblock_media.c bootblock-y += bootblock_media.c
bootblock-y += dmtimer.c bootblock-y += dmtimer.c
@ -13,6 +14,7 @@ romstage-y += monotonic_timer.c
ramstage-y += dmtimer.c ramstage-y += dmtimer.c
ramstage-y += monotonic_timer.c ramstage-y += monotonic_timer.c
ramstage-y += nand.c ramstage-y += nand.c
ramstage-y += soc.c
bootblock-y += uart.c bootblock-y += uart.c
romstage-y += uart.c romstage-y += uart.c
@ -51,3 +53,4 @@ omap-header-y += header.c
omap-header-srcs += $(CONFIG_MEMLAYOUT_LD_FILE) omap-header-srcs += $(CONFIG_MEMLAYOUT_LD_FILE)
omap-header-y += header.ld omap-header-y += header.ld
endif

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __CPU_TI_AM335X_CLOCK_H__ #ifndef __SOC_TI_AM335X_CLOCK_H__
#define __CPU_TI_AM335X_CLOCK_H__ #define __SOC_TI_AM335X_CLOCK_H__
#include <stdint.h> #include <stdint.h>
@ -219,4 +219,4 @@ struct am335x_cm_cefuse_regs {
static struct am335x_cm_cefuse_regs * const am335x_cm_cefuse = static struct am335x_cm_cefuse_regs * const am335x_cm_cefuse =
(void *)0x44e00a00; (void *)0x44e00a00;
#endif /* __CPU_TI_AM335X_CLOCK_H__ */ #endif /* __SOC_TI_AM335X_CLOCK_H__ */

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __CPU_TI_AM335X_DMTIMER_H__ #ifndef __SOC_TI_AM335X_DMTIMER_H__
#define __CPU_TI_AM335X_DMTIMER_H__ #define __SOC_TI_AM335X_DMTIMER_H__
#include <stdint.h> #include <stdint.h>

View File

@ -2,7 +2,7 @@
#include <device/mmio.h> #include <device/mmio.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/ti/am335x/gpio.h> #include <soc/ti/am335x/gpio.h>
#include <stdint.h> #include <stdint.h>
static struct am335x_gpio_regs *gpio_regs_and_bit(unsigned int gpio, static struct am335x_gpio_regs *gpio_regs_and_bit(unsigned int gpio,

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __CPU_TI_AM335X_GPIO_H__ #ifndef __SOC_TI_AM335X_GPIO_H__
#define __CPU_TI_AM335X_GPIO_H__ #define __SOC_TI_AM335X_GPIO_H__
#include <stdint.h> #include <stdint.h>
@ -55,4 +55,4 @@ int gpio_direction_output(unsigned int gpio, int value);
int gpio_get_value(unsigned int gpio); int gpio_get_value(unsigned int gpio);
int gpio_set_value(unsigned int gpio, int value); int gpio_set_value(unsigned int gpio, int value);
#endif /* __CPU_TI_AM335X_CLOCK_H__ */ #endif /* __SOC_TI_AM335X_CLOCK_H__ */

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __CPU_TI_AM335X_HEADER_H #ifndef __SOC_TI_AM335X_HEADER_H
#define __CPU_TI_AM335X_HEADER_H #define __SOC_TI_AM335X_HEADER_H
#include <stdint.h> #include <stdint.h>

View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __CPU_TI_AM335X_PINMUX_H #ifndef __SOC_TI_AM335X_PINMUX_H
#define __CPU_TI_AM335X_PINMUX_H #define __SOC_TI_AM335X_PINMUX_H
#include <stdint.h> #include <stdint.h>

7
src/soc/ti/am335x/soc.c Normal file
View File

@ -0,0 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <device/device.h>
struct chip_operations soc_ti_am335x_ops = {
CHIP_NAME("TI AM335X")
};

View File

@ -4,7 +4,7 @@
#include <console/uart.h> #include <console/uart.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <boot/coreboot_tables.h> #include <boot/coreboot_tables.h>
#include <cpu/ti/am335x/uart.h> #include <soc/ti/am335x/uart.h>
#define EFR_ENHANCED_EN (1 << 4) #define EFR_ENHANCED_EN (1 << 4)
#define FCR_FIFO_EN (1 << 0) #define FCR_FIFO_EN (1 << 0)