stubdom: explcitly add libc and lwip Mini-OS config options

Today the Mini-OS build systems derives libc and lwip config options
from the stubdom and LWIPDIR make variables supplied by the Xen build
system.

In order to prepare those being explicit Mini-OS config options, add
them to the related stubdom Mini-OS config files.

While at it remove the CONFIG_START_NETWORK setting from config files
disabling lwip, as CONFIG_START_NETWORK requires lwip for becoming
effective.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/stubdom/c/minios.cfg b/stubdom/c/minios.cfg
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..56d65510cdce1ea96ad89f60a8c9c51cdae2bac6 100644 (file)
--- a/stubdom/c/minios.cfg
+++ b/stubdom/c/minios.cfg
@@ -0,0 +1,2 @@
+CONFIG_LIBC=y
+CONFIG_LWIP=y

diff --git a/stubdom/grub/minios.cfg b/stubdom/grub/minios.cfg
index 8df49092cd3f3ee7fc6fc3d2ac65f209fee9e63b..5145b357e011240637866360fe41f4f5128f7393 100644 (file)
--- a/stubdom/grub/minios.cfg
+++ b/stubdom/grub/minios.cfg
@@ -1,3 +1,4 @@
-CONFIG_START_NETWORK=n
+CONFIG_LIBC=y
+CONFIG_LWIP=n
 CONFIG_SPARSE_BSS=n
 CONFIG_TPMFRONT=y

diff --git a/stubdom/ioemu-minios.cfg b/stubdom/ioemu-minios.cfg
index a65baa37654224de7a981b8cf4fbe662669b1b95..6153ae05f8bc491e64b37cd5bf361f70e2d6ba1b 100644 (file)
--- a/stubdom/ioemu-minios.cfg
+++ b/stubdom/ioemu-minios.cfg
@@ -1,3 +1,5 @@
+CONFIG_LIBC=y
+CONFIG_LWIP=y
 CONFIG_START_NETWORK=n
 CONFIG_QEMU_XS_ARGS=y
 CONFIG_PCIFRONT=y

diff --git a/stubdom/vtpm/minios.cfg b/stubdom/vtpm/minios.cfg
index 31652ee4f214fa7aadd7724cac3a0be71ae1cbe8..22f66f1351724f72e827b1ba1a5de16f6de384cc 100644 (file)
--- a/stubdom/vtpm/minios.cfg
+++ b/stubdom/vtpm/minios.cfg
@@ -1,7 +1,8 @@
+CONFIG_LIBC=y
+CONFIG_LWIP=n
 CONFIG_TPMFRONT=y
 CONFIG_TPM_TIS=n
 CONFIG_TPMBACK=y
-CONFIG_START_NETWORK=n
 CONFIG_TEST=n
 CONFIG_PCIFRONT=n
 CONFIG_BLKFRONT=y

diff --git a/stubdom/vtpmmgr/minios.cfg b/stubdom/vtpmmgr/minios.cfg
index 3fb383d30fe2d1d8786417b3764ab7c67f4e30a6..a9f13a2fd2cac7525299dec7dd57694ba072b22d 100644 (file)
--- a/stubdom/vtpmmgr/minios.cfg
+++ b/stubdom/vtpmmgr/minios.cfg
@@ -1,7 +1,8 @@
+CONFIG_LIBC=y
+CONFIG_LWIP=n
 CONFIG_TPMFRONT=y
 CONFIG_TPM_TIS=y
 CONFIG_TPMBACK=y
-CONFIG_START_NETWORK=n
 CONFIG_TEST=n
 CONFIG_PCIFRONT=n
 CONFIG_BLKFRONT=y

diff --git a/stubdom/xenstore-minios.cfg b/stubdom/xenstore-minios.cfg
index 239da519b995add42e9e31fd5b74ea73e62eaa7e..0252b59432e03cde089ad0837b4a72a01307bb25 100644 (file)
--- a/stubdom/xenstore-minios.cfg
+++ b/stubdom/xenstore-minios.cfg
@@ -1,3 +1,4 @@
+CONFIG_LIBC=y
 CONFIG_BLKFRONT=n
 CONFIG_NETFRONT=n
 CONFIG_FBFRONT=n

diff --git a/stubdom/xenstorepvh-minios.cfg b/stubdom/xenstorepvh-minios.cfg
index 752b90d7d36adc622bb54e27b9cb174023509af5..62a228f33d03bdec72a2f55a252a571fbec817fc 100644 (file)
--- a/stubdom/xenstorepvh-minios.cfg
+++ b/stubdom/xenstorepvh-minios.cfg
@@ -1,3 +1,4 @@
+CONFIG_LIBC=y
 CONFIG_PARAVIRT=n
 CONFIG_BLKFRONT=n
 CONFIG_NETFRONT=n