From: Simon Glass Date: Thu, 12 Apr 2018 20:04:40 +0000 (-0600) Subject: x86: Rename coreboot-x86 to coreboot X-Git-Tag: v2018.05-rc2~7^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d5032392babd3a8bd027ccb79072ee7b05299b67;p=u-boot x86: Rename coreboot-x86 to coreboot We only use coreboot as a target on x86 platforms, since on ARM platforms U-Boot always runs as the primary boot loader. Rename the coreboot-x86 platform to reflect this. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- diff --git a/board/coreboot/coreboot/MAINTAINERS b/board/coreboot/coreboot/MAINTAINERS index 2736aa0282..188906b080 100644 --- a/board/coreboot/coreboot/MAINTAINERS +++ b/board/coreboot/coreboot/MAINTAINERS @@ -3,4 +3,4 @@ M: Simon Glass S: Maintained F: board/coreboot/coreboot/ F: include/configs/chromebook_link.h -F: configs/coreboot-x86_defconfig +F: configs/coreboot_defconfig diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig deleted file mode 100644 index ecedc8b4c5..0000000000 --- a/configs/coreboot-x86_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -CONFIG_X86=y -CONFIG_SYS_TEXT_BASE=0x1110000 -CONFIG_VENDOR_COREBOOT=y -CONFIG_TARGET_COREBOOT=y -CONFIG_FIT=y -CONFIG_BOOTSTAGE=y -CONFIG_BOOTSTAGE_REPORT=y -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_DISPLAY_BOARDINFO_LATE=y -CONFIG_LAST_STAGE_INIT=y -CONFIG_HUSH_PARSER=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_IDE=y -CONFIG_CMD_PART=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -# CONFIG_CMD_NFS is not set -CONFIG_CMD_PING=y -CONFIG_CMD_TIME=y -CONFIG_CMD_BOOTSTAGE=y -CONFIG_CMD_TPM=y -CONFIG_CMD_TPM_TEST=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_MAC_PARTITION=y -CONFIG_ISO_PARTITION=y -CONFIG_EFI_PARTITION=y -CONFIG_BOOTP_BOOTPATH=y -CONFIG_BOOTP_GATEWAY=y -CONFIG_BOOTP_HOSTNAME=y -CONFIG_REGMAP=y -CONFIG_SYSCON=y -CONFIG_TPM_TIS_LPC=y -CONFIG_USB_STORAGE=y -CONFIG_USB_KEYBOARD=y -CONFIG_CONSOLE_SCROLL_LINES=5 -CONFIG_TPM=y diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig new file mode 100644 index 0000000000..ecedc8b4c5 --- /dev/null +++ b/configs/coreboot_defconfig @@ -0,0 +1,45 @@ +CONFIG_X86=y +CONFIG_SYS_TEXT_BASE=0x1110000 +CONFIG_VENDOR_COREBOOT=y +CONFIG_TARGET_COREBOOT=y +CONFIG_FIT=y +CONFIG_BOOTSTAGE=y +CONFIG_BOOTSTAGE_REPORT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_LAST_STAGE_INIT=y +CONFIG_HUSH_PARSER=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_IDE=y +CONFIG_CMD_PART=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +# CONFIG_CMD_NFS is not set +CONFIG_CMD_PING=y +CONFIG_CMD_TIME=y +CONFIG_CMD_BOOTSTAGE=y +CONFIG_CMD_TPM=y +CONFIG_CMD_TPM_TEST=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_MAC_PARTITION=y +CONFIG_ISO_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_BOOTP_BOOTPATH=y +CONFIG_BOOTP_GATEWAY=y +CONFIG_BOOTP_HOSTNAME=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_TPM_TIS_LPC=y +CONFIG_USB_STORAGE=y +CONFIG_USB_KEYBOARD=y +CONFIG_CONSOLE_SCROLL_LINES=5 +CONFIG_TPM=y diff --git a/doc/README.x86 b/doc/README.x86 index 772e8d2a86..b1663a4111 100644 --- a/doc/README.x86 +++ b/doc/README.x86 @@ -46,7 +46,7 @@ Build Instructions for U-Boot as coreboot payload Building U-Boot as a coreboot payload is just like building U-Boot for targets on other architectures, like below: -$ make coreboot-x86_defconfig +$ make coreboot_defconfig $ make all Note this default configuration will build a U-Boot payload for the QEMU board.