michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Remove k_boot.h and flashboot.c

Browse source 
The files k_boot.h and flashboot.c are obsolete.

Change-Id: Ieab69e714462079c2a836dacb7c5bab53d2e3b2b
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
This commit is contained in:
Peter Mitsis 2015-04-21 14:11:11 -04:00 • committed by Anas Nashif
commit bd969c97cc
5 changed files with 0 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/microkernel.h
View file

@ -38,7 +38,6 @@
#include <cputype.h>
#include <microkernel/k_types.h>
#include <microkernel/k_struct.h>
#include <microkernel/k_boot.h>
#include <microkernel/entries.h>
#include <clock_vars.h>

54
include/microkernel/k_boot.h
View file

@ -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 <stdint.h>
#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__ */

50
kernel/microkernel/core/flashboot.c
View file

@ -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 <microkernel/k_boot.h>
#include <toolchain.h>
#include <stdint.h>
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;
}

3
make/target/kernel/defs.ukbuild
View file

@ -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}

1
scripts/sysgen.py
View file

@ -298,7 +298,6 @@ def kernel_main_c_header():
do_not_edit_warning +
"\n" +
"#include <microkernel.h>\n" +
"#include <k_boot.h>\n" +
"#include <toolchain.h>\n" +
"#include <sections.h>\n" +
"#include <vxmicro.h>\n")