armv7: Move Exynos from 'cpu' to 'soc'.

The Exynos family and most ARM products are SoC, not just CPU.

We used to put ARM code in src/cpu to avoid polluting the code base for what was
essentially an experiment at the time. Now that it's past the experimental phase
and we're going to see more SoCs (including intel/baytrail) in coreboot.

Change-Id: I5ea1f822664244edf5f77087bc8018d7c535f81c
Reviewed-on: https://chromium-review.googlesource.com/170891
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Ronald Minnich <rminnich@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
(cherry picked from commit c8bb8fe0b20be37465f93c738d80e7e43033670a)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6739
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Hung-Te Lin 2013-09-27 12:45:45 +08:00 committed by Isaac Christensen
parent b123e0d334
commit 22d0ca0ceb
116 changed files with 65 additions and 63 deletions

View File

@ -4,7 +4,6 @@
source src/cpu/allwinner/Kconfig
source src/cpu/armltd/Kconfig
source src/cpu/samsung/Kconfig
source src/cpu/ti/Kconfig
source src/cpu/amd/Kconfig

View File

@ -6,7 +6,6 @@ subdirs-y += amd
subdirs-y += dmp
subdirs-y += armltd
subdirs-y += intel
subdirs-y += samsung
subdirs-y += ti
subdirs-y += via
subdirs-y += x86

View File

@ -1,2 +0,0 @@
source src/cpu/samsung/exynos5250/Kconfig
source src/cpu/samsung/exynos5420/Kconfig

View File

@ -24,8 +24,8 @@
#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include <bootmode.h>
#include <cpu/samsung/exynos5420/cpu.h>
#include <cpu/samsung/exynos5420/gpio.h>
#include <soc/samsung/exynos5420/cpu.h>
#include <soc/samsung/exynos5420/gpio.h>
void fill_lb_gpios(struct lb_gpios *gpios)
{

View File

@ -17,7 +17,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
chip cpu/samsung/exynos5420
chip soc/samsung/exynos5420
device cpu_cluster 0 on end
register "xres" = "1366"
register "yres" = "768"

View File

@ -28,15 +28,15 @@
#include <boot/coreboot_tables.h>
#include <arch/cache.h>
#include <arch/exception.h>
#include <cpu/samsung/exynos5420/tmu.h>
#include <cpu/samsung/exynos5420/clk.h>
#include <cpu/samsung/exynos5420/cpu.h>
#include <cpu/samsung/exynos5420/gpio.h>
#include <cpu/samsung/exynos5420/power.h>
#include <cpu/samsung/exynos5420/i2c.h>
#include <cpu/samsung/exynos5420/dp.h>
#include <cpu/samsung/exynos5420/fimd.h>
#include <cpu/samsung/exynos5420/usb.h>
#include <soc/samsung/exynos5420/tmu.h>
#include <soc/samsung/exynos5420/clk.h>
#include <soc/samsung/exynos5420/cpu.h>
#include <soc/samsung/exynos5420/gpio.h>
#include <soc/samsung/exynos5420/power.h>
#include <soc/samsung/exynos5420/i2c.h>
#include <soc/samsung/exynos5420/dp.h>
#include <soc/samsung/exynos5420/fimd.h>
#include <soc/samsung/exynos5420/usb.h>
#include <drivers/parade/ps8625/ps8625.h>
#include <ec/google/chromeec/ec.h>
#include <stdlib.h>

View File

@ -22,10 +22,10 @@
#include <stdlib.h>
#include <console/console.h>
#include <cpu/samsung/exynos5420/gpio.h>
#include <cpu/samsung/exynos5420/dmc.h>
#include <cpu/samsung/exynos5420/setup.h>
#include <cpu/samsung/exynos5420/clk.h>
#include <soc/samsung/exynos5420/gpio.h>
#include <soc/samsung/exynos5420/dmc.h>
#include <soc/samsung/exynos5420/setup.h>
#include <soc/samsung/exynos5420/clk.h>
const struct mem_timings mem_timings = {
.mem_manuf = MEM_MANUF_SAMSUNG,

View File

@ -25,16 +25,16 @@
#include <cbmem.h>
#include <arch/cache.h>
#include <cpu/samsung/exynos5420/i2c.h>
#include <cpu/samsung/exynos5420/clk.h>
#include <cpu/samsung/exynos5420/cpu.h>
#include <cpu/samsung/exynos5420/dmc.h>
#include <cpu/samsung/exynos5420/gpio.h>
#include <cpu/samsung/exynos5420/setup.h>
#include <cpu/samsung/exynos5420/periph.h>
#include <cpu/samsung/exynos5420/power.h>
#include <cpu/samsung/exynos5420/trustzone.h>
#include <cpu/samsung/exynos5420/wakeup.h>
#include <soc/samsung/exynos5420/i2c.h>
#include <soc/samsung/exynos5420/clk.h>
#include <soc/samsung/exynos5420/cpu.h>
#include <soc/samsung/exynos5420/dmc.h>
#include <soc/samsung/exynos5420/gpio.h>
#include <soc/samsung/exynos5420/setup.h>
#include <soc/samsung/exynos5420/periph.h>
#include <soc/samsung/exynos5420/power.h>
#include <soc/samsung/exynos5420/trustzone.h>
#include <soc/samsung/exynos5420/wakeup.h>
#include <console/console.h>
#include <arch/stages.h>

View File

@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <cpu/samsung/exynos5420/gpio.h>
#include <cpu/samsung/exynos5420/wakeup.h>
#include <soc/samsung/exynos5420/gpio.h>
#include <soc/samsung/exynos5420/wakeup.h>
int wakeup_need_reset(void)
{

View File

@ -24,8 +24,8 @@
#include <string.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include <bootmode.h>
#include <cpu/samsung/exynos5250/cpu.h>
#include <cpu/samsung/exynos5250/gpio.h>
#include <soc/samsung/exynos5250/cpu.h>
#include <soc/samsung/exynos5250/gpio.h>
void fill_lb_gpios(struct lb_gpios *gpios)
{

View File

@ -17,7 +17,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
chip cpu/samsung/exynos5250
chip soc/samsung/exynos5250
device cpu_cluster 0 on end
register "xres" = "1366"
register "yres" = "768"

View File

@ -28,14 +28,14 @@
#include <boot/coreboot_tables.h>
#include <arch/cache.h>
#include <arch/exception.h>
#include <cpu/samsung/exynos5250/tmu.h>
#include <cpu/samsung/exynos5250/clk.h>
#include <cpu/samsung/exynos5250/gpio.h>
#include <cpu/samsung/exynos5250/power.h>
#include <cpu/samsung/exynos5250/i2c.h>
#include <cpu/samsung/exynos5250/dp-core.h>
#include <cpu/samsung/exynos5250/dp.h>
#include <cpu/samsung/exynos5250/usb.h>
#include <soc/samsung/exynos5250/tmu.h>
#include <soc/samsung/exynos5250/clk.h>
#include <soc/samsung/exynos5250/gpio.h>
#include <soc/samsung/exynos5250/power.h>
#include <soc/samsung/exynos5250/i2c.h>
#include <soc/samsung/exynos5250/dp-core.h>
#include <soc/samsung/exynos5250/dp.h>
#include <soc/samsung/exynos5250/usb.h>
#include "exynos5250.h"

View File

@ -22,10 +22,10 @@
#include <stdlib.h>
#include <console/console.h>
#include <cpu/samsung/exynos5250/gpio.h>
#include <cpu/samsung/exynos5250/setup.h>
#include <cpu/samsung/exynos5250/dmc.h>
#include <cpu/samsung/exynos5250/clk.h>
#include <soc/samsung/exynos5250/gpio.h>
#include <soc/samsung/exynos5250/setup.h>
#include <soc/samsung/exynos5250/dmc.h>
#include <soc/samsung/exynos5250/clk.h>
const struct mem_timings mem_timings[] = {
{

View File

@ -24,16 +24,16 @@
#include <cbmem.h>
#include <arch/cache.h>
#include <cpu/samsung/exynos5250/i2c.h>
#include <cpu/samsung/exynos5250/clk.h>
#include <cpu/samsung/exynos5250/cpu.h>
#include <cpu/samsung/exynos5250/dmc.h>
#include <cpu/samsung/exynos5250/gpio.h>
#include <cpu/samsung/exynos5250/setup.h>
#include <cpu/samsung/exynos5250/periph.h>
#include <cpu/samsung/exynos5250/power.h>
#include <cpu/samsung/exynos5250/trustzone.h>
#include <cpu/samsung/exynos5250/wakeup.h>
#include <soc/samsung/exynos5250/i2c.h>
#include <soc/samsung/exynos5250/clk.h>
#include <soc/samsung/exynos5250/cpu.h>
#include <soc/samsung/exynos5250/dmc.h>
#include <soc/samsung/exynos5250/gpio.h>
#include <soc/samsung/exynos5250/setup.h>
#include <soc/samsung/exynos5250/periph.h>
#include <soc/samsung/exynos5250/power.h>
#include <soc/samsung/exynos5250/trustzone.h>
#include <soc/samsung/exynos5250/wakeup.h>
#include <console/console.h>
#include <arch/stages.h>

View File

@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <cpu/samsung/exynos5250/gpio.h>
#include <cpu/samsung/exynos5250/wakeup.h>
#include <soc/samsung/exynos5250/gpio.h>
#include <soc/samsung/exynos5250/wakeup.h>
int wakeup_need_reset(void)
{

View File

@ -1,2 +1,3 @@
source src/soc/intel/Kconfig
source src/soc/nvidia/Kconfig
source src/soc/samsung/Kconfig

View File

@ -3,3 +3,4 @@
################################################################################
subdirs-y += intel
subdirs-y += nvidia
subdirs-y += samsung

2
src/soc/samsung/Kconfig Normal file
View File

@ -0,0 +1,2 @@
source src/soc/samsung/exynos5250/Kconfig
source src/soc/samsung/exynos5420/Kconfig

View File

@ -57,5 +57,6 @@ ramstage-y += cbmem.c
$(obj)/coreboot.rom: exynos5250_add_bl1
exynos5250_add_bl1: $(obj)/coreboot.pre
printf " DD Adding Samsung Exynos5250 BL1\n"
# TODO(hungte) Change this 'cpu' to soc when build scripts are changed.
dd if=3rdparty/cpu/samsung/exynos5250/bl1.bin \
of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1

View File

@ -22,7 +22,7 @@
#include "gpio.h"
struct cpu_samsung_exynos5250_config {
struct soc_samsung_exynos5250_config {
/* special magic numbers! */
int clkval_f;
int upper_margin;

View File

@ -63,7 +63,7 @@ static void exynos_displayport_init(device_t dev, u32 lcdbase,
unsigned long fb_size)
{
int ret;
struct cpu_samsung_exynos5250_config *conf = dev->chip_info;
struct soc_samsung_exynos5250_config *conf = dev->chip_info;
/* put these on the stack. If, at some point, we want to move
* this code to a pre-ram stage, it will be much easier.
*/

View File

@ -57,5 +57,6 @@ ramstage-y += cbmem.c
$(obj)/coreboot.rom: exynos5420_add_bl1
exynos5420_add_bl1: $(obj)/coreboot.pre
printf " DD Adding Samsung Exynos5420 BL1\n"
# TODO(hungte) Change this 'cpu' to soc when build scripts are changed.
dd if=3rdparty/cpu/samsung/exynos5420/bl1.bin \
of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1

View File

@ -22,7 +22,7 @@
#include "gpio.h"
struct cpu_samsung_exynos5420_config {
struct soc_samsung_exynos5420_config {
/* special magic numbers! */
int clkval_f;
int upper_margin;

View File

@ -76,7 +76,7 @@ static void set_cpu_id(void)
static void exynos_displayport_init(device_t dev, u32 lcdbase,
unsigned long fb_size)
{
struct cpu_samsung_exynos5420_config *conf = dev->chip_info;
struct soc_samsung_exynos5420_config *conf = dev->chip_info;
/* put these on the stack. If, at some point, we want to move
* this code to a pre-ram stage, it will be much easier.
*/

Some files were not shown because too many files have changed in this diff Show More