mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-17 11:00:43 +09:00
Conflicts: Makefile arch/arm/Kconfig arch/arm/Makefile arch/arm/common/Kconfig arch/arm/common/Makefile arch/arm/common/pl330.c arch/arm/include/asm/dma.h arch/arm/include/asm/memory.h arch/arm/kernel/Makefile arch/arm/kernel/dma.c arch/arm/kernel/process.c arch/arm/mm/Kconfig arch/arm/mm/mmu.c arch/arm/mm/proc-v7.S arch/arm/oprofile/op_model_v7.c arch/arm/tools/mach-types block/blk-core.c drivers/base/firmware_class.c drivers/base/platform.c drivers/bluetooth/Kconfig drivers/bluetooth/hci_h4.c drivers/char/Makefile drivers/gpio/Kconfig drivers/gpio/Makefile drivers/gpio/gpiolib.c drivers/gpio/wm831x-gpio.c drivers/gpio/wm8994-gpio.c drivers/i2c/busses/Kconfig drivers/i2c/busses/Makefile drivers/i2c/i2c-core.c drivers/input/keyboard/Kconfig drivers/input/keyboard/Makefile drivers/input/keyboard/matrix_keypad.c drivers/input/misc/Kconfig drivers/input/misc/Makefile drivers/input/misc/wm831x-on.c drivers/input/touchscreen/Kconfig drivers/input/touchscreen/Makefile drivers/leds/Kconfig drivers/leds/Makefile drivers/media/video/Kconfig drivers/media/video/Makefile drivers/media/video/soc_camera.c drivers/media/video/uvc/uvc_queue.c drivers/mfd/Kconfig drivers/mfd/Makefile drivers/mfd/wm831x-core.c drivers/mfd/wm831x-irq.c drivers/mfd/wm8994-core.c drivers/misc/Kconfig drivers/misc/Makefile drivers/mmc/core/sdio_io.c drivers/mtd/mtd_blkdevs.c drivers/mtd/mtdblock.c drivers/mtd/nand/Makefile drivers/net/dm9000.c drivers/net/irda/Kconfig drivers/net/usb/Kconfig drivers/net/usb/Makefile drivers/net/wireless/Kconfig drivers/net/wireless/Makefile drivers/net/wireless/adm8211.c drivers/net/wireless/adm8211.h drivers/net/wireless/airo.c drivers/net/wireless/airo_cs.c drivers/net/wireless/at76c50x-usb.c drivers/net/wireless/at76c50x-usb.h drivers/net/wireless/ath/Kconfig drivers/net/wireless/ath/Makefile drivers/net/wireless/ath/ar9170/Kconfig drivers/net/wireless/ath/ar9170/ar9170.h drivers/net/wireless/ath/ar9170/cmd.c drivers/net/wireless/ath/ar9170/cmd.h drivers/net/wireless/ath/ar9170/eeprom.h drivers/net/wireless/ath/ar9170/hw.h drivers/net/wireless/ath/ar9170/led.c drivers/net/wireless/ath/ar9170/mac.c drivers/net/wireless/ath/ar9170/main.c drivers/net/wireless/ath/ar9170/phy.c drivers/net/wireless/ath/ar9170/usb.c drivers/net/wireless/ath/ar9170/usb.h drivers/net/wireless/ath/ath.h drivers/net/wireless/ath/ath5k/Kconfig drivers/net/wireless/ath/ath5k/Makefile drivers/net/wireless/ath/ath5k/ath5k.h drivers/net/wireless/ath/ath5k/attach.c drivers/net/wireless/ath/ath5k/base.c drivers/net/wireless/ath/ath5k/base.h drivers/net/wireless/ath/ath5k/caps.c drivers/net/wireless/ath/ath5k/debug.c drivers/net/wireless/ath/ath5k/debug.h drivers/net/wireless/ath/ath5k/desc.c drivers/net/wireless/ath/ath5k/desc.h drivers/net/wireless/ath/ath5k/dma.c drivers/net/wireless/ath/ath5k/eeprom.c drivers/net/wireless/ath/ath5k/eeprom.h drivers/net/wireless/ath/ath5k/gpio.c drivers/net/wireless/ath/ath5k/initvals.c drivers/net/wireless/ath/ath5k/led.c drivers/net/wireless/ath/ath5k/pcu.c drivers/net/wireless/ath/ath5k/phy.c drivers/net/wireless/ath/ath5k/qcu.c drivers/net/wireless/ath/ath5k/reg.h drivers/net/wireless/ath/ath5k/reset.c drivers/net/wireless/ath/ath9k/Kconfig drivers/net/wireless/ath/ath9k/Makefile drivers/net/wireless/ath/ath9k/ahb.c drivers/net/wireless/ath/ath9k/ani.c drivers/net/wireless/ath/ath9k/ani.h drivers/net/wireless/ath/ath9k/ath9k.h drivers/net/wireless/ath/ath9k/beacon.c drivers/net/wireless/ath/ath9k/btcoex.c drivers/net/wireless/ath/ath9k/btcoex.h drivers/net/wireless/ath/ath9k/calib.c drivers/net/wireless/ath/ath9k/calib.h drivers/net/wireless/ath/ath9k/debug.c drivers/net/wireless/ath/ath9k/debug.h drivers/net/wireless/ath/ath9k/eeprom.c drivers/net/wireless/ath/ath9k/eeprom.h drivers/net/wireless/ath/ath9k/eeprom_4k.c drivers/net/wireless/ath/ath9k/eeprom_9287.c drivers/net/wireless/ath/ath9k/eeprom_def.c drivers/net/wireless/ath/ath9k/hw.c drivers/net/wireless/ath/ath9k/hw.h drivers/net/wireless/ath/ath9k/mac.c drivers/net/wireless/ath/ath9k/mac.h drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/ath9k/pci.c drivers/net/wireless/ath/ath9k/phy.h drivers/net/wireless/ath/ath9k/rc.c drivers/net/wireless/ath/ath9k/rc.h drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/ath/ath9k/reg.h drivers/net/wireless/ath/ath9k/virtual.c drivers/net/wireless/ath/ath9k/xmit.c drivers/net/wireless/ath/regd.c drivers/net/wireless/ath/regd.h drivers/net/wireless/ath/regd_common.h drivers/net/wireless/atmel.c drivers/net/wireless/atmel_cs.c drivers/net/wireless/atmel_pci.c drivers/net/wireless/b43/Kconfig drivers/net/wireless/b43/Makefile drivers/net/wireless/b43/b43.h drivers/net/wireless/b43/dma.c drivers/net/wireless/b43/dma.h drivers/net/wireless/b43/leds.c drivers/net/wireless/b43/lo.c drivers/net/wireless/b43/main.c drivers/net/wireless/b43/pcmcia.c drivers/net/wireless/b43/phy_a.c drivers/net/wireless/b43/phy_common.c drivers/net/wireless/b43/phy_common.h drivers/net/wireless/b43/phy_g.c drivers/net/wireless/b43/phy_lp.c drivers/net/wireless/b43/phy_lp.h drivers/net/wireless/b43/phy_n.c drivers/net/wireless/b43/phy_n.h drivers/net/wireless/b43/pio.c drivers/net/wireless/b43/pio.h drivers/net/wireless/b43/rfkill.c drivers/net/wireless/b43/sdio.c drivers/net/wireless/b43/tables_nphy.c drivers/net/wireless/b43/tables_nphy.h drivers/net/wireless/b43/wa.c drivers/net/wireless/b43/xmit.c drivers/net/wireless/b43/xmit.h drivers/net/wireless/b43legacy/Kconfig drivers/net/wireless/b43legacy/b43legacy.h drivers/net/wireless/b43legacy/dma.c drivers/net/wireless/b43legacy/dma.h drivers/net/wireless/b43legacy/leds.h drivers/net/wireless/b43legacy/main.c drivers/net/wireless/b43legacy/phy.c drivers/net/wireless/b43legacy/pio.c drivers/net/wireless/b43legacy/pio.h drivers/net/wireless/b43legacy/rfkill.c drivers/net/wireless/b43legacy/xmit.c drivers/net/wireless/b43legacy/xmit.h drivers/net/wireless/bcm4329/Kconfig drivers/net/wireless/bcm4329/Makefile drivers/net/wireless/bcm4329/bcmsdh_linux.c drivers/net/wireless/bcm4329/bcmsdh_sdmmc_linux.c drivers/net/wireless/bcm4329/dhd.h drivers/net/wireless/bcm4329/dhd_cdc.c drivers/net/wireless/bcm4329/dhd_common.c drivers/net/wireless/bcm4329/dhd_custom_gpio.c drivers/net/wireless/bcm4329/dhd_linux.c drivers/net/wireless/bcm4329/dhd_sdio.c drivers/net/wireless/bcm4329/include/epivers.h drivers/net/wireless/bcm4329/include/wlioctl.h drivers/net/wireless/bcm4329/linux_osl.c drivers/net/wireless/bcm4329/wl_iw.c drivers/net/wireless/bcm4329/wl_iw.h drivers/net/wireless/hostap/Kconfig drivers/net/wireless/hostap/hostap_80211.h drivers/net/wireless/hostap/hostap_80211_rx.c drivers/net/wireless/hostap/hostap_80211_tx.c drivers/net/wireless/hostap/hostap_ap.c drivers/net/wireless/hostap/hostap_common.h drivers/net/wireless/hostap/hostap_cs.c drivers/net/wireless/hostap/hostap_download.c drivers/net/wireless/hostap/hostap_hw.c drivers/net/wireless/hostap/hostap_info.c drivers/net/wireless/hostap/hostap_ioctl.c drivers/net/wireless/hostap/hostap_main.c drivers/net/wireless/hostap/hostap_pci.c drivers/net/wireless/hostap/hostap_plx.c drivers/net/wireless/hostap/hostap_wlan.h drivers/net/wireless/ipw2x00/Kconfig drivers/net/wireless/ipw2x00/ipw2100.c drivers/net/wireless/ipw2x00/ipw2100.h drivers/net/wireless/ipw2x00/ipw2200.c drivers/net/wireless/ipw2x00/ipw2200.h drivers/net/wireless/ipw2x00/libipw.h drivers/net/wireless/ipw2x00/libipw_geo.c drivers/net/wireless/ipw2x00/libipw_module.c drivers/net/wireless/ipw2x00/libipw_rx.c drivers/net/wireless/ipw2x00/libipw_tx.c drivers/net/wireless/ipw2x00/libipw_wx.c drivers/net/wireless/iwlwifi/Kconfig drivers/net/wireless/iwlwifi/Makefile drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-3945-fh.h drivers/net/wireless/iwlwifi/iwl-3945-hw.h drivers/net/wireless/iwlwifi/iwl-3945-led.c drivers/net/wireless/iwlwifi/iwl-3945-led.h drivers/net/wireless/iwlwifi/iwl-3945-rs.c drivers/net/wireless/iwlwifi/iwl-3945.c drivers/net/wireless/iwlwifi/iwl-3945.h drivers/net/wireless/iwlwifi/iwl-4965-hw.h drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl-5000-hw.h drivers/net/wireless/iwlwifi/iwl-5000.c drivers/net/wireless/iwlwifi/iwl-6000-hw.h drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-agn-rs.c drivers/net/wireless/iwlwifi/iwl-agn-rs.h drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-calib.h drivers/net/wireless/iwlwifi/iwl-commands.h drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/iwlwifi/iwl-csr.h drivers/net/wireless/iwlwifi/iwl-debug.h drivers/net/wireless/iwlwifi/iwl-debugfs.c drivers/net/wireless/iwlwifi/iwl-dev.h drivers/net/wireless/iwlwifi/iwl-eeprom.c drivers/net/wireless/iwlwifi/iwl-eeprom.h drivers/net/wireless/iwlwifi/iwl-fh.h drivers/net/wireless/iwlwifi/iwl-hcmd.c drivers/net/wireless/iwlwifi/iwl-helpers.h drivers/net/wireless/iwlwifi/iwl-io.h drivers/net/wireless/iwlwifi/iwl-led.c drivers/net/wireless/iwlwifi/iwl-led.h drivers/net/wireless/iwlwifi/iwl-power.c drivers/net/wireless/iwlwifi/iwl-power.h drivers/net/wireless/iwlwifi/iwl-prph.h drivers/net/wireless/iwlwifi/iwl-rx.c drivers/net/wireless/iwlwifi/iwl-scan.c drivers/net/wireless/iwlwifi/iwl-spectrum.h drivers/net/wireless/iwlwifi/iwl-sta.c drivers/net/wireless/iwlwifi/iwl-sta.h drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/iwlwifi/iwl3945-base.c drivers/net/wireless/iwmc3200wifi/Kconfig drivers/net/wireless/iwmc3200wifi/Makefile drivers/net/wireless/iwmc3200wifi/bus.h drivers/net/wireless/iwmc3200wifi/cfg80211.c drivers/net/wireless/iwmc3200wifi/commands.c drivers/net/wireless/iwmc3200wifi/commands.h drivers/net/wireless/iwmc3200wifi/debug.h drivers/net/wireless/iwmc3200wifi/debugfs.c drivers/net/wireless/iwmc3200wifi/eeprom.c drivers/net/wireless/iwmc3200wifi/eeprom.h drivers/net/wireless/iwmc3200wifi/fw.c drivers/net/wireless/iwmc3200wifi/hal.c drivers/net/wireless/iwmc3200wifi/hal.h drivers/net/wireless/iwmc3200wifi/iwm.h drivers/net/wireless/iwmc3200wifi/lmac.h drivers/net/wireless/iwmc3200wifi/main.c drivers/net/wireless/iwmc3200wifi/netdev.c drivers/net/wireless/iwmc3200wifi/rx.c drivers/net/wireless/iwmc3200wifi/sdio.c drivers/net/wireless/iwmc3200wifi/tx.c drivers/net/wireless/iwmc3200wifi/umac.h drivers/net/wireless/libertas/Makefile drivers/net/wireless/libertas/README drivers/net/wireless/libertas/cmd.c drivers/net/wireless/libertas/cmd.h drivers/net/wireless/libertas/cmdresp.c drivers/net/wireless/libertas/debugfs.c drivers/net/wireless/libertas/decl.h drivers/net/wireless/libertas/defs.h drivers/net/wireless/libertas/dev.h drivers/net/wireless/libertas/ethtool.c drivers/net/wireless/libertas/host.h drivers/net/wireless/libertas/if_cs.c drivers/net/wireless/libertas/if_sdio.c drivers/net/wireless/libertas/if_sdio.h drivers/net/wireless/libertas/if_spi.c drivers/net/wireless/libertas/if_usb.c drivers/net/wireless/libertas/main.c drivers/net/wireless/libertas/radiotap.h drivers/net/wireless/libertas/rx.c drivers/net/wireless/libertas/tx.c drivers/net/wireless/libertas/types.h drivers/net/wireless/libertas_tf/cmd.c drivers/net/wireless/libertas_tf/if_usb.c drivers/net/wireless/libertas_tf/libertas_tf.h drivers/net/wireless/libertas_tf/main.c drivers/net/wireless/mac80211_hwsim.c drivers/net/wireless/mv8686/scan.h drivers/net/wireless/mv8686/wext.h drivers/net/wireless/mwl8k.c drivers/net/wireless/orinoco/Kconfig drivers/net/wireless/orinoco/Makefile drivers/net/wireless/orinoco/airport.c drivers/net/wireless/orinoco/cfg.c drivers/net/wireless/orinoco/fw.c drivers/net/wireless/orinoco/hermes.c drivers/net/wireless/orinoco/hermes.h drivers/net/wireless/orinoco/hermes_dld.c drivers/net/wireless/orinoco/hw.c drivers/net/wireless/orinoco/hw.h drivers/net/wireless/orinoco/main.c drivers/net/wireless/orinoco/main.h drivers/net/wireless/orinoco/orinoco.h drivers/net/wireless/orinoco/orinoco_cs.c drivers/net/wireless/orinoco/orinoco_nortel.c drivers/net/wireless/orinoco/orinoco_pci.c drivers/net/wireless/orinoco/orinoco_plx.c drivers/net/wireless/orinoco/orinoco_tmd.c drivers/net/wireless/orinoco/scan.c drivers/net/wireless/orinoco/spectrum_cs.c drivers/net/wireless/orinoco/wext.c drivers/net/wireless/p54/Kconfig drivers/net/wireless/p54/eeprom.c drivers/net/wireless/p54/fwio.c drivers/net/wireless/p54/led.c drivers/net/wireless/p54/main.c drivers/net/wireless/p54/net2280.h drivers/net/wireless/p54/p54.h drivers/net/wireless/p54/p54pci.c drivers/net/wireless/p54/p54pci.h drivers/net/wireless/p54/p54spi.c drivers/net/wireless/p54/p54spi.h drivers/net/wireless/p54/p54usb.c drivers/net/wireless/p54/p54usb.h drivers/net/wireless/p54/txrx.c drivers/net/wireless/prism54/isl_ioctl.c drivers/net/wireless/prism54/isl_oid.h drivers/net/wireless/prism54/islpci_dev.c drivers/net/wireless/prism54/islpci_eth.c drivers/net/wireless/prism54/islpci_eth.h drivers/net/wireless/prism54/islpci_hotplug.c drivers/net/wireless/prism54/islpci_mgt.c drivers/net/wireless/prism54/islpci_mgt.h drivers/net/wireless/prism54/oid_mgt.c drivers/net/wireless/ray_cs.c drivers/net/wireless/ray_cs.h drivers/net/wireless/rndis_wlan.c drivers/net/wireless/rt2x00/Kconfig drivers/net/wireless/rt2x00/Makefile drivers/net/wireless/rt2x00/rt2400pci.c drivers/net/wireless/rt2x00/rt2400pci.h drivers/net/wireless/rt2x00/rt2500pci.c drivers/net/wireless/rt2x00/rt2500pci.h drivers/net/wireless/rt2x00/rt2500usb.c drivers/net/wireless/rt2x00/rt2500usb.h drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/rt2x00/rt2800usb.h drivers/net/wireless/rt2x00/rt2x00.h drivers/net/wireless/rt2x00/rt2x00config.c drivers/net/wireless/rt2x00/rt2x00crypto.c drivers/net/wireless/rt2x00/rt2x00debug.c drivers/net/wireless/rt2x00/rt2x00debug.h drivers/net/wireless/rt2x00/rt2x00dev.c drivers/net/wireless/rt2x00/rt2x00dump.h drivers/net/wireless/rt2x00/rt2x00firmware.c drivers/net/wireless/rt2x00/rt2x00ht.c drivers/net/wireless/rt2x00/rt2x00leds.c drivers/net/wireless/rt2x00/rt2x00leds.h drivers/net/wireless/rt2x00/rt2x00lib.h drivers/net/wireless/rt2x00/rt2x00link.c drivers/net/wireless/rt2x00/rt2x00mac.c drivers/net/wireless/rt2x00/rt2x00pci.c drivers/net/wireless/rt2x00/rt2x00pci.h drivers/net/wireless/rt2x00/rt2x00queue.c drivers/net/wireless/rt2x00/rt2x00queue.h drivers/net/wireless/rt2x00/rt2x00reg.h drivers/net/wireless/rt2x00/rt2x00usb.c drivers/net/wireless/rt2x00/rt2x00usb.h drivers/net/wireless/rt2x00/rt61pci.c drivers/net/wireless/rt2x00/rt61pci.h drivers/net/wireless/rt2x00/rt73usb.c drivers/net/wireless/rt2x00/rt73usb.h drivers/net/wireless/rtl818x/rtl8180.h drivers/net/wireless/rtl818x/rtl8180_dev.c drivers/net/wireless/rtl818x/rtl8180_grf5101.c drivers/net/wireless/rtl818x/rtl8180_max2820.c drivers/net/wireless/rtl818x/rtl8180_rtl8225.c drivers/net/wireless/rtl818x/rtl8180_sa2400.c drivers/net/wireless/rtl818x/rtl8187.h drivers/net/wireless/rtl818x/rtl8187_dev.c drivers/net/wireless/rtl818x/rtl8187_leds.c drivers/net/wireless/rtl818x/rtl8187_leds.h drivers/net/wireless/rtl818x/rtl8187_rfkill.c drivers/net/wireless/rtl818x/rtl8187_rtl8225.c drivers/net/wireless/rtl818x/rtl818x.h drivers/net/wireless/wl12xx/Kconfig drivers/net/wireless/wl12xx/Makefile drivers/net/wireless/wl12xx/wl1251.h drivers/net/wireless/wl12xx/wl1251_acx.c drivers/net/wireless/wl12xx/wl1251_acx.h drivers/net/wireless/wl12xx/wl1251_boot.c drivers/net/wireless/wl12xx/wl1251_cmd.c drivers/net/wireless/wl12xx/wl1251_cmd.h drivers/net/wireless/wl12xx/wl1251_debugfs.c drivers/net/wireless/wl12xx/wl1251_event.c drivers/net/wireless/wl12xx/wl1251_event.h drivers/net/wireless/wl12xx/wl1251_init.c drivers/net/wireless/wl12xx/wl1251_init.h drivers/net/wireless/wl12xx/wl1251_io.h drivers/net/wireless/wl12xx/wl1251_main.c drivers/net/wireless/wl12xx/wl1251_ps.c drivers/net/wireless/wl12xx/wl1251_ps.h drivers/net/wireless/wl12xx/wl1251_reg.h drivers/net/wireless/wl12xx/wl1251_rx.c drivers/net/wireless/wl12xx/wl1251_rx.h drivers/net/wireless/wl12xx/wl1251_sdio.c drivers/net/wireless/wl12xx/wl1251_spi.c drivers/net/wireless/wl12xx/wl1251_tx.c drivers/net/wireless/wl12xx/wl1251_tx.h drivers/net/wireless/wl12xx/wl1271.h drivers/net/wireless/wl12xx/wl1271_acx.c drivers/net/wireless/wl12xx/wl1271_acx.h drivers/net/wireless/wl12xx/wl1271_boot.c drivers/net/wireless/wl12xx/wl1271_boot.h drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_cmd.h drivers/net/wireless/wl12xx/wl1271_debugfs.c drivers/net/wireless/wl12xx/wl1271_event.c drivers/net/wireless/wl12xx/wl1271_event.h drivers/net/wireless/wl12xx/wl1271_init.c drivers/net/wireless/wl12xx/wl1271_init.h drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_ps.c drivers/net/wireless/wl12xx/wl1271_ps.h drivers/net/wireless/wl12xx/wl1271_reg.h drivers/net/wireless/wl12xx/wl1271_rx.c drivers/net/wireless/wl12xx/wl1271_rx.h drivers/net/wireless/wl12xx/wl1271_spi.c drivers/net/wireless/wl12xx/wl1271_tx.c drivers/net/wireless/wl12xx/wl1271_tx.h drivers/net/wireless/wl12xx/wl12xx_80211.h drivers/net/wireless/wl3501.h drivers/net/wireless/wl3501_cs.c drivers/net/wireless/zd1201.c drivers/net/wireless/zd1211rw/Kconfig drivers/net/wireless/zd1211rw/zd_chip.c drivers/net/wireless/zd1211rw/zd_chip.h drivers/net/wireless/zd1211rw/zd_mac.c drivers/net/wireless/zd1211rw/zd_mac.h drivers/net/wireless/zd1211rw/zd_rf_uw2453.c drivers/net/wireless/zd1211rw/zd_usb.c drivers/net/wireless/zd1211rw/zd_usb.h drivers/power/Kconfig drivers/power/Makefile drivers/power/wm831x_backup.c drivers/power/wm831x_power.c drivers/regulator/Kconfig drivers/regulator/Makefile drivers/regulator/wm831x-dcdc.c drivers/regulator/wm8994-regulator.c drivers/rtc/Makefile drivers/rtc/rtc-wm831x.c drivers/serial/Kconfig drivers/spi/Kconfig drivers/spi/Makefile drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dream/Kconfig drivers/staging/iio/Kconfig drivers/staging/iio/Makefile drivers/usb/core/hub.c drivers/usb/gadget/gadget_chips.h drivers/video/Kconfig drivers/video/backlight/Kconfig drivers/video/backlight/Makefile drivers/video/backlight/wm831x_bl.c drivers/watchdog/Kconfig drivers/watchdog/Makefile fs/partitions/check.c include/asm-generic/gpio.h include/linux/fb.h include/linux/i82593.h include/linux/l3g4200d.h include/linux/mfd/wm831x/core.h include/linux/mfd/wm831x/pdata.h include/linux/mfd/wm8994/core.h include/linux/mfd/wm8994/gpio.h include/linux/mfd/wm8994/pdata.h include/linux/mmc/card.h include/linux/mmc/host.h include/linux/mtd/nand.h include/linux/serial_core.h include/linux/videodev2.h include/media/v4l2-chip-ident.h include/sound/soc-dai.h include/sound/soc-dapm.h sound/soc/codecs/Kconfig sound/soc/codecs/Makefile sound/soc/codecs/wm8900.c sound/soc/codecs/wm8988.c sound/soc/codecs/wm8994.c sound/soc/codecs/wm8994.h sound/soc/codecs/wm_hubs.c sound/soc/soc-dapm.c
404 lines
12 KiB
Makefile
404 lines
12 KiB
Makefile
# ==========================================================================
|
|
# Building
|
|
# ==========================================================================
|
|
|
|
src := $(obj)
|
|
|
|
PHONY := __build
|
|
__build:
|
|
|
|
# Init all relevant variables used in kbuild files so
|
|
# 1) they have correct type
|
|
# 2) they do not inherit any value from the environment
|
|
obj-y :=
|
|
obj-m :=
|
|
lib-y :=
|
|
lib-m :=
|
|
always :=
|
|
targets :=
|
|
subdir-y :=
|
|
subdir-m :=
|
|
EXTRA_AFLAGS :=
|
|
EXTRA_CFLAGS :=
|
|
EXTRA_CPPFLAGS :=
|
|
EXTRA_LDFLAGS :=
|
|
asflags-y :=
|
|
ccflags-y :=
|
|
cppflags-y :=
|
|
ldflags-y :=
|
|
|
|
subdir-asflags-y :=
|
|
subdir-ccflags-y :=
|
|
|
|
# Read auto.conf if it exists, otherwise ignore
|
|
-include include/config/auto.conf
|
|
|
|
include scripts/Kbuild.include
|
|
|
|
# For backward compatibility check that these variables do not change
|
|
save-cflags := $(CFLAGS)
|
|
|
|
# The filename Kbuild has precedence over Makefile
|
|
kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
|
|
kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
|
|
include $(kbuild-file)
|
|
|
|
# If the save-* variables changed error out
|
|
ifeq ($(KBUILD_NOPEDANTIC),)
|
|
ifneq ("$(save-cflags)","$(CFLAGS)")
|
|
$(error CFLAGS was changed in "$(kbuild-file)". Fix it to use EXTRA_CFLAGS)
|
|
endif
|
|
endif
|
|
include scripts/Makefile.lib
|
|
|
|
ifdef host-progs
|
|
ifneq ($(hostprogs-y),$(host-progs))
|
|
$(warning kbuild: $(obj)/Makefile - Usage of host-progs is deprecated. Please replace with hostprogs-y!)
|
|
hostprogs-y += $(host-progs)
|
|
endif
|
|
endif
|
|
|
|
# Do not include host rules unless needed
|
|
ifneq ($(hostprogs-y)$(hostprogs-m),)
|
|
include scripts/Makefile.host
|
|
endif
|
|
|
|
ifneq ($(KBUILD_SRC),)
|
|
# Create output directory if not already present
|
|
_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
|
|
|
|
# Create directories for object files if directory does not exist
|
|
# Needed when obj-y := dir/file.o syntax is used
|
|
_dummy := $(foreach d,$(obj-dirs), $(shell [ -d $(d) ] || mkdir -p $(d)))
|
|
endif
|
|
|
|
ifndef obj
|
|
$(warning kbuild: Makefile.build is included improperly)
|
|
endif
|
|
|
|
# ===========================================================================
|
|
|
|
ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
|
|
lib-target := $(obj)/lib.a
|
|
endif
|
|
|
|
ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(subdir-m) $(lib-target)),)
|
|
builtin-target := $(obj)/built-in.o
|
|
endif
|
|
|
|
modorder-target := $(obj)/modules.order
|
|
|
|
# We keep a list of all modules in $(MODVERDIR)
|
|
|
|
__build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \
|
|
$(if $(KBUILD_MODULES),$(obj-m) $(modorder-target)) \
|
|
$(subdir-ym) $(always)
|
|
@:
|
|
|
|
# Linus' kernel sanity checking tool
|
|
ifneq ($(KBUILD_CHECKSRC),0)
|
|
ifeq ($(KBUILD_CHECKSRC),2)
|
|
quiet_cmd_force_checksrc = CHECK $<
|
|
cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
|
|
else
|
|
quiet_cmd_checksrc = CHECK $<
|
|
cmd_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
|
|
endif
|
|
endif
|
|
|
|
# Do section mismatch analysis for each module/built-in.o
|
|
ifdef CONFIG_DEBUG_SECTION_MISMATCH
|
|
cmd_secanalysis = ; scripts/mod/modpost $@
|
|
endif
|
|
|
|
# Compile C sources (.c)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
# Default is built-in, unless we know otherwise
|
|
modkern_cflags = \
|
|
$(if $(part-of-module), \
|
|
$(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE), \
|
|
$(KBUILD_CFLAGS_KERNEL) $(CFLAGS_KERNEL))
|
|
quiet_modtag := $(empty) $(empty)
|
|
|
|
$(real-objs-m) : part-of-module := y
|
|
$(real-objs-m:.o=.i) : part-of-module := y
|
|
$(real-objs-m:.o=.s) : part-of-module := y
|
|
$(real-objs-m:.o=.lst): part-of-module := y
|
|
|
|
$(real-objs-m) : quiet_modtag := [M]
|
|
$(real-objs-m:.o=.i) : quiet_modtag := [M]
|
|
$(real-objs-m:.o=.s) : quiet_modtag := [M]
|
|
$(real-objs-m:.o=.lst): quiet_modtag := [M]
|
|
|
|
$(obj-m) : quiet_modtag := [M]
|
|
|
|
# Default for not multi-part modules
|
|
modname = $(basetarget)
|
|
|
|
$(multi-objs-m) : modname = $(modname-multi)
|
|
$(multi-objs-m:.o=.i) : modname = $(modname-multi)
|
|
$(multi-objs-m:.o=.s) : modname = $(modname-multi)
|
|
$(multi-objs-m:.o=.lst) : modname = $(modname-multi)
|
|
$(multi-objs-y) : modname = $(modname-multi)
|
|
$(multi-objs-y:.o=.i) : modname = $(modname-multi)
|
|
$(multi-objs-y:.o=.s) : modname = $(modname-multi)
|
|
$(multi-objs-y:.o=.lst) : modname = $(modname-multi)
|
|
|
|
quiet_cmd_cc_s_c = CC $(quiet_modtag) $@
|
|
cmd_cc_s_c = $(CC) $(c_flags) -fverbose-asm -S -o $@ $<
|
|
|
|
$(obj)/%.s: $(src)/%.c FORCE
|
|
$(call if_changed_dep,cc_s_c)
|
|
|
|
quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
|
|
cmd_cc_i_c = $(CPP) $(c_flags) -o $@ $<
|
|
|
|
$(obj)/%.i: $(src)/%.c FORCE
|
|
$(call if_changed_dep,cc_i_c)
|
|
|
|
cmd_gensymtypes = \
|
|
$(CPP) -D__GENKSYMS__ $(c_flags) $< | \
|
|
$(GENKSYMS) $(if $(1), -T $(2)) -a $(ARCH) \
|
|
$(if $(KBUILD_PRESERVE),-p) \
|
|
-r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
|
|
|
|
quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
|
|
cmd_cc_symtypes_c = \
|
|
set -e; \
|
|
$(call cmd_gensymtypes,true,$@) >/dev/null; \
|
|
test -s $@ || rm -f $@
|
|
|
|
$(obj)/%.symtypes : $(src)/%.c FORCE
|
|
$(call cmd,cc_symtypes_c)
|
|
|
|
# C (.c) files
|
|
# The C file is compiled and updated dependency information is generated.
|
|
# (See cmd_cc_o_c + relevant part of rule_cc_o_c)
|
|
|
|
quiet_cmd_cc_o_c = CC $(quiet_modtag) $@
|
|
|
|
ifndef CONFIG_MODVERSIONS
|
|
cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
|
|
|
|
else
|
|
# When module versioning is enabled the following steps are executed:
|
|
# o compile a .tmp_<file>.o from <file>.c
|
|
# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
|
|
# not export symbols, we just rename .tmp_<file>.o to <file>.o and
|
|
# are done.
|
|
# o otherwise, we calculate symbol versions using the good old
|
|
# genksyms on the preprocessed source and postprocess them in a way
|
|
# that they are usable as a linker script
|
|
# o generate <file>.o from .tmp_<file>.o using the linker to
|
|
# replace the unresolved symbols __crc_exported_symbol with
|
|
# the actual value of the checksum generated by genksyms
|
|
|
|
cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
|
|
cmd_modversions = \
|
|
if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then \
|
|
$(call cmd_gensymtypes,$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \
|
|
> $(@D)/.tmp_$(@F:.o=.ver); \
|
|
\
|
|
$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) \
|
|
-T $(@D)/.tmp_$(@F:.o=.ver); \
|
|
rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver); \
|
|
else \
|
|
mv -f $(@D)/.tmp_$(@F) $@; \
|
|
fi;
|
|
endif
|
|
|
|
ifdef CONFIG_FTRACE_MCOUNT_RECORD
|
|
cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
|
|
"$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
|
|
"$(if $(CONFIG_64BIT),64,32)" \
|
|
"$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \
|
|
"$(if $(part-of-module),1,0)" "$(@)";
|
|
endif
|
|
|
|
define rule_cc_o_c
|
|
$(call echo-cmd,checksrc) $(cmd_checksrc) \
|
|
$(call echo-cmd,cc_o_c) $(cmd_cc_o_c); \
|
|
$(cmd_modversions) \
|
|
$(call echo-cmd,record_mcount) \
|
|
$(cmd_record_mcount) \
|
|
scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > \
|
|
$(dot-target).tmp; \
|
|
rm -f $(depfile); \
|
|
mv -f $(dot-target).tmp $(dot-target).cmd
|
|
endef
|
|
|
|
# Built-in and composite module parts
|
|
$(obj)/%.o: $(src)/%.c FORCE
|
|
$(call cmd,force_checksrc)
|
|
$(call if_changed_rule,cc_o_c)
|
|
|
|
# Single-part modules are special since we need to mark them in $(MODVERDIR)
|
|
|
|
$(single-used-m): $(obj)/%.o: $(src)/%.c FORCE
|
|
$(call cmd,force_checksrc)
|
|
$(call if_changed_rule,cc_o_c)
|
|
@{ echo $(@:.o=.ko); echo $@; } > $(MODVERDIR)/$(@F:.o=.mod)
|
|
|
|
quiet_cmd_cc_lst_c = MKLST $@
|
|
cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \
|
|
$(CONFIG_SHELL) $(srctree)/scripts/makelst $*.o \
|
|
System.map $(OBJDUMP) > $@
|
|
|
|
$(obj)/%.lst: $(src)/%.c FORCE
|
|
$(call if_changed_dep,cc_lst_c)
|
|
|
|
# Compile assembler sources (.S)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)
|
|
|
|
$(real-objs-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
|
|
$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
|
|
|
|
quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
|
|
cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
|
|
|
|
$(obj)/%.s: $(src)/%.S FORCE
|
|
$(call if_changed_dep,as_s_S)
|
|
|
|
quiet_cmd_as_o_S = AS $(quiet_modtag) $@
|
|
cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
|
|
|
|
$(obj)/%.o: $(src)/%.S FORCE
|
|
$(call if_changed_dep,as_o_S)
|
|
|
|
targets += $(real-objs-y) $(real-objs-m) $(lib-y)
|
|
targets += $(extra-y) $(MAKECMDGOALS) $(always)
|
|
|
|
# Linker scripts preprocessor (.lds.S -> .lds)
|
|
# ---------------------------------------------------------------------------
|
|
quiet_cmd_cpp_lds_S = LDS $@
|
|
cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
|
|
-D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
|
|
|
|
$(obj)/%.lds: $(src)/%.lds.S FORCE
|
|
$(call if_changed_dep,cpp_lds_S)
|
|
|
|
# Build the compiled-in targets
|
|
# ---------------------------------------------------------------------------
|
|
|
|
# To build objects in subdirs, we need to descend into the directories
|
|
$(sort $(subdir-obj-y)): $(subdir-ym) ;
|
|
|
|
#
|
|
# Rule to compile a set of .o files into one .o file
|
|
#
|
|
ifdef builtin-target
|
|
quiet_cmd_link_o_target = LD $@
|
|
# If the list of objects to link is empty, just create an empty built-in.o
|
|
cmd_link_o_target = $(if $(strip $(obj-y)),\
|
|
$(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^) \
|
|
$(cmd_secanalysis),\
|
|
rm -f $@; $(AR) rcs $@)
|
|
|
|
$(builtin-target): $(obj-y) FORCE
|
|
$(call if_changed,link_o_target)
|
|
|
|
targets += $(builtin-target)
|
|
endif # builtin-target
|
|
|
|
#
|
|
# Rule to create modules.order file
|
|
#
|
|
# Create commands to either record .ko file or cat modules.order from
|
|
# a subdirectory
|
|
modorder-cmds = \
|
|
$(foreach m, $(modorder), \
|
|
$(if $(filter %/modules.order, $m), \
|
|
cat $m;, echo kernel/$m;))
|
|
|
|
$(modorder-target): $(subdir-ym) FORCE
|
|
$(Q)(cat /dev/null; $(modorder-cmds)) > $@
|
|
|
|
#
|
|
# Rule to compile a set of .o files into one .a file
|
|
#
|
|
ifdef lib-target
|
|
quiet_cmd_link_l_target = AR $@
|
|
cmd_link_l_target = rm -f $@; $(AR) rcs $@ $(lib-y)
|
|
|
|
$(lib-target): $(lib-y) FORCE
|
|
$(call if_changed,link_l_target)
|
|
|
|
targets += $(lib-target)
|
|
endif
|
|
|
|
#
|
|
# Rule to link composite objects
|
|
#
|
|
# Composite objects are specified in kbuild makefile as follows:
|
|
# <composite-object>-objs := <list of .o files>
|
|
# or
|
|
# <composite-object>-y := <list of .o files>
|
|
link_multi_deps = \
|
|
$(filter $(addprefix $(obj)/, \
|
|
$($(subst $(obj)/,,$(@:.o=-objs))) \
|
|
$($(subst $(obj)/,,$(@:.o=-y)))), $^)
|
|
|
|
quiet_cmd_link_multi-y = LD $@
|
|
cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
|
|
|
|
quiet_cmd_link_multi-m = LD [M] $@
|
|
cmd_link_multi-m = $(cmd_link_multi-y)
|
|
|
|
# We would rather have a list of rules like
|
|
# foo.o: $(foo-objs)
|
|
# but that's not so easy, so we rather make all composite objects depend
|
|
# on the set of all their parts
|
|
$(multi-used-y) : %.o: $(multi-objs-y) FORCE
|
|
$(call if_changed,link_multi-y)
|
|
|
|
$(multi-used-m) : %.o: $(multi-objs-m) FORCE
|
|
$(call if_changed,link_multi-m)
|
|
@{ echo $(@:.o=.ko); echo $(link_multi_deps); } > $(MODVERDIR)/$(@F:.o=.mod)
|
|
|
|
targets += $(multi-used-y) $(multi-used-m)
|
|
|
|
|
|
# Descending
|
|
# ---------------------------------------------------------------------------
|
|
|
|
PHONY += $(subdir-ym)
|
|
$(subdir-ym):
|
|
$(Q)$(MAKE) $(build)=$@
|
|
|
|
# Add FORCE to the prequisites of a target to force it to be always rebuilt.
|
|
# ---------------------------------------------------------------------------
|
|
|
|
PHONY += FORCE
|
|
|
|
FORCE:
|
|
|
|
# Read all saved command lines and dependencies for the $(targets) we
|
|
# may be building above, using $(if_changed{,_dep}). As an
|
|
# optimization, we don't need to read them if the target does not
|
|
# exist, we will rebuild anyway in that case.
|
|
|
|
targets := $(wildcard $(sort $(targets)))
|
|
cmd_files := $(wildcard $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd))
|
|
|
|
ifneq ($(cmd_files),)
|
|
include $(cmd_files)
|
|
endif
|
|
|
|
|
|
# Declare the contents of the .PHONY variable as phony. We keep that
|
|
# information in a variable se we can use it in if_changed and friends.
|
|
|
|
.PHONY: $(PHONY)
|
|
|
|
|
|
# .uu -> .o
|
|
# ---------------------------------------------------------------------------
|
|
quiet_cmd_uudecode_o_uu = DECODE $@
|
|
cmd_uudecode_o_uu = uudecode -o $@ $<
|
|
|
|
$(obj)/%.o: $(src)/%.uu FORCE
|
|
$(call if_changed,uudecode_o_uu)
|