From cacf7234afaaef29d1fe5739f423fb2c1b29cdfb Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 6 Jun 2015 11:00:02 +0200 Subject: libpayload: retire LAR support Who knows it still? Change-Id: If6e36569cd9a1ba3da8b3fe84264cd2a6dfd634b Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/10443 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- payloads/libpayload/include/lar.h | 94 -------------------------------- payloads/libpayload/include/libpayload.h | 60 -------------------- 2 files changed, 154 deletions(-) delete mode 100644 payloads/libpayload/include/lar.h (limited to 'payloads/libpayload/include') diff --git a/payloads/libpayload/include/lar.h b/payloads/libpayload/include/lar.h deleted file mode 100644 index 8fe4cd1558..0000000000 --- a/payloads/libpayload/include/lar.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2006 coresystems GmbH - * (Written by Stefan Reinauer for coresystems GmbH) - * - * This file is dual-licensed. You can choose between: - * - The GNU GPL, version 2, as published by the Free Software Foundation - * - The revised BSD license (without advertising clause) - * - * --------------------------------------------------------------------------- - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 LAR_H -#define LAR_H - -#include - -#define LAR_MAGIC "LARCHIVE" -#define LAR_MAX_PATHLEN 1024 - -struct lar_header { - char magic[8]; - u32 len; - u32 reallen; - u32 checksum; - u32 compchecksum; - u32 offset; - /* Compression: - * 0 = no compression - * 1 = lzma - * 2 = nrv2b - * 3 = zeroes - */ - u32 compression; - u64 entry; - u64 loadaddress; -}; - -enum compalgo { - ALGO_NONE = 0, - ALGO_LZMA = 1, - ALGO_NRV2B = 2, - ALGO_ZEROES = 3, - /* invalid should always be the last entry. */ - ALGO_INVALID -}; - -struct mem_file { - void *start; - int len; - u32 reallen; - u32 compression; - void *entry; - void *loadaddress; -}; - -#endif /* LAR_H */ diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index c3ca123f1f..3e240710e7 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -58,9 +58,6 @@ #include #include #include -#ifdef CONFIG_LP_LAR -#include -#endif #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b)) @@ -354,63 +351,6 @@ struct timeval { int gettimeofday(struct timeval *tv, void *tz); /** @} */ -#ifdef CONFIG_LP_LAR -/** - * @defgroup lar LAR functions - * @{ - */ - -/** LAR file header */ -struct LAR { - void *start; /**< Location of the LAR in memory */ - int cindex; /**< Next file to return in readlar() */ - int count; /**< Number of entries in the header cache */ - int alloc; /**< Number of slots in the header cache */ - int eof; /**< Last entry in the header cache */ - void **headers; /**< Pointer to the header cache */ -}; - -/** A structure representing the next LAR entry */ -struct larent { - u8 name[LAR_MAX_PATHLEN]; /**< The name of the next LAR entry */ -}; - -/** A structure containing information about a LAR file */ -struct larstat { - u32 len; /**< Length of the file in the LAR */ - u32 reallen; /**< Length of the uncompressed file */ - u32 checksum; /**< Checksum of the uncompressed file */ - u32 compchecksum; /**< Checksum of the compressed file in the LAR */ - u32 offset; /**< Offset of the file in the LAR */ - u32 compression; /**< Compression type of the file */ - u64 entry; /**< Entry point of the file for executables */ - u64 loadaddress; /**< Address in memory to put the uncompressed file */ -}; - -/** A structure representing a LAR file */ -struct LFILE { - struct LAR *lar; /**< Pointer to the LAR struct */ - struct lar_header *header; /**< Pointer to the header struct */ - u32 size; /**< Size of the file */ - void *start; /**< Start of the file in memory */ - u32 offset; /**< Offset of the file in the LAR */ -}; - -struct LAR *openlar(void *addr); -int closelar(struct LAR *lar); -struct larent *readlar(struct LAR *lar); -void rewindlar(struct LAR *lar); -int larstat(struct LAR *lar, const char *path, struct larstat *buf); -void *larfptr(struct LAR *lar, const char *filename); -int lfverify(struct LAR *lar, const char *filename); -struct LFILE *lfopen(struct LAR *lar, const char *filename); -int lfread(void *ptr, size_t size, size_t nmemb, struct LFILE *stream); - -int lfseek(struct LFILE *stream, long offset, int whence); -int lfclose(struct LFILE *file); -/** @} */ -#endif - /** * @defgroup info System information functions * This module contains functions that return information about the system -- cgit v1.2.3