Explorar el Código

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

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown hace 9 años
padre
commit
1c3fb3c61a
Se han modificado 5 ficheros con 36 adiciones y 18 borrados
  1. 2
    1
      src/arch/i386/prefix/romprefix.S
  2. 32
    0
      src/config/branding.h
  3. 0
    16
      src/config/general.h
  4. 1
    0
      src/core/version.c
  5. 1
    1
      src/usr/autoboot.c

+ 2
- 1
src/arch/i386/prefix/romprefix.S Ver fichero

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

+ 32
- 0
src/config/branding.h Ver fichero

@@ -0,0 +1,32 @@
1
+#ifndef CONFIG_BRANDING_H
2
+#define CONFIG_BRANDING_H
3
+
4
+/** @file
5
+ *
6
+ * Branding configuration
7
+ *
8
+ */
9
+
10
+FILE_LICENCE ( GPL2_OR_LATER );
11
+
12
+#include <config/defaults.h>
13
+
14
+/*
15
+ * Branding
16
+ *
17
+ * Vendors may use these strings to add their own branding to iPXE.
18
+ * PRODUCT_NAME is displayed prior to any iPXE branding in startup
19
+ * messages, and PRODUCT_SHORT_NAME is used where a brief product
20
+ * label is required (e.g. in BIOS boot selection menus).
21
+ *
22
+ * To minimise end-user confusion, it's probably a good idea to either
23
+ * make PRODUCT_SHORT_NAME a substring of PRODUCT_NAME or leave it as
24
+ * "iPXE".
25
+ *
26
+ */
27
+#define PRODUCT_NAME ""
28
+#define PRODUCT_SHORT_NAME "iPXE"
29
+
30
+#include <config/local/branding.h>
31
+
32
+#endif /* CONFIG_BRANDING_H */

+ 0
- 16
src/config/general.h Ver fichero

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

+ 1
- 0
src/core/version.c Ver fichero

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

+ 1
- 1
src/usr/autoboot.c Ver fichero

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

Loading…
Cancelar
Guardar