drivers: move some drivers to drivers/Makefile

This commit moves some drivers subdirectory entry from the toplevel Makefile to drivers/Makefile using Kbuild descending feature. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

drivers: move some drivers to drivers/Makefile
This commit moves some drivers subdirectory entry from the toplevel Makefile to drivers/Makefile using Kbuild descending feature. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada · Tom Rini
1 parent ac7e735322
Showing 4 changed files with 18 additions and 18 deletions Side-by-side Diff
Makefile
board/LEOX/elpt860/u-boot.lds
board/tqc/tqm8xx/u-boot.lds
drivers/Makefile
@@ -261,17 +261,11 @@
 	fs/zfs/libzfs.o
 LIBS-y += net/libnet.o
 LIBS-y += disk/libdisk.o
-LIBS-y += drivers/bios_emulator/libatibiosemu.o
-LIBS-y += drivers/block/libblock.o
-LIBS-$(CONFIG_BOOTCOUNT_LIMIT) += drivers/bootcount/libbootcount.o
-LIBS-y += drivers/crypto/libcrypto.o
+LIBS-y += drivers/libdrivers.o
 LIBS-y += drivers/dma/libdma.o
-LIBS-y += drivers/fpga/libfpga.o
 LIBS-y += drivers/gpio/libgpio.o
-LIBS-y += drivers/hwmon/libhwmon.o
 LIBS-y += drivers/i2c/libi2c.o
 LIBS-y += drivers/input/libinput.o
-LIBS-y += drivers/misc/libmisc.o
 LIBS-y += drivers/mmc/libmmc.o
 LIBS-y += drivers/mtd/libmtd.o
 LIBS-y += drivers/mtd/nand/libnand.o
  
@@ -281,14 +275,12 @@
 LIBS-y += drivers/net/libnet.o
 LIBS-y += drivers/net/phy/libphy.o
 LIBS-y += drivers/pci/libpci.o
-LIBS-y += drivers/pcmcia/libpcmcia.o
 LIBS-y += drivers/power/libpower.o \
 	drivers/power/fuel_gauge/libfuel_gauge.o \
 	drivers/power/mfd/libmfd.o \
 	drivers/power/pmic/libpmic.o \
 	drivers/power/battery/libbattery.o
 LIBS-y += drivers/spi/libspi.o
-LIBS-y += drivers/dfu/libdfu.o
 ifeq ($(CPU),mpc83xx)
 LIBS-y += drivers/qe/libqe.o
 LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
  
@@ -304,11 +296,7 @@
 LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
 LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
 endif
-LIBS-y += drivers/rtc/librtc.o
 LIBS-y += drivers/serial/libserial.o
-LIBS-y += drivers/sound/libsound.o
-LIBS-y += drivers/tpm/libtpm.o
-LIBS-y += drivers/twserial/libtws.o
 LIBS-y += drivers/usb/eth/libusb_eth.o
 LIBS-y += drivers/usb/gadget/libusb_gadget.o
 LIBS-y += drivers/usb/host/libusb_host.o
@@ -316,8 +304,6 @@
 LIBS-y += drivers/usb/musb-new/libusb_musb-new.o
 LIBS-y += drivers/usb/phy/libusb_phy.o
 LIBS-y += drivers/usb/ulpi/libusb_ulpi.o
-LIBS-y += drivers/video/libvideo.o
-LIBS-y += drivers/watchdog/libwatchdog.o
 LIBS-y += common/libcommon.o
 LIBS-y += lib/libfdt/libfdt.o
 LIBS-y += api/libapi.o
@@ -34,7 +34,6 @@
     arch/powerpc/cpu/mpc8xx/libmpc8xx.o	(.text*)
     board/LEOX/elpt860/libelpt860.o	(.text*)
     arch/powerpc/lib/libpowerpc.o	(.text*)
-/*    drivers/rtc/librtc.o		(.text*)	*/
  
     . = env_offset;
     common/env_embedded.o		(.text*)
@@ -23,8 +23,8 @@
     board/tqc/tqm8xx/libtqm8xx.o	(.text*)
     disk/libdisk.o			(.text*)
     drivers/net/libnet.o		(.text*)
-    drivers/pcmcia/libpcmcia.o		(.text.pcmcia_on)
-    drivers/pcmcia/libpcmcia.o		(.text.pcmcia_hardware_enable)
+    drivers/libdrivers.o		(.text.pcmcia_on)
+    drivers/libdrivers.o		(.text.pcmcia_hardware_enable)
  
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.ppcenv*)
+obj-y += bios_emulator/
+obj-y += block/
+obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/
+obj-y += crypto/
+obj-y += fpga/
+obj-y += hwmon/
+obj-y += misc/
+obj-y += pcmcia/
+obj-y += dfu/
+obj-y += rtc/
+obj-y += sound/
+obj-y += tpm/
+obj-y += twserial/
+obj-y += video/
+obj-y += watchdog/
...	...	@@ -261,17 +261,11 @@
261	261	fs/zfs/libzfs.o
262	262	LIBS-y += net/libnet.o
263	263	LIBS-y += disk/libdisk.o
264		-LIBS-y += drivers/bios_emulator/libatibiosemu.o
265		-LIBS-y += drivers/block/libblock.o
266		-LIBS-$(CONFIG_BOOTCOUNT_LIMIT) += drivers/bootcount/libbootcount.o
267		-LIBS-y += drivers/crypto/libcrypto.o
	264	+LIBS-y += drivers/libdrivers.o
268	265	LIBS-y += drivers/dma/libdma.o
269		-LIBS-y += drivers/fpga/libfpga.o
270	266	LIBS-y += drivers/gpio/libgpio.o
271		-LIBS-y += drivers/hwmon/libhwmon.o
272	267	LIBS-y += drivers/i2c/libi2c.o
273	268	LIBS-y += drivers/input/libinput.o
274		-LIBS-y += drivers/misc/libmisc.o
275	269	LIBS-y += drivers/mmc/libmmc.o
276	270	LIBS-y += drivers/mtd/libmtd.o
277	271	LIBS-y += drivers/mtd/nand/libnand.o
278	272
...	...	@@ -281,14 +275,12 @@
281	275	LIBS-y += drivers/net/libnet.o
282	276	LIBS-y += drivers/net/phy/libphy.o
283	277	LIBS-y += drivers/pci/libpci.o
284		-LIBS-y += drivers/pcmcia/libpcmcia.o
285	278	LIBS-y += drivers/power/libpower.o \
286	279	drivers/power/fuel_gauge/libfuel_gauge.o \
287	280	drivers/power/mfd/libmfd.o \
288	281	drivers/power/pmic/libpmic.o \
289	282	drivers/power/battery/libbattery.o
290	283	LIBS-y += drivers/spi/libspi.o
291		-LIBS-y += drivers/dfu/libdfu.o
292	284	ifeq ($(CPU),mpc83xx)
293	285	LIBS-y += drivers/qe/libqe.o
294	286	LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
295	287
...	...	@@ -304,11 +296,7 @@
304	296	LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
305	297	LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
306	298	endif
307		-LIBS-y += drivers/rtc/librtc.o
308	299	LIBS-y += drivers/serial/libserial.o
309		-LIBS-y += drivers/sound/libsound.o
310		-LIBS-y += drivers/tpm/libtpm.o
311		-LIBS-y += drivers/twserial/libtws.o
312	300	LIBS-y += drivers/usb/eth/libusb_eth.o
313	301	LIBS-y += drivers/usb/gadget/libusb_gadget.o
314	302	LIBS-y += drivers/usb/host/libusb_host.o
...	...	@@ -316,8 +304,6 @@
316	304	LIBS-y += drivers/usb/musb-new/libusb_musb-new.o
317	305	LIBS-y += drivers/usb/phy/libusb_phy.o
318	306	LIBS-y += drivers/usb/ulpi/libusb_ulpi.o
319		-LIBS-y += drivers/video/libvideo.o
320		-LIBS-y += drivers/watchdog/libwatchdog.o
321	307	LIBS-y += common/libcommon.o
322	308	LIBS-y += lib/libfdt/libfdt.o
323	309	LIBS-y += api/libapi.o
...	...	@@ -34,7 +34,6 @@
34	34	arch/powerpc/cpu/mpc8xx/libmpc8xx.o (.text*)
35	35	board/LEOX/elpt860/libelpt860.o (.text*)
36	36	arch/powerpc/lib/libpowerpc.o (.text*)
37		-/* drivers/rtc/librtc.o (.text) /
38	37
39	38	. = env_offset;
40	39	common/env_embedded.o (.text*)
...	...	@@ -23,8 +23,8 @@
23	23	board/tqc/tqm8xx/libtqm8xx.o (.text*)
24	24	disk/libdisk.o (.text*)
25	25	drivers/net/libnet.o (.text*)
26		- drivers/pcmcia/libpcmcia.o (.text.pcmcia_on)
27		- drivers/pcmcia/libpcmcia.o (.text.pcmcia_hardware_enable)
	26	+ drivers/libdrivers.o (.text.pcmcia_on)
	27	+ drivers/libdrivers.o (.text.pcmcia_hardware_enable)
28	28
29	29	. = DEFINED(env_offset) ? env_offset : .;
30	30	common/env_embedded.o (.ppcenv*)
	1	+obj-y += bios_emulator/
	2	+obj-y += block/
	3	+obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/
	4	+obj-y += crypto/
	5	+obj-y += fpga/
	6	+obj-y += hwmon/
	7	+obj-y += misc/
	8	+obj-y += pcmcia/
	9	+obj-y += dfu/
	10	+obj-y += rtc/
	11	+obj-y += sound/
	12	+obj-y += tpm/
	13	+obj-y += twserial/
	14	+obj-y += video/
	15	+obj-y += watchdog/