sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-01-30 16:40:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

[build] Use REQUIRE_OBJECT() to drag in per-object configuration

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2015-03-04 17:22:07 +00:00
parent 04c1ea8170
commit 86ae6e6c18
11 changed files with 21 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -874,3 +874,6 @@ wait_for_tick:
popl %eax popl %eax
ret ret
.size wait_for_tick, . - wait_for_tick .size wait_for_tick, . - wait_for_tick
/* Drag in ROM configuration */
REQUIRE_OBJECT ( config_romprefix )

24
src/config/config_isaromprefix.c
View File

@@ -1,24 +0,0 @@
/*
* 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; either version 2 of the
* License, or (at your option) any later version.
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*
* You can also choose to distribute this program under the terms of
* the Unmodified Binary Distribution Licence (as given in the file
* COPYING.UBDL), provided that you have satisfied its requirements.
*/
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include "config_romprefix.c"

24
src/config/config_mromprefix.c
View File

@@ -1,24 +0,0 @@
/*
* 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; either version 2 of the
* License, or (at your option) any later version.
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*
* You can also choose to distribute this program under the terms of
* the Unmodified Binary Distribution Licence (as given in the file
* COPYING.UBDL), provided that you have satisfied its requirements.
*/
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include "config_romprefix.c"

24
src/config/config_pciromprefix.c
View File

@@ -1,24 +0,0 @@
/*
* 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; either version 2 of the
* License, or (at your option) any later version.
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*
* You can also choose to distribute this program under the terms of
* the Unmodified Binary Distribution Licence (as given in the file
* COPYING.UBDL), provided that you have satisfied its requirements.
*/
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include "config_romprefix.c"

3
src/drivers/bus/usb.c
View File

@@ -1903,5 +1903,8 @@ struct usb_port * usb_root_hub_port ( struct usb_device *usb ) {
return usb->port; return usb->port;
} }
/* Drag in USB configuration */
REQUIRE_OBJECT ( config_usb );
/* Drag in hub driver */ /* Drag in hub driver */
REQUIRE_OBJECT ( usbhub ); REQUIRE_OBJECT ( usbhub );

5
src/include/compiler.h
View File

@@ -115,15 +115,10 @@
#define PREFIX_OBJECT( _prefix ) _C2 ( _prefix, OBJECT ) #define PREFIX_OBJECT( _prefix ) _C2 ( _prefix, OBJECT )
#define OBJECT_SYMBOL PREFIX_OBJECT ( obj_ ) #define OBJECT_SYMBOL PREFIX_OBJECT ( obj_ )
#define REQUEST_EXPANDED( _sym ) REQUEST_SYMBOL ( _sym )
#define CONFIG_SYMBOL PREFIX_OBJECT ( obj_config_ )
/** Always provide the symbol for the current object (defined by -DOBJECT) */ /** Always provide the symbol for the current object (defined by -DOBJECT) */
PROVIDE_SYMBOL ( OBJECT_SYMBOL ); PROVIDE_SYMBOL ( OBJECT_SYMBOL );
/** Pull in an object-specific configuration file if available */
REQUEST_EXPANDED ( CONFIG_SYMBOL );
/** Explicitly require another object */ /** Explicitly require another object */
#define REQUIRE_OBJECT( _obj ) REQUIRE_SYMBOL ( obj_ ## _obj ) #define REQUIRE_OBJECT( _obj ) REQUIRE_SYMBOL ( obj_ ## _obj )

3
src/net/80211/net80211.c
View File

@@ -2826,3 +2826,6 @@ struct errortab common_wireless_errors[] __errortab = {
__einfo_errortab ( EINFO_ECONNREFUSED_ASSOC_DENIED ), __einfo_errortab ( EINFO_ECONNREFUSED_ASSOC_DENIED ),
__einfo_errortab ( EINFO_ECONNREFUSED_AUTH_ALGO_UNSUPP ), __einfo_errortab ( EINFO_ECONNREFUSED_AUTH_ALGO_UNSUPP ),
}; };
/* Drag in 802.11 configuration */
REQUIRE_OBJECT ( config_net80211 );

3
src/net/ethernet.c
View File

@@ -239,5 +239,8 @@ struct net_device * alloc_etherdev ( size_t priv_size ) {
return netdev; return netdev;
} }
/* Drag in Ethernet configuration */
REQUIRE_OBJECT ( config_ethernet );
/* Drag in Ethernet slow protocols */ /* Drag in Ethernet slow protocols */
REQUIRE_OBJECT ( eth_slow ); REQUIRE_OBJECT ( eth_slow );

3
src/net/fc.c
View File

@@ -1939,3 +1939,6 @@ struct fc_ulp * fc_ulp_get_port_id_type ( struct fc_port *port,
err_peer_get_wwn: err_peer_get_wwn:
return NULL; return NULL;
} }
/* Drag in Fibre Channel configuration */
REQUIRE_OBJECT ( config_fc );

3
src/net/infiniband.c
View File

@@ -999,5 +999,8 @@ struct ib_device * last_opened_ibdev ( void ) {
return ibdev; return ibdev;
} }
/* Drag in Infiniband configuration */
REQUIRE_OBJECT ( config_infiniband );
/* Drag in IPoIB */ /* Drag in IPoIB */
REQUIRE_OBJECT ( ipoib ); REQUIRE_OBJECT ( ipoib );

3
src/usr/route.c
View File

@@ -46,3 +46,6 @@ void route ( void ) {
} }
} }
} }
/* Drag in routing management configuration */
REQUIRE_OBJECT ( config_route );