Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-16 17:58:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/include/configs/x86-common.h

60 lines
1.3 KiB
C
Raw Normal View History

SPDX: Convert all of our single license tags to Linux Kernel style When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
2018-05-06 21:58:06 +00:00
/* SPDX-License-Identifier: GPL-2.0+ */
x86: config: Move common x86 configs to a common file Many of the x86 CONFIG options will be common across different boards. Move them to a common file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2014-11-11 01:00:23 +00:00
/*
* Copyright (c) 2011 The Chromium OS Authors.
* (C) Copyright 2008
* Graeme Russ, graeme.russ@gmail.com.
*/
#include <asm/ibmpc.h>
#ifndef __CONFIG_X86_COMMON_H
#define __CONFIG_X86_COMMON_H
/*-----------------------------------------------------------------------
* CPU Features
*/
global: Move remaining CONFIG_SYS_* to CFG_SYS_* The rest of the unmigrated CONFIG symbols in the CONFIG_SYS namespace do not easily transition to Kconfig. In many cases they likely should come from the device tree instead. Move these out of CONFIG namespace and in to CFG namespace. Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2022-11-16 18:10:41 +00:00
#define CFG_SYS_STACK_SIZE (32 * 1024)
x86: config: Move common x86 configs to a common file Many of the x86 CONFIG options will be common across different boards. Move them to a common file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2014-11-11 01:00:23 +00:00
/*-----------------------------------------------------------------------
* Environment configuration
*/
/*-----------------------------------------------------------------------
* USB configuration
*/
x86: Add ramboot and nfsboot commands in x86-common.h It is very common in the debug stage to test U-Boot loading a linux kernel. The commands to boot linux kernel with ramdisk and nfs as the root are common to all x86 targets, so it makes sense to add them as the U-Boot default environment in x86-common.h. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chroimum.org>
2015-03-12 05:08:46 +00:00
/* Default environment */
global: Migrate CONFIG_RAMDISK_ADDR to CFG Perform a simple rename of CONFIG_RAMDISK_ADDR to CFG_RAMDISK_ADDR Signed-off-by: Tom Rini <trini@konsulko.com>
2022-12-04 15:13:39 +00:00
#define CFG_RAMDISK_ADDR 0x4000000
x86: efi: payload: Turn on acpi in the kernel command line Now that we have full Linux kernel boot support on EFI payload, avoid pass "acpi=off" to the kernel command line. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2018-08-23 15:24:11 +00:00
#if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
global: Migrate CONFIG_OTHBOOTARGS to CFG Perform a simple rename of CONFIG_OTHBOOTARGS to CFG_OTHBOOTARGS Signed-off-by: Tom Rini <trini@konsulko.com>
2022-12-04 15:13:24 +00:00
#define CFG_OTHBOOTARGS "othbootargs=\0"
x86: Remove acpi=off boot parameter when ACPI is on Remove the kernel boot parameter acpi=off so that kernel can turn on ACPI support. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Tested-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
2016-05-07 14:46:35 +00:00
#else
global: Migrate CONFIG_OTHBOOTARGS to CFG Perform a simple rename of CONFIG_OTHBOOTARGS to CFG_OTHBOOTARGS Signed-off-by: Tom Rini <trini@konsulko.com>
2022-12-04 15:13:24 +00:00
#define CFG_OTHBOOTARGS "othbootargs=acpi=off\0"
x86: Remove acpi=off boot parameter when ACPI is on Remove the kernel boot parameter acpi=off so that kernel can turn on ACPI support. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Tested-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
2016-05-07 14:46:35 +00:00
#endif
x86: Add ramboot and nfsboot commands in x86-common.h It is very common in the debug stage to test U-Boot loading a linux kernel. The commands to boot linux kernel with ramdisk and nfs as the root are common to all x86 targets, so it makes sense to add them as the U-Boot default environment in x86-common.h. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chroimum.org>
2015-03-12 05:08:46 +00:00
x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n Use DISTRO_BOOTENV to decouple BOOTENV from CONFIG_DISTRO_DEFAULTS. Reported-by: Heinrich Schuchardt <xypron.debian@gmx.de> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2019-08-14 08:23:05 +00:00
#if defined(CONFIG_DISTRO_DEFAULTS)
#define DISTRO_BOOTENV BOOTENV
#else
#define DISTRO_BOOTENV
x86: qemu: Fix non-working ramboot and nfsboot environment variables With qemu-x86 starting to use config_distro_bootcmd, the pre-defined ramboot and nfsboot commands do not work any more. This is caused by undefined environment variable 'ramdiskaddr' that was previously set in CONFIG_EXTRA_ENV_SETTINGS but later CONFIG_EXTRA_ENV_SETTINGS was redefined for distro boot. Update the x86 generic CONFIG_EXTRA_ENV_SETTINGS to consider distro boot, and remove the one in qemu-x86.h. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2019-07-28 15:13:58 +00:00
#endif
x86: coreboot: Support getting a logo from virtio Enable this feature so that a splash screen can be provided. Signed-off-by: Simon Glass <sjg@chromium.org>
2021-11-19 20:24:06 +00:00
#ifndef SPLASH_SETTINGS
#define SPLASH_SETTINGS
#endif
global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG Perform a simple rename of CONFIG_EXTRA_ENV_SETTINGS to CFG_EXTRA_ENV_SETTINGS Signed-off-by: Tom Rini <trini@konsulko.com>
2022-12-04 15:03:50 +00:00
#define CFG_EXTRA_ENV_SETTINGS \
x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n Use DISTRO_BOOTENV to decouple BOOTENV from CONFIG_DISTRO_DEFAULTS. Reported-by: Heinrich Schuchardt <xypron.debian@gmx.de> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2019-08-14 08:23:05 +00:00
DISTRO_BOOTENV \
global: Migrate CONFIG_STD_DEVICES_SETTINGS to CFG Perform a simple rename of CONFIG_STD_DEVICES_SETTINGS to CFG_STD_DEVICES_SETTINGS Signed-off-by: Tom Rini <trini@konsulko.com>
2022-12-04 15:13:56 +00:00
CFG_STD_DEVICES_SETTINGS \
x86: coreboot: Support getting a logo from virtio Enable this feature so that a splash screen can be provided. Signed-off-by: Simon Glass <sjg@chromium.org>
2021-11-19 20:24:06 +00:00
SPLASH_SETTINGS \
x86: qemu: Make host bridge (b.d.f=0.0.0) visible The default weak version of pci_skip_dev() in drivers/pci/pci_common.c skips the host bridge (b.d.f = 0.0.0) which is actually the i440fx/q35 chipset for QEMU targets. Define CONFIG_PCI_CONFIG_HOST_BRIDGE to make it visible in the PCI configuration space. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
2015-05-23 16:12:32 +00:00
"pciconfighost=1\0" \
x86: Add ramboot and nfsboot commands in x86-common.h It is very common in the debug stage to test U-Boot loading a linux kernel. The commands to boot linux kernel with ramdisk and nfs as the root are common to all x86 targets, so it makes sense to add them as the U-Boot default environment in x86-common.h. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chroimum.org>
2015-03-12 05:08:46 +00:00
"netdev=eth0\0" \
"consoledev=ttyS0\0" \
global: Migrate CONFIG_OTHBOOTARGS to CFG Perform a simple rename of CONFIG_OTHBOOTARGS to CFG_OTHBOOTARGS Signed-off-by: Tom Rini <trini@konsulko.com>
2022-12-04 15:13:24 +00:00
CFG_OTHBOOTARGS \
x86: qemu: Fix non-working ramboot and nfsboot environment variables With qemu-x86 starting to use config_distro_bootcmd, the pre-defined ramboot and nfsboot commands do not work any more. This is caused by undefined environment variable 'ramdiskaddr' that was previously set in CONFIG_EXTRA_ENV_SETTINGS but later CONFIG_EXTRA_ENV_SETTINGS was redefined for distro boot. Update the x86 generic CONFIG_EXTRA_ENV_SETTINGS to consider distro boot, and remove the one in qemu-x86.h. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2019-07-28 15:13:58 +00:00
"scriptaddr=0x7000000\0" \
"kernel_addr_r=0x1000000\0" \
"ramdisk_addr_r=0x4000000\0" \
x86: qemu: Fix build warnings with CONFIG_DISTRO_DEFAULTS=n Use DISTRO_BOOTENV to decouple BOOTENV from CONFIG_DISTRO_DEFAULTS. Reported-by: Heinrich Schuchardt <xypron.debian@gmx.de> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
2019-08-14 08:23:05 +00:00
"ramdiskfile=initramfs.gz\0"
x86: Add ramboot and nfsboot commands in x86-common.h It is very common in the debug stage to test U-Boot loading a linux kernel. The commands to boot linux kernel with ramdisk and nfs as the root are common to all x86 targets, so it makes sense to add them as the U-Boot default environment in x86-common.h. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chroimum.org>
2015-03-12 05:08:46 +00:00
x86: config: Move common x86 configs to a common file Many of the x86 CONFIG options will be common across different boards. Move them to a common file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2014-11-11 01:00:23 +00:00
#endif /* __CONFIG_H */
Reference in a new issue Copy permalink