Commit 7acf3f56 authored by Mauro Ribeiro's avatar Mauro Ribeiro

rename config symbol / srctree usage

Change-Id: Ide74881abcb8845b10c988525e2577cf7666bd65
parent 17bf40a0
......@@ -11,9 +11,9 @@ NOSTDINC_FLAGS := \
-I$(M)/include/uapi \
-include $(M)/backport-include/backport/backport.h \
$(call backport-cc-disable-warning, unused-but-set-variable) \
-DCPTCFG_VERSION=\"$(BACKPORTS_VERSION)\" \
-DCPTCFG_KERNEL_VERSION=\"$(BACKPORTED_KERNEL_VERSION)\" \
-DCPTCFG_KERNEL_NAME=\"$(BACKPORTED_KERNEL_NAME)\" \
-DCONFIG_BACKPORT_VERSION=\"$(BACKPORTS_VERSION)\" \
-DCONFIG_BACKPORT_KERNEL_VERSION=\"$(BACKPORTED_KERNEL_VERSION)\" \
-DCONFIG_BACKPORT_KERNEL_NAME=\"$(BACKPORTED_KERNEL_NAME)\" \
$(BACKPORTS_GIT_TRACKER_DEF) \
$(CFLAGS)
......@@ -33,24 +33,24 @@ endif
obj-y += compat/
obj-$(CPTCFG_CFG80211) += net/wireless/
obj-$(CPTCFG_MAC80211) += net/mac80211/
obj-$(CPTCFG_WLAN) += drivers/net/wireless/
obj-$(CPTCFG_BT) += net/bluetooth/
obj-$(CPTCFG_BT) += drivers/bluetooth/
obj-$(CPTCFG_SSB) += drivers/ssb/
obj-$(CPTCFG_BCMA) += drivers/bcma/
obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
obj-$(CPTCFG_NFC) += net/nfc/
obj-$(CPTCFG_NFC) += drivers/nfc/
obj-$(CPTCFG_MEDIA_SUPPORT) += drivers/media/
obj-$(CONFIG_BACKPORT_CFG80211) += net/wireless/
obj-$(CONFIG_BACKPORT_MAC80211) += net/mac80211/
obj-$(CONFIG_BACKPORT_WLAN) += drivers/net/wireless/
obj-$(CONFIG_BACKPORT_BT) += net/bluetooth/
obj-$(CONFIG_BACKPORT_BT) += drivers/bluetooth/
obj-$(CONFIG_BACKPORT_SSB) += drivers/ssb/
obj-$(CONFIG_BACKPORT_BCMA) += drivers/bcma/
obj-$(CONFIG_BACKPORT_ETHERNET) += drivers/net/ethernet/
obj-$(CONFIG_BACKPORT_USB_NET_RNDIS_WLAN) += drivers/net/usb/
obj-$(CONFIG_BACKPORT_NFC) += net/nfc/
obj-$(CONFIG_BACKPORT_NFC) += drivers/nfc/
obj-$(CONFIG_BACKPORT_MEDIA_SUPPORT) += drivers/media/
obj-$(CPTCFG_6LOWPAN) += net/6lowpan/
obj-$(CPTCFG_IEEE802154) += net/ieee802154/
obj-$(CPTCFG_BT) += net/ieee802154/
obj-$(CPTCFG_MAC802154) += net/mac802154/
obj-$(CPTCFG_IEEE802154) += drivers/net/ieee802154/
obj-$(CONFIG_BACKPORT_6LOWPAN) += net/6lowpan/
obj-$(CONFIG_BACKPORT_IEEE802154) += net/ieee802154/
obj-$(CONFIG_BACKPORT_BT) += net/ieee802154/
obj-$(CONFIG_BACKPORT_MAC802154) += net/mac802154/
obj-$(CONFIG_BACKPORT_IEEE802154) += drivers/net/ieee802154/
obj-$(CPTCFG_USB_WDM) += drivers/usb/class/
obj-$(CPTCFG_USB_USBNET) += drivers/net/usb/
obj-$(CONFIG_BACKPORT_USB_WDM) += drivers/usb/class/
obj-$(CONFIG_BACKPORT_USB_USBNET) += drivers/net/usb/
......@@ -3,12 +3,12 @@
#include_next <asm/dma-mapping.h>
#include <linux/version.h>
#if defined(CPTCFG_BPAUTO_BUILD_DMA_SHARED_HELPERS)
#if defined(CONFIG_BACKPORT_BPAUTO_BUILD_DMA_SHARED_HELPERS)
#define dma_common_get_sgtable LINUX_BACKPORT(dma_common_get_sgtable)
int
dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
void *cpu_addr, dma_addr_t dma_addr, size_t size);
#endif /* defined(CPTCFG_BPAUTO_BUILD_DMA_SHARED_HELPERS) */
#endif /* defined(CONFIG_BACKPORT_BPAUTO_BUILD_DMA_SHARED_HELPERS) */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
......
#ifndef __BACKPORT_CHECKS
#define __BACKPORT_CHECKS
#if defined(CONFIG_MAC80211) && defined(CPTCFG_MAC80211)
#if defined(CONFIG_BACKPORT_MAC80211) && defined(CONFIG_BACKPORT_MAC80211)
#error "You must not have mac80211 built into your kernel if you want to enable it"
#endif
#if defined(CONFIG_CFG80211) && defined(CPTCFG_CFG80211)
#if defined(CONFIG_BACKPORT_CFG80211) && defined(CONFIG_BACKPORT_CFG80211)
#error "You must not have cfg80211 built into your kernel if you want to enable it"
#endif
......
......@@ -8,7 +8,7 @@
* allows compilation.
*/
#ifdef CPTCFG_BPAUTO_BUILD_LEDS
#ifdef CONFIG_BACKPORT_BPAUTO_BUILD_LEDS
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/rwsem.h>
......
......@@ -20,9 +20,9 @@ extern void backport_dependency_symbol(void);
#define BACKPORT_MOD_VERSIONS MODULE_VERSION(BACKPORTS_GIT_TRACKED);
#else
#define BACKPORT_MOD_VERSIONS \
MODULE_VERSION("backported from " CPTCFG_KERNEL_NAME \
" (" CPTCFG_KERNEL_VERSION ")" \
" using backports " CPTCFG_VERSION);
MODULE_VERSION("backported from " CONFIG_BACKPORT_KERNEL_NAME \
" (" CONFIG_BACKPORT_KERNEL_VERSION ")" \
" using backports " CONFIG_BACKPORT_VERSION);
#endif
#ifdef MODULE
......
......@@ -3,7 +3,7 @@
#include_next <net/net_namespace.h>
#if IS_ENABLED(CPTCFG_IEEE802154_6LOWPAN)
#if IS_ENABLED(CONFIG_BACKPORT_IEEE802154_6LOWPAN)
#include <linux/version.h>
#include <net/netns/ieee802154_6lowpan.h>
......@@ -22,7 +22,7 @@ net_ieee802154_lowpan(struct net *net)
return &net->ieee802154_lowpan;
}
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) */
#endif /* CPTCFG_IEEE802154_6LOWPAN */
#endif /* CONFIG_BACKPORT_IEEE802154_6LOWPAN */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0)
/*
......
......@@ -7,27 +7,27 @@ endif
compat-y += main.o
# Kernel backport compatibility code
compat-$(CPTCFG_KERNEL_3_0) += compat-3.0.o
compat-$(CPTCFG_KERNEL_3_1) += compat-3.1.o
compat-$(CPTCFG_KERNEL_3_2) += backport-3.2.o
compat-$(CPTCFG_KERNEL_3_3) += compat-3.3.o
compat-$(CPTCFG_KERNEL_3_4) += compat-3.4.o
compat-$(CPTCFG_KERNEL_3_5) += compat-3.5.o user_namespace.o
compat-$(CPTCFG_KERNEL_3_6) += compat-3.6.o
compat-$(CPTCFG_KERNEL_3_7) += compat-3.7.o
compat-$(CPTCFG_KERNEL_3_8) += compat-3.8.o
compat-$(CPTCFG_KERNEL_3_9) += compat-3.9.o
compat-$(CPTCFG_KERNEL_3_10) += backport-3.10.o
compat-$(CPTCFG_KERNEL_3_12) += backport-3.12.o
compat-$(CPTCFG_KERNEL_3_13) += backport-3.13.o
compat-$(CPTCFG_KERNEL_3_14) += backport-3.14.o
compat-$(CPTCFG_KERNEL_3_15) += backport-3.15.o
compat-$(CPTCFG_KERNEL_3_17) += backport-3.17.o
compat-$(CPTCFG_KERNEL_3_18) += backport-3.18.o
compat-$(CPTCFG_KERNEL_3_19) += backport-3.19.o
compat-$(CONFIG_BACKPORT_KERNEL_3_0) += compat-3.0.o
compat-$(CONFIG_BACKPORT_KERNEL_3_1) += compat-3.1.o
compat-$(CONFIG_BACKPORT_KERNEL_3_2) += backport-3.2.o
compat-$(CONFIG_BACKPORT_KERNEL_3_3) += compat-3.3.o
compat-$(CONFIG_BACKPORT_KERNEL_3_4) += compat-3.4.o
compat-$(CONFIG_BACKPORT_KERNEL_3_5) += compat-3.5.o user_namespace.o
compat-$(CONFIG_BACKPORT_KERNEL_3_6) += compat-3.6.o
compat-$(CONFIG_BACKPORT_KERNEL_3_7) += compat-3.7.o
compat-$(CONFIG_BACKPORT_KERNEL_3_8) += compat-3.8.o
compat-$(CONFIG_BACKPORT_KERNEL_3_9) += compat-3.9.o
compat-$(CONFIG_BACKPORT_KERNEL_3_10) += backport-3.10.o
compat-$(CONFIG_BACKPORT_KERNEL_3_12) += backport-3.12.o
compat-$(CONFIG_BACKPORT_KERNEL_3_13) += backport-3.13.o
compat-$(CONFIG_BACKPORT_KERNEL_3_14) += backport-3.14.o
compat-$(CONFIG_BACKPORT_KERNEL_3_15) += backport-3.15.o
compat-$(CONFIG_BACKPORT_KERNEL_3_17) += backport-3.17.o
compat-$(CONFIG_BACKPORT_KERNEL_3_18) += backport-3.18.o
compat-$(CONFIG_BACKPORT_KERNEL_3_19) += backport-3.19.o
compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
compat-$(CPTCFG_BPAUTO_BUILD_DMA_SHARED_HELPERS) += dma-shared-helpers.o
compat-$(CONFIG_BACKPORT_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
compat-$(CONFIG_BACKPORT_BPAUTO_BUILD_DMA_SHARED_HELPERS) += dma-shared-helpers.o
compat-$(CONFIG_BACKPORT_BPAUTO_BUILD_WANT_DEV_COREDUMP) += drivers-base-devcoredump.o
compat-$(CONFIG_BACKPORT_BPAUTO_BUILD_AVERAGE) += lib-average.o
cordic-objs += lib-cordic.o
......
......@@ -17,7 +17,7 @@
#include <linux/slab.h>
#include <net/net_namespace.h>
#if IS_ENABLED(CPTCFG_IEEE802154_6LOWPAN)
#if IS_ENABLED(CONFIG_BACKPORT_IEEE802154_6LOWPAN)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
/* the above kernel dependency is set to match the dependencies file */
struct netns_ieee802154_lowpan ieee802154_lowpan;
......@@ -29,7 +29,7 @@ struct netns_ieee802154_lowpan *net_ieee802154_lowpan(struct net *net)
}
EXPORT_SYMBOL_GPL(net_ieee802154_lowpan);
#endif
#endif /* CPTCFG_IEEE802154_6LOWPAN */
#endif /* CONFIG_BACKPORT_IEEE802154_6LOWPAN */
/**
* devm_kstrdup - Allocate resource managed space and
......
......@@ -3,7 +3,7 @@
#include <linux/version.h>
#ifdef CPTCFG_BPAUTO_BUILD_CRYPTO_CCM
#ifdef CONFIG_BACKPORT_BPAUTO_BUILD_CRYPTO_CCM
int crypto_ccm_module_init(void);
void crypto_ccm_module_exit(void);
#else
......@@ -13,7 +13,7 @@ static inline void crypto_ccm_module_exit(void)
{}
#endif
#ifdef CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP
#ifdef CONFIG_BACKPORT_BPAUTO_BUILD_WANT_DEV_COREDUMP
int devcoredump_init(void);
void devcoredump_exit(void);
#else
......
......@@ -8,23 +8,23 @@ MODULE_AUTHOR("Luis R. Rodriguez");
MODULE_DESCRIPTION("Kernel backport module");
MODULE_LICENSE("GPL");
#ifndef CPTCFG_KERNEL_NAME
#error "You need a CPTCFG_KERNEL_NAME"
#ifndef CONFIG_BACKPORT_KERNEL_NAME
#error "You need a CONFIG_BACKPORT_KERNEL_NAME"
#endif
#ifndef CPTCFG_KERNEL_VERSION
#error "You need a CPTCFG_KERNEL_VERSION"
#ifndef CONFIG_BACKPORT_KERNEL_VERSION
#error "You need a CONFIG_BACKPORT_KERNEL_VERSION"
#endif
#ifndef CPTCFG_VERSION
#error "You need a CPTCFG_VERSION"
#ifndef CONFIG_BACKPORT_VERSION
#error "You need a CONFIG_BACKPORT_VERSION"
#endif
static char *backported_kernel_name = CPTCFG_KERNEL_NAME;
static char *backported_kernel_name = CONFIG_BACKPORT_KERNEL_NAME;
module_param(backported_kernel_name, charp, 0400);
MODULE_PARM_DESC(backported_kernel_name,
"The kernel tree name that was used for this backport (" CPTCFG_KERNEL_NAME ")");
"The kernel tree name that was used for this backport (" CONFIG_BACKPORT_KERNEL_NAME ")");
#ifdef BACKPORTS_GIT_TRACKED
static char *backports_tracker_id = BACKPORTS_GIT_TRACKED;
......@@ -32,16 +32,16 @@ module_param(backports_tracker_id, charp, 0400);
MODULE_PARM_DESC(backports_tracker_id,
"The version of the tree containing this backport (" BACKPORTS_GIT_TRACKED ")");
#else
static char *backported_kernel_version = CPTCFG_KERNEL_VERSION;
static char *backports_version = CPTCFG_VERSION;
static char *backported_kernel_version = CONFIG_BACKPORT_KERNEL_VERSION;
static char *backports_version = CONFIG_BACKPORT_VERSION;
module_param(backported_kernel_version, charp, 0400);
MODULE_PARM_DESC(backported_kernel_version,
"The kernel version that was used for this backport (" CPTCFG_KERNEL_VERSION ")");
"The kernel version that was used for this backport (" CONFIG_BACKPORT_KERNEL_VERSION ")");
module_param(backports_version, charp, 0400);
MODULE_PARM_DESC(backports_version,
"The git version of the backports tree used to generate this backport (" CPTCFG_VERSION ")");
"The git version of the backports tree used to generate this backport (" CONFIG_BACKPORT_VERSION ")");
#endif
......@@ -63,9 +63,9 @@ static int __init backport_init(void)
return ret;
}
printk(KERN_INFO "Loading modules backported from " CPTCFG_KERNEL_NAME
printk(KERN_INFO "Loading modules backported from " CONFIG_BACKPORT_KERNEL_NAME
#ifndef BACKPORTS_GIT_TRACKED
" version " CPTCFG_KERNEL_VERSION
" version " CONFIG_BACKPORT_KERNEL_VERSION
#endif
"\n");
#ifdef BACKPORTS_GIT_TRACKED
......@@ -73,9 +73,9 @@ static int __init backport_init(void)
#else
#ifdef CONFIG_BACKPORT_INTEGRATE
printk(KERN_INFO "Backport integrated by backports.git " CPTCFG_VERSION "\n");
printk(KERN_INFO "Backport integrated by backports.git " CONFIG_BACKPORT_VERSION "\n");
#else
printk(KERN_INFO "Backport generated by backports.git " CPTCFG_VERSION "\n");
printk(KERN_INFO "Backport generated by backports.git " CONFIG_BACKPORT_VERSION "\n");
#endif /* CONFIG_BACKPORT_INTEGRATE */
#endif /* BACKPORTS_GIT_TRACKED */
......
bcma-y += main.o scan.o core.o sprom.o
bcma-y += driver_chipcommon.o driver_chipcommon_pmu.o
bcma-y += driver_chipcommon_b.o
bcma-$(CONFIG_BCMA_SFLASH) += driver_chipcommon_sflash.o
bcma-$(CONFIG_BCMA_NFLASH) += driver_chipcommon_nflash.o
bcma-$(CONFIG_BACKPORT_BCMA_SFLASH) += driver_chipcommon_sflash.o
bcma-$(CONFIG_BACKPORT_BCMA_NFLASH) += driver_chipcommon_nflash.o
bcma-y += driver_pci.o
bcma-y += driver_pcie2.o
bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE) += driver_pci_host.o
bcma-$(CONFIG_BCMA_DRIVER_MIPS) += driver_mips.o
bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN) += driver_gmac_cmn.o
bcma-$(CONFIG_BCMA_DRIVER_GPIO) += driver_gpio.o
bcma-$(CONFIG_BCMA_HOST_PCI) += host_pci.o
bcma-$(CONFIG_BCMA_HOST_SOC) += host_soc.o
obj-$(CONFIG_BCMA) += bcma.o
bcma-$(CONFIG_BACKPORT_BCMA_DRIVER_PCI_HOSTMODE) += driver_pci_host.o
bcma-$(CONFIG_BACKPORT_BCMA_DRIVER_MIPS) += driver_mips.o
bcma-$(CONFIG_BACKPORT_BCMA_DRIVER_GMAC_CMN) += driver_gmac_cmn.o
bcma-$(CONFIG_BACKPORT_BCMA_DRIVER_GPIO) += driver_gpio.o
bcma-$(CONFIG_BACKPORT_BCMA_HOST_PCI) += host_pci.o
bcma-$(CONFIG_BACKPORT_BCMA_HOST_SOC) += host_soc.o
obj-$(CONFIG_BACKPORT_BCMA) += bcma.o
ccflags-$(CONFIG_BCMA_DEBUG) := -DDEBUG
ccflags-$(CONFIG_BACKPORT_BCMA_DEBUG) := -DDEBUG
......@@ -42,10 +42,10 @@ int bcma_bus_scan(struct bcma_bus *bus);
int bcma_sprom_get(struct bcma_bus *bus);
/* driver_chipcommon.c */
#ifdef CONFIG_BCMA_DRIVER_MIPS
#ifdef CONFIG_BACKPORT_BCMA_DRIVER_MIPS
void bcma_chipco_serial_init(struct bcma_drv_cc *cc);
extern struct platform_device bcma_pflash_dev;
#endif /* CONFIG_BCMA_DRIVER_MIPS */
#endif /* CONFIG_BACKPORT_BCMA_DRIVER_MIPS */
/* driver_chipcommon_b.c */
int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);
......@@ -55,7 +55,7 @@ void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb);
u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);
u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);
#ifdef CONFIG_BCMA_SFLASH
#ifdef CONFIG_BACKPORT_BCMA_SFLASH
/* driver_chipcommon_sflash.c */
int bcma_sflash_init(struct bcma_drv_cc *cc);
extern struct platform_device bcma_sflash_dev;
......@@ -65,9 +65,9 @@ static inline int bcma_sflash_init(struct bcma_drv_cc *cc)
bcma_err(cc->core->bus, "Serial flash not supported\n");
return 0;
}
#endif /* CONFIG_BCMA_SFLASH */
#endif /* CONFIG_BACKPORT_BCMA_SFLASH */
#ifdef CONFIG_BCMA_NFLASH
#ifdef CONFIG_BACKPORT_BCMA_NFLASH
/* driver_chipcommon_nflash.c */
int bcma_nflash_init(struct bcma_drv_cc *cc);
extern struct platform_device bcma_nflash_dev;
......@@ -77,16 +77,16 @@ static inline int bcma_nflash_init(struct bcma_drv_cc *cc)
bcma_err(cc->core->bus, "NAND flash not supported\n");
return 0;
}
#endif /* CONFIG_BCMA_NFLASH */
#endif /* CONFIG_BACKPORT_BCMA_NFLASH */
#ifdef CONFIG_BCMA_HOST_PCI
#ifdef CONFIG_BACKPORT_BCMA_HOST_PCI
/* host_pci.c */
extern int __init bcma_host_pci_init(void);
extern void __exit bcma_host_pci_exit(void);
#endif /* CONFIG_BCMA_HOST_PCI */
#endif /* CONFIG_BACKPORT_BCMA_HOST_PCI */