From d93289b63db52c0bf8b29414063094a8f9c95c02 Mon Sep 17 00:00:00 2001 From: Sergiu Moga Date: Sat, 8 Apr 2023 13:30:09 +0300 Subject: [PATCH] plat/linuxu: Drop no longer used `liblinuxuplat_opts` structure Now that we rely on `ukplat_memregion` generic API's, we have no more need for linuxu configuration specific structures when it comes to memory regions. Signed-off-by: Sergiu Moga Reviewed-by: Michalis Pappas Approved-by: Razvan Deaconescu Tested-by: Unikraft CI GitHub-Closes: #848 --- plat/linuxu/include/linuxu/setup.h | 51 ------------------------------ plat/linuxu/setup.c | 3 -- 2 files changed, 54 deletions(-) delete mode 100644 plat/linuxu/include/linuxu/setup.h diff --git a/plat/linuxu/include/linuxu/setup.h b/plat/linuxu/include/linuxu/setup.h deleted file mode 100644 index 7eea2ee25..000000000 --- a/plat/linuxu/include/linuxu/setup.h +++ /dev/null @@ -1,51 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause */ -/* - * Authors: Simon Kuenzer - * - * - * Copyright (c) 2017, NEC Europe Ltd., NEC Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __SETUP_H__ -#define __SETUP_H__ - -#include - -struct liblinuxuplat_memregion { - void *base; - size_t len; -}; - -struct liblinuxuplat_opts { - struct liblinuxuplat_memregion heap; - struct liblinuxuplat_memregion initrd; -}; - -extern struct liblinuxuplat_opts _liblinuxuplat_opts; - -#endif /* __SETUP_H__ */ diff --git a/plat/linuxu/setup.c b/plat/linuxu/setup.c index b52577c5b..7db7843fc 100644 --- a/plat/linuxu/setup.c +++ b/plat/linuxu/setup.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -48,8 +47,6 @@ #include #include -struct liblinuxuplat_opts _liblinuxuplat_opts = { 0 }; - #define MB2B (1024 * 1024) static __u32 heap_size = CONFIG_LINUXU_DEFAULT_HEAPMB; -- 2.39.5