narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[build] Move branding information to config/branding.h 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/34/head
Michael Brown 2015-02-11 12:51:58 +00:00
parent 32d20fdd7e
commit 1c3fb3c61a
5 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/arch/i386/prefix/romprefix.S
View File

@ -9,6 +9,7 @@
FILE_LICENCE ( GPL2_OR_LATER )
#include <config/general.h>
#include <config/branding.h>
#define PNP_SIGNATURE ( '$' + ( 'P' << 8 ) + ( 'n' << 16 ) + ( 'P' << 24 ) )
#define PMM_SIGNATURE ( '$' + ( 'P' << 8 ) + ( 'M' << 16 ) + ( 'M' << 24 ) )
@ -573,7 +574,7 @@ get_pmm_decompress_to:
* Note to hardware vendors:
*
* If you wish to brand this boot ROM, please do so by defining the
* strings PRODUCT_NAME and PRODUCT_SHORT_NAME in config/general.h.
* strings PRODUCT_NAME and PRODUCT_SHORT_NAME in config/branding.h.
*
* While nothing in the GPL prevents you from removing all references
* to iPXE or http://ipxe.org, we prefer you not to do so.

32
src/config/branding.h Normal file
View File

@ -0,0 +1,32 @@
#ifndef CONFIG_BRANDING_H
#define CONFIG_BRANDING_H
/** @file
*
* Branding configuration
*
*/
FILE_LICENCE ( GPL2_OR_LATER );
#include <config/defaults.h>
/*
* Branding
*
* Vendors may use these strings to add their own branding to iPXE.
* PRODUCT_NAME is displayed prior to any iPXE branding in startup
* messages, and PRODUCT_SHORT_NAME is used where a brief product
* label is required (e.g. in BIOS boot selection menus).
*
* To minimise end-user confusion, it's probably a good idea to either
* make PRODUCT_SHORT_NAME a substring of PRODUCT_NAME or leave it as
* "iPXE".
*
*/
#define PRODUCT_NAME ""
#define PRODUCT_SHORT_NAME "iPXE"
#include <config/local/branding.h>
#endif /* CONFIG_BRANDING_H */

16
src/config/general.h
View File

@ -11,22 +11,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <config/defaults.h>
/*
* Branding
*
* Vendors may use these strings to add their own branding to iPXE.
* PRODUCT_NAME is displayed prior to any iPXE branding in startup
* messages, and PRODUCT_SHORT_NAME is used where a brief product
* label is required (e.g. in BIOS boot selection menus).
*
* To minimise end-user confusion, it's probably a good idea to either
* make PRODUCT_SHORT_NAME a substring of PRODUCT_NAME or leave it as
* "iPXE".
*
*/
#define PRODUCT_NAME ""
#define PRODUCT_SHORT_NAME "iPXE"
/*
* Banner timeout configuration
*

1
src/core/version.c
View File

@ -29,6 +29,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <ipxe/features.h>
#include <ipxe/version.h>
#include <config/general.h>
#include <config/branding.h>
/**
* Create wide-character version of string

2
src/usr/autoboot.c
View File

@ -542,7 +542,7 @@ void ipxe ( struct net_device *netdev ) {
*
*
* If you wish to brand this build of iPXE, please do so by
* defining the string PRODUCT_NAME in config/general.h.
* defining the string PRODUCT_NAME in config/branding.h.
*
* While nothing in the GPL prevents you from removing all
* references to iPXE or http://ipxe.org, we prefer you not to