diff --git a/include/microkernel.h b/include/microkernel.h index f0bc87a4302..4940c945957 100644 --- a/include/microkernel.h +++ b/include/microkernel.h @@ -38,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/include/microkernel/k_boot.h b/include/microkernel/k_boot.h deleted file mode 100644 index 6b3260a1490..00000000000 --- a/include/microkernel/k_boot.h +++ /dev/null @@ -1,54 +0,0 @@ -/* microkernel/k_boot.h */ - -/* - * Copyright (c) 1997-2013 Wind River Systems, Inc. - * - * 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 Wind River Systems 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 __K_BOOT_H__ -#define __K_BOOT_H__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -struct boot_struct { - uint32_t data; - uint32_t reserved; -}; - -extern int ReadNextWordFromFlash(struct boot_struct *pBootStruct); -extern int PutWordToDevNull(struct boot_struct *pBootStruct); - -#ifdef __cplusplus -} -#endif - -#endif /* __K_BOOT_H__ */ diff --git a/kernel/microkernel/core/flashboot.c b/kernel/microkernel/core/flashboot.c deleted file mode 100644 index 95e93d54e25..00000000000 --- a/kernel/microkernel/core/flashboot.c +++ /dev/null @@ -1,50 +0,0 @@ -/* flashboot.c */ - -/* - * Copyright (c) 1997-2010, 2013-2014 Wind River Systems, Inc. - * - * 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 Wind River Systems 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. - */ - - -#include -#include -#include - -extern uint32_t *_currentbootinfo_word; - -int ReadNextWordFromFlash(struct boot_struct *pBootData) -{ - pBootData->data = *_currentbootinfo_word++; - return 0; -} - -int PutWordToDevNull(struct boot_struct *pBootData) -{ - ARG_UNUSED(pBootData); - return 0; -} diff --git a/make/target/kernel/defs.ukbuild b/make/target/kernel/defs.ukbuild index 3f3fdc0ee20..55ff8cbc657 100644 --- a/make/target/kernel/defs.ukbuild +++ b/make/target/kernel/defs.ukbuild @@ -55,11 +55,8 @@ iKERNEL_MAIN_C = ${iSYSGEN_OUT}/kernel_main.$c ##### # extra generated headers # -# include/microkernel is needed because kernel_main.c includes "k_boot.h", -# not "microkernel/k_boot.h" iKTYPE_kapp_INC += $(strip \ ${iSYSGEN_OUT} \ - ${vBASE}/include/microkernel \ ) iKTYPE_kapp_SRC += ${iKERNEL_MAIN_C} diff --git a/scripts/sysgen.py b/scripts/sysgen.py index d5999d79e84..c88d147a5b2 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -298,7 +298,6 @@ def kernel_main_c_header(): do_not_edit_warning + "\n" + "#include \n" + - "#include \n" + "#include \n" + "#include \n" + "#include \n")