From: Simon Glass Date: Thu, 13 Nov 2014 05:42:29 +0000 (-0700) Subject: x86: Rename chromebook-x86 to coreboot X-Git-Tag: v2015.01-rc2~5^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fe5b9b447c6eea3873833b1f3ba15c9854aa2ef8;p=oweals%2Fu-boot.git x86: Rename chromebook-x86 to coreboot Rename this vendor since it is intended to be used on any platform where coreboot runs at reset and then loads U-Boot. So far it is only tested on link. When other boards are supported it is likely that we will need to move to multiple board names, all under the 'coreboot' vendor. So while it would be possible to remove the vendor for now, that would be short-sighted. Suggested-by: Bin Meng Signed-off-by: Simon Glass --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 43c22ff7a5..6e29868f5f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -85,7 +85,7 @@ config X86_RAMTEST source "arch/x86/cpu/ivybridge/Kconfig" -source "board/chromebook-x86/coreboot/Kconfig" +source "board/coreboot/coreboot/Kconfig" source "board/google/chromebook_link/Kconfig" diff --git a/board/chromebook-x86/coreboot/Kconfig b/board/chromebook-x86/coreboot/Kconfig deleted file mode 100644 index 83385c7207..0000000000 --- a/board/chromebook-x86/coreboot/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_COREBOOT - -config SYS_BOARD - default "coreboot" - -config SYS_VENDOR - default "chromebook-x86" - -config SYS_SOC - default "coreboot" - -config SYS_CONFIG_NAME - default "coreboot" - -endif diff --git a/board/chromebook-x86/coreboot/MAINTAINERS b/board/chromebook-x86/coreboot/MAINTAINERS deleted file mode 100644 index 3b2fb52266..0000000000 --- a/board/chromebook-x86/coreboot/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -COREBOOT BOARD -M: Simon Glass -S: Maintained -F: board/chromebook-x86/coreboot/ -F: include/configs/coreboot.h -F: configs/coreboot-x86_defconfig diff --git a/board/chromebook-x86/coreboot/Makefile b/board/chromebook-x86/coreboot/Makefile deleted file mode 100644 index 27ebe78eb1..0000000000 --- a/board/chromebook-x86/coreboot/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) 2011 The Chromium OS Authors. -# (C) Copyright 2008 -# Graeme Russ, graeme.russ@gmail.com. -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# (C) Copyright 2002 -# Daniel Engström, Omicron Ceti AB, daniel@omicron.se. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += coreboot_start.o coreboot.o diff --git a/board/chromebook-x86/coreboot/coreboot.c b/board/chromebook-x86/coreboot/coreboot.c deleted file mode 100644 index 0240c34581..0000000000 --- a/board/chromebook-x86/coreboot/coreboot.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include - -int arch_early_init_r(void) -{ - if (cros_ec_board_init()) - return -1; - - return 0; -} diff --git a/board/chromebook-x86/coreboot/coreboot_start.S b/board/chromebook-x86/coreboot/coreboot_start.S deleted file mode 100644 index 932fe6c24b..0000000000 --- a/board/chromebook-x86/coreboot/coreboot_start.S +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2011 The Chromium OS Authors. - * (C) Copyright 2008 - * Graeme Russ, graeme.russ@gmail.com. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* board early intialization */ -.globl early_board_init -early_board_init: - /* No 32-bit board specific initialisation */ - jmp early_board_init_ret diff --git a/board/coreboot/coreboot/Kconfig b/board/coreboot/coreboot/Kconfig new file mode 100644 index 0000000000..6ca6cedf0d --- /dev/null +++ b/board/coreboot/coreboot/Kconfig @@ -0,0 +1,15 @@ +if TARGET_COREBOOT + +config SYS_BOARD + default "coreboot" + +config SYS_VENDOR + default "coreboot" + +config SYS_SOC + default "coreboot" + +config SYS_CONFIG_NAME + default "coreboot" + +endif diff --git a/board/coreboot/coreboot/MAINTAINERS b/board/coreboot/coreboot/MAINTAINERS new file mode 100644 index 0000000000..6ce66f551f --- /dev/null +++ b/board/coreboot/coreboot/MAINTAINERS @@ -0,0 +1,6 @@ +COREBOOT BOARD +M: Simon Glass +S: Maintained +F: board/coreboot/coreboot/ +F: include/configs/coreboot.h +F: configs/coreboot-x86_defconfig diff --git a/board/coreboot/coreboot/Makefile b/board/coreboot/coreboot/Makefile new file mode 100644 index 0000000000..27ebe78eb1 --- /dev/null +++ b/board/coreboot/coreboot/Makefile @@ -0,0 +1,15 @@ +# +# Copyright (c) 2011 The Chromium OS Authors. +# (C) Copyright 2008 +# Graeme Russ, graeme.russ@gmail.com. +# +# (C) Copyright 2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# (C) Copyright 2002 +# Daniel Engström, Omicron Ceti AB, daniel@omicron.se. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += coreboot_start.o coreboot.o diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c new file mode 100644 index 0000000000..0240c34581 --- /dev/null +++ b/board/coreboot/coreboot/coreboot.c @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2013 Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include + +int arch_early_init_r(void) +{ + if (cros_ec_board_init()) + return -1; + + return 0; +} diff --git a/board/coreboot/coreboot/coreboot_start.S b/board/coreboot/coreboot/coreboot_start.S new file mode 100644 index 0000000000..932fe6c24b --- /dev/null +++ b/board/coreboot/coreboot/coreboot_start.S @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2011 The Chromium OS Authors. + * (C) Copyright 2008 + * Graeme Russ, graeme.russ@gmail.com. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* board early intialization */ +.globl early_board_init +early_board_init: + /* No 32-bit board specific initialisation */ + jmp early_board_init_ret