From 1c3fb3c61ae4af8b8ccf92afc90b48dfc0b597c7 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Wed, 11 Feb 2015 12:51:58 +0000
Subject: [build] Move branding information to config/branding.h

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/arch/i386/prefix/romprefix.S |  3 ++-
 src/config/branding.h            | 32 ++++++++++++++++++++++++++++++++
 src/config/general.h             | 16 ----------------
 src/core/version.c               |  1 +
 src/usr/autoboot.c               |  2 +-
 5 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 src/config/branding.h

(limited to 'src')

diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/i386/prefix/romprefix.S
index 7bc4fe8c..03ab8c78 100644
--- a/src/arch/i386/prefix/romprefix.S
+++ b/src/arch/i386/prefix/romprefix.S
@@ -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.
diff --git a/src/config/branding.h b/src/config/branding.h
new file mode 100644
index 00000000..e96d8ca7
--- /dev/null
+++ b/src/config/branding.h
@@ -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 */
diff --git a/src/config/general.h b/src/config/general.h
index 53920345..8ea10c4b 100644
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -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
  *
diff --git a/src/core/version.c b/src/core/version.c
index 1e1e9dac..87048e5d 100644
--- a/src/core/version.c
+++ b/src/core/version.c
@@ -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
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index 4aba593e..2e52c87b 100644
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -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
-- 
cgit v1.2.3-55-g7522