initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,64 @@
|
||||
From 8458abb357cd981f55d730ec2d74459a3042e571 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 6 Oct 2020 21:52:20 +0200
|
||||
Subject: [PATCH] fix build with gcc 10
|
||||
|
||||
Define variables in header files as extern to avoid the following build failure
|
||||
with gcc 10 (which defaults to -fno-common):
|
||||
|
||||
/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-ld:
|
||||
/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/mmc.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67:
|
||||
multiple definition of `sdio_func_type';
|
||||
/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/core.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67:
|
||||
first defined here
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/b6070c0721b33824e71833ce53423979980aa598
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/xvisor/xvisor/pull/125]
|
||||
---
|
||||
drivers/mmc/core/core.h | 2 +-
|
||||
emulators/display/drawfn.h | 10 +++++-----
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
|
||||
index d75d135a..e2ca3141 100644
|
||||
--- a/drivers/mmc/core/core.h
|
||||
+++ b/drivers/mmc/core/core.h
|
||||
@@ -64,7 +64,7 @@ int mmc_go_idle(struct mmc_host *host);
|
||||
* Note: Must be called with host->lock held.
|
||||
*/
|
||||
extern struct vmm_bus sdio_bus_type;
|
||||
-struct vmm_device_type sdio_func_type;
|
||||
+extern struct vmm_device_type sdio_func_type;
|
||||
|
||||
int __sdio_attach(struct mmc_host *host);
|
||||
|
||||
diff --git a/emulators/display/drawfn.h b/emulators/display/drawfn.h
|
||||
index f9163cff..385deaf6 100644
|
||||
--- a/emulators/display/drawfn.h
|
||||
+++ b/emulators/display/drawfn.h
|
||||
@@ -69,14 +69,14 @@ typedef void (*drawfn)(struct vmm_surface *,
|
||||
DRAWFN_ORDER_MAX * \
|
||||
DRAWFN_FORMAT_MAX)
|
||||
|
||||
-drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE];
|
||||
+extern drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE];
|
||||
|
||||
-drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE];
|
||||
+extern drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE];
|
||||
|
||||
-drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE];
|
||||
+extern drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE];
|
||||
|
||||
-drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE];
|
||||
+extern drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE];
|
||||
|
||||
-drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE];
|
||||
+extern drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE];
|
||||
|
||||
#endif
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
From 0e07e82121697d99470a147eadad9a708889c4df Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 2 Sep 2021 18:13:03 +0200
|
||||
Subject: [PATCH] psmouse-back.c: fix build with gcc 11
|
||||
|
||||
Fix the following build failures with gcc 11 by defining inline
|
||||
functions as static:
|
||||
|
||||
/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/build/drivers/drivers.o: in function `psmouse_extensions':
|
||||
/home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `lifebook_detect'
|
||||
/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `alps_detect'
|
||||
/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `ps2pp_init'
|
||||
/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `trackpoint_detect'
|
||||
/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.1.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/xvisor-0.3.0/drivers/input/mouse/psmouse-base.c:783: undefined reference to `fsp_detect'
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/69062b9c80567d135edd48890165e69881cf7295
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
drivers/input/mouse/alps.h | 4 ++--
|
||||
drivers/input/mouse/lifebook.h | 6 +++---
|
||||
drivers/input/mouse/logips2pp.h | 2 +-
|
||||
drivers/input/mouse/sentelic.h | 4 ++--
|
||||
drivers/input/mouse/trackpoint.h | 2 +-
|
||||
5 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
|
||||
index ae1ac354..acc1e89e 100644
|
||||
--- a/drivers/input/mouse/alps.h
|
||||
+++ b/drivers/input/mouse/alps.h
|
||||
@@ -51,11 +51,11 @@ struct alps_data {
|
||||
int alps_detect(struct psmouse *psmouse, bool set_properties);
|
||||
int alps_init(struct psmouse *psmouse);
|
||||
#else
|
||||
-inline int alps_detect(struct psmouse *psmouse, bool set_properties)
|
||||
+static inline int alps_detect(struct psmouse *psmouse, bool set_properties)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
-inline int alps_init(struct psmouse *psmouse)
|
||||
+static inline int alps_init(struct psmouse *psmouse)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h
|
||||
index 4c4326c6..0baf02a7 100644
|
||||
--- a/drivers/input/mouse/lifebook.h
|
||||
+++ b/drivers/input/mouse/lifebook.h
|
||||
@@ -16,14 +16,14 @@ void lifebook_module_init(void);
|
||||
int lifebook_detect(struct psmouse *psmouse, bool set_properties);
|
||||
int lifebook_init(struct psmouse *psmouse);
|
||||
#else
|
||||
-inline void lifebook_module_init(void)
|
||||
+static inline void lifebook_module_init(void)
|
||||
{
|
||||
}
|
||||
-inline int lifebook_detect(struct psmouse *psmouse, bool set_properties)
|
||||
+static inline int lifebook_detect(struct psmouse *psmouse, bool set_properties)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
-inline int lifebook_init(struct psmouse *psmouse)
|
||||
+static inline int lifebook_init(struct psmouse *psmouse)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
diff --git a/drivers/input/mouse/logips2pp.h b/drivers/input/mouse/logips2pp.h
|
||||
index 0c186f02..439e9c58 100644
|
||||
--- a/drivers/input/mouse/logips2pp.h
|
||||
+++ b/drivers/input/mouse/logips2pp.h
|
||||
@@ -14,7 +14,7 @@
|
||||
#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
|
||||
int ps2pp_init(struct psmouse *psmouse, bool set_properties);
|
||||
#else
|
||||
-inline int ps2pp_init(struct psmouse *psmouse, bool set_properties)
|
||||
+static inline int ps2pp_init(struct psmouse *psmouse, bool set_properties)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
diff --git a/drivers/input/mouse/sentelic.h b/drivers/input/mouse/sentelic.h
|
||||
index aa697ece..42df9e3b 100644
|
||||
--- a/drivers/input/mouse/sentelic.h
|
||||
+++ b/drivers/input/mouse/sentelic.h
|
||||
@@ -123,11 +123,11 @@ struct fsp_data {
|
||||
extern int fsp_detect(struct psmouse *psmouse, bool set_properties);
|
||||
extern int fsp_init(struct psmouse *psmouse);
|
||||
#else
|
||||
-inline int fsp_detect(struct psmouse *psmouse, bool set_properties)
|
||||
+static inline int fsp_detect(struct psmouse *psmouse, bool set_properties)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
-inline int fsp_init(struct psmouse *psmouse)
|
||||
+static inline int fsp_init(struct psmouse *psmouse)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
|
||||
index e558a709..f14e59c0 100644
|
||||
--- a/drivers/input/mouse/trackpoint.h
|
||||
+++ b/drivers/input/mouse/trackpoint.h
|
||||
@@ -145,7 +145,7 @@ struct trackpoint_data
|
||||
#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
|
||||
int trackpoint_detect(struct psmouse *psmouse, bool set_properties);
|
||||
#else
|
||||
-inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
|
||||
+static inline int trackpoint_detect(struct psmouse *psmouse, bool set_properties)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS
|
||||
bool
|
||||
default y
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_arm || BR2_aarch64 || BR2_x86_64
|
||||
depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV7M
|
||||
|
||||
menuconfig BR2_PACKAGE_XVISOR
|
||||
bool "xvisor"
|
||||
depends on BR2_PACKAGE_XVISOR_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
help
|
||||
Xvisor is an open-source type-1 hypervisor, which aims at
|
||||
providing a monolithic, light-weight, portable, and flexible
|
||||
virtualization solution.
|
||||
|
||||
http://www.xhypervisor.org/
|
||||
|
||||
if BR2_PACKAGE_XVISOR
|
||||
|
||||
choice
|
||||
prompt "Xvisor configuration"
|
||||
default BR2_PACKAGE_XVISOR_USE_DEFCONFIG
|
||||
|
||||
config BR2_PACKAGE_XVISOR_USE_DEFCONFIG
|
||||
bool "Using an in-tree defconfig file"
|
||||
|
||||
config BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG
|
||||
bool "Using a custom (def)config file"
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_PACKAGE_XVISOR_DEFCONFIG
|
||||
string "Defconfig name"
|
||||
default "generic-v5" if BR2_ARM_CPU_ARMV5
|
||||
default "generic-v6" if BR2_ARM_CPU_ARMV6
|
||||
default "generic-v7" if BR2_ARM_CPU_ARMV7A
|
||||
default "generic-v8" if BR2_aarch64
|
||||
default "x86_64_generic" if BR2_x86_64
|
||||
depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG
|
||||
help
|
||||
Name of the Xvisor defconfig file to use, without the
|
||||
trailing -defconfig. The defconfig is located in
|
||||
arch/<arch>/configs in the source tree.
|
||||
|
||||
config BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE
|
||||
string "Configuration file path"
|
||||
depends on BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG
|
||||
help
|
||||
Path to the Xvisor configuration file
|
||||
|
||||
config BR2_PACKAGE_XVISOR_CREATE_UBOOT_IMAGE
|
||||
bool "Create U-Boot image of Xvisor"
|
||||
depends on BR2_arm
|
||||
select BR2_PACKAGE_HOST_UBOOT_TOOLS
|
||||
help
|
||||
Create an image file of Xvisor loadable from Das U-Boot.
|
||||
|
||||
config BR2_PACKAGE_XVISOR_BUILD_TEST_DTB
|
||||
bool "Build test device-tree blobs"
|
||||
help
|
||||
Build test device-tree blobs for popular boards.
|
||||
|
||||
endif
|
||||
|
||||
comment "xvisor needs a toolchain w/ gcc >= 4.9"
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
depends on BR2_PACKAGE_XVISOR_ARCH_SUPPORTS
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally generated
|
||||
sha256 81660d26a0bc63979ba40872f10511df777185712eba2d0e19e816438388de05 xvisor-0.3.0.tar.xz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
@@ -0,0 +1,86 @@
|
||||
################################################################################
|
||||
#
|
||||
# xvisor
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XVISOR_VERSION = 0.3.0
|
||||
XVISOR_SOURCE = xvisor-$(XVISOR_VERSION).tar.xz
|
||||
XVISOR_SITE = http://www.xhypervisor.org/tarball
|
||||
XVISOR_LICENSE = GPL-2.0+
|
||||
XVISOR_LICENSE_FILES = COPYING
|
||||
XVISOR_INSTALL_IMAGES = YES
|
||||
XVISOR_INSTALL_TARGET = NO
|
||||
XVISOR_DEPENDENCIES = host-bison host-dtc host-flex
|
||||
|
||||
XVISOR_MAKE_TARGETS = all
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XVISOR_BUILD_TEST_DTB),y)
|
||||
XVISOR_MAKE_TARGETS += dtbs
|
||||
endif
|
||||
|
||||
XVISOR_KCONFIG_DOTCONFIG = build/openconf/.config
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XVISOR_USE_DEFCONFIG),y)
|
||||
XVISOR_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_PACKAGE_XVISOR_DEFCONFIG))-defconfig
|
||||
else ifeq ($(BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG),y)
|
||||
XVISOR_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE))
|
||||
endif
|
||||
XVISOR_KCONFIG_EDITORS = menuconfig
|
||||
|
||||
ifeq ($(BR2_x86_64),y)
|
||||
XVISOR_ARCH = x86
|
||||
else ifeq ($(BR2_arm)$(BR2_aarch64),y)
|
||||
XVISOR_ARCH = arm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XVISOR)$(BR_BUILDING),yy)
|
||||
ifeq ($(XVISOR_ARCH),)
|
||||
$(error "Architecture not supported by XVisor")
|
||||
endif
|
||||
endif
|
||||
|
||||
XVISOR_MAKE_ENV = \
|
||||
ARCH=$(XVISOR_ARCH) \
|
||||
CROSS_COMPILE=$(TARGET_CROSS)
|
||||
|
||||
XVISOR_MAKE_OPTS = $(if $(VERBOSE),VERBOSE=1)
|
||||
|
||||
define XVISOR_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(XVISOR_MAKE_ENV) $(MAKE) $(XVISOR_MAKE_OPTS) \
|
||||
-C $(@D) $(XVISOR_MAKE_TARGETS)
|
||||
endef
|
||||
|
||||
define XVISOR_INSTALL_IMAGES_CMDS
|
||||
$(INSTALL) -m 0644 -D $(@D)/build/vmm.bin $(BINARIES_DIR)/vmm.bin
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XVISOR_CREATE_UBOOT_IMAGE),y)
|
||||
XVISOR_DEPENDENCIES += host-uboot-tools
|
||||
define XVISOR_CREATE_UBOOT_IMAGE
|
||||
$(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux -T kernel -C none \
|
||||
-a 0x00008000 -e 0x00008000 \
|
||||
-n Xvisor -d $(BINARIES_DIR)/vmm.bin $(BINARIES_DIR)/uvmm.bin
|
||||
endef
|
||||
endif
|
||||
|
||||
XVISOR_POST_INSTALL_IMAGES_HOOKS += XVISOR_CREATE_UBOOT_IMAGE
|
||||
|
||||
# Checks to give errors that the user can understand
|
||||
ifeq ($(BR_BUILDING),y)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XVISOR_USE_DEFCONFIG),y)
|
||||
ifeq ($(call qstrip,$(BR2_PACKAGE_XVISOR_DEFCONFIG)),)
|
||||
$(error No Xvisor defconfig name specified, check your BR2_PACKAGE_XVISOR_DEFCONFIG setting)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG),y)
|
||||
ifeq ($(BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE),)
|
||||
$(error No Xvisor configuration file specified, check your BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE setting)
|
||||
endif
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
$(eval $(kconfig-package))
|
||||
Reference in New Issue
Block a user