mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-22 06:57:51 +00:00
L4Linux: make ballooning driver configureable
To circumvent compilation errors with the older L4Android Linux kernel version, the ballooning driver is included in the more recent L4Linux kernel only. Moreover, to be able to maintain L4Android / L4Linux in a more convenient way, e.g. to apply patches valid for both versions, we use the same git clone that is used for L4Linux instead of using the upstream L4Android version by applying patches. Fixes #1390
This commit is contained in:
parent
78e8e04b88
commit
0ac039fad7
@ -35,8 +35,9 @@ CONFIG_L4_PLATFORM_GENERIC=y
|
|||||||
# CONFIG_L4_NET_L4SHM is not set
|
# CONFIG_L4_NET_L4SHM is not set
|
||||||
# CONFIG_L4_SERIAL is not set
|
# CONFIG_L4_SERIAL is not set
|
||||||
# CONFIG_L4_SERIAL_SHM is not set
|
# CONFIG_L4_SERIAL_SHM is not set
|
||||||
CONFIG_SCREEN_GENODE=y
|
CONFIG_GENODE_SCREEN=y
|
||||||
CONFIG_SERIAL_GENODE=y
|
CONFIG_GENODE_SERIAL=y
|
||||||
|
# CONFIG_GENODE_BALLOON is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Debugging options
|
# Debugging options
|
||||||
|
@ -34,8 +34,9 @@ CONFIG_PHYSICAL_START=0x0
|
|||||||
# CONFIG_L4_NET_L4SHM is not set
|
# CONFIG_L4_NET_L4SHM is not set
|
||||||
# CONFIG_L4_SERIAL is not set
|
# CONFIG_L4_SERIAL is not set
|
||||||
# CONFIG_L4_SERIAL_SHM is not set
|
# CONFIG_L4_SERIAL_SHM is not set
|
||||||
CONFIG_SCREEN_GENODE=y
|
CONFIG_GENODE_SCREEN=y
|
||||||
CONFIG_SERIAL_GENODE=y
|
CONFIG_GENODE_SERIAL=y
|
||||||
|
# CONFIG_GENODE_BALLOON is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Debugging options
|
# Debugging options
|
||||||
|
@ -35,8 +35,9 @@ CONFIG_L4_PLATFORM_GENERIC=y
|
|||||||
# CONFIG_L4_NET_L4SHM is not set
|
# CONFIG_L4_NET_L4SHM is not set
|
||||||
# CONFIG_L4_SERIAL is not set
|
# CONFIG_L4_SERIAL is not set
|
||||||
# CONFIG_L4_SERIAL_SHM is not set
|
# CONFIG_L4_SERIAL_SHM is not set
|
||||||
CONFIG_SCREEN_GENODE=y
|
CONFIG_GENODE_SCREEN=y
|
||||||
CONFIG_SERIAL_GENODE=y
|
CONFIG_GENODE_SERIAL=y
|
||||||
|
CONFIG_GENODE_BALLOON=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Debugging options
|
# Debugging options
|
||||||
|
@ -34,8 +34,9 @@ CONFIG_PHYSICAL_START=0x100000
|
|||||||
# CONFIG_L4_NET_L4SHM is not set
|
# CONFIG_L4_NET_L4SHM is not set
|
||||||
# CONFIG_L4_SERIAL is not set
|
# CONFIG_L4_SERIAL is not set
|
||||||
# CONFIG_L4_SERIAL_SHM is not set
|
# CONFIG_L4_SERIAL_SHM is not set
|
||||||
CONFIG_SCREEN_GENODE=y
|
CONFIG_GENODE_SCREEN=y
|
||||||
CONFIG_SERIAL_GENODE=y
|
CONFIG_GENODE_SERIAL=y
|
||||||
|
CONFIG_GENODE_BALLOON=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Debugging options
|
# Debugging options
|
||||||
|
@ -1 +1 @@
|
|||||||
cc3203080fe5e1c5029c47fd7f73fab76c71b9ed
|
07d72c264878024efa078d14241f1648172a39de
|
||||||
|
@ -1,11 +1,9 @@
|
|||||||
LICENSE := GPLv2
|
LICENSE := GPLv2
|
||||||
VERSION := git
|
VERSION := git
|
||||||
DOWNLOADS := l4android.git
|
DOWNLOADS := l4android.git
|
||||||
URL(l4android) := http://git.l4android.org/kernel
|
URL(l4android) := https://github.com/skalk/l4linux.git
|
||||||
REV(l4android) := bf83cc85e672bfafddc0fb85398129e427d6780f
|
REV(l4android) := cea6e7ab97a5ad421e53d456dd940893d5a14866
|
||||||
DIR(l4android) := src/l4android
|
DIR(l4android) := src/l4android
|
||||||
PATCH_OPT := -p0 -d src/l4android
|
|
||||||
PATCHES = $(addprefix $(REP_DIR)/patches/,l4lx_genode.patch icmp_align.patch tcp_mem.patch android_binder.patch)
|
|
||||||
sym_link := src/l4android/arch/l4/drivers
|
sym_link := src/l4android/arch/l4/drivers
|
||||||
|
|
||||||
default: $(sym_link)
|
default: $(sym_link)
|
||||||
|
@ -1 +1 @@
|
|||||||
e431e60cfc9fe79a849f79353de2e49c4c8d123e
|
60792b132cd767f53991729999939a28b742f74d
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
LICENSE := GPLv2
|
LICENSE := GPLv2
|
||||||
VERSION := git
|
VERSION := git
|
||||||
DOWNLOADS := l4linux.git
|
DOWNLOADS := l4linux.git
|
||||||
URL(l4linux) := https://github.com/ssumpf/l4linux.git
|
URL(l4linux) := https://github.com/skalk/l4linux.git
|
||||||
REV(l4linux) := 75354b3f0f6ed7b9ebec118670213062c5a4c78e
|
REV(l4linux) := f2eebaebf7d304dec7eb49ca5b9a020603cf6cb6
|
||||||
DIR(l4linux) := src/l4linux
|
DIR(l4linux) := src/l4linux
|
||||||
sym_link := src/l4linux/arch/l4/drivers
|
sym_link := src/l4linux/arch/l4/drivers
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
obj-y += genode_serial.o
|
obj-y += genode_serial.o
|
||||||
obj-y += genode_balloon.o
|
obj-$(CONFIG_GENODE_BALLOON) += genode_balloon.o
|
||||||
obj-$(CONFIG_RTC_CLASS) += genode_rtc.o
|
obj-$(CONFIG_RTC_CLASS) += genode_rtc.o
|
||||||
obj-$(CONFIG_FB) += genode_fb.o
|
obj-$(CONFIG_FB) += genode_fb.o
|
||||||
obj-$(CONFIG_BLOCK) += genode_block.o
|
obj-$(CONFIG_BLOCK) += genode_block.o
|
||||||
obj-$(CONFIG_NET) += genode_net.o
|
obj-$(CONFIG_NET) += genode_net.o
|
||||||
|
Loading…
Reference in New Issue
Block a user